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

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


The following commit has been merged in the upstream branch:
commit e75c835980e5ea9fe7c5e82618d655a9b09340f3
Author: Stephane Popinet <s.popinet at niwa.co.nz>
Date:   Tue Feb 8 14:29:09 2005 +1100

    Minimum timestep is 1e-9
    
    Several functions implicitly rely on the timestep being strictly positive.
    
    darcs-hash:20050208032909-fbd8f-9d2bb9300372c02e8f0d546b46456d66430e34f0.gz

diff --git a/src/simulation.c b/src/simulation.c
index 0f01d51..e5590c7 100644
--- a/src/simulation.c
+++ b/src/simulation.c
@@ -886,6 +886,8 @@ void gfs_simulation_set_timestep (GfsSimulation * sim)
     sim->advection_params.dt = sim->time.end - t;
     sim->tnext = sim->time.end;
   }
+  if (sim->advection_params.dt < 1e-9)
+    sim->advection_params.dt = 1e-9;
 }
 
 /**
diff --git a/src/timestep.c b/src/timestep.c
index 658a252..e785ed6 100644
--- a/src/timestep.c
+++ b/src/timestep.c
@@ -420,8 +420,7 @@ void gfs_approximate_projection (GfsDomain * domain,
 
   /* compute MAC divergence */
   gfs_domain_cell_traverse (domain, FTT_PRE_ORDER, FTT_TRAVERSE_LEAFS, -1,
-			    (FttCellTraverseFunc) gfs_normal_divergence, 
-			    NULL);
+			    (FttCellTraverseFunc) gfs_normal_divergence, NULL);
   gfs_domain_cell_traverse (domain, FTT_PRE_ORDER, FTT_TRAVERSE_ALL, -1,
   			    (FttCellTraverseFunc) scale_divergence, &apar->dt);
   

-- 
Gerris Flow Solver



More information about the debian-science-commits mailing list