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

[Stephane Popinet]

The following commit has been merged in the upstream branch:
commit 210b8faf9d66a49d2684382a1c976b88a18ce062
Author: Stephane Popinet <popinet at users.sf.net>
Date:   Sat Jul 26 10:25:31 2008 +1000

    gfs_init_solid_fractions() always resets the old solids first
    
    darcs-hash:20080726002531-d4795-e43769d792874f2118e74b3b8cc9311ac4b4ecd2.gz

diff --git a/src/solid.c b/src/solid.c
index bc2c631..ae7e527 100644
--- a/src/solid.c
+++ b/src/solid.c
@@ -873,6 +873,17 @@ static void match_fractions (FttCell * cell, GfsVariable * status)
   }
 }
 
+static void reset_solid (FttCell * cell, GfsVariable * status)
+{
+  GFS_VALUE (cell, status) = 0.;
+  if (GFS_STATE (cell)->solid)
+    fprintf (stderr, "* %g %g %g %p\n",
+	     GFS_STATE (cell)->solid->ca.x, GFS_STATE (cell)->solid->ca.y,
+	     GFS_STATE (cell)->solid->a, cell);
+  g_free (GFS_STATE (cell)->solid);
+  GFS_STATE (cell)->solid = NULL;
+}
+
 /**
  * gfs_domain_init_solid_fractions:
  * @domain: a #GfsDomain.
@@ -906,7 +917,7 @@ guint gfs_domain_init_solid_fractions (GfsDomain * domain,
   p.status = status ? status : gfs_temporary_variable (domain);
   p.thin = 0;
   gfs_domain_cell_traverse (domain, FTT_PRE_ORDER, FTT_TRAVERSE_ALL, -1,
-			    (FttCellTraverseFunc) gfs_cell_reset, p.status);
+			    (FttCellTraverseFunc) reset_solid, p.status);
   while (i) {
     gfs_domain_traverse_cut (domain, i->data, FTT_PRE_ORDER, FTT_TRAVERSE_LEAFS,
 			     (FttCellTraverseCutFunc) set_solid_fractions_from_surface, &p);

-- 
Gerris Flow Solver