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

Stephane Popinet s.popinet at niwa.co.nz
Fri May 15 02:52:41 UTC 2009


The following commit has been merged in the upstream branch:
commit 201d7004a57b3b5348827a9bda8d66df10bf66d0
Author: Stephane Popinet <s.popinet at niwa.co.nz>
Date:   Tue Sep 27 09:10:59 2005 +1000

    Variable half-events for ocean models
    
    darcs-hash:20050926231059-fbd8f-d0b5973771035719b4e18705f52fd0afd1d4440c.gz

diff --git a/src/ocean.c b/src/ocean.c
index 8e24776..20b698c 100644
--- a/src/ocean.c
+++ b/src/ocean.c
@@ -312,11 +312,7 @@ static void ocean_run (GfsSimulation * sim)
     GfsVariable * g[2];
     gdouble tstart;
 
-    i = domain->variables;
-    while (i) {
-      gfs_event_do (i->data, sim);
-      i = i->next;
-    }
+    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);
@@ -332,6 +328,7 @@ 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); 
@@ -666,11 +663,7 @@ static void ocean_run (GfsSimulation * sim)
     GfsVariable * g[2];
     gdouble tstart;
 
-    i = domain->variables;
-    while (i) {
-      gfs_event_do (i->data, sim);
-      i = i->next;
-    }
+    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);
@@ -721,6 +714,7 @@ 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,

-- 
Gerris Flow Solver



More information about the debian-science-commits mailing list