trename tests from "simple shear" to "cngf_pf" - cngf-pf - continuum model for granular flows with pore-pressure dynamics (renamed from 1d_fd_simple_shear)
HTML git clone git://src.adamsgaard.dk/cngf-pf
DIR Log
DIR Files
DIR Refs
DIR README
DIR LICENSE
---
DIR commit 73d9302b38b8b286a43b392a3c8b6d23b65e7925
DIR parent 30733e55ce95327404e4d55f8cd679f194c8447a
HTML Author: Anders Damsgaard <anders@adamsgaard.dk>
Date: Mon, 30 Aug 2021 09:50:33 +0200
rename tests from "simple shear" to "cngf_pf"
Diffstat:
M test/Makefile | 140 ++++++++++++++++----------------
R test/simple_shear_dry.std -> test/… | 0
R test/simple_shear_dry_cohesive.std… | 0
R test/simple_shear_dry_norm.std -> … | 0
R test/simple_shear_dry_transient.st… | 0
R test/simple_shear_dry_vconst.std -… | 0
R test/simple_shear_wet.std -> test/… | 0
R test/simple_shear_wet_norm.std -> … | 0
R test/simple_shear_wet_vari.std -> … | 0
R test/simple_shear_wet_vari_diff.st… | 0
R test/simple_shear_wet_vari_pulse.s… | 0
R test/simple_shear_wet_vari_pulse_v… | 0
12 files changed, 70 insertions(+), 70 deletions(-)
---
DIR diff --git a/test/Makefile b/test/Makefile
t@@ -2,31 +2,31 @@ BIN = ../cngf-pf
BIN2 = ../max_depth_simple_shear
BIN3 = ../shear_flux
-TESTS = simple_shear_dry \
- simple_shear_dry_norm \
- simple_shear_dry_cohesive \
- simple_shear_dry_transient \
- simple_shear_dry_vconst \
- simple_shear_wet \
- simple_shear_wet_norm \
- simple_shear_wet_vari \
- simple_shear_wet_vari_diff \
- simple_shear_wet_vari_pulse \
- simple_shear_wet_vari_pulse_vlim \
+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 \
+ cngf_pf_wet_vari \
+ cngf_pf_wet_vari_diff \
+ cngf_pf_wet_vari_pulse \
+ cngf_pf_wet_vari_pulse_vlim \
max_depth_misc\
shear_flux_dry \
shear_flux_wet
STANDARDS := $(TESTS:=.std)
-SIMPLE_SHEAR_DRY_OPTS = -o 0.03 -L 0.64 -n 40e3
-SIMPLE_SHEAR_DRY_NORM_OPTS = -o 0.03 -L 0.64 -n 40e3 -N
-SIMPLE_SHEAR_DRY_COHESIVE_OPTS = -o 0.03 -L 0.64 -n 40e3 -c 1e3
-SIMPLE_SHEAR_DRY_TRANSIENT_OPTS =-T -e 5.0
-SIMPLE_SHEAR_DRY_VCONST_OPTS = -s 1e-3
-SIMPLE_SHEAR_WET_OPTS = -o 0.03 -L 0.64 -n 40e3 -F
-SIMPLE_SHEAR_WET_NORM_OPTS = -o 0.03 -L 0.64 -n 40e3 -F -N
-SIMPLE_SHEAR_WET_VARI_OPTS = -L 8.0 \
+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
+CNGF_PF_WET_VARI_OPTS = -L 8.0 \
-n 150e3 \
-F -k 2e-17 \
-O 50e3 \
t@@ -34,7 +34,7 @@ SIMPLE_SHEAR_WET_VARI_OPTS = -L 8.0 \
-q $$( echo "1.0/(3600*24)" | bc -l ) \
-I $$( echo "60*1000" | bc -l ) \
-e $$( echo "60*20" | bc -l )
-SIMPLE_SHEAR_WET_VARI_DIFF_OPTS =-L 8.0 \
+CNGF_PF_WET_VARI_DIFF_OPTS =-L 8.0 \
-n 150e3 \
-F -D $$(awk 'BEGIN{print 2e-17/(1.787e-3*(1e-8 + 0.25*3.9e-10))}') \
-O 50e3 \
t@@ -42,9 +42,9 @@ SIMPLE_SHEAR_WET_VARI_DIFF_OPTS =-L 8.0 \
-q $$( echo "1.0/(3600*24)" | bc -l ) \
-I $$( echo "60*1000" | bc -l ) \
-e $$( echo "60*20" | bc -l )
-SIMPLE_SHEAR_WET_VARI_PULSE_OPTS = $(SIMPLE_SHEAR_WET_VARI_OPTS) \
+CNGF_PF_WET_VARI_PULSE_OPTS = $(CNGF_PF_WET_VARI_OPTS) \
-u 500
-SIMPLE_SHEAR_WET_VARI_PULSE_VLIM_OPTS = $(SIMPLE_SHEAR_WET_VARI_OPTS) \
+CNGF_PF_WET_VARI_PULSE_VLIM_OPTS = $(CNGF_PF_WET_VARI_OPTS) \
-u 500 -l 1e-3
MAX_DEPTH_MISC = sh -c 'for A_f in 1e3 5e3 10e3 50e3 100e3; \
do ./$(BIN2) -O 101e3 -a $$A_f -q 0.01;\
t@@ -55,90 +55,90 @@ test: $(TESTS)
standards: $(STANDARDS)
-simple_shear_dry: $(BIN)
- ./$(BIN) $(SIMPLE_SHEAR_DRY_OPTS) | diff $@.std -
+cngf_pf_dry: $(BIN)
+ ./$(BIN) $(CNGF_PF_DRY_OPTS) | diff $@.std -
-simple_shear_dry_norm: $(BIN)
- ./$(BIN) $(SIMPLE_SHEAR_DRY_NORM_OPTS) | diff $@.std -
+cngf_pf_dry_norm: $(BIN)
+ ./$(BIN) $(CNGF_PF_DRY_NORM_OPTS) | diff $@.std -
-simple_shear_dry_cohesive: $(BIN)
- ./$(BIN) $(SIMPLE_SHEAR_DRY_COHESIVE_OPTS) | diff $@.std -
+cngf_pf_dry_cohesive: $(BIN)
+ ./$(BIN) $(CNGF_PF_DRY_COHESIVE_OPTS) | diff $@.std -
-simple_shear_dry_transient: $(BIN)
- ./$(BIN) $(SIMPLE_SHEAR_DRY_TRANSIENT_OPTS) | diff $@.std -
+cngf_pf_dry_transient: $(BIN)
+ ./$(BIN) $(CNGF_PF_DRY_TRANSIENT_OPTS) | diff $@.std -
-simple_shear_dry_vconst: $(BIN)
- ./$(BIN) $(SIMPLE_SHEAR_DRY_VCONST_OPTS) | diff $@.std -
+cngf_pf_dry_vconst: $(BIN)
+ ./$(BIN) $(CNGF_PF_DRY_VCONST_OPTS) | diff $@.std -
-simple_shear_wet: $(BIN)
- ./$(BIN) $(SIMPLE_SHEAR_WET_OPTS) | diff $@.std -
+cngf_pf_wet: $(BIN)
+ ./$(BIN) $(CNGF_PF_WET_OPTS) | diff $@.std -
-simple_shear_wet_norm: $(BIN)
- ./$(BIN) $(SIMPLE_SHEAR_WET_NORM_OPTS) | diff $@.std -
+cngf_pf_wet_norm: $(BIN)
+ ./$(BIN) $(CNGF_PF_WET_NORM_OPTS) | diff $@.std -
-simple_shear_wet_vari: $(BIN)
- ./$(BIN) $(SIMPLE_SHEAR_WET_VARI_OPTS) | diff $@.std -
+cngf_pf_wet_vari: $(BIN)
+ ./$(BIN) $(CNGF_PF_WET_VARI_OPTS) | diff $@.std -
-simple_shear_wet_vari_diff: $(BIN)
- ./$(BIN) $(SIMPLE_SHEAR_WET_VARI_DIFF_OPTS) | diff $@.std -
+cngf_pf_wet_vari_diff: $(BIN)
+ ./$(BIN) $(CNGF_PF_WET_VARI_DIFF_OPTS) | diff $@.std -
-simple_shear_wet_vari_pulse: $(BIN)
- ./$(BIN) $(SIMPLE_SHEAR_WET_VARI_PULSE_OPTS) | diff $@.std -
+cngf_pf_wet_vari_pulse: $(BIN)
+ ./$(BIN) $(CNGF_PF_WET_VARI_PULSE_OPTS) | diff $@.std -
-simple_shear_wet_vari_pulse_vlim: $(BIN)
- ./$(BIN) $(SIMPLE_SHEAR_WET_VARI_PULSE_VLIM_OPTS) | diff $@.std -
+cngf_pf_wet_vari_pulse_vlim: $(BIN)
+ ./$(BIN) $(CNGF_PF_WET_VARI_PULSE_VLIM_OPTS) | diff $@.std -
max_depth_misc: $(BIN2)
$(MAX_DEPTH_MISC) | diff $@.std -
shear_flux_dry: $(BIN) $(BIN3)
- ./$(BIN) $(SIMPLE_SHEAR_DRY_OPTS) | ./$(BIN3) | diff $@.std -
+ ./$(BIN) $(CNGF_PF_DRY_OPTS) | ./$(BIN3) | diff $@.std -
shear_flux_wet: $(BIN)
- ./$(BIN) $(SIMPLE_SHEAR_WET_OPTS) | ./$(BIN3) | diff $@.std -
+ ./$(BIN) $(CNGF_PF_WET_OPTS) | ./$(BIN3) | diff $@.std -
-simple_shear_dry.std: $(BIN)
- ./$(BIN) $(SIMPLE_SHEAR_DRY_OPTS) > $@
+cngf_pf_dry.std: $(BIN)
+ ./$(BIN) $(CNGF_PF_DRY_OPTS) > $@
-simple_shear_dry_norm.std: $(BIN)
- ./$(BIN) $(SIMPLE_SHEAR_DRY_NORM_OPTS) > $@
+cngf_pf_dry_norm.std: $(BIN)
+ ./$(BIN) $(CNGF_PF_DRY_NORM_OPTS) > $@
-simple_shear_dry_cohesive.std: $(BIN)
- ./$(BIN) $(SIMPLE_SHEAR_DRY_COHESIVE_OPTS) > $@
+cngf_pf_dry_cohesive.std: $(BIN)
+ ./$(BIN) $(CNGF_PF_DRY_COHESIVE_OPTS) > $@
-simple_shear_dry_transient.std: $(BIN)
- ./$(BIN) $(SIMPLE_SHEAR_DRY_TRANSIENT_OPTS) > $@
+cngf_pf_dry_transient.std: $(BIN)
+ ./$(BIN) $(CNGF_PF_DRY_TRANSIENT_OPTS) > $@
-simple_shear_dry_vconst.std: $(BIN)
- ./$(BIN) $(SIMPLE_SHEAR_DRY_VCONST_OPTS) > $@
+cngf_pf_dry_vconst.std: $(BIN)
+ ./$(BIN) $(CNGF_PF_DRY_VCONST_OPTS) > $@
-simple_shear_wet.std: $(BIN)
- ./$(BIN) $(SIMPLE_SHEAR_WET_OPTS) > $@
+cngf_pf_wet.std: $(BIN)
+ ./$(BIN) $(CNGF_PF_WET_OPTS) > $@
-simple_shear_wet_norm.std: $(BIN)
- ./$(BIN) $(SIMPLE_SHEAR_WET_NORM_OPTS) > $@
+cngf_pf_wet_norm.std: $(BIN)
+ ./$(BIN) $(CNGF_PF_WET_NORM_OPTS) > $@
-simple_shear_wet_vari.std: $(BIN)
- ./$(BIN) $(SIMPLE_SHEAR_WET_VARI_OPTS) > $@
+cngf_pf_wet_vari.std: $(BIN)
+ ./$(BIN) $(CNGF_PF_WET_VARI_OPTS) > $@
-simple_shear_wet_vari_diff.std: $(BIN)
- ./$(BIN) $(SIMPLE_SHEAR_WET_VARI_DIFF_OPTS) > $@
+cngf_pf_wet_vari_diff.std: $(BIN)
+ ./$(BIN) $(CNGF_PF_WET_VARI_DIFF_OPTS) > $@
-simple_shear_wet_vari_pulse.std: $(BIN)
- ./$(BIN) $(SIMPLE_SHEAR_WET_VARI_PULSE_OPTS) > $@
+cngf_pf_wet_vari_pulse.std: $(BIN)
+ ./$(BIN) $(CNGF_PF_WET_VARI_PULSE_OPTS) > $@
-simple_shear_wet_vari_pulse_vlim.std: $(BIN)
- ./$(BIN) $(SIMPLE_SHEAR_WET_VARI_PULSE_VLIM_OPTS) > $@
+cngf_pf_wet_vari_pulse_vlim.std: $(BIN)
+ ./$(BIN) $(CNGF_PF_WET_VARI_PULSE_VLIM_OPTS) > $@
max_depth_misc.std: $(BIN2)
$(MAX_DEPTH_MISC) > $@
shear_flux_dry.std: $(BIN) $(BIN3)
- ./$(BIN) $(SIMPLE_SHEAR_DRY_OPTS) | ./$(BIN3) > $@
+ ./$(BIN) $(CNGF_PF_DRY_OPTS) | ./$(BIN3) > $@
shear_flux_wet.std: $(BIN) $(BIN3)
- ./$(BIN) $(SIMPLE_SHEAR_WET_OPTS) | ./$(BIN3) > $@
+ ./$(BIN) $(CNGF_PF_WET_OPTS) | ./$(BIN3) > $@
$(BIN):
make -C ..
DIR diff --git a/test/simple_shear_dry.std b/test/cngf_pf_dry.std
DIR diff --git a/test/simple_shear_dry_cohesive.std b/test/cngf_pf_dry_cohesive.std
DIR diff --git a/test/simple_shear_dry_norm.std b/test/cngf_pf_dry_norm.std
DIR diff --git a/test/simple_shear_dry_transient.std b/test/cngf_pf_dry_transient.std
DIR diff --git a/test/simple_shear_dry_vconst.std b/test/cngf_pf_dry_vconst.std
DIR diff --git a/test/simple_shear_wet.std b/test/cngf_pf_wet.std
DIR diff --git a/test/simple_shear_wet_norm.std b/test/cngf_pf_wet_norm.std
DIR diff --git a/test/simple_shear_wet_vari.std b/test/cngf_pf_wet_vari.std
DIR diff --git a/test/simple_shear_wet_vari_diff.std b/test/cngf_pf_wet_vari_diff.std
DIR diff --git a/test/simple_shear_wet_vari_pulse.std b/test/cngf_pf_wet_vari_pulse.std
DIR diff --git a/test/simple_shear_wet_vari_pulse_vlim.std b/test/cngf_pf_wet_vari_pulse_vlim.std