ttest: use consistent naming for transient tests - cngf-pf - continuum model for granular flows with pore-pressure dynamics (renamed from 1d_fd_simple_shear)
(HTM) git clone git://src.adamsgaard.dk/cngf-pf
(DIR) Log
(DIR) Files
(DIR) Refs
(DIR) README
(DIR) LICENSE
---
(DIR) commit 2be72b1f936e1bef3a3e6f5464978d6ead9f3590
(DIR) parent c8fed31ef3ece1d7ae56a449d68a7ff3356a10ec
(HTM) Author: Anders Damsgaard <anders@adamsgaard.dk>
Date: Mon, 30 Aug 2021 19:15:20 +0200
ttest: use consistent naming for transient tests
Diffstat:
M test/Makefile | 45 ++++++++++++++++---------------
R test/cngf_pf_dry_transient.std -> … | 0
R test/cngf_pf_trans_overcons.std ->… | 0
R test/cngf_pf_trans_undercons.std -… | 0
4 files changed, 23 insertions(+), 22 deletions(-)
---
(DIR) diff --git a/test/Makefile b/test/Makefile
t@@ -5,7 +5,6 @@ BIN3 = ../shear_flux
TESTS = cngf_pf_dry \
cngf_pf_dry_norm \
cngf_pf_dry_cohesive \
- cngf_pf_dry_transient \
cngf_pf_dry_vconst \
cngf_pf_wet \
cngf_pf_wet_norm \
t@@ -13,8 +12,9 @@ TESTS = cngf_pf_dry \
cngf_pf_wet_vari_diff \
cngf_pf_wet_vari_pulse \
cngf_pf_wet_vari_pulse_vlim \
- cngf_pf_trans_undercons \
- cngf_pf_trans_overcons \
+ cngf_pf_dry_trans \
+ cngf_pf_dry_trans_undercons \
+ cngf_pf_dry_trans_overcons \
max_depth_misc \
shear_flux_dry \
shear_flux_wet
t@@ -24,7 +24,6 @@ STANDARDS := $(TESTS:=.std)
CNGF_PF_DRY_OPTS = -o 0.03 -L 0.64 -n 40e3
CNGF_PF_DRY_NORM_OPTS = -o 0.03 -L 0.64 -n 40e3 -N
CNGF_PF_DRY_COHESIVE_OPTS = -o 0.03 -L 0.64 -n 40e3 -c 1e3
-CNGF_PF_DRY_TRANSIENT_OPTS =-T -e 5.0
CNGF_PF_DRY_VCONST_OPTS = -s 1e-3
CNGF_PF_WET_OPTS = -o 0.03 -L 0.64 -n 40e3 -F
CNGF_PF_WET_NORM_OPTS = -o 0.03 -L 0.64 -n 40e3 -F -N
t@@ -48,10 +47,12 @@ CNGF_PF_WET_VARI_PULSE_OPTS = $(CNGF_PF_WET_VARI_OPTS) \
-u 500
CNGF_PF_WET_VARI_PULSE_VLIM_OPTS = $(CNGF_PF_WET_VARI_OPTS) \
-u 500 -l 1e-3
-CNGF_PF_TRANS_UNDERCONS_OPTS = -T -e 100.0 -I 1.0 -s 0.01 -p 0.25 trans_undercons >/dev/null && \
- for f in trans_undercons.output*.txt; do tail -n 1 "$$f"; done
-CNGF_PF_TRANS_OVERCONS_OPTS = -T -e 100.0 -I 1.0 -s 0.01 -p 0.15 trans_overcons >/dev/null && \
- for f in trans_overcons.output*.txt; do tail -n 1 "$$f"; done
+CNGF_PF_DRY_TRANS_OPTS = -T -e 5.0
+CNGF_PF_DRY_TRANS_UNDERCONS_OPTS = -T -e 100.0 -I 1.0 -s 0.01 -p 0.25 trans_undercons >/dev/null && \
+ for f in trans_undercons.output*.txt; do tail -n 1 "$$f"; done
+CNGF_PF_DRY_TRANS_OVERCONS_OPTS = -T -e 100.0 -I 1.0 -s 0.01 -p 0.15 trans_overcons >/dev/null && \
+ for f in trans_overcons.output*.txt; do tail -n 1 "$$f"; done
+
MAX_DEPTH_MISC = sh -c 'for A_f in 1e3 5e3 10e3 50e3 100e3; \
do ./$(BIN2) -O 101e3 -a $$A_f -q 0.01;\
./$(BIN2) -O 101e3 -a $$A_f -q 0.001;\
t@@ -70,9 +71,6 @@ cngf_pf_dry_norm: $(BIN)
cngf_pf_dry_cohesive: $(BIN)
./$(BIN) $(CNGF_PF_DRY_COHESIVE_OPTS) | diff $@.std -
-cngf_pf_dry_transient: $(BIN)
- ./$(BIN) $(CNGF_PF_DRY_TRANSIENT_OPTS) | diff $@.std -
-
cngf_pf_dry_vconst: $(BIN)
./$(BIN) $(CNGF_PF_DRY_VCONST_OPTS) | diff $@.std -
t@@ -94,11 +92,14 @@ cngf_pf_wet_vari_pulse: $(BIN)
cngf_pf_wet_vari_pulse_vlim: $(BIN)
./$(BIN) $(CNGF_PF_WET_VARI_PULSE_VLIM_OPTS) | diff $@.std -
-cngf_pf_trans_undercons: $(BIN)
- ./$(BIN) $(CNGF_PF_TRANS_UNDERCONS_OPTS) | diff $@.std -
+cngf_pf_dry_transient: $(BIN)
+ ./$(BIN) $(CNGF_PF_DRY_TRANS_OPTS) | diff $@.std -
+
+cngf_pf_dry_trans_undercons: $(BIN)
+ ./$(BIN) $(CNGF_PF_DRY_TRANS_UNDERCONS_OPTS) | diff $@.std -
-cngf_pf_trans_overcons: $(BIN)
- ./$(BIN) $(CNGF_PF_TRANS_OVERCONS_OPTS) | diff $@.std -
+cngf_pf_dry_trans_overcons: $(BIN)
+ ./$(BIN) $(CNGF_PF_DRY_TRANS_OVERCONS_OPTS) | diff $@.std -
max_depth_misc: $(BIN2)
$(MAX_DEPTH_MISC) | diff $@.std -
t@@ -119,9 +120,6 @@ cngf_pf_dry_norm.std: $(BIN)
cngf_pf_dry_cohesive.std: $(BIN)
./$(BIN) $(CNGF_PF_DRY_COHESIVE_OPTS) > $@
-cngf_pf_dry_transient.std: $(BIN)
- ./$(BIN) $(CNGF_PF_DRY_TRANSIENT_OPTS) > $@
-
cngf_pf_dry_vconst.std: $(BIN)
./$(BIN) $(CNGF_PF_DRY_VCONST_OPTS) > $@
t@@ -143,11 +141,14 @@ cngf_pf_wet_vari_pulse.std: $(BIN)
cngf_pf_wet_vari_pulse_vlim.std: $(BIN)
./$(BIN) $(CNGF_PF_WET_VARI_PULSE_VLIM_OPTS) > $@
-cngf_pf_trans_undercons.std: $(BIN)
- ./$(BIN) $(CNGF_PF_TRANS_UNDERCONS_OPTS) > $@
+cngf_pf_dry_transient.std: $(BIN)
+ ./$(BIN) $(CNGF_PF_DRY_TRANS_OPTS) > $@
+
+cngf_pf_dry_trans_undercons.std: $(BIN)
+ ./$(BIN) $(CNGF_PF_DRY_TRANS_UNDERCONS_OPTS) > $@
-cngf_pf_trans_overcons.std: $(BIN)
- ./$(BIN) $(CNGF_PF_TRANS_OVERCONS_OPTS) > $@
+cngf_pf_dry_trans_overcons.std: $(BIN)
+ ./$(BIN) $(CNGF_PF_DRY_TRANS_OVERCONS_OPTS) > $@
max_depth_misc.std: $(BIN2)
$(MAX_DEPTH_MISC) > $@
(DIR) diff --git a/test/cngf_pf_dry_transient.std b/test/cngf_pf_dry_trans.std
(DIR) diff --git a/test/cngf_pf_trans_overcons.std b/test/cngf_pf_dry_trans_overcons.std
(DIR) diff --git a/test/cngf_pf_trans_undercons.std b/test/cngf_pf_dry_trans_undercons.std