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

[Stephane Popinet]

The following commit has been merged in the upstream branch:
commit 1a42b13bb44ca41082e88da4f823c29b50e06b63
Author: Stephane Popinet <popinet at users.sf.net>
Date:   Sun Feb 5 12:10:24 2006 +1100

    GfsAdapts should be treated as standard events
    
    ... in particular to avoid problems due to a changed order of events
    in output files.
    
    darcs-hash:20060205011024-d4795-f64e542c9c11f39726b0850138947d1f3db99514.gz

diff --git a/src/adaptive.c b/src/adaptive.c
index e246707..256fade 100644
--- a/src/adaptive.c
+++ b/src/adaptive.c
@@ -890,8 +890,6 @@ void gfs_simulation_adapt (GfsSimulation * simulation,
 
   gfs_domain_timer_start (domain, "adapt");
 
-  gts_container_foreach (GTS_CONTAINER (simulation->adapts), (GtsFunc) gfs_event_do, simulation);
-
   i = simulation->adapts->items;
   while (i) {
     GfsAdapt * a = i->data;
diff --git a/src/ocean.c b/src/ocean.c
index e55f337..77a211c 100644
--- a/src/ocean.c
+++ b/src/ocean.c
@@ -288,7 +288,6 @@ static void ocean_run (GfsSimulation * sim)
   gfs_simulation_refine (sim);
 
   gts_container_foreach (GTS_CONTAINER (sim->events), (GtsFunc) gfs_event_init, sim);
-  gts_container_foreach (GTS_CONTAINER (sim->adapts), (GtsFunc) gfs_event_init, sim);
 
   gfs_set_merged (domain);
   i = domain->variables;
@@ -624,7 +623,6 @@ static void ocean_run (GfsSimulation * sim)
 			    (FttCellTraverseFunc) compute_H, H);
 
   gts_container_foreach (GTS_CONTAINER (sim->events), (GtsFunc) gfs_event_init, sim);
-  gts_container_foreach (GTS_CONTAINER (sim->adapts), (GtsFunc) gfs_event_init, sim);
 
   gfs_set_merged (domain);
   i = domain->variables;
diff --git a/src/simulation.c b/src/simulation.c
index cbb4c74..5689ce8 100644
--- a/src/simulation.c
+++ b/src/simulation.c
@@ -45,13 +45,10 @@ static void simulation_destroy (GtsObject * object)
 			 (GtsFunc) gts_object_destroy, NULL);
   gts_object_destroy (GTS_OBJECT (sim->refines));
 
-  gts_container_foreach (GTS_CONTAINER (sim->adapts),
-			 (GtsFunc) gts_object_destroy, NULL);
-  gts_object_destroy (GTS_OBJECT (sim->adapts));
-
   gts_container_foreach (GTS_CONTAINER (sim->events),
 			 (GtsFunc) gts_object_destroy, NULL);
   gts_object_destroy (GTS_OBJECT (sim->events));
+  gts_object_destroy (GTS_OBJECT (sim->adapts));
 
   i = sim->modules;
   while (i) {
@@ -125,17 +122,6 @@ static void simulation_write (GtsObject * object, FILE * fp)
     }
   }
 
-  i = sim->adapts->items;
-  while (i) {
-    GtsObject * object = i->data;
-
-    fputs ("  ", fp);
-    g_assert (object->klass->write);
-    (* object->klass->write) (object, fp);
-    fputc ('\n', fp);
-    i = i->next;
-  }
-
   i = sim->events->items;
   while (i) {
     GtsObject * object = i->data;
@@ -462,8 +448,10 @@ static void simulation_read (GtsObject ** object, GtsFile * fp)
 
       if (GFS_IS_REFINE (object))
 	gts_container_add (GTS_CONTAINER (sim->refines), GTS_CONTAINEE (object));
-      else if (GFS_IS_ADAPT (object))
+      else if (GFS_IS_ADAPT (object)) {
 	gts_container_add (GTS_CONTAINER (sim->adapts), GTS_CONTAINEE (object));
+	gts_container_add (GTS_CONTAINER (sim->events), GTS_CONTAINEE (object));
+      }
       else if (GFS_IS_EVENT (object))
 	gts_container_add (GTS_CONTAINER (sim->events), GTS_CONTAINEE (object));
       else if (GFS_IS_SURFACE_GENERIC_BC (object))
@@ -508,7 +496,6 @@ static void simulation_run (GfsSimulation * sim)
   gfs_simulation_refine (sim);
 
   gts_container_foreach (GTS_CONTAINER (sim->events), (GtsFunc) gfs_event_init, sim);
-  gts_container_foreach (GTS_CONTAINER (sim->adapts), (GtsFunc) gfs_event_init, sim);
 
   gfs_set_merged (domain);
   i = domain->variables;
@@ -1298,7 +1285,6 @@ static void advection_run (GfsSimulation * sim)
   gfs_simulation_refine (sim);
 
   gts_container_foreach (GTS_CONTAINER (sim->events), (GtsFunc) gfs_event_init, sim);
-  gts_container_foreach (GTS_CONTAINER (sim->adapts), (GtsFunc) gfs_event_init, sim);
 
   gfs_set_merged (domain);
   i = domain->variables;
@@ -1457,7 +1443,6 @@ static void poisson_run (GfsSimulation * sim)
   gfs_simulation_refine (sim);
 
   gts_container_foreach (GTS_CONTAINER (sim->events), (GtsFunc) gfs_event_init, sim);
-  gts_container_foreach (GTS_CONTAINER (sim->adapts), (GtsFunc) gfs_event_init, sim);
 
   i = domain->variables;
   while (i) {

-- 
Gerris Flow Solver