[SCM] Gerris Flow Solver branch, upstream, updated. b3aa46814a06c9cb2912790b23916ffb44f1f203
Stephane Popinet
popinet at users.sf.net
Fri May 15 02:55:06 UTC 2009
The following commit has been merged in the upstream branch:
commit e8048abfcd2f731935dd21e3be3ee39c4e937741
Author: Stephane Popinet <popinet at users.sf.net>
Date: Fri Mar 7 09:31:24 2008 +1100
'omega' relaxation parameter is written only if different from default
This means that simulation files are backward-compatible with older versions of
gerris/gfsview.
darcs-hash:20080306223124-d4795-87b1457511ecade222f7c3385560bb5c6d6251f0.gz
diff --git a/src/poisson.c b/src/poisson.c
index f5e1d36..2eb7cd3 100644
--- a/src/poisson.c
+++ b/src/poisson.c
@@ -45,9 +45,7 @@ void gfs_multilevel_params_write (GfsMultilevelParams * par, FILE * fp)
" nitermax = %u\n"
" nitermin = %u\n"
" weighted = %d\n"
- " beta = %g\n"
- " omega = %g\n"
- "}",
+ " beta = %g\n",
par->tolerance,
par->nrelax,
par->erelax,
@@ -55,8 +53,10 @@ void gfs_multilevel_params_write (GfsMultilevelParams * par, FILE * fp)
par->nitermax,
par->nitermin,
par->weighted,
- par->beta,
- par->omega);
+ par->beta);
+ if (par->omega != 1.)
+ fprintf (fp, " omega = %g\n", par->omega);
+ fputc ('}', fp);
}
void gfs_multilevel_params_init (GfsMultilevelParams * par)
--
Gerris Flow Solver
More information about the debian-science-commits
mailing list