tuse one value for all solver relative tolerance criteria - cngf-pf - continuum… | |
git clone git://src.adamsgaard.dk/cngf-pf | |
Log | |
Files | |
Refs | |
README | |
LICENSE | |
--- | |
commit 43e0e5c4c402b41ae10648b4b568e134950d5d84 | |
parent e0cfd5c51ba33c79ef4149d98e85b39972e7c2b2 | |
Author: Anders Damsgaard <[email protected]> | |
Date: Tue, 24 Nov 2020 13:45:23 +0100 | |
use one value for all solver relative tolerance criteria | |
Diffstat: | |
M cngf-pf.c | 4 ++-- | |
M simulation.c | 6 ++---- | |
2 files changed, 4 insertions(+), 6 deletions(-) | |
--- | |
diff --git a/cngf-pf.c b/cngf-pf.c | |
t@@ -10,8 +10,8 @@ | |
#include "arg.h" | |
-/* relative tolerance criteria for granular fluidity solver */ | |
-#define RTOL 1e-12 | |
+/* relative tolerance criteria for the solvers */ | |
+#define RTOL 1e-5 | |
#define MAX_ITER_1D_FD_SIMPLE_SHEAR 100000 | |
/* uncomment to print time spent per time step to stdout */ | |
diff --git a/simulation.c b/simulation.c | |
t@@ -10,11 +10,9 @@ | |
/* #define SHOW_PARAMETERS */ | |
/* relative tolerance criteria for granular fluidity solver */ | |
-#define RTOL_GRANULAR 1e-5 | |
#define MAX_ITER_GRANULAR 10000 | |
/* relative tolerance criteria for fluid-pressure solver */ | |
-#define RTOL_DARCY 1e-5 | |
#define MAX_ITER_DARCY 10000 | |
/* relative tolerance criteria when shear velocity is restricted */ | |
t@@ -803,7 +801,7 @@ coupled_shear_solver(struct simulation *sim, | |
/* step 5, Eq. 13 */ | |
if (sim->fluid) | |
- if (darcy_solver_1d(sim, MAX_ITER_DARCY, RTOL_… | |
+ if (darcy_solver_1d(sim, MAX_ITER_DARCY, rel_t… | |
exit(11); | |
/* step 6 */ | |
t@@ -816,7 +814,7 @@ coupled_shear_solver(struct simulation *sim, | |
/* step 8, Eq. 11 */ | |
if (implicit_1d_jacobian_poisson_solver(sim, | |
MAX_ITER_GRANU… | |
- RTOL_GRANULAR)) | |
+ rel_tol)) | |
exit(12); | |
/* step 9 */ |