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

Stephane Popinet popinet at users.sf.net
Fri May 15 02:53:50 UTC 2009


The following commit has been merged in the upstream branch:
commit f41d5c19eb1036145b8ebdcfdc8a4d6aff105d21
Author: Stephane Popinet <popinet at users.sf.net>
Date:   Tue Dec 19 06:48:40 2006 +1100

    Default CFL for VOF advection has been set to 0.45
    
    To have some margin. Also a warning has been added in case the true
    CFL is larger than 0.5 (when doing the VOF advection proper).
    
    darcs-hash:20061218194840-d4795-5df2d80152ad6a4ee4962bbef006a4aed27d5b3e.gz

diff --git a/src/advection.c b/src/advection.c
index 439f35f..7dc961d 100644
--- a/src/advection.c
+++ b/src/advection.c
@@ -963,7 +963,7 @@ void gfs_advection_params_read (GfsAdvectionParams * par, GtsFile * fp)
 	if (fp->type != GTS_ERROR && var[0].set)
 	  gts_file_variable_error (fp, var, "cfl", "cfl `%g' is out of range `]0,0.5]'", par->cfl);
 	else
-	  par->cfl = 0.5;
+	  par->cfl = 0.45;
       }
     }
     else if (fp->type != GTS_ERROR)
diff --git a/src/vof.c b/src/vof.c
index e82e7bd..295dee1 100644
--- a/src/vof.c
+++ b/src/vof.c
@@ -638,6 +638,11 @@ static void vof_flux (FttCellFace * face, VofParms * p)
   gdouble un = GFS_FACE_NORMAL_VELOCITY (face)*p->par->dt/ftt_cell_size (face->cell);
   if (!FTT_FACE_DIRECT (face))
     un = - un;
+  if (fabs (un) > 0.5) {
+    FttVector p;
+    ftt_face_pos (face, &p);
+    g_warning ("CFL (%g) at (%g,%g,%g) is larger than 0.5!", un, p.x, p.y, p.z);
+  }
 
   switch (ftt_face_type (face)) {
   case FTT_FINE_FINE: {

-- 
Gerris Flow Solver



More information about the debian-science-commits mailing list