[SCM] Gerris Flow Solver branch, upstream, updated. b3aa46814a06c9cb2912790b23916ffb44f1f203
Stephane Popinet
popinet at users.sf.net
Fri May 15 02:55:31 UTC 2009
The following commit has been merged in the upstream branch:
commit 2790b9d582069504aba479661fd8a1fb5e86a3f4
Author: Stephane Popinet <popinet at users.sf.net>
Date: Thu Jul 10 07:43:55 2008 +1000
Bug fix for cgd files and face boundary conditions
darcs-hash:20080709214355-d4795-83d2350c3ef854143cc382c841535c3d5c43fe2d.gz
diff --git a/src/cartesian.c b/src/cartesian.c
index 19a3feb..fcd2628 100644
--- a/src/cartesian.c
+++ b/src/cartesian.c
@@ -56,7 +56,7 @@ static void gfs_cartesian_grid_read (GtsObject ** o, GtsFile * fp)
for (i = 0; i < cgd->N; i++) {
while (fp->type == '\n')
gts_file_next_token (fp);
- if (fp->type != GTS_UINT) {
+ if (fp->type != GTS_INT) {
gts_file_error (fp, "expecting an integer (n[%d])", i);
return;
}
diff --git a/src/utils.c b/src/utils.c
index 75fb50e..a27cb8f 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -983,10 +983,14 @@ gdouble gfs_function_face_value (GfsFunction * f, FttCellFace * fa)
gdouble dimensional;
if (f->s) {
FttVector p;
-
ftt_face_pos (fa, &p);
dimensional = interpolated_value (f, &p);
}
+ else if (f->g) {
+ FttVector p;
+ ftt_face_pos (fa, &p);
+ dimensional = interpolated_cgd (f, &p);
+ }
else if (f->v)
dimensional = gfs_dimensional_value (f->v, gfs_face_interpolated_value (fa, f->v->i));
else if (f->dv)
--
Gerris Flow Solver
More information about the debian-science-commits
mailing list