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

[Stephane Popinet]

The following commit has been merged in the upstream branch:
commit 99ef7be2153bdd3dfe1c88ad9a04c9e53b4307ec
Author: Stephane Popinet <popinet at users.sf.net>
Date:   Thu Mar 29 10:45:42 2007 +1000

    Bug fix for gfs_domain_traverse_cut_2D()
    
    darcs-hash:20070329004542-d4795-e8f15c9c50498126eee287de5ff7f6a873b1197f.gz

diff --git a/src/fluid.c b/src/fluid.c
index 514be9f..b5aedb3 100644
--- a/src/fluid.c
+++ b/src/fluid.c
@@ -2144,7 +2144,7 @@ static void cell_traverse_cut (FttCell * cell,
 			       gpointer data,
 			       gboolean flatten)
 {
-  GtsSurface * s1 = gfs_cell_is_cut (cell, s, flatten);
+  GtsSurface * s1 = gfs_cell_is_cut (cell, s, flatten && FTT_CELL_IS_LEAF (cell));
 
   if (s1 == NULL)
     return;
diff --git a/src/solid.c b/src/solid.c
index 7743afc..f4309de 100644
--- a/src/solid.c
+++ b/src/solid.c
@@ -765,12 +765,9 @@ void gfs_cell_init_solid_fractions_from_children (FttCell * cell)
       guint n = ftt_cell_children_direction (cell, i, &child);
 
       w = 0.;
-      for (j = 0; j < n; j++) {
-	FttCell * c = child.c[j];
-
-	if (c)
-	  w += GFS_IS_FLUID (c) ? 1. : GFS_STATE (c)->solid->s[i];
-      }
+      for (j = 0; j < n; j++)
+	if (child.c[j])
+	  w += GFS_IS_FLUID (child.c[j]) ? 1. : GFS_STATE (child.c[j])->solid->s[i];
       solid->s[i] = w/n;
     }
   }

-- 
Gerris Flow Solver