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

[Stephane Popinet]

The following commit has been merged in the upstream branch:
commit bdafb98f8bc63bfc66ec178a50f166f1efacb334
Author: Stephane Popinet <popinet at users.sf.net>
Date:   Thu Feb 21 14:55:57 2008 +1100

    Bug fix when restarting simulations using SurfaceBc
    
    darcs-hash:20080221035557-d4795-5051596230d4e1b892cda98344f823db51af748e.gz

diff --git a/src/simulation.c b/src/simulation.c
index 10d7f7c..af03548 100644
--- a/src/simulation.c
+++ b/src/simulation.c
@@ -50,7 +50,6 @@ static void simulation_destroy (GtsObject * object)
 
   g_slist_foreach (sim->modules, (GFunc) g_module_close, NULL);
   g_slist_free (sim->modules);
-  g_slist_free (sim->variables);
   g_slist_foreach (sim->globals, (GFunc) gts_object_destroy, NULL);
   g_slist_free (sim->globals);
 
@@ -88,25 +87,6 @@ static void simulation_write (GtsObject * object, FILE * fp)
   gfs_time_write (&sim->time, fp);
   fputc ('\n', fp);
 
-  i = sim->variables;
-  while (i) {
-    fputs ("  ", fp);
-    (* GTS_OBJECT (i->data)->klass->write) (i->data, fp);
-    fputc ('\n', fp);
-    i = i->next;
-  }
-
-  i = GFS_DOMAIN (sim)->variables;
-  while (i) {
-    v = i->data;
-    if (v->surface_bc) {
-      fputs ("  ", fp);
-      (* GTS_OBJECT (v->surface_bc)->klass->write) (GTS_OBJECT (v->surface_bc), fp);
-      fputc ('\n', fp);
-    }
-    i = i->next;
-  }
-
   if (GFS_DOMAIN (sim)->max_depth_write < -1) {
     i = sim->refines->items;
     while (i) {
@@ -134,6 +114,17 @@ static void simulation_write (GtsObject * object, FILE * fp)
     i = i->next;
   }
 
+  i = GFS_DOMAIN (sim)->variables;
+  while (i) {
+    v = i->data;
+    if (v->surface_bc) {
+      fputs ("  ", fp);
+      (* GTS_OBJECT (v->surface_bc)->klass->write) (GTS_OBJECT (v->surface_bc), fp);
+      fputc ('\n', fp);
+    }
+    i = i->next;
+  }
+
   fputs ("  GfsPhysicalParams ", fp);
   gfs_physical_params_write (&sim->physical_params, fp);
   fputs ("\n  GfsAdvectionParams ", fp);
diff --git a/src/simulation.h b/src/simulation.h
index a1d0cc4..2ae8b72 100644
--- a/src/simulation.h
+++ b/src/simulation.h
@@ -69,7 +69,7 @@ struct _GfsSimulation {
   GfsAdaptStats adapts_stats;
 
   GtsSListContainer * events;
-  GSList * modules, * variables, * globals;
+  GSList * modules, * globals;
 
   GtsSListContainer * solids;
   guint thin;

-- 
Gerris Flow Solver