commit 130f86a441865b5b7e84fd62a710a9bd0ccb80f7
parent 3271084ceedc54d91dd18704de0372a5076a8ffb
Author: Anders Damsgaard <anders@adamsgaard.dk>
Date:   Mon,  8 Jul 2019 13:00:54 +0200
Add test with non-zero cohesion
Diffstat:
2 files changed, 120 insertions(+), 12 deletions(-)
diff --git a/test/Makefile b/test/Makefile
@@ -2,24 +2,26 @@ BIN = ../1d_fd_simple_shear
 
 TESTS := simple_shear_dry \
          simple_shear_dry_norm \
+         simple_shear_dry_cohesive \
          simple_shear_wet \
          simple_shear_wet_norm \
          simple_shear_wet_vari
 
 STANDARDS := $(addsuffix .std,$(TESTS))
 
-SIMPLE_SHEAR_DRY_OPTS =      -o 0.03 -L 0.64 -P 40e3
-SIMPLE_SHEAR_DRY_NORM_OPTS = -o 0.03 -L 0.64 -P 40e3 -N
-SIMPLE_SHEAR_WET_OPTS =      -o 0.03 -L 0.64 -P 40e3 -F
-SIMPLE_SHEAR_WET_NORM_OPTS = -o 0.03 -L 0.64 -P 40e3 -F -N
-SIMPLE_SHEAR_WET_VARI_OPTS = --resolution 50 --length 8.0 \
-                             --normal-stress 150e3 \
-                             --fluid --fluid-permeability 2e-17 \
-                             --fluid-pressure-top 50e3 \
-                             --fluid-pressure-ampl 50e3 \
-                             --fluid-pressure-freq $$( echo "1.0/(3600*24)" | bc -l ) \
-                             --file-interval $$( echo "60*1000" | bc -l ) \
-                             --time-end $$( echo "60*20" | bc -l )
+SIMPLE_SHEAR_DRY_OPTS =          -o 0.03 -L 0.64 -P 40e3
+SIMPLE_SHEAR_DRY_NORM_OPTS =     -o 0.03 -L 0.64 -P 40e3 -N
+SIMPLE_SHEAR_DRY_COHESIVE_OPTS = -o 0.03 -L 0.64 -P 40e3 -C 1e3
+SIMPLE_SHEAR_WET_OPTS =          -o 0.03 -L 0.64 -P 40e3 -F
+SIMPLE_SHEAR_WET_NORM_OPTS =     -o 0.03 -L 0.64 -P 40e3 -F -N
+SIMPLE_SHEAR_WET_VARI_OPTS =     --resolution 50 --length 8.0 \
+                                 --normal-stress 150e3 \
+                                 --fluid --fluid-permeability 2e-17 \
+                                 --fluid-pressure-top 50e3 \
+                                 --fluid-pressure-ampl 50e3 \
+                                 --fluid-pressure-freq $$( echo "1.0/(3600*24)" | bc -l ) \
+                                 --file-interval $$( echo "60*1000" | bc -l ) \
+                                 --time-end $$( echo "60*20" | bc -l )
 
 test: $(TESTS)
 
@@ -31,6 +33,9 @@ simple_shear_dry: $(BIN)
 simple_shear_dry_norm: $(BIN)
 	./$< $(SIMPLE_SHEAR_DRY_NORM_OPTS) | diff $@.std -
 
+simple_shear_dry_cohesive: $(BIN)
+	./$< $(SIMPLE_SHEAR_DRY_COHESIVE_OPTS) | diff $@.std -
+
 simple_shear_wet: $(BIN)
 	./$< $(SIMPLE_SHEAR_WET_OPTS) | diff $@.std -
 
@@ -48,6 +53,9 @@ simple_shear_dry.std: $(BIN)
 simple_shear_dry_norm.std: $(BIN)
 	./$< $(SIMPLE_SHEAR_DRY_NORM_OPTS) > $@
 
+simple_shear_dry_cohesive.std: $(BIN)
+	./$< $(SIMPLE_SHEAR_DRY_COHESIVE_OPTS) > $@
+
 simple_shear_wet.std: $(BIN)
 	./$< $(SIMPLE_SHEAR_WET_OPTS) > $@
 
diff --git a/test/simple_shear_dry_cohesive.std b/test/simple_shear_dry_cohesive.std
@@ -0,0 +1,100 @@
+0.029999999999999999	0	51668.994999999995
+0.036464646464646464	2.0788373601869636e-11	51545.329545454544
+0.042929292929292928	5.2540367468869448e-11	51421.664090909093
+0.049393939393939393	9.5914550192758865e-11	51297.998636363634
+0.055858585858585857	1.5177734728682309e-10	51174.333181818183
+0.062323232323232322	2.2123598071645872e-10	51050.667727272725
+0.068787878787878787	3.0562907369549287e-10	50927.002272727274
+0.075252525252525251	4.0657808759243104e-10	50803.336818181822
+0.081717171717171716	5.2597299839245008e-10	50679.671363636364
+0.088181818181818181	6.6604460740782138e-10	50556.005909090913
+0.094646464646464645	8.293441488066187e-10	50432.340454545454
+0.10111111111111111	1.0188397610619824e-09	50308.675000000003
+0.10757575757575757	1.2378885520994292e-09	50185.009545454544
+0.11404040404040404	1.4903614885386252e-09	50061.344090909093
+0.1205050505050505	1.7806060380550732e-09	49937.678636363635
+0.12696969696969695	2.1136047825289008e-09	49814.013181818184
+0.13343434343434343	2.4949262640135913e-09	49690.347727272725
+0.13989898989898991	2.9309237708287623e-09	49566.682272727274
+0.14636363636363636	3.42867141990236e-09	49443.016818181815
+0.15282828282828281	3.9962108117341253e-09	49319.351363636364
+0.15929292929292929	4.6424686717835541e-09	49195.685909090913
+0.16575757575757574	5.3775604256550438e-09	49072.020454545454
+0.17222222222222222	6.2126848779289398e-09	48948.354999999996
+0.1786868686868687	7.1604952208934027e-09	48824.689545454545
+0.18515151515151515	8.2349652316452761e-09	48701.024090909094
+0.1916161616161616	9.4518397864107239e-09	48577.358636363635
+0.19808080808080808	1.082846588572642e-08	48453.693181818184
+0.20454545454545456	1.238433638273953e-08	48330.027727272725
+0.21101010101010101	1.4140877781132976e-08	48206.362272727274
+0.21747474747474746	1.6122102569722053e-08	48082.696818181816
+0.22393939393939394	1.8354344157960624e-08	47959.031363636364
+0.23040404040404042	2.0867034897947729e-08	47835.365909090906
+0.23686868686868687	2.369237670830676e-08	47711.700454545455
+0.24333333333333332	2.6866263501329528e-08	47588.035000000003
+0.2497979797979798	3.0427873980353103e-08	47464.369545454545
+0.2562626262626263	3.442075870127885e-08	47340.704090909087
+0.2627272727272727	3.8892339197414615e-08	47217.038636363635
+0.2691919191919192	4.389518120101445e-08	47093.373181818184
+0.27565656565656566	4.9486381644303072e-08	46969.707727272726
+0.28212121212121211	5.572905054023116e-08	46846.042272727274
+0.28858585858585861	6.2691564527796046e-08	46722.376818181816
+0.29505050505050501	7.0449280436450833e-08	46598.711363636365
+0.30151515151515151	7.9083630896437272e-08	46475.045909090906
+0.30797979797979802	8.8684092546173586e-08	46351.380454545455
+0.31444444444444442	9.9347095835376447e-08	46227.715000000004
+0.32090909090909092	1.111782700230152e-07	46104.049545454545
+0.32737373737373743	1.2429113569977238e-07	45980.384090909094
+0.33383838383838382	1.3880964699929498e-07	45856.718636363636
+0.34030303030303033	1.5486663161399422e-07	45733.053181818184
+0.34676767676767672	1.72606647833508e-07	45609.387727272726
+0.35323232323232323	1.9218413300474752e-07	45485.722272727275
+0.35969696969696974	2.137665889515746e-07	45362.056818181816
+0.36616161616161613	2.375323960453607e-07	45238.391363636365
+0.37262626262626264	2.636743350958794e-07	45114.725909090906
+0.37909090909090915	2.9239702059427539e-07	44991.060454545455
+0.38555555555555554	3.2392076017115106e-07	44867.395000000004
+0.39202020202020205	3.5847855732903601e-07	44743.729545454546
+0.39848484848484844	3.9632030095619672e-07	44620.064090909094
+0.40494949494949495	4.3770928520162705e-07	44496.398636363636
+0.41141414141414145	4.829267112891009e-07	44372.733181818185
+0.41787878787878785	5.3226767037131299e-07	44249.067727272726
+0.42434343434343436	5.8604592806495433e-07	44125.402272727275
+0.43080808080808086	6.4458931546752834e-07	44001.736818181816
+0.43727272727272726	7.0824475358845632e-07	43878.071363636365
+0.44373737373737376	7.7737299858790836e-07	43754.405909090907
+0.45020202020202016	8.5235384889084209e-07	43630.740454545456
+0.45666666666666667	9.33580193526718e-07	43507.074999999997
+0.46313131313131317	1.021463329604601e-06	43383.409545454546
+0.46959595959595957	1.116426267855936e-06	43259.744090909095
+0.47606060606060607	1.2189090729000614e-06	43136.078636363636
+0.48252525252525258	1.3293613882166997e-06	43012.413181818178
+0.48898989898989897	1.4482476969940296e-06	42888.747727272726
+0.49545454545454548	1.5760390403049407e-06	42765.082272727275
+0.50191919191919188	1.7132180832309635e-06	42641.416818181817
+0.50838383838383838	1.8602700155134718e-06	42517.751363636366
+0.51484848484848489	2.0176872971820098e-06	42394.085909090907
+0.52131313131313128	2.1859597509037344e-06	42270.420454545456
+0.52777777777777779	2.3655788547589026e-06	42146.754999999997
+0.5342424242424243	2.5570270603672897e-06	42023.089545454546
+0.54070707070707069	2.7607814991044953e-06	41899.424090909095
+0.5471717171717172	2.9773025901896195e-06	41775.758636363636
+0.5536363636363637	3.2070370319382399e-06	41652.093181818178
+0.5601010101010101	3.4504057995416238e-06	41528.427727272727
+0.56656565656565661	3.7078063062997604e-06	41404.762272727276
+0.573030303030303	3.979599931777881e-06	41281.096818181817
+0.57949494949494951	4.2661132606286381e-06	41157.431363636366
+0.58595959595959601	4.5676253278503332e-06	41033.765909090907
+0.59242424242424241	4.884367875819184e-06	40910.100454545456
+0.59888888888888892	5.2165167716991773e-06	40786.434999999998
+0.60535353535353542	5.5640697050337368e-06	40662.769545454546
+0.61181818181818182	5.926398797403963e-06	40539.104090909088
+0.61828282828282832	6.3018050779740812e-06	40415.438636363637
+0.62474747474747483	6.6870526410987627e-06	40291.773181818178
+0.63121212121212122	7.0769007251486779e-06	40168.107727272727
+0.63767676767676773	7.4636138033980515e-06	40044.442272727269
+0.64414141414141413	7.836463560895652e-06	39920.776818181817
+0.65060606060606063	8.181205405826886e-06	39797.111363636366
+0.65707070707070714	8.4795385507704427e-06	39673.445909090908
+0.66353535353535353	8.7085350328119986e-06	39549.780454545456
+0.67000000000000004	8.8400414360788537e-06	39426.114999999998