[SCM] Gerris Flow Solver branch, upstream, updated. b3aa46814a06c9cb2912790b23916ffb44f1f203
Stephane Popinet
popinet at users.sf.net
Fri May 15 02:53:47 UTC 2009
The following commit has been merged in the upstream branch:
commit a2b5da36bf659bac6e237856d5e22d7575b234b8
Author: Stephane Popinet <popinet at users.sf.net>
Date: Thu Nov 23 08:54:20 2006 +1100
Maximum CFL is 0.5 for VOF
darcs-hash:20061122215420-d4795-280734b98f99209bfb66bb0b5d208c4c2617a2f2.gz
diff --git a/src/advection.c b/src/advection.c
index 93764d7..439f35f 100644
--- a/src/advection.c
+++ b/src/advection.c
@@ -957,8 +957,15 @@ 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 f5adc61..5384978 100644
--- a/src/vof.c
+++ b/src/vof.c
@@ -663,6 +663,7 @@ void gfs_tracer_vof_advection (GfsDomain * domain,
g_return_if_fail (domain != NULL);
g_return_if_fail (par != NULL);
+ g_return_if_fail (par->cfl <= 0.5);
gfs_domain_timer_start (domain, "tracer_vof_advection");
--
Gerris Flow Solver
More information about the debian-science-commits
mailing list