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

[Stephane Popinet]

The following commit has been merged in the upstream branch:
commit aa2efea0311fbcb88bad10bc082523e712006f4e
Author: Stephane Popinet <popinet at users.sf.net>
Date:   Mon Jan 30 21:18:56 2006 +1100

    Bug fix for GfsVariable half-events
    
    Half-events were never processed for GfsVariables.
    
    darcs-hash:20060130101856-d4795-2302b05a31d9bb08c6f619d4dbeb8c00fec62f4b.gz

diff --git a/src/ocean.c b/src/ocean.c
index 847a02c..c997dec 100644
--- a/src/ocean.c
+++ b/src/ocean.c
@@ -312,7 +312,6 @@ static void ocean_run (GfsSimulation * sim)
     GfsVariable * g[2];
     gdouble tstart;
 
-    g_slist_foreach (domain->variables, (GFunc) gfs_event_do, sim);
     gfs_domain_cell_traverse (domain,
 			      FTT_POST_ORDER, FTT_TRAVERSE_NON_LEAFS, -1,
 			      (FttCellTraverseFunc) gfs_cell_coarse_init, domain);
@@ -328,7 +327,6 @@ static void ocean_run (GfsSimulation * sim)
 
     gfs_domain_bc (domain, FTT_TRAVERSE_LEAFS, -1, p);
 
-    g_slist_foreach (domain->variables, (GFunc) gfs_event_half_do, sim);
     gts_container_foreach (GTS_CONTAINER (sim->events), (GtsFunc) gfs_event_half_do, sim);
 
     gfs_correct_normal_velocities_weighted (domain, 2, p, g, 0., FALSE); 
@@ -663,7 +661,6 @@ static void ocean_run (GfsSimulation * sim)
     GfsVariable * g[2];
     gdouble tstart;
 
-    g_slist_foreach (domain->variables, (GFunc) gfs_event_do, sim);
     gfs_domain_cell_traverse (domain,
 			      FTT_POST_ORDER, FTT_TRAVERSE_NON_LEAFS, -1,
 			      (FttCellTraverseFunc) gfs_cell_coarse_init, domain);
@@ -714,7 +711,6 @@ static void ocean_run (GfsSimulation * sim)
       i = i->next;
     }
 
-    g_slist_foreach (domain->variables, (GFunc) gfs_event_half_do, sim);
     gts_container_foreach (GTS_CONTAINER (sim->events), (GtsFunc) gfs_event_half_do, sim);
 
     gfs_centered_velocity_advection_diffusion (domain, 2,
diff --git a/src/simulation.c b/src/simulation.c
index 0c2daed..36f059d 100644
--- a/src/simulation.c
+++ b/src/simulation.c
@@ -530,7 +530,6 @@ static void simulation_run (GfsSimulation * sim)
     GfsVariable * g[FTT_DIMENSION];
     gdouble tstart;
 
-    g_slist_foreach (domain->variables, (GFunc) gfs_event_do, sim);
     gfs_domain_cell_traverse (domain,
 			      FTT_POST_ORDER, FTT_TRAVERSE_NON_LEAFS, -1,
 			      (FttCellTraverseFunc) gfs_cell_coarse_init, domain);
@@ -568,7 +567,6 @@ static void simulation_run (GfsSimulation * sim)
       i = i->next;
     }
 
-    g_slist_foreach (domain->variables, (GFunc) gfs_event_half_do, sim);
     gts_container_foreach (GTS_CONTAINER (sim->events), (GtsFunc) gfs_event_half_do, sim);
 
     gfs_centered_velocity_advection_diffusion (domain,
@@ -1316,11 +1314,6 @@ static void advection_run (GfsSimulation * sim)
 	 sim->time.i < sim->time.iend) {
     gdouble tstart;
 
-    i = domain->variables;
-    while (i) {
-      gfs_event_do (GFS_EVENT (i->data), sim);
-      i = i->next;
-    }
     gfs_domain_cell_traverse (domain,
 			      FTT_POST_ORDER, FTT_TRAVERSE_NON_LEAFS, -1,
 			      (FttCellTraverseFunc) gfs_cell_coarse_init, domain);
@@ -1506,11 +1499,6 @@ static void poisson_run (GfsSimulation * sim)
 				(FttCellTraverseFunc) copy_res, data);
     }
 
-    i = domain->variables;
-    while (i) {
-      gfs_event_do (GFS_EVENT (i->data), sim);
-      i = i->next;
-    }
     gfs_domain_cell_traverse (domain,
     			      FTT_POST_ORDER, FTT_TRAVERSE_NON_LEAFS, -1,
     			      (FttCellTraverseFunc) gfs_cell_coarse_init, domain);

-- 
Gerris Flow Solver