[SCM] Gerris Flow Solver branch, upstream, updated. b3aa46814a06c9cb2912790b23916ffb44f1f203

[Stephane Popinet]

The following commit has been merged in the upstream branch:
commit 643897dc6736bec7c003494823d20f405243924d
Author: Stephane Popinet <popinet at users.sf.net>
Date:   Tue Jan 17 01:42:08 2006 +1100

    S now returns normalised surface fraction
    
    darcs-hash:20060116144208-d4795-17b5efb36388d0fd1ee44a310f59994a96419342.gz

diff --git a/src/fluid.c b/src/fluid.c
index 27a2618..febca19 100644
--- a/src/fluid.c
+++ b/src/fluid.c
@@ -1853,9 +1853,14 @@ void gfs_pressure_force (FttCell * cell,
   g_return_if_fail (f != NULL);
 
   if ((s = GFS_STATE (cell)->solid)) {
-    gdouble pv = gfs_cell_dirichlet_value (cell, p, -1);
+    gdouble size = ftt_cell_size (cell);
+    gdouble pv = gfs_cell_dirichlet_value (cell, p, -1)*size;
     FttComponent c;
 
+#if (!FTT_2D)
+    pv *= size;
+#endif /* 3D */
+
     gfs_solid_normal (cell, f);
     for (c = 0; c < FTT_DIMENSION; c++)
       (&f->x)[c] *= pv;
diff --git a/src/solid.c b/src/solid.c
index 85eab9e..8c18228 100644
--- a/src/solid.c
+++ b/src/solid.c
@@ -1048,17 +1048,14 @@ void gfs_solid_normal (const FttCell * cell, FttVector * n)
   g_return_if_fail (n != NULL);
 
   if ((s = GFS_STATE (cell)->solid)) {
-    gdouble size = ftt_cell_size (cell);
     FttComponent c;
 
-#if (!FTT_2D)
-    size *= size;
-#else /* 2D */
+#if (FTT_2D)
     n->z = 0.;
 #endif /* 2D */
 
     for (c = 0; c < FTT_DIMENSION; c++)
-      (&n->x)[c] = (s->s[2*c + 1] - s->s[2*c])*size;
+      (&n->x)[c] = (s->s[2*c + 1] - s->s[2*c]);
   }
   else
     n->x = n->y = n->z = 0.;

-- 
Gerris Flow Solver