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

[Stephane Popinet]

The following commit has been merged in the upstream branch:
commit 19cccb8b55ab1fdfaabeb84854f4c6bae7ccf7bb
Author: Stephane Popinet <s.popinet at niwa.co.nz>
Date:   Thu Apr 14 02:51:11 2005 +1000

    VOF scheme has a CFL limit of one (not 0.5)
    
    darcs-hash:20050413165111-fbd8f-c3ed287967b866a8c1d8baff341216a5e82dbf50.gz

diff --git a/src/advection.c b/src/advection.c
index 6cfc6f5..62a7941 100644
--- a/src/advection.c
+++ b/src/advection.c
@@ -950,17 +950,8 @@ void gfs_advection_params_read (GfsAdvectionParams * par, GtsFile * fp)
       par->scheme = GFS_GODUNOV;
     else if (!strcmp (scheme, "none"))
       par->scheme = GFS_NONE;
-    else if (!strcmp (scheme, "vof")) {
+    else if (!strcmp (scheme, "vof"))
       par->scheme = GFS_VOF;
-      if (par->cfl > 0.5) {
-	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;
-      }
-    }
     else if (fp->type != GTS_ERROR)
       gts_file_variable_error (fp, var, "scheme",
 			       "unknown scheme parameter `%s'", scheme);
diff --git a/src/vof.c b/src/vof.c
index 81d6c74..5a74cf6 100644
--- a/src/vof.c
+++ b/src/vof.c
@@ -410,7 +410,6 @@ static void gfs_cell_vof_advected_face_values (FttCell * cell,
 
   g_return_if_fail (cell != NULL);
   g_return_if_fail (par != NULL);
-  g_return_if_fail (par->cfl <= 0.5);
 
   f = GFS_VARIABLE (cell, par->v->i);
   THRESHOLD (f);

-- 
Gerris Flow Solver