[SCM] Gerris Flow Solver branch, upstream, updated. b3aa46814a06c9cb2912790b23916ffb44f1f203
Stephane Popinet
popinet at users.sf.net
Fri May 15 02:55:49 UTC 2009
The following commit has been merged in the upstream branch:
commit b2fc1fbc19abe01ac57cc98432c28b8e755d62e1
Author: Stephane Popinet <popinet at users.sf.net>
Date: Thu Oct 23 07:52:22 2008 +1100
Fixed dimensioning of GfsEventHarmonic
darcs-hash:20081022205222-d4795-bccba11a23e703da872e6874feb1687af8e9f5fe.gz
diff --git a/src/event.c b/src/event.c
index 38dd081..d75442c 100644
--- a/src/event.c
+++ b/src/event.c
@@ -1151,6 +1151,7 @@ static void gfs_event_harmonic_read (GtsObject ** o, GtsFile * fp)
gts_file_error (fp, "`%s' is a reserved keyword", fp->token->str);
return;
}
+ s->z->units = s->v->units;
gts_file_next_token (fp);
if (fp->type != GTS_INT && fp->type != GTS_FLOAT) {
@@ -1163,6 +1164,7 @@ static void gfs_event_harmonic_read (GtsObject ** o, GtsFile * fp)
gts_file_error (fp, "`%s' is a reserved keyword", fp->token->str);
return;
}
+ s->e->units = s->v->units;
gts_file_next_token (fp);
}
@@ -1196,6 +1198,7 @@ static void gfs_event_harmonic_read (GtsObject ** o, GtsFile * fp)
gts_file_error (fp, "`%s' is a reserved keyword", u);
return;
}
+ s->A[i]->units = s->v->units;
g_free (u);
u = g_strdup_printf ("%s%d", s->Bname, i);
if (!(s->B[i] = gfs_domain_get_or_add_variable (domain, u,
@@ -1203,6 +1206,8 @@ static void gfs_event_harmonic_read (GtsObject ** o, GtsFile * fp)
gts_file_error (fp, "`%s' is a reserved keyword", u);
return;
}
+ s->B[i]->units = s->v->units;
+ g_free (u);
}
if (fp->type == '{') {
--
Gerris Flow Solver
More information about the debian-science-commits
mailing list