tcngf-pf.c: fix manual override of numerical time step - cngf-pf - continuum mo… | |
git clone git://src.adamsgaard.dk/cngf-pf | |
Log | |
Files | |
Refs | |
README | |
LICENSE | |
--- | |
commit 5bd5b0c8750a91f1b5a7bc083a98aa6e474eda46 | |
parent bcfdeee0984251238a21f42b6491db14638ce373 | |
Author: Anders Damsgaard <[email protected]> | |
Date: Wed, 13 Jan 2021 14:51:21 +0100 | |
cngf-pf.c: fix manual override of numerical time step | |
Diffstat: | |
M cngf-pf.c | 13 ++++++++----- | |
1 file changed, 8 insertions(+), 5 deletions(-) | |
--- | |
diff --git a/cngf-pf.c b/cngf-pf.c | |
t@@ -69,7 +69,7 @@ usage(void) | |
int | |
main(int argc, char *argv[]) | |
{ | |
- int i, normalize; | |
+ int i, normalize, dt_override; | |
unsigned long iter; | |
double new_phi, new_k, filetimeclock; | |
struct simulation sim; | |
t@@ -88,7 +88,7 @@ main(int argc, char *argv[]) | |
normalize = 0; | |
new_phi = sim.phi[0]; | |
new_k = sim.k[0]; | |
- sim.dt = -1.0; | |
+ dt_override = 0; | |
ARGBEGIN { | |
case 'A': | |
t@@ -138,6 +138,7 @@ main(int argc, char *argv[]) | |
break; | |
case 'j': | |
sim.dt = atof(EARGF(usage())); | |
+ dt_override = 1; | |
break; | |
case 'K': | |
sim.dilatancy_constant = atof(EARGF(usage())); | |
t@@ -248,9 +249,11 @@ main(int argc, char *argv[]) | |
if (sim.fluid) { | |
hydrostatic_fluid_pressure_distribution(&sim); | |
- if (sim.dt <= 0.0 && set_largest_fluid_timestep(&sim, 0.5)) { | |
- free_arrays(&sim); | |
- return 20; | |
+ if (!dt_override) { | |
+ if (set_largest_fluid_timestep(&sim, 0.5)) { | |
+ free_arrays(&sim); | |
+ return 20; | |
+ } | |
} | |
} | |