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

[Stephane Popinet]

The following commit has been merged in the upstream branch:
commit 05d65f3e6cc0b98941334b2e71d3836feae2f8d2
Author: Stephane Popinet <s.popinet at niwa.co.nz>
Date:   Tue Jan 18 15:05:24 2005 +1100

    Fixed test/advection
    
    The results needs checking.
    
    darcs-hash:20050118040524-fbd8f-6fef1252a6aa165319439b2361da780ec904f00c.gz

diff --git a/test/advection/advection.c b/test/advection/advection.c
index 66bb648..82264d6 100644
--- a/test/advection/advection.c
+++ b/test/advection/advection.c
@@ -81,14 +81,6 @@ static gboolean refine_box (FttCell * cell, guint * maxlevel)
   return FALSE;
 }
 
-static void copy_fraction (FttCell * cell)
-{
-  if (GFS_IS_FLUID (cell))
-    GFS_STATE (cell)->p = 1.;
-  else
-    GFS_STATE (cell)->p = GFS_STATE (cell)->solid->a;
-}
-
 static void smooth_gaussian (FttCell * cell)
 {
   FttVector pos;
@@ -340,8 +332,6 @@ int main (int argc, char * argv[])
 
   if (!smooth) {
     GtsSurface * interface;
-    GNode * itree;
-    gboolean is_open;
     GtsFile * fp = gts_file_new (stdin);
 
     /* read GTS surface */
@@ -358,21 +348,7 @@ int main (int argc, char * argv[])
     }
     
     /* compute solid fractions using surface */
-    itree = gts_bb_tree_surface (interface);
-    is_open = gts_surface_volume (interface) < 0. ? TRUE : FALSE;
-    gfs_cell_init_solid_fractions (box->root, interface, itree, is_open,
-				   FALSE, NULL, NULL);
-    if (leftrefine == 0 && rightrefine == 0 && boxrefine == 0)
-      g_assert (gfs_cell_check_solid_fractions (box->root, 
-						interface, itree, is_open));
-    gts_bb_tree_destroy (itree, TRUE);
-
-    /* save solid fraction */
-    ftt_cell_traverse (box->root, FTT_PRE_ORDER, FTT_TRAVERSE_ALL, -1,
-		       (FttCellTraverseFunc) copy_fraction, NULL);
-
-    /* reset all cells to fluid */
-    gfs_cell_fluid (box->root);
+    gfs_domain_init_fraction (domain, interface, gfs_p);
   }
   else
     ftt_cell_traverse (box->root, FTT_PRE_ORDER, FTT_TRAVERSE_LEAFS, -1,

-- 
Gerris Flow Solver