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

[Stephane Popinet]

The following commit has been merged in the upstream branch:
commit 91dc8dc307fdb8e11dd7548a8bac125b7cfe4985
Author: Stephane Popinet <popinet at users.sf.net>
Date:   Wed Feb 1 01:33:01 2006 +1100

    OutputTiming computes the total running time
    
    i.e. does not exclude the time taken by Outputs and Events.
    
    darcs-hash:20060131143301-d4795-ce09aae76ff66ba5b9863ab397386de53ceeb0f7.gz

diff --git a/src/ocean.c b/src/ocean.c
index c997dec..99c1a26 100644
--- a/src/ocean.c
+++ b/src/ocean.c
@@ -310,15 +310,13 @@ static void ocean_run (GfsSimulation * sim)
   while (sim->time.t < sim->time.end &&
 	 sim->time.i < sim->time.iend) {
     GfsVariable * g[2];
-    gdouble tstart;
+    gdouble tstart = gfs_clock_elapsed (domain->timer);
 
     gfs_domain_cell_traverse (domain,
 			      FTT_POST_ORDER, FTT_TRAVERSE_NON_LEAFS, -1,
 			      (FttCellTraverseFunc) gfs_cell_coarse_init, domain);
     gts_container_foreach (GTS_CONTAINER (sim->events), (GtsFunc) gfs_event_do, sim);
 
-    tstart = gfs_clock_elapsed (domain->timer);
-
     gfs_simulation_set_timestep (sim);
 
     normal_velocities (domain, gfs_domain_velocity (domain));
@@ -659,15 +657,13 @@ static void ocean_run (GfsSimulation * sim)
   while (sim->time.t < sim->time.end &&
 	 sim->time.i < sim->time.iend) {
     GfsVariable * g[2];
-    gdouble tstart;
+    gdouble tstart = gfs_clock_elapsed (domain->timer);
 
     gfs_domain_cell_traverse (domain,
 			      FTT_POST_ORDER, FTT_TRAVERSE_NON_LEAFS, -1,
 			      (FttCellTraverseFunc) gfs_cell_coarse_init, domain);
     gts_container_foreach (GTS_CONTAINER (sim->events), (GtsFunc) gfs_event_do, sim);
 
-    tstart = gfs_clock_elapsed (domain->timer);
-
     gfs_simulation_set_timestep (sim);
 
     /* barotropic divergence */
diff --git a/src/simulation.c b/src/simulation.c
index 36f059d..cbb4c74 100644
--- a/src/simulation.c
+++ b/src/simulation.c
@@ -528,15 +528,13 @@ static void simulation_run (GfsSimulation * sim)
   while (sim->time.t < sim->time.end &&
 	 sim->time.i < sim->time.iend) {
     GfsVariable * g[FTT_DIMENSION];
-    gdouble tstart;
+    gdouble tstart = gfs_clock_elapsed (domain->timer);
 
     gfs_domain_cell_traverse (domain,
 			      FTT_POST_ORDER, FTT_TRAVERSE_NON_LEAFS, -1,
 			      (FttCellTraverseFunc) gfs_cell_coarse_init, domain);
     gts_container_foreach (GTS_CONTAINER (sim->events), (GtsFunc) gfs_event_do, sim);
 
-    tstart = gfs_clock_elapsed (domain->timer);
-
     gfs_simulation_set_timestep (sim);
 
     gfs_predicted_face_velocities (domain, FTT_DIMENSION, &sim->advection_params);
@@ -1312,15 +1310,13 @@ static void advection_run (GfsSimulation * sim)
 
   while (sim->time.t < sim->time.end &&
 	 sim->time.i < sim->time.iend) {
-    gdouble tstart;
+    gdouble tstart = gfs_clock_elapsed (domain->timer);
 
     gfs_domain_cell_traverse (domain,
 			      FTT_POST_ORDER, FTT_TRAVERSE_NON_LEAFS, -1,
 			      (FttCellTraverseFunc) gfs_cell_coarse_init, domain);
     gts_container_foreach (GTS_CONTAINER (sim->events), (GtsFunc) gfs_event_do, sim);
 
-    tstart = gfs_clock_elapsed (domain->timer);
-
     gfs_simulation_set_timestep (sim);
 
     gfs_domain_face_traverse (domain, FTT_XYZ,
@@ -1489,7 +1485,7 @@ static void poisson_run (GfsSimulation * sim)
 	 sim->time.i < sim->time.iend &&
 	 sim->time.i < par->nitermax &&
 	 par->residual.infty > par->tolerance) {
-    gdouble tstart;
+    gdouble tstart = gfs_clock_elapsed (domain->timer);
 
     if (res) {
       gpointer data[2];
@@ -1504,8 +1500,6 @@ static void poisson_run (GfsSimulation * sim)
     			      (FttCellTraverseFunc) gfs_cell_coarse_init, domain);
     gts_container_foreach (GTS_CONTAINER (sim->events), (GtsFunc) gfs_event_do, sim);
 
-    tstart = gfs_clock_elapsed (domain->timer);
-
     gfs_domain_timer_start (domain, "poisson_cycle");
     gfs_poisson_cycle (domain, par, p, div, dia, res1);
     par->residual = gfs_domain_norm_residual (domain, FTT_TRAVERSE_LEAFS, -1, 1., res1);

-- 
Gerris Flow Solver