tMerge gitlab.com:admesg/1d_fd_simple_shear into HEAD - cngf-pf - continuum mod… | |
git clone git://src.adamsgaard.dk/cngf-pf | |
Log | |
Files | |
Refs | |
README | |
LICENSE | |
--- | |
commit fd615ab4602465081610d02237f01612533da609 | |
parent c9eed26502eaf12aadf89aceb211093b76db3097 | |
Author: Anders Damsgaard <[email protected]> | |
Date: Tue, 9 Jul 2019 16:02:28 +0200 | |
Merge gitlab.com:admesg/1d_fd_simple_shear into HEAD | |
Diffstat: | |
M arrays.c | 4 ++++ | |
M examples/1d_fd_simple_shear_rheolo… | 0 | |
M examples/1d_fd_simple_shear_rheolo… | 0 | |
M examples/Makefile | 8 ++++---- | |
M parameter_defaults.h | 126 +++++++++++++++++++++--------… | |
M test/simple_shear_dry.std | 198 ++++++++++++++++-------------… | |
M test/simple_shear_dry_cohesive.std | 198 ++++++++++++++++-------------… | |
M test/simple_shear_dry_norm.std | 196 ++++++++++++++++-------------… | |
M test/simple_shear_wet.std | 200 ++++++++++++++++-------------… | |
M test/simple_shear_wet_norm.std | 200 ++++++++++++++++-------------… | |
M test/simple_shear_wet_vari.std | 100 ++++++++++++++++-------------… | |
11 files changed, 638 insertions(+), 592 deletions(-) | |
--- | |
diff --git a/arrays.c b/arrays.c | |
t@@ -237,6 +237,10 @@ normalize(const double* in, const int n) | |
out = malloc(n*sizeof(double)); | |
copy_values(in, out, n); | |
max_val = max(out, n); | |
+ | |
+ if (max_val == 0.0) | |
+ max_val = 1.0; | |
+ | |
for (i=0; i<n; ++i) | |
out[i] /= max_val; | |
return out; | |
diff --git a/examples/1d_fd_simple_shear_rheology.png b/examples/1d_fd_simple_s… | |
Binary files differ. | |
diff --git a/examples/1d_fd_simple_shear_rheology_kamb.png b/examples/1d_fd_sim… | |
Binary files differ. | |
diff --git a/examples/Makefile b/examples/Makefile | |
t@@ -10,13 +10,13 @@ plots: 1d_fd_simple_shear.png \ | |
diurnal.mp4: diurnal.output00000.txt.png | |
ffmpeg -i diurnal.output%05d.txt.png -y diurnal.mp4 | |
-diurnal.output00000.txt.png: 1d_fd_simple_shear_fluid.gp diurnal.output00000.t… | |
+diurnal.output00000.txt.png: 1d_fd_simple_shear_fluid.gp diurnal.output00000.t… | |
/bin/sh -c '\ | |
for f in diurnal.output*.txt; do \ | |
gnuplot -e "filename=\"$$f\"; p_min=\"0\"; p_max=\"100e3\"" $<… | |
done' | |
-diurnal.output00000.txt: $(BIN) Makefile | |
+diurnal.output00000.txt: $(BIN) | |
/bin/sh -c '\ | |
./$< --resolution 50 --length 8.0 --normal-stress 150e3 \ | |
--fluid --fluid-permeability 2e-17 \ | |
t@@ -59,14 +59,14 @@ diurnal.gif: diurnal.mp4 | |
gnuplot 1d_fd_simple_shear_rheology.gp > $@ | |
# 1 bar is equal to 100 kPa | |
-1d_fd_simple_shear_rheology_kamb.png: $(BIN) 1d_fd_simple_shear_rheology_kamb.… | |
+1d_fd_simple_shear_rheology_kamb.png: $(BIN) 1d_fd_simple_shear_rheology_kamb.… | |
/bin/sh -c '\ | |
for b in 0.01 0.10 0.20 0.40 0.94; do \ | |
out="1d_fd_simple_shear_rheology_b$${b}_kamb.txt"; \ | |
rm -f "$$out"; \ | |
for t in $$(seq 0.01 0.01 2.0); do \ | |
printf "$$t\t" >> "$$out"; \ | |
- ./$< -f 1.1 -P 1.7e3 --stress-ratio $$t -b $$b | \ | |
+ ./$< -f 0.443 -C 1.0e3 -P 1.7e3 --stress-ratio $$t -b … | |
tail -n 1 | cut -f2 >> "$$out"; \ | |
done; done' | |
gnuplot 1d_fd_simple_shear_rheology_kamb.gp > $@ | |
diff --git a/parameter_defaults.h b/parameter_defaults.h | |
t@@ -11,64 +11,106 @@ | |
/* Simulation settings */ | |
struct simulation init_sim(void) | |
{ | |
- struct simulation sim; | |
+ struct simulation sim; | |
- sprintf(sim.name, DEFAULT_SIMULATION_NAME); | |
+ sprintf(sim.name, DEFAULT_SIMULATION_NAME); | |
- sim.G = 9.81; | |
+ sim.G = 9.81; | |
- sim.P_wall = 120e3; /* larger normal stress deepens the shear depth */ | |
- sim.mu_wall = 0.45; | |
- sim.v_x_bot = 0.0; | |
+ sim.P_wall = 120e3; /* larger normal stress deepens the shear depth */ | |
+ sim.mu_wall = 0.45; | |
+ sim.v_x_bot = 0.0; | |
- sim.nz = 100; | |
+ sim.nz = 100; | |
- /* lower values of A mean that the velocity curve can have sharper curves, | |
- * e.g. at the transition from μ ≈ μ_s */ | |
- sim.A = 0.40; /* Loose fit to Damsgaard et al 2013 */ | |
+ /* lower values of A mean that the velocity curve can have sharper cur… | |
+ * e.g. at the transition from μ ≈ μ_s */ | |
+ sim.A = 0.40; /* Loose fit to Damsgaard et al 2013 */ | |
- /* lower values of b mean larger shear velocity for a given stress ratio | |
- * above yield */ | |
- sim.b = 0.9377; /* Henann and Kamrin 2016 */ | |
+ /* lower values of b mean larger shear velocity for a given stress rat… | |
+ * above yield */ | |
+ sim.b = 0.9377; /* Henann and Kamrin 2016 */ | |
- sim.mu_s = atan(DEG2RAD(22.0)); /* Damsgaard et al 2013 */ | |
- sim.C = 0.0; /* Damsgaard et al 2013 */ | |
+ /* Henann and Kamrin 2016 */ | |
+ /* sim.mu_s = 0.3819; */ | |
+ /* sim.C = 0.0; */ | |
- sim.phi = initval(0.25, 1); /* Damsgaard et al 2013 */ | |
+ /* Damsgaard et al 2013 */ | |
+ sim.mu_s = tan(DEG2RAD(22.0)); | |
+ sim.C = 0.0; | |
+ sim.phi = initval(0.25, 1); | |
+ sim.d = 0.04; /* Damsgaard et al 2013 */ | |
- /* lower values of d mean that the shear velocity curve can have sharper | |
- * curves, e.g. at the transition from μ ≈ μ_s */ | |
- sim.d = 0.04; /* Damsgaard et al 2013 */ | |
+ /* Iverson et al 1997, 1998: Storglaciaren till */ | |
+ /* sim.mu_s = tan(DEG2RAD(26.3)); */ | |
+ /* sim.C = 5.0e3; */ | |
+ /* sim.phi = initval(0.22, 1); */ | |
+ /* sim.d = ??; */ | |
- /* grain material density [kg/m^3] */ | |
- sim.rho_s = 2.6e3; /* Damsgaard et al 2013 */ | |
+ /* Iverson et al 1997, 1998: Two Rivers till */ | |
+ /* sim.mu_s = tan(DEG2RAD(17.8)); */ | |
+ /* sim.C = 14.0e3; */ | |
+ /* sim.phi = initval(0.37, 1); */ | |
+ /* sim.d = ??; */ | |
- /* spatial settings */ | |
- sim.origo_z = 0.0; | |
- sim.L_z = 0.7; /* Damsgaard et al 2013 */ | |
+ /* Tulaczyk et al 2000a: Upstream B till */ | |
+ /* sim.mu_s = tan(DEG2RAD(23.9)); */ | |
+ /* sim.C = 3.0e3; */ | |
+ /* sim.phi = initval(0.35, 1); */ | |
+ /* sim.d = ??; */ | |
- /* temporal settings */ | |
- sim.t = 0.0; | |
- sim.dt = 2.0; | |
- sim.t_end = 1.0; | |
- sim.file_dt = 0.1; | |
- sim.n_file = 0; | |
+ /* grain material density [kg/m^3] */ | |
+ sim.rho_s = 2.6e3; /* Damsgaard et al 2013 */ | |
- /* fluid settings */ | |
- sim.fluid = 0; | |
+ /* spatial settings */ | |
+ sim.origo_z = 0.0; | |
+ sim.L_z = 0.7; /* Damsgaard et al 2013 */ | |
- sim.beta_f = 4.5e-10; /* Water, Goren et al 2011 */ | |
- sim.mu_f = 1e-3; /* Water, Goren et al 2011 */ | |
- sim.rho_f = 1e3; /* Water */ | |
- sim.k = initval(1.9e-15, 1); /* Damsgaard et al 2015 */ | |
+ /* temporal settings */ | |
+ sim.t = 0.0; | |
+ sim.dt = 2.0; | |
+ sim.t_end = 1.0; | |
+ sim.file_dt = 0.1; | |
+ sim.n_file = 0; | |
- /* no fluid-pressure variations */ | |
- sim.p_f_top = 0.0; | |
- sim.p_f_mod_ampl = 0.0; | |
- sim.p_f_mod_freq = 1.0; | |
- sim.p_f_mod_phase = 0.0; | |
+ /* fluid settings */ | |
+ sim.fluid = 0; | |
- return sim; | |
+ sim.rho_f = 1e3; | |
+ | |
+ /* Water at 20 deg C, Goren et al 2011 */ | |
+ /* sim.beta_f = 4.5e-10; */ | |
+ /* sim.mu_f = 1.0-3; */ | |
+ | |
+ /* Water at 0 deg C */ | |
+ sim.beta_f = 3.9e-10; /* doi:10.1063/1.1679903 */ | |
+ sim.mu_f = 1.797e-3; /* Cuffey and Paterson 2010 */ | |
+ | |
+ /* Damsgaard et al 2015 */ | |
+ sim.k = initval(1.9e-15, 1); | |
+ | |
+ /* Iverson et al 1997, 1998: Two Rivers till */ | |
+ /* sim.k = initval(7.35e-9*sim.phi*sim.beta_f*sim.mu_f, 1); */ | |
+ | |
+ /* Iverson et al 1997, 1998: Storglaciaren till */ | |
+ /* sim.k = initval(1.5e-6*sim.phi*sim.beta_f*sim.mu_f, 1); */ | |
+ | |
+ /* Iverson et al 1994: Storglaciaren */ | |
+ /* sim.k = initval(1.3e-14, 1); */ | |
+ | |
+ /* Engelhardt et al 1990: Upstream B */ | |
+ /* sim.k = initval(2.0e-16, 1); */ | |
+ | |
+ /* Leeman et al 2016: Upstream B till */ | |
+ /* sim.k = initval(4.9e-17, 1); */ | |
+ | |
+ /* no fluid-pressure variations */ | |
+ sim.p_f_top = 0.0; | |
+ sim.p_f_mod_ampl = 0.0; | |
+ sim.p_f_mod_freq = 1.0; | |
+ sim.p_f_mod_phase = 0.0; | |
+ | |
+ return sim; | |
} | |
#endif | |
diff --git a/test/simple_shear_dry.std b/test/simple_shear_dry.std | |
t@@ -1,100 +1,100 @@ | |
0.029999999999999999 0 51668.994999999995 | |
-0.036464646464646464 3.4154873903777154e-09 51545.329545454544 | |
-0.042929292929292928 8.6173554258856903e-09 51421.664090909093 | |
-0.049393939393939393 1.5694322949717552e-08 51297.998636363634 | |
-0.055858585858585857 2.4763127982497807e-08 51174.333181818183 | |
-0.062323232323232322 3.5970071169397719e-08 51050.667727272725 | |
-0.068787878787878787 4.9492116989196431e-08 50927.002272727274 | |
-0.075252525252525251 6.5539290138387775e-08 50803.336818181822 | |
-0.081717171717171716 8.4356241334060707e-08 50679.671363636364 | |
-0.088181818181818181 1.0622553744794185e-07 50556.005909090913 | |
-0.094646464646464645 1.3146968614620043e-07 50432.340454545454 | |
-0.10111111111111111 1.6045538356331405e-07 50308.675000000003 | |
-0.10757575757575757 1.9359599543966539e-07 50185.009545454544 | |
-0.11404040404040404 2.3135684527220051e-07 50061.344090909093 | |
-0.1205050505050505 2.7425814783143872e-07 49937.678636363635 | |
-0.12696969696969695 3.2288143593296741e-07 49814.013181818184 | |
-0.13343434343434343 3.7787293476922655e-07 49690.347727272725 | |
-0.13989898989898991 4.3995123628133972e-07 49566.682272727274 | |
-0.14636363636363636 5.0991108893079664e-07 49443.016818181815 | |
-0.15282828282828281 5.8863243438515667e-07 49319.351363636364 | |
-0.15929292929292929 6.7708456629460247e-07 49195.685909090913 | |
-0.16575757575757574 7.7633664363388889e-07 49072.020454545454 | |
-0.17222222222222222 8.8756214270853404e-07 48948.354999999996 | |
-0.1786868686868687 1.0120509537716395e-06 48824.689545454545 | |
-0.18515151515151515 1.1512140117459916e-06 48701.024090909094 | |
-0.1916161616161616 1.3065970662089095e-06 48577.358636363635 | |
-0.19808080808080808 1.479885327045322e-06 48453.693181818184 | |
-0.20454545454545456 1.6729189709743404e-06 48330.027727272725 | |
-0.21101010101010101 1.8876975774856296e-06 48206.362272727274 | |
-0.21747474747474746 2.1263973961132212e-06 48082.696818181816 | |
-0.22393939393939394 2.3913752746852255e-06 47959.031363636364 | |
-0.23040404040404042 2.6851876589239224e-06 47835.365909090906 | |
-0.23686868686868687 3.0105936287214262e-06 47711.700454545455 | |
-0.24333333333333332 3.3705755339347094e-06 47588.035000000003 | |
-0.2497979797979798 3.7683406550531176e-06 47464.369545454545 | |
-0.2562626262626263 4.2073432951941488e-06 47340.704090909087 | |
-0.2627272727272727 4.6912844698167462e-06 47217.038636363635 | |
-0.2691919191919192 5.2241351744055107e-06 47093.373181818184 | |
-0.27565656565656566 5.8101333853898918e-06 46969.707727272726 | |
-0.28212121212121211 6.4538081061368724e-06 46846.042272727274 | |
-0.28858585858585861 7.1599728307034481e-06 46722.376818181816 | |
-0.29505050505050501 7.933749838927854e-06 46598.711363636365 | |
-0.30151515151515151 8.78055914022275e-06 46475.045909090906 | |
-0.30797979797979802 9.7061423445248322e-06 46351.380454545455 | |
-0.31444444444444442 1.0716545970833592e-05 46227.715000000004 | |
-0.32090909090909092 1.1818144068986019e-05 46104.049545454545 | |
-0.32737373737373743 1.3017614654738032e-05 45980.384090909094 | |
-0.33383838383838382 1.4321960104174873e-05 45856.718636363636 | |
-0.34030303030303033 1.5738475373539792e-05 45733.053181818184 | |
-0.34676767676767672 1.7274765042181472e-05 45609.387727272726 | |
-0.35323232323232323 1.8938701902911004e-05 45485.722272727275 | |
-0.35969696969696974 2.0738439401719458e-05 45362.056818181816 | |
-0.36616161616161613 2.2682359157150297e-05 45238.391363636365 | |
-0.37262626262626264 2.4779077449032177e-05 45114.725909090906 | |
-0.37909090909090915 2.7037380259074522e-05 44991.060454545455 | |
-0.38555555555555554 2.9466222412338359e-05 44867.395000000004 | |
-0.39202020202020205 3.2074648843422382e-05 44743.729545454546 | |
-0.39848484848484844 3.4871785011162525e-05 44620.064090909094 | |
-0.40494949494949495 3.7866743303710479e-05 44496.398636363636 | |
-0.41141414141414145 4.1068603448304822e-05 44372.733181818185 | |
-0.41787878787878785 4.4486303292587145e-05 44249.067727272726 | |
-0.42434343434343436 4.8128608137110708e-05 44125.402272727275 | |
-0.43080808080808086 5.2003985586489141e-05 44001.736818181816 | |
-0.43727272727272726 5.6120563061854545e-05 43878.071363636365 | |
-0.44373737373737376 6.0485987018183921e-05 43754.405909090907 | |
-0.45020202020202016 6.5107368364202678e-05 43630.740454545456 | |
-0.45666666666666667 6.9991277099871506e-05 43507.074999999997 | |
-0.46313131313131317 7.5144964067441205e-05 43383.409545454546 | |
-0.46959595959595957 8.0575992052649929e-05 43259.744090909095 | |
-0.47606060606060607 8.6291961406638847e-05 43136.078636363636 | |
-0.48252525252525258 9.230013766320227e-05 43012.413181818178 | |
-0.48898989898989897 9.8607173154718563e-05 42888.747727272726 | |
-0.49545454545454548 0.00010521873066721698 42765.082272727275 | |
-0.50191919191919188 0.00011213919816619717 42641.416818181817 | |
-0.50838383838383838 0.00011937130554767099 42517.751363636366 | |
-0.51484848484848489 0.00012691582713963306 42394.085909090907 | |
-0.52131313131313128 0.00013477118595996257 42270.420454545456 | |
-0.52777777777777779 0.00014293313600923212 42146.754999999997 | |
-0.5342424242424243 0.00015139434555057834 42023.089545454546 | |
-0.54070707070707069 0.00016014404827266422 41899.424090909095 | |
-0.5471717171717172 0.00016916759386077264 41775.758636363636 | |
-0.5536363636363637 0.00017844605375849626 41652.093181818178 | |
-0.5601010101010101 0.00018795572355817508 41528.427727272727 | |
-0.56656565656565661 0.00019766766515198148 41404.762272727276 | |
-0.573030303030303 0.00020754714103512811 41281.096818181817 | |
-0.57949494949494951 0.00021755306987835811 41157.431363636366 | |
-0.58595959595959601 0.00022763736744463517 41033.765909090907 | |
-0.59242424242424241 0.00023774428672840859 40910.100454545456 | |
-0.59888888888888892 0.00024780963348705354 40786.434999999998 | |
-0.60535353535353542 0.00025775995467507238 40662.769545454546 | |
-0.61181818181818182 0.00026751158812753773 40539.104090909088 | |
-0.61828282828282832 0.00027696965354252572 40415.438636363637 | |
-0.62474747474747483 0.00028602688502414836 40291.773181818178 | |
-0.63121212121212122 0.00029456236664249019 40168.107727272727 | |
-0.63767676767676773 0.00030244008255757564 40044.442272727269 | |
-0.64414141414141413 0.00030950732330248503 39920.776818181817 | |
-0.65060606060606063 0.00031559287002243394 39797.111363636366 | |
-0.65707070707070714 0.00032050497687992661 39673.445909090908 | |
-0.66353535353535353 0.00032402908217053631 39549.780454545456 | |
-0.67000000000000004 0.00032592524504066291 39426.114999999998 | |
+0.036464646464646464 4.6401414191458777e-16 51545.329545454544 | |
+0.042929292929292928 1.1811337381510584e-15 51421.664090909093 | |
+0.049393939393939393 2.2025057621922495e-15 51297.998636363634 | |
+0.055858585858585857 3.5545165719852709e-15 51174.333181818183 | |
+0.062323232323232322 5.3308011072604347e-15 51050.667727272725 | |
+0.068787878787878787 7.5758385688193347e-15 50927.002272727274 | |
+0.075252525252525251 1.044030715097517e-14 50803.336818181822 | |
+0.081717171717171716 1.3993990902362679e-14 50679.671363636364 | |
+0.088181818181818181 1.8467252230466851e-14 50556.005909090913 | |
+0.094646464646464645 2.3966138845809688e-14 50432.340454545454 | |
+0.10111111111111111 3.0834014012816771e-14 50308.675000000003 | |
+0.10757575757575757 3.922923731444573e-14 50185.009545454544 | |
+0.11404040404040404 4.9655807333628056e-14 50061.344090909093 | |
+0.1205050505050505 6.2347415375710833e-14 49937.678636363635 | |
+0.12696969696969695 7.803558815768268e-14 49814.013181818184 | |
+0.13343434343434343 9.7061908738210244e-14 49690.347727272725 | |
+0.13989898989898991 1.2047812999466879e-13 49566.682272727274 | |
+0.14636363636363636 1.4877926786605339e-13 49443.016818181815 | |
+0.15282828282828281 1.8346432712974638e-13 49319.351363636364 | |
+0.15929292929292929 2.2524482084539411e-13 49195.685909090913 | |
+0.16575757575757574 2.7623928480802368e-13 49072.020454545454 | |
+0.17222222222222222 3.3746223332292389e-13 48948.354999999996 | |
+0.1786868686868687 4.1188307220480658e-13 48824.689545454545 | |
+0.18515151515151515 5.009368714254344e-13 48701.024090909094 | |
+0.1916161616161616 6.0875150603453264e-13 48577.358636363635 | |
+0.19808080808080808 7.3734087168393094e-13 48453.693181818184 | |
+0.20454545454545456 8.9239629066642607e-13 48330.027727272725 | |
+0.21101010101010101 1.0767215861996983e-12 48206.362272727274 | |
+0.21747474747474746 1.298099422304554e-12 48082.696818181816 | |
+0.22393939393939394 1.5604024679244664e-12 47959.031363636364 | |
+0.23040404040404042 1.8741859256499533e-12 47835.365909090906 | |
+0.23686868686868687 2.2447563133675522e-12 47711.700454545455 | |
+0.24333333333333332 2.6863113999090692e-12 47588.035000000003 | |
+0.2497979797979798 3.2060645770003493e-12 47464.369545454545 | |
+0.2562626262626263 3.8229557904874865e-12 47340.704090909087 | |
+0.2627272727272727 4.5467122639222294e-12 47217.038636363635 | |
+0.2691919191919192 5.4023910643416277e-12 47093.373181818184 | |
+0.27565656565656566 6.4030041978615597e-12 46969.707727272726 | |
+0.28212121212121211 7.581426238613252e-12 46846.042272727274 | |
+0.28858585858585861 8.9549230954391771e-12 46722.376818181816 | |
+0.29505050505050501 1.0566265972211895e-11 46598.711363636365 | |
+0.30151515151515151 1.243817994232711e-11 46475.045909090906 | |
+0.30797979797979802 1.4625845356884214e-11 46351.380454545455 | |
+0.31444444444444442 1.7158928914814515e-11 46227.715000000004 | |
+0.32090909090909092 2.0108019455492322e-11 46104.049545454545 | |
+0.32737373737373743 2.3511527897976763e-11 45980.384090909094 | |
+0.33383838383838382 2.7458986471321161e-11 45856.718636363636 | |
+0.34030303030303033 3.1999716033197359e-11 45733.053181818184 | |
+0.34676767676767672 3.7246302303368436e-11 45609.387727272726 | |
+0.35323232323232323 4.326154541890356e-11 45485.722272727275 | |
+0.35969696969696974 5.0185795054444607e-11 45362.056818181816 | |
+0.36616161616161613 5.8098338218593588e-11 45238.391363636365 | |
+0.37262626262626264 6.7172603734732073e-11 45114.725909090906 | |
+0.37909090909090915 7.7507835798142382e-11 44991.060454545455 | |
+0.38555555555555554 8.9316438714858539e-11 44867.395000000004 | |
+0.39202020202020205 1.0272155597663785e-10 44743.729545454546 | |
+0.39848484848484844 1.1798098549774206e-10 44620.064090909094 | |
+0.40494949494949495 1.3524617145423488e-10 44496.398636363636 | |
+0.41141414141414145 1.5482714202889325e-10 44372.733181818185 | |
+0.41787878787878785 1.7690846158909391e-10 44249.067727272726 | |
+0.42434343434343436 2.0185948852287731e-10 44125.402272727275 | |
+0.43080808080808086 2.2990306746292581e-10 44001.736818181816 | |
+0.43727272727272726 2.6147503543377798e-10 43878.071363636365 | |
+0.44373737373737376 2.9684189585567672e-10 43754.405909090907 | |
+0.45020202020202016 3.3651288067277827e-10 43630.740454545456 | |
+0.45666666666666667 3.8080357417889371e-10 43507.074999999997 | |
+0.46313131313131317 4.3030293641978552e-10 43383.409545454546 | |
+0.46959595959595957 4.8538086286499479e-10 43259.744090909095 | |
+0.47606060606060607 5.4671136868011088e-10 43136.078636363636 | |
+0.48252525252525258 6.1472339668720366e-10 43012.413181818178 | |
+0.48898989898989897 6.9017984449737985e-10 42888.747727272726 | |
+0.49545454545454548 7.7357257043438461e-10 42765.082272727275 | |
+0.50191919191919188 8.6575512405921938e-10 42641.416818181817 | |
+0.50838383838383838 9.6728483216962568e-10 42517.751363636366 | |
+0.51484848484848489 1.0791049960403138e-09 42394.085909090907 | |
+0.52131313131313128 1.2018391305472978e-09 42270.420454545456 | |
+0.52777777777777779 1.3365160693567406e-09 42146.754999999997 | |
+0.5342424242424243 1.4838238195858956e-09 42023.089545454546 | |
+0.54070707070707069 1.6448685444808815e-09 41899.424090909095 | |
+0.5471717171717172 1.8203979993456117e-09 41775.758636363636 | |
+0.5536363636363637 2.0115828398551992e-09 41652.093181818178 | |
+0.5601010101010101 2.2192221139407962e-09 41528.427727272727 | |
+0.56656565656565661 2.4445328957496393e-09 41404.762272727276 | |
+0.573030303030303 2.6883526930205033e-09 41281.096818181817 | |
+0.57949494949494951 2.9519211742544036e-09 41157.431363636366 | |
+0.58595959595959601 3.236096465171297e-09 41033.765909090907 | |
+0.59242424242424241 3.5421108760610318e-09 40910.100454545456 | |
+0.59888888888888892 3.8708197471781403e-09 40786.434999999998 | |
+0.60535353535353542 4.2234117565301456e-09 40662.769545454546 | |
+0.61181818181818182 4.6007100738540413e-09 40539.104090909088 | |
+0.61828282828282832 5.0038171943737219e-09 40415.438636363637 | |
+0.62474747474747483 5.4334885242605117e-09 40291.773181818178 | |
+0.63121212121212122 5.8906918860271781e-09 40168.107727272727 | |
+0.63767676767676773 6.3760731552320328e-09 40044.442272727269 | |
+0.64414141414141413 6.89041173359385e-09 39920.776818181817 | |
+0.65060606060606063 7.4341963894990798e-09 39797.111363636366 | |
+0.65707070707070714 8.0079601712306419e-09 39673.445909090908 | |
+0.66353535353535353 8.6119821188435786e-09 39549.780454545456 | |
+0.67000000000000004 9.1976349112779642e-09 39426.114999999998 | |
diff --git a/test/simple_shear_dry_cohesive.std b/test/simple_shear_dry_cohesiv… | |
t@@ -1,100 +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 | |
+0.036464646464646464 0 51545.329545454544 | |
+0.042929292929292928 0 51421.664090909093 | |
+0.049393939393939393 0 51297.998636363634 | |
+0.055858585858585857 0 51174.333181818183 | |
+0.062323232323232322 0 51050.667727272725 | |
+0.068787878787878787 0 50927.002272727274 | |
+0.075252525252525251 0 50803.336818181822 | |
+0.081717171717171716 0 50679.671363636364 | |
+0.088181818181818181 0 50556.005909090913 | |
+0.094646464646464645 0 50432.340454545454 | |
+0.10111111111111111 0 50308.675000000003 | |
+0.10757575757575757 0 50185.009545454544 | |
+0.11404040404040404 0 50061.344090909093 | |
+0.1205050505050505 0 49937.678636363635 | |
+0.12696969696969695 0 49814.013181818184 | |
+0.13343434343434343 0 49690.347727272725 | |
+0.13989898989898991 0 49566.682272727274 | |
+0.14636363636363636 0 49443.016818181815 | |
+0.15282828282828281 0 49319.351363636364 | |
+0.15929292929292929 0 49195.685909090913 | |
+0.16575757575757574 0 49072.020454545454 | |
+0.17222222222222222 0 48948.354999999996 | |
+0.1786868686868687 0 48824.689545454545 | |
+0.18515151515151515 0 48701.024090909094 | |
+0.1916161616161616 0 48577.358636363635 | |
+0.19808080808080808 0 48453.693181818184 | |
+0.20454545454545456 0 48330.027727272725 | |
+0.21101010101010101 0 48206.362272727274 | |
+0.21747474747474746 0 48082.696818181816 | |
+0.22393939393939394 0 47959.031363636364 | |
+0.23040404040404042 0 47835.365909090906 | |
+0.23686868686868687 0 47711.700454545455 | |
+0.24333333333333332 0 47588.035000000003 | |
+0.2497979797979798 0 47464.369545454545 | |
+0.2562626262626263 0 47340.704090909087 | |
+0.2627272727272727 0 47217.038636363635 | |
+0.2691919191919192 0 47093.373181818184 | |
+0.27565656565656566 0 46969.707727272726 | |
+0.28212121212121211 0 46846.042272727274 | |
+0.28858585858585861 0 46722.376818181816 | |
+0.29505050505050501 0 46598.711363636365 | |
+0.30151515151515151 0 46475.045909090906 | |
+0.30797979797979802 0 46351.380454545455 | |
+0.31444444444444442 0 46227.715000000004 | |
+0.32090909090909092 0 46104.049545454545 | |
+0.32737373737373743 0 45980.384090909094 | |
+0.33383838383838382 0 45856.718636363636 | |
+0.34030303030303033 0 45733.053181818184 | |
+0.34676767676767672 0 45609.387727272726 | |
+0.35323232323232323 0 45485.722272727275 | |
+0.35969696969696974 0 45362.056818181816 | |
+0.36616161616161613 0 45238.391363636365 | |
+0.37262626262626264 0 45114.725909090906 | |
+0.37909090909090915 0 44991.060454545455 | |
+0.38555555555555554 0 44867.395000000004 | |
+0.39202020202020205 0 44743.729545454546 | |
+0.39848484848484844 0 44620.064090909094 | |
+0.40494949494949495 0 44496.398636363636 | |
+0.41141414141414145 0 44372.733181818185 | |
+0.41787878787878785 0 44249.067727272726 | |
+0.42434343434343436 0 44125.402272727275 | |
+0.43080808080808086 0 44001.736818181816 | |
+0.43727272727272726 0 43878.071363636365 | |
+0.44373737373737376 0 43754.405909090907 | |
+0.45020202020202016 0 43630.740454545456 | |
+0.45666666666666667 0 43507.074999999997 | |
+0.46313131313131317 0 43383.409545454546 | |
+0.46959595959595957 0 43259.744090909095 | |
+0.47606060606060607 0 43136.078636363636 | |
+0.48252525252525258 0 43012.413181818178 | |
+0.48898989898989897 0 42888.747727272726 | |
+0.49545454545454548 0 42765.082272727275 | |
+0.50191919191919188 0 42641.416818181817 | |
+0.50838383838383838 0 42517.751363636366 | |
+0.51484848484848489 0 42394.085909090907 | |
+0.52131313131313128 0 42270.420454545456 | |
+0.52777777777777779 0 42146.754999999997 | |
+0.5342424242424243 0 42023.089545454546 | |
+0.54070707070707069 0 41899.424090909095 | |
+0.5471717171717172 0 41775.758636363636 | |
+0.5536363636363637 0 41652.093181818178 | |
+0.5601010101010101 0 41528.427727272727 | |
+0.56656565656565661 0 41404.762272727276 | |
+0.573030303030303 0 41281.096818181817 | |
+0.57949494949494951 0 41157.431363636366 | |
+0.58595959595959601 0 41033.765909090907 | |
+0.59242424242424241 0 40910.100454545456 | |
+0.59888888888888892 0 40786.434999999998 | |
+0.60535353535353542 0 40662.769545454546 | |
+0.61181818181818182 0 40539.104090909088 | |
+0.61828282828282832 0 40415.438636363637 | |
+0.62474747474747483 0 40291.773181818178 | |
+0.63121212121212122 0 40168.107727272727 | |
+0.63767676767676773 0 40044.442272727269 | |
+0.64414141414141413 0 39920.776818181817 | |
+0.65060606060606063 0 39797.111363636366 | |
+0.65707070707070714 0 39673.445909090908 | |
+0.66353535353535353 0 39549.780454545456 | |
+0.67000000000000004 0 39426.114999999998 | |
diff --git a/test/simple_shear_dry_norm.std b/test/simple_shear_dry_norm.std | |
t@@ -1,100 +1,100 @@ | |
0.029999999999999999 0 51668.994999999995 | |
-0.036464646464646464 1.0479358203601547e-05 51545.329545454544 | |
-0.042929292929292928 2.6439668473089822e-05 51421.664090909093 | |
-0.049393939393939393 4.815313691874192e-05 51297.998636363634 | |
-0.055858585858585857 7.5977937761183005e-05 51174.333181818183 | |
-0.062323232323232322 0.00011036294891765761 51050.667727272725 | |
-0.068787878787878787 0.00015185113071870736 50927.002272727274 | |
-0.075252525252525251 0.000201086878465677 50803.336818181822 | |
-0.081717171717171716 0.00025882082660867923 50679.671363636364 | |
-0.088181818181818181 0.00032591994349713229 50556.005909090913 | |
-0.094646464646464645 0.00040337374335577494 50432.340454545454 | |
-0.10111111111111111 0.00049230731894761755 50308.675000000003 | |
-0.10757575757575757 0.00059398895417110773 50185.009545454544 | |
-0.11404040404040404 0.00070984634910172754 50061.344090909093 | |
-0.1205050505050505 0.00084147562057434945 49937.678636363635 | |
-0.12696969696969695 0.00099066102072787958 49814.013181818184 | |
-0.13343434343434343 0.0011593852900903168 49690.347727272725 | |
-0.13989898989898991 0.0013498532039960597 49566.682272727274 | |
-0.14636363636363636 0.0015645032003187705 49443.016818181815 | |
-0.15282828282828281 0.0018060351057240687 49319.351363636364 | |
-0.15929292929292929 0.0020774228955787958 49195.685909090913 | |
-0.16575757575757574 0.0023819469508630175 49072.020454545454 | |
-0.17222222222222222 0.0027232077177630118 48948.354999999996 | |
-0.1786868686868687 0.003105162822368591 48824.689545454545 | |
-0.18515151515151515 0.003532141278600142 48701.024090909094 | |
-0.1916161616161616 0.0040088857371140324 48577.358636363635 | |
-0.19808080808080808 0.0045405667390406943 48453.693181818184 | |
-0.20454545454545456 0.005132830292926909 48330.027727272725 | |
-0.21101010101010101 0.0057918114850235604 48206.362272727274 | |
-0.21747474747474746 0.0065241874585318747 48082.696818181816 | |
-0.22393939393939394 0.0073371894662129468 47959.031363636364 | |
-0.23040404040404042 0.008238661164737069 47835.365909090906 | |
-0.23686868686868687 0.0092370679305489832 47711.700454545455 | |
-0.24333333333333332 0.010341560174371246 47588.035000000003 | |
-0.2497979797979798 0.011561978436444756 47464.369545454545 | |
-0.2562626262626263 0.012908921168930117 47340.704090909087 | |
-0.2627272727272727 0.014393743783889629 47217.038636363635 | |
-0.2691919191919192 0.016028630042922081 47093.373181818184 | |
-0.27565656565656566 0.017826582855418306 46969.707727272726 | |
-0.28212121212121211 0.019801498056192874 46846.042272727274 | |
-0.28858585858585861 0.021968144351046385 46722.376818181816 | |
-0.29505050505050501 0.024342237858678385 46598.711363636365 | |
-0.30151515151515151 0.026940408188163744 46475.045909090906 | |
-0.30797979797979802 0.029780271679519271 46351.380454545455 | |
-0.31444444444444442 0.032880380191158805 46227.715000000004 | |
-0.32090909090909092 0.036260290507756067 46104.049545454545 | |
-0.32737373737373743 0.039940492038638906 45980.384090909094 | |
-0.33383838383838382 0.043942469391679201 45856.718636363636 | |
-0.34030303030303033 0.048288604865745322 45733.053181818184 | |
-0.34676767676767672 0.053002230741672825 45609.387727272726 | |
-0.35323232323232323 0.058107502229685165 45485.722272727275 | |
-0.35969696969696974 0.063629435636788731 45362.056818181816 | |
-0.36616161616161613 0.069593747346329102 45238.391363636365 | |
-0.37262626262626264 0.0760268737266446 45114.725909090906 | |
-0.37909090909090915 0.082955771823386371 44991.060454545455 | |
-0.38555555555555554 0.090407916725389309 44867.395000000004 | |
-0.39202020202020205 0.09841105999451101 44743.729545454546 | |
-0.39848484848484844 0.10699320025612581 44620.064090909094 | |
-0.40494949494949495 0.11618229603228854 44496.398636363636 | |
-0.41141414141414145 0.12600620563522485 44372.733181818185 | |
-0.41787878787878785 0.13649235206385124 44249.067727272726 | |
-0.42434343434343436 0.14766762891013893 44125.402272727275 | |
-0.43080808080808086 0.15955801637888176 44001.736818181816 | |
-0.43727272727272726 0.17218845092792018 43878.071363636365 | |
-0.44373737373737376 0.18558239332039958 43754.405909090907 | |
-0.45020202020202016 0.19976166116276076 43630.740454545456 | |
-0.45666666666666667 0.21474641245154019 43507.074999999997 | |
-0.46313131313131317 0.23055889413557396 43383.409545454546 | |
-0.46959595959595957 0.24722231026503377 43259.744090909095 | |
-0.47606060606060607 0.26475998014781865 43136.078636363636 | |
-0.48252525252525258 0.28319419580918553 43012.413181818178 | |
-0.48898989898989897 0.30254536785702557 42888.747727272726 | |
-0.49545454545454548 0.32283087078477068 42765.082272727275 | |
-0.50191919191919188 0.34406416769651127 42641.416818181817 | |
-0.50838383838383838 0.36625363442705411 42517.751363636366 | |
-0.51484848484848489 0.38940164676043693 42394.085909090907 | |
-0.52131313131313128 0.413503366218681 42270.420454545456 | |
-0.52777777777777779 0.43854576527632766 42146.754999999997 | |
-0.5342424242424243 0.46450634878464281 42023.089545454546 | |
-0.54070707070707069 0.49135208367392469 41899.424090909095 | |
-0.5471717171717172 0.51903802002102362 41775.758636363636 | |
-0.5536363636363637 0.54750608145200008 41652.093181818178 | |
-0.5601010101010101 0.57668353838232278 41528.427727272727 | |
-0.56656565656565661 0.60648160325021827 41404.762272727276 | |
-0.573030303030303 0.63679369485243231 41281.096818181817 | |
-0.57949494949494951 0.66749376793815363 41157.431363636366 | |
-0.58595959595959601 0.69843429101736132 41033.765909090907 | |
-0.59242424242424241 0.72944422178388568 40910.100454545456 | |
-0.59888888888888892 0.76032660021820786 40786.434999999998 | |
-0.60535353535353542 0.79085605855083074 40662.769545454546 | |
-0.61181818181818182 0.82077590551220603 40539.104090909088 | |
-0.61828282828282832 0.84979503047691374 40415.438636363637 | |
-0.62474747474747483 0.87758432148593835 40291.773181818178 | |
-0.63121212121212122 0.90377278570655106 40168.107727272727 | |
-0.63767676767676773 0.92794310093973476 40044.442272727269 | |
-0.64414141414141413 0.94962672579680174 39920.776818181817 | |
-0.65060606060606063 0.96829832860311293 39797.111363636366 | |
-0.65707070707070714 0.98336959703732041 39673.445909090908 | |
-0.66353535353535353 0.99418221540374996 39549.780454545456 | |
+0.036464646464646464 5.0449289017291006e-08 51545.329545454544 | |
+0.042929292929292928 1.2841711478488613e-07 51421.664090909093 | |
+0.049393939393939393 2.3946436050550115e-07 51297.998636363634 | |
+0.055858585858585857 3.864598460661654e-07 51174.333181818183 | |
+0.062323232323232322 5.7958389941352293e-07 51050.667727272725 | |
+0.068787878787878787 8.236724594852081e-07 50927.002272727274 | |
+0.075252525252525251 1.1351078023518269e-06 50803.336818181822 | |
+0.081717171717171716 1.5214771011625516e-06 50679.671363636364 | |
+0.088181818181818181 2.0078261866887822e-06 50556.005909090913 | |
+0.094646464646464645 2.6056849480318975e-06 50432.340454545454 | |
+0.10111111111111111 3.3523850761904773e-06 50308.675000000003 | |
+0.10757575757575757 4.2651439954790535e-06 50185.009545454544 | |
+0.11404040404040404 5.3987582473773834e-06 50061.344090909093 | |
+0.1205050505050505 6.7786355924240502e-06 49937.678636363635 | |
+0.12696969696969695 8.4843102504532905e-06 49814.013181818184 | |
+0.13343434343434343 1.0552920362080776e-05 49690.347727272725 | |
+0.13989898989898991 1.3098816288841907e-05 49566.682272727274 | |
+0.14636363636363636 1.6175817946809683e-05 49443.016818181815 | |
+0.15282828282828281 1.9946902535214345e-05 49319.351363636364 | |
+0.15929292929292929 2.4489428316969097e-05 49195.685909090913 | |
+0.16575757575757574 3.0033730135266007e-05 49072.020454545454 | |
+0.17222222222222222 3.6690109639939518e-05 48948.354999999996 | |
+0.1786868686868687 4.4781411327792909e-05 48824.689545454545 | |
+0.18515151515151515 5.4463661175678453e-05 48701.024090909094 | |
+0.1916161616161616 6.6185656628759332e-05 48577.358636363635 | |
+0.19808080808080808 8.0166355676916215e-05 48453.693181818184 | |
+0.20454545454545456 9.7024539381551967e-05 48330.027727272725 | |
+0.21101010101010101 0.00011706504950304593 48206.362272727274 | |
+0.21747474747474746 0.00014113404530906627 48082.696818181816 | |
+0.22393939393939394 0.00016965257731758093 47959.031363636364 | |
+0.23040404040404042 0.00020376824517701419 47835.365909090906 | |
+0.23686868686868687 0.00024405799262754765 47711.700454545455 | |
+0.24333333333333332 0.00029206545224089788 47588.035000000003 | |
+0.2497979797979798 0.00034857488995014731 47464.369545454545 | |
+0.2562626262626263 0.00041564552489464996 47340.704090909087 | |
+0.2627272727272727 0.00049433493585912373 47217.038636363635 | |
+0.2691919191919192 0.00058736741743437969 47093.373181818184 | |
+0.27565656565656566 0.00069615768179821075 46969.707727272726 | |
+0.28212121212121211 0.00082427997107354766 46846.042272727274 | |
+0.28858585858585861 0.00097361149706636234 46722.376818181816 | |
+0.29505050505050501 0.0011488024991354834 46598.711363636365 | |
+0.30151515151515151 0.0013523237291225435 46475.045909090906 | |
+0.30797979797979802 0.0015901745935740807 46351.380454545455 | |
+0.31444444444444442 0.0018655805628656301 46227.715000000004 | |
+0.32090909090909092 0.0021862163098946507 46104.049545454545 | |
+0.32737373737373743 0.0025562580081480921 45980.384090909094 | |
+0.33383838383838382 0.0029854399240886891 45856.718636363636 | |
+0.34030303030303033 0.0034791243990300071 45733.053181818184 | |
+0.34676767676767672 0.0040495521579898474 45609.387727272726 | |
+0.35323232323232323 0.0047035510580939761 45485.722272727275 | |
+0.35969696969696974 0.0054563804215481248 45362.056818181816 | |
+0.36616161616161613 0.0063166606175414199 45238.391363636365 | |
+0.37262626262626264 0.0073032474524908908 45114.725909090906 | |
+0.37909090909090915 0.0084269311128128983 44991.060454545455 | |
+0.38555555555555554 0.0097108049597990059 44867.395000000004 | |
+0.39202020202020205 0.011168257597470263 44743.729545454546 | |
+0.39848484848484844 0.012827317743725187 44620.064090909094 | |
+0.40494949494949495 0.014704450954929577 44496.398636363636 | |
+0.41141414141414145 0.016833364611922915 44372.733181818185 | |
+0.41787878787878785 0.01923412521757872 44249.067727272726 | |
+0.42434343434343436 0.021946890746376665 44125.402272727275 | |
+0.43080808080808086 0.024995889669530487 44001.736818181816 | |
+0.43727272727272726 0.02842850775835452 43878.071363636365 | |
+0.44373737373737376 0.032273720224717209 43754.405909090907 | |
+0.45020202020202016 0.036586892599982698 43630.740454545456 | |
+0.45666666666666667 0.041402336345396751 43507.074999999997 | |
+0.46313131313131317 0.046784085318733001 43383.409545454546 | |
+0.46959595959595957 0.052772355887906582 43259.744090909095 | |
+0.47606060606060607 0.059440429409710949 43136.078636363636 | |
+0.48252525252525258 0.066834942092933211 43012.413181818178 | |
+0.48898989898989897 0.07503883891402284 42888.747727272726 | |
+0.49545454545454548 0.084105596481748229 42765.082272727275 | |
+0.50191919191919188 0.094128015779105012 42641.416818181817 | |
+0.50838383838383838 0.10516669138319021 42517.751363636366 | |
+0.51484848484848489 0.11732418240662454 42394.085909090907 | |
+0.52131313131313128 0.13066827963280273 42270.420454545456 | |
+0.52777777777777779 0.1453108415640558 42146.754999999997 | |
+0.5342424242424243 0.16132667081256499 42023.089545454546 | |
+0.54070707070707069 0.17883603343115687 41899.424090909095 | |
+0.5471717171717172 0.19792022807009599 41775.758636363636 | |
+0.5536363636363637 0.21870653263140882 41652.093181818178 | |
+0.5601010101010101 0.24128182248456376 41528.427727272727 | |
+0.56656565656565661 0.2657784223150888 41404.762272727276 | |
+0.573030303030303 0.29228738898128004 41281.096818181817 | |
+0.57949494949494951 0.32094350370819941 41157.431363636366 | |
+0.58595959595959601 0.35184006501532883 41033.765909090907 | |
+0.59242424242424241 0.38511105411650587 40910.100454545456 | |
+0.59888888888888892 0.42084946668537748 40786.434999999998 | |
+0.60535353535353542 0.45918454007687115 40662.769545454546 | |
+0.61181818181818182 0.50020577227007978 40539.104090909088 | |
+0.61828282828282832 0.54403303051724061 40415.438636363637 | |
+0.62474747474747483 0.59074844529848336 40291.773181818178 | |
+0.63121212121212122 0.64045724176376306 40168.107727272727 | |
+0.63767676767676773 0.69322964183040292 40044.442272727269 | |
+0.64414141414141413 0.74915038486089058 39920.776818181817 | |
+0.65060606060606063 0.80827261151488083 39797.111363636366 | |
+0.65707070707070714 0.87065427672188145 39673.445909090908 | |
+0.66353535353535353 0.93632571872185644 39549.780454545456 | |
0.67000000000000004 1 39426.114999999998 | |
diff --git a/test/simple_shear_wet.std b/test/simple_shear_wet.std | |
t@@ -1,100 +1,100 @@ | |
-0.029999999999999999 0 50172.900701113751 1496.0942988862… | |
-0.036464646464646464 2.568140550197167e-08 50065.088671607169 … | |
-0.042929292929292928 6.4544866483611638e-08 49957.275508925421 … | |
-0.049393939393939393 1.169550104545198e-07 49849.461187477311 … | |
-0.055858585858585857 1.8337933402681501e-07 49741.645668695928 … | |
-0.062323232323232322 2.643892198601668e-07 49633.828900823108 … | |
-0.068787878787878787 3.6066127461499046e-07 49526.010818623588 … | |
-0.075252525252525251 4.7297957050325686e-07 49418.191343029692 … | |
-0.081717171717171716 6.0223800618403373e-07 49310.370380718166 … | |
-0.088181818181818181 7.4944364053676953e-07 49202.547823620982 … | |
-0.094646464646464645 9.1571994322132548e-07 49094.723548372065 … | |
-0.10111111111111111 1.1023111012908133e-06 48986.897415692772 … | |
-0.10757575757575757 1.3105860323584418e-06 48879.069269718697 … | |
-0.11404040404040404 1.5420435481714477e-06 48771.238937271439 … | |
-0.1205050505050505 1.798317000488226e-06 48663.406227078878 … | |
-0.12696969696969695 2.0811801803592374e-06 48555.570928948502 … | |
-0.13343434343434343 2.3925524554293951e-06 48447.73281289819 … | |
-0.13989898989898991 2.7345052698224463e-06 48339.891628250189 … | |
-0.14636363636363636 3.109267611998086e-06 48232.047102693723 … | |
-0.15282828282828281 3.5192329580960752e-06 48124.19894132304 … | |
-0.15929292929292929 3.9669648819751571e-06 48016.346825657616 … | |
-0.16575757575757574 4.4552042548849992e-06 47908.49041265242 … | |
-0.17222222222222222 4.9868747741857465e-06 47800.629333706369 … | |
-0.1786868686868687 5.5650901945668481e-06 47692.763193677878 … | |
-0.18515151515151515 6.1931595095792509e-06 47584.891569917119 … | |
-0.1916161616161616 6.8745939447286536e-06 47477.014011325053 … | |
-0.19808080808080808 7.6131114769190686e-06 47369.130037450101 … | |
-0.20454545454545456 8.4126432682548675e-06 47261.239137633638 … | |
-0.21101010101010101 9.2773371536447713e-06 47153.340770216419 … | |
-0.21747474747474746 1.0211563137011206e-05 47045.434361818123 … | |
-0.22393939393939394 1.1219915417862458e-05 46937.519306703121 … | |
-0.23040404040404042 1.2307216510205869e-05 46829.594966245495 … | |
-0.23686868686868687 1.3478517316561708e-05 46721.660668507102 … | |
-0.24333333333333332 1.4739099366103521e-05 46613.715707942436 … | |
-0.2497979797979798 1.6094472381631724e-05 46505.759345244238 … | |
-0.2562626262626263 1.7550374069832475e-05 46397.790807344012 … | |
-0.2627272727272727 1.9112764566090404e-05 46289.809287581324 … | |
-0.2691919191919192 2.0787823149488248e-05 46181.81394605567 … | |
-0.27565656565656566 2.2581938895704723e-05 46073.803910174422 … | |
-0.28212121212121211 2.4501703636479589e-05 45965.778275409881 … | |
-0.28858585858585861 2.6553898106716263e-05 45857.736106277625 … | |
-0.29505050505050501 2.8745480427461573e-05 45749.676437548078 … | |
-0.30151515151515151 3.1083567005064394e-05 45641.598275701639 … | |
-0.30797979797979802 3.3575415793979159e-05 45533.500600637344 … | |
-0.31444444444444442 3.6228401199615962e-05 45425.382367642982 … | |
-0.32090909090909092 3.9049991379021869e-05 45317.242509633958 … | |
-0.32737373737373743 4.2047716421872685e-05 45209.079939666066 … | |
-0.33383838383838382 4.5229138980615424e-05 45100.893553725626 … | |
-0.34030303030303033 4.8601815063528867e-05 44992.682233799016 … | |
-0.34676767676767672 5.2173257359108847e-05 44884.444851220862 … | |
-0.35323232323232323 5.5950888079334279e-05 44776.180270298668 … | |
-0.35969696969696974 5.9941994464155515e-05 44667.887352208803 … | |
-0.36616161616161613 6.4153673270236444e-05 44559.564959156793 … | |
-0.37262626262626264 6.859277811853717e-05 44451.211958792024 … | |
-0.37909090909090915 7.3265855441740445e-05 44342.827228864735 … | |
-0.38555555555555554 7.8179083578744414e-05 44234.409662110127 … | |
-0.39202020202020205 8.3338200279728708e-05 44125.958171342347 … | |
-0.39848484848484844 8.8748433762378376e-05 44017.471694737862 … | |
-0.40494949494949495 9.4414422232534886e-05 43908.949201285614 … | |
-0.41141414141414145 0.00010034013750273124 43800.389696378574 … | |
-0.41787878787878785 0.00010652879742163605 43691.79222751873 … | |
-0.42434343434343436 0.00011298278311775689 43583.155890105583 … | |
-0.43080808080808086 0.0001197045573246445 43474.479833275494 … | |
-0.43727272727272726 0.00012669730862311602 43365.76326575772 … | |
-0.44373737373737376 0.00013396472325980793 43257.005461710585 … | |
-0.45020202020202016 0.00014151076221974605 43148.205766500309 … | |
-0.45666666666666667 0.00014933942811234398 43039.363602382873 … | |
-0.46313131313131317 0.00015745453715744755 42930.478474049043 … | |
-0.46959595959595957 0.00016585948083455121 42821.549973991292 … | |
-0.47606060606060607 0.000174556991689249 42712.57778765136 … | |
-0.48252525252525258 0.00018354889798487484 42603.561698306905 … | |
-0.48898989898989897 0.00019283588073652617 42494.50159165603 … | |
-0.49545454545454548 0.00020241721803395611 42385.397460059219 … | |
-0.50191919191919188 0.00021229052908176848 42276.249406399234 … | |
-0.50838383838383838 0.00022245150314375875 42167.057647520916 … | |
-0.51484848484848489 0.00023289362456663273 42057.822517214619 … | |
-0.52131313131313128 0.00024360787937566787 41948.544468709544 … | |
-0.52777777777777779 0.00025458245322097903 41839.224076645216 … | |
-0.5342424242424243 0.00026580240645652115 41729.862038493047 … | |
-0.54070707070707069 0.00027724933458365443 41620.459175402451 … | |
-0.5471717171717172 0.00028890100006734488 41511.016432450182 … | |
-0.5536363636363637 0.00030073094204293626 41401.534878275175 … | |
-0.5601010101010101 0.00031270805002898484 41292.015704085272 … | |
-0.56656565656565661 0.00032479610625409284 41182.460222026762 … | |
-0.573030303030303 0.00033695328263762817 41072.869862912223 … | |
-0.57949494949494951 0.00034913159488178476 40963.246173306659 … | |
-0.58595959595959601 0.00036127629937901247 40853.59081197701 … | |
-0.59242424242424241 0.00037332523293766474 40743.905545714784 … | |
-0.59888888888888892 0.00038520808033948333 40634.192244546524 … | |
-0.60535353535353542 0.00039684556688488853 40524.452876351701 … | |
-0.61181818181818182 0.00040814855977746418 40414.689500912245 … | |
-0.61828282828282832 0.0004190170721448438 40304.904263422715 … | |
-0.62474747474747483 0.00042933915176509332 40195.099387494301 … | |
-0.63121212121212122 0.00043898964426479574 40085.277167690394 … | |
-0.63767676767676773 0.00044782881026559051 39975.439961634896 … | |
-0.64414141414141413 0.00045570078132857179 39865.590181738611 … | |
-0.65060606060606063 0.00046243183052471624 39755.730286591737 … | |
-0.65707070707070714 0.00046782843639463819 39645.862772073757 … | |
-0.66353535353535353 0.0004716751110991929 39535.990162234237 … | |
-0.67000000000000004 0.00047373196389281964 39426.114999999998 … | |
+0.029999999999999999 0 50172.968088659189 1496.0269113408… | |
+0.036464646464646464 3.0977515985486982e-14 50065.157106640087 … | |
+0.042929292929292928 7.8109238190757301e-14 49957.3460494553 … | |
+0.049393939393939393 1.4219812538877682e-13 49849.534912579911 … | |
+0.055858585858585857 2.2422125141429489e-13 49741.723689101091 … | |
+0.062323232323232322 3.2551153452118142e-13 49633.912369565762 … | |
+0.068787878787878787 4.4755740104970389e-13 49526.100941774857 … | |
+0.075252525252525251 5.9228426368195922e-13 49418.289390521466 … | |
+0.081717171717171716 7.6176405824679441e-13 49310.477697270166 … | |
+0.088181818181818181 9.5860612408752434e-13 49202.665839773916 … | |
+0.094646464646464645 1.185566733546518e-12 49094.853791624388 … | |
+0.10111111111111111 1.44606225907206e-12 48987.041521731408 … | |
+0.10757575757575757 1.7436660907602764e-12 48879.228993726232 … | |
+0.11404040404040404 2.0827603631050363e-12 48771.416165283488 … | |
+0.1205050505050505 2.4679047547681291e-12 48663.602987355705 … | |
+0.12696969696969695 2.9046466431519707e-12 48555.789403314651 … | |
+0.13343434343434343 3.3987431698662028e-12 48447.975347992862 … | |
+0.13989898989898991 3.9571535332217415e-12 48340.1607466192 … | |
+0.14636363636363636 4.5870923566382429e-12 48232.345513641645 … | |
+0.15282828282828281 5.297231946271672e-12 48124.529551431333 … | |
+0.15929292929292929 6.0965613991526133e-12 48016.712748861231 … | |
+0.16575757575757574 6.9958310617203002e-12 47908.894979754048 … | |
+0.17222222222222222 8.0061879495715526e-12 47801.076101193932 … | |
+0.1786868686868687 9.1408993448691125e-12 47693.255951697465 … | |
+0.18515151515151515 1.0413730969905909e-11 47585.434349240422 … | |
+0.1916161616161616 1.1840991643030966e-11 47477.611089137754 … | |
+0.19808080808080808 1.3439616265062465e-11 47369.785941775859 … | |
+0.20454545454545456 1.5229578681306152e-11 47261.958650197514 … | |
+0.21101010101010101 1.7231636927879628e-11 47154.128927542028 … | |
+0.21747474747474746 1.9470166866177103e-11 47046.296454345029 … | |
+0.22393939393939394 2.1970522335499591e-11 46938.46087570495 … | |
+0.23040404040404042 2.4762347654946017e-11 46830.621798325628 … | |
+0.23686868686868687 2.7876500396922656e-11 46722.778787447729 … | |
+0.24333333333333332 3.1348906379745509e-11 46614.931363684489 … | |
+0.2497979797979798 3.5216987790603644e-11 46507.07899978089 … | |
+0.2562626262626263 3.9524129677212537e-11 46399.22111731903 … | |
+0.2627272727272727 4.4315551206877017e-11 46291.357083395931 … | |
+0.2691919191919192 4.9643457728243867e-11 46183.486207304348 … | |
+0.27565656565656566 5.5562288176317059e-11 46075.607737250779 … | |
+0.28212121212121211 6.2134631297481472e-11 45967.720857149281 … | |
+0.28858585858585861 6.9425777743657392e-11 45859.824683533363 … | |
+0.29505050505050501 7.7510482775680444e-11 45751.918262632491 … | |
+0.30151515151515151 8.646674760265482e-11 45644.000567663279 … | |
+0.30797979797979802 9.6383513498308555e-11 45536.070496389228 … | |
+0.31444444444444442 1.07353593627554e-10 45428.126869005631 … | |
+0.32090909090909092 1.1948238468322096e-10 45320.168426409633 … | |
+0.32737373737373743 1.3287986801726332e-10 45212.19382891713 … | |
+0.33383838383838382 1.4767042424703638e-10 45104.201655489989 … | |
+0.34030303030303033 1.6398382121037704e-10 44996.190403538254 … | |
+0.34676767676767672 1.8196621408194888e-10 44888.158489361485 … | |
+0.35323232323232323 2.0177003775323977e-10 44780.104249293239 … | |
+0.35969696969696974 2.2356626939374792e-10 44672.025941610285 … | |
+0.36616161616161613 2.4753314458417995e-10 44563.921749265704 … | |
+0.37262626262626264 2.7386975049176428e-10 44455.789783500761 … | |
+0.37909090909090915 3.0278348872820453e-10 44347.628088385383 … | |
+0.38555555555555554 3.3450505492015568e-10 44239.434646330585 … | |
+0.39202020202020205 3.6927457709067642e-10 44131.207384608657 … | |
+0.39848484848484844 4.0735802095163066e-10 44022.944182908039 … | |
+0.40494949494949495 4.4903194087440178e-10 43914.642881939653 … | |
+0.41141414141414145 4.9460132931241352e-10 43806.301293100601 … | |
+0.41787878787878785 5.4438292836730156e-10 43697.917209188454 … | |
+0.42434343434343436 5.9872451604411765e-10 43589.488416146676 … | |
+0.43080808080808086 6.5798674023310019e-10 43481.012705807188 … | |
+0.43727272727272726 7.2256380379600721e-10 43372.487889581884 … | |
+0.44373737373737376 7.9286379962619963e-10 43263.911813039304 … | |
+0.45020202020202016 8.6933072080269559e-10 43155.282371287656 … | |
+0.45666666666666667 9.5242329536123536e-10 43046.597525069315 … | |
+0.46313131313131317 1.0426382070711194e-09 42937.855317457324 … | |
+0.46959595959595957 1.1404874516790477e-09 42829.053891028772 … | |
+0.47606060606060607 1.2465226086460956e-09 42720.191505376366 … | |
+0.48252525252525258 1.3613107668699515e-09 42611.266554806047 … | |
+0.48898989898989897 1.4854596386436926e-09 42502.277586056596 … | |
+0.49545454545454548 1.6195921320925587e-09 42393.223315866824 … | |
+0.50191919191919188 1.7643720467031164e-09 42284.102648207481 … | |
+0.50838383838383838 1.9204774017114404e-09 42174.914690988153 … | |
+0.51484848484848489 2.088626399206516e-09 42065.658772045412 … | |
+0.52131313131313128 2.2695496521706859e-09 41956.334454216456 … | |
+0.52777777777777779 2.4640160482089442e-09 41846.941549303236 … | |
+0.5342424242424243 2.6728040574731034e-09 41737.480130735727 … | |
+0.54070707070707069 2.8967270797705711e-09 41627.950544748957 … | |
+0.5471717171717172 3.1366040507181211e-09 41518.35341989794 … | |
+0.5536363636363637 3.3932838100373194e-09 41408.689674746398 … | |
+0.5601010101010101 3.6676152634189101e-09 41298.960523579888 … | |
+0.56656565656565661 3.9604702733224514e-09 41189.167480011507 … | |
+0.573030303030303 4.2727136735516603e-09 41079.312358368072 … | |
+0.57949494949494951 4.6052241592943991e-09 40969.397272766997 … | |
+0.58595959595959601 4.9588644906101019e-09 40859.424633817813 … | |
+0.59242424242424241 5.3344998494695933e-09 40749.397142908798 … | |
+0.59888888888888892 5.7329686064744186e-09 40639.317784065417 … | |
+0.60535353535353542 6.155097623080058e-09 40529.189813396399 … | |
+0.61181818181818182 6.6016739920815609e-09 40419.016746170841 … | |
+0.61828282828282832 7.073456796729839e-09 40308.802341599505 … | |
+0.62474747474747483 7.5711502689449684e-09 40198.550585420853 … | |
+0.63121212121212122 8.0954115770263865e-09 40088.265670420973 … | |
+0.63767676767676773 8.6468258752398989e-09 39977.951975041869 … | |
+0.64414141414141413 9.225909781012751e-09 39867.614040258268 … | |
+0.65060606060606063 9.8330888144389468e-09 39757.2565449248 … | |
+0.65707070707070714 1.0468696346012951e-08 39646.884279816339 … | |
+0.66353535353535353 1.1132953943550553e-08 39536.502120601021 … | |
+0.67000000000000004 1.1748703174866315e-08 39426.114999999998 … | |
diff --git a/test/simple_shear_wet_norm.std b/test/simple_shear_wet_norm.std | |
t@@ -1,100 +1,100 @@ | |
-0.029999999999999999 0 50172.900701113751 1496.0942988862… | |
-0.036464646464646464 5.4210835365506401e-05 50065.088671607169 … | |
-0.042929292929292928 0.0001362476493104331 49957.275508925421 … | |
-0.049393939393939393 0.00024688013342705434 49849.461187477311 … | |
-0.055858585858585857 0.00038709512552187421 49741.645668695928 … | |
-0.062323232323232322 0.00055809875628317122 49633.828900823108 … | |
-0.068787878787878787 0.00076131927356413076 49526.010818623588 … | |
-0.075252525252525251 0.00099841177406865254 49418.191343029692 … | |
-0.081717171717171716 0.0012712631869617483 49310.370380718166 … | |
-0.088181818181818181 0.0015819993111259192 49202.547823620982 … | |
-0.094646464646464645 0.0019329916767628207 49094.723548372065 … | |
-0.10111111111111111 0.0023268666362150046 48986.897415692772 … | |
-0.10757575757575757 0.0027665138353530181 48879.069269718697 … | |
-0.11404040404040404 0.0032550971133548639 48771.238937271439 … | |
-0.1205050505050505 0.0037960643096801665 48663.406227078878 … | |
-0.12696969696969695 0.0043931597168522449 48555.570928948502 … | |
-0.13343434343434343 0.0050504349247810151 48447.73281289819 … | |
-0.13989898989898991 0.0057722625413579214 48339.891628250189 … | |
-0.14636363636363636 0.0065633477345462552 48232.047102693723 … | |
-0.15282828282828281 0.0074287428890744862 48124.19894132304 … | |
-0.15929292929292929 0.0083738594486579138 48016.346825657616 … | |
-0.16575757575757574 0.0094044831137739624 47908.49041265242 … | |
-0.17222222222222222 0.010526785512226933 47800.629333706369 … | |
-0.1786868686868687 0.011747339463515558 47692.763193677878 … | |
-0.18515151515151515 0.013073129916520545 47584.891569917119 … | |
-0.1916161616161616 0.014511568711213264 47477.014011325053 … | |
-0.19808080808080808 0.016070504118741523 47369.130037450101 … | |
-0.20454545454545456 0.01775823442253139 47261.239137633638 … | |
-0.21101010101010101 0.019583515280264557 47153.340770216419 … | |
-0.21747474747474746 0.021555571325817355 47045.434361818123 … | |
-0.22393939393939394 0.023684100447148481 46937.519306703121 … | |
-0.23040404040404042 0.025979282480905887 46829.594966245495 … | |
-0.23686868686868687 0.028451779368662528 46721.660668507102 … | |
-0.24333333333333332 0.031112739881403055 46613.715707942436 … | |
-0.2497979797979798 0.033973794483652467 46505.759345244238 … | |
-0.2562626262626263 0.037047054890733934 46397.790807344012 … | |
-0.2627272727272727 0.040345102342333412 46289.809287581324 … | |
-0.2691919191919192 0.043880980668197907 46181.81394605567 … | |
-0.27565656565656566 0.047668176557353462 46073.803910174422 … | |
-0.28212121212121211 0.051720604696251872 45965.778275409881 … | |
-0.28858585858585861 0.056052578526713047 45857.736106277625 … | |
-0.29505050505050501 0.060678785934666524 45749.676437548078 … | |
-0.30151515151515151 0.06561424893021775 45641.598275701639 … | |
-0.30797979797979802 0.0708742883171284 45533.500600637344 … | |
-0.31444444444444442 0.076474470715285153 45425.382367642982 … | |
-0.32090909090909092 0.082430560644746381 45317.242509633958 … | |
-0.32737373737373743 0.08875845335905147 45209.079939666066 … | |
-0.33383838383838382 0.09547411284843843 45100.893553725626 … | |
-0.34030303030303033 0.10259348907798181 44992.682233799016 … | |
-0.34676767676767672 0.11013244056909971 44884.444851220862 … | |
-0.35323232323232323 0.11810663485648393 44776.180270298668 … | |
-0.35969696969696974 0.12653145456259987 44667.887352208803 … | |
-0.36616161616161613 0.13542188021906626 44559.564959156793 … | |
-0.37262626262626264 0.14479237912275658 44451.211958792024 … | |
-0.37909090909090915 0.15465677012733009 44342.827228864735 … | |
-0.38555555555555554 0.16502809507789976 44234.409662110127 … | |
-0.39202020202020205 0.17591846578159906 44125.958171342347 … | |
-0.39848484848484844 0.18733891847428186 44017.471694737862 … | |
-0.40494949494949495 0.19929924393680104 43908.949201285614 … | |
-0.41141414141414145 0.2118078262615036 43800.389696378574 … | |
-0.41787878787878785 0.22487145799969255 43691.79222751873 … | |
-0.42434343434343436 0.23849516547150043 43583.155890105583 … | |
-0.43080808080808086 0.25268414725700727 43474.479833275494 … | |
-0.43727272727272726 0.26744513412605803 43365.76326575772 … | |
-0.44373737373737376 0.28278590737043241 43257.005461710585 … | |
-0.45020202020202016 0.29871482822671097 43148.205766500309 … | |
-0.45666666666666667 0.31524034579632365 43039.363602382873 … | |
-0.46313131313131317 0.33237051573127785 42930.478474049043 … | |
-0.46959595959595957 0.35011249709989251 42821.549973991292 … | |
-0.47606060606060607 0.36847205802803285 42712.57778765136 … | |
-0.48252525252525258 0.38745305779367295 42603.561698306905 … | |
-0.48898989898989897 0.4070569339504283 42494.50159165603 … | |
-0.49545454545454548 0.42728216261918178 42385.397460059219 … | |
-0.50191919191919188 0.44812371818296504 42276.249406399234 … | |
-0.50838383838383838 0.46957250111602711 42167.057647520916 … | |
-0.51484848484848489 0.49161475753686779 42057.822517214619 … | |
-0.52131313131313128 0.51423145986151653 41948.544468709544 … | |
-0.52777777777777779 0.53739766919881615 41839.224076645216 … | |
-0.5342424242424243 0.56108184947524065 41729.862038493047 … | |
-0.54070707070707069 0.5852451506657913 41620.459175402451 … | |
-0.5471717171717172 0.60984063159543911 41511.016432450182 … | |
-0.5536363636363637 0.6348124360698103 41401.534878275175 … | |
-0.5601010101010101 0.66009489302633173 41292.015704085272 … | |
-0.56656565656565661 0.68561155043271882 41182.460222026762 … | |
-0.573030303030303 0.71127411346442893 41072.869862912223 … | |
-0.57949494949494951 0.73698129214851682 40963.246173306659 … | |
-0.58595959595959601 0.76261752829654972 40853.59081197701 … | |
-0.59242424242424241 0.78805160173259581 40743.905545714784 … | |
-0.59888888888888892 0.81313508418155933 40634.192244546524 … | |
-0.60535353535353542 0.83770063481440227 40524.452876351701 … | |
-0.61181818181818182 0.8615601033621757 40414.689500912245 … | |
-0.61828282828282832 0.88450242770539567 40304.904263422715 … | |
-0.62474747474747483 0.90629128808844728 40195.099387494301 … | |
-0.63121212121212122 0.92666249635651721 40085.277167690394 … | |
-0.63767676767676773 0.94532107689256617 39975.439961634896 … | |
-0.64414141414141413 0.96193800727297485 39865.590181738611 … | |
-0.65060606060606063 0.97614656761759055 39755.730286591737 … | |
-0.65707070707070714 0.98753825380565385 39645.862772073757 … | |
-0.66353535353535353 0.99565819292258673 39535.990162234237 … | |
-0.67000000000000004 1 39426.114999999998 0 0.40582… | |
+0.029999999999999999 0 50172.968088659189 1496.0269113408… | |
+0.036464646464646464 2.6366753440291477e-06 50065.157106640087 … | |
+0.042929292929292928 6.6483285030005947e-06 49957.3460494553 … | |
+0.049393939393939393 1.2103303936810443e-05 49849.534912579911 … | |
+0.055858585858585857 1.9084766044133738e-05 49741.723689101091 … | |
+0.062323232323232322 2.7706167197886103e-05 49633.912369565762 … | |
+0.068787878787878787 3.8094195962593678e-05 49526.100941774857 … | |
+0.075252525252525251 5.0412735334825465e-05 49418.289390521466 … | |
+0.081717171717171716 6.4838139742641197e-05 49310.477697270166 … | |
+0.088181818181818181 8.1592505131821246e-05 49202.665839773916 … | |
+0.094646464646464645 0.00010091043376453404 49094.853791624388 … | |
+0.10111111111111111 0.0001230827128363905 48987.041521731408 … | |
+0.10757575757575757 0.00014841349422210737 48879.228993726232 … | |
+0.11404040404040404 0.00017727576670424608 48771.416165283488 … | |
+0.1205050505050505 0.00021005763087518045 48663.602987355705 … | |
+0.12696969696969695 0.00024723125607307902 48555.789403314651 … | |
+0.13343434343434343 0.00028928666587960469 48447.975347992862 … | |
+0.13989898989898991 0.00033681619786660145 48340.1607466192 … | |
+0.14636363636363636 0.00039043393031252047 48232.345513641645 … | |
+0.15282828282828281 0.00045087801329459903 48124.529551431333 … | |
+0.15929292929292929 0.00051891356079152831 48016.712748861231 … | |
+0.16575757575757574 0.00059545559689398687 47908.894979754048 … | |
+0.17222222222222222 0.00068145290849623086 47801.076101193932 … | |
+0.1786868686868687 0.00077803475062881771 47693.255951697465 … | |
+0.18515151515151515 0.00088637280344129588 47585.434349240422 … | |
+0.1916161616161616 0.0010078552046801285 47477.611089137754 … | |
+0.19808080808080808 0.0011439233815876357 47369.785941775859 … | |
+0.20454545454545456 0.0012962774235275925 47261.958650197514 … | |
+0.21101010101010101 0.0014666841668740773 47154.128927542028 … | |
+0.21747474747474746 0.0016572183820108 47046.296454345029 … | |
+0.22393939393939394 0.0018700380806709407 46938.46087570495 … | |
+0.23040404040404042 0.0021076664621095748 46830.621798325628 … | |
+0.23686868686868687 0.0023727299925797858 46722.778787447729 … | |
+0.24333333333333332 0.0026682865260235175 46614.931363684489 … | |
+0.2497979797979798 0.0029975212809820917 46507.07899978089 … | |
+0.2562626262626263 0.0033641270095039464 46399.22111731903 … | |
+0.2627272727272727 0.0037719525761515608 46291.357083395931 … | |
+0.2691919191919192 0.0042254414797409118 46183.486207304348 … | |
+0.27565656565656566 0.0047292273325263649 46075.607737250779 … | |
+0.28212121212121211 0.0052886374242907437 45967.720857149281 … | |
+0.28858585858585861 0.0059092290196060184 45859.824683533363 … | |
+0.29505050505050501 0.0065973649705864165 45751.918262632491 … | |
+0.30151515151515151 0.0073596844107552918 45644.000567663279 … | |
+0.30797979797979802 0.0082037576457373793 45536.070496389228 … | |
+0.31444444444444442 0.0091374845401842007 45428.126869005631 … | |
+0.32090909090909092 0.010169836015503942 45320.168426409633 … | |
+0.32737373737373743 0.011310173219928617 45212.19382891713 … | |
+0.33383838383838382 0.012569082906353763 45104.201655489989 … | |
+0.34030303030303033 0.013957610365132317 44996.190403538254 … | |
+0.34676767676767672 0.015488195707524922 44888.158489361485 … | |
+0.35323232323232323 0.01717381354776934 44780.104249293239 … | |
+0.35969696969696974 0.019029016740504365 44672.025941610285 … | |
+0.36616161616161613 0.021068975945678921 44563.921749265704 … | |
+0.37262626262626264 0.023310636622231335 44455.789783500761 … | |
+0.37909090909090915 0.025771651919502155 44347.628088385383 … | |
+0.38555555555555554 0.028471657675015007 44239.434646330585 … | |
+0.39202020202020205 0.03143109257204281 44131.207384608657 … | |
+0.39848484848484844 0.034672594488818195 44022.944182908039 … | |
+0.40494949494949495 0.038219702565556658 43914.642881939653 … | |
+0.41141414141414145 0.042098376471924222 43806.301293100601 … | |
+0.41787878787878785 0.046335575958024483 43697.917209188454 … | |
+0.42434343434343436 0.050960902418996583 43589.488416146676 … | |
+0.43080808080808086 0.056005052680257815 43481.012705807188 … | |
+0.43727272727272726 0.06150157962470007 43372.487889581884 … | |
+0.44373737373737376 0.067485218396048333 43263.911813039304 … | |
+0.45020202020202016 0.073993759810225809 43155.282371287656 … | |
+0.45666666666666667 0.081066248860446902 43046.597525069315 … | |
+0.46313131313131317 0.08874496117168125 42937.855317457324 … | |
+0.46959595959595957 0.097073475659752967 42829.053891028772 … | |
+0.47606060606060607 0.10609874043909356 42720.191505376366 … | |
+0.48252525252525258 0.11586902372188337 42611.266554806047 … | |
+0.48898989898989897 0.12643605141216746 42502.277586056596 … | |
+0.49545454545454548 0.1378528428190533 42393.223315866824 … | |
+0.50191919191919188 0.15017589775164208 42284.102648207481 … | |
+0.50838383838383838 0.16346292634406376 42174.914690988153 … | |
+0.51484848484848489 0.17777505892519765 42065.658772045412 … | |
+0.52131313131313128 0.19317448218675509 41956.334454216456 … | |
+0.52777777777777779 0.20972664059469537 41846.941549303236 … | |
+0.5342424242424243 0.22749779424089642 41737.480130735727 … | |
+0.54070707070707069 0.24655717628201396 41627.950544748957 … | |
+0.5471717171717172 0.26697449105941956 41518.35341989794 … | |
+0.5536363636363637 0.28882198822560096 41408.689674746398 … | |
+0.5601010101010101 0.31217192304806379 41298.960523579888 … | |
+0.56656565656565661 0.33709850477752973 41189.167480011507 … | |
+0.573030303030303 0.36367534441521698 41079.312358368072 … | |
+0.57949494949494951 0.3919772327848261 40969.397272766997 … | |
+0.58595959595959601 0.42207760437921926 40859.424633817813 … | |
+0.59242424242424241 0.45405009983412853 40749.397142908798 … | |
+0.59888888888888892 0.48796607771475614 40639.317784065417 … | |
+0.60535353535353542 0.52389591697639382 40529.189813396399 … | |
+0.61181818181818182 0.56190661163389888 40419.016746170841 … | |
+0.61828282828282832 0.60206277164801425 40308.802341599505 … | |
+0.62474747474747483 0.64442433826583745 40198.550585420853 … | |
+0.63121212121212122 0.68904724687782415 40088.265670420973 … | |
+0.63767676767676773 0.7359813033439998 39977.951975041869 … | |
+0.64414141414141413 0.78527047995811927 39867.614040258268 … | |
+0.65060606060606063 0.83695099519363203 39757.2565449248 … | |
+0.65707070707070714 0.89105122413921833 39646.884279816339 … | |
+0.66353535353535353 0.94759002571168716 39536.502120601021 … | |
+0.67000000000000004 1 39426.114999999998 0 0.40582… | |
diff --git a/test/simple_shear_wet_vari.std b/test/simple_shear_wet_vari.std | |
t@@ -1,50 +1,50 @@ | |
-0 0 233416 69620 0.17136785824450768 4.6669… | |
-0.16326530612244897 1.7254952706385231e-54 230693.22448979598 … | |
-0.32653061224489793 4.0407528378181352e-53 227970.44897959181 … | |
-0.48979591836734693 8.974295020266734e-52 225247.67346938775 … | |
-0.65306122448979587 1.9701560192325873e-50 222524.89795918373 … | |
-0.81632653061224481 4.2761289007686597e-49 219802.12244897956 … | |
-0.97959183673469385 9.1830745572815287e-48 217079.3469387755 … | |
-1.1428571428571428 1.9498828754953071e-46 214356.57142857148 … | |
-1.3061224489795917 4.0947197409276331e-45 211633.79591836737 … | |
-1.4693877551020407 8.5036429549021249e-44 208911.02040816325 … | |
-1.6326530612244896 1.7480675471538054e-42 206188.24489795923 … | |
-1.7959183673469385 3.539940981416758e-41 203465.46938775512 … | |
-1.9591836734693877 7.0931648073750382e-40 200742.69387755101 … | |
-2.1224489795918364 1.3977718223300297e-38 198019.91836734698 … | |
-2.2857142857142856 2.7169484005267094e-37 195297.14285714287 … | |
-2.4489795918367343 5.1911969991998432e-36 192574.36734693879 … | |
-2.6122448979591835 9.763078128451431e-35 189851.59183673467 … | |
-2.7755102040816326 1.8040901888251089e-33 187128.81632653045 … | |
-2.9387755102040813 3.2762762225154885e-32 184406.04081632581 … | |
-3.1020408163265305 5.8407996135536725e-31 181683.26530611966 … | |
-3.2653061224489792 1.0219296569113868e-29 178960.48979590717 … | |
-3.4285714285714284 1.7537839775708538e-28 176237.71428567087 … | |
-3.5918367346938771 2.9532594673125378e-27 173514.93877534565 … | |
-3.7551020408163263 4.852289272484226e-26 170792.16326469684 … | |
-3.9183673469387754 7.8070892844153727e-25 168069.38775290188 … | |
-4.0816326530612246 1.2217233046811581e-23 165346.6122371552 … | |
-4.2448979591836729 1.8629810243254646e-22 162623.83670816355 … | |
-4.408163265306122 2.7563943070352647e-21 159901.06113606569 … | |
-4.5714285714285712 3.9572518926888654e-20 157178.28542789785 … | |
-4.7346938775510203 5.4963506588583547e-19 154455.5093036305 … | |
-4.8979591836734686 7.3755464522665584e-18 151732.73194821359 … | |
-5.0612244897959178 9.535833533755632e-17 149009.95107267829 … | |
-5.2244897959183669 1.1851835425236564e-15 146287.16048356297 … | |
-5.3877551020408161 1.4120738727817069e-14 143564.34405923815 … | |
-5.5510204081632653 1.6091823684041896e-13 140841.46149164127 … | |
-5.7142857142857135 1.7383234595739768e-12 138118.41613303503 … | |
-5.8775510204081627 1.7795936522605085e-11 135394.98611092602 … | |
-6.0408163265306118 1.7077361522838451e-10 132670.68455710524 … | |
-6.204081632653061 1.5298790337792099e-09 129944.4919604421 … | |
-6.3673469387755093 1.2660201931744904e-08 127214.37447105086 … | |
-6.5306122448979584 9.5919875640144804e-08 124476.47316476867 … | |
-6.6938775510204076 6.561993735809059e-07 121723.83584970099 … | |
-6.8571428571428568 3.9863386318433809e-06 118944.58921107838 … | |
-7.0204081632653059 2.099480365468637e-05 116119.53887028329 … | |
-7.1836734693877542 9.26138484566583e-05 113219.36777615397 … | |
-7.3469387755102034 0.00032389643940719027 110201.74924202729 … | |
-7.5102040816326525 0.00081486226743948708 107009.4075015166 … | |
-7.6734693877551017 0.0017146965332775813 103568.32747808649 … | |
-7.8367346938775508 0.0031367194103326056 99790.872544753947 … | |
-7.9999999999999991 0.0049264573041015863 95644.023244240714 … | |
+0 0 233416 69620 0.17136785824450768 5.0501… | |
+0.16326530612244897 2.1928144948635719e-62 230693.22448979598 … | |
+0.32653061224489793 6.048360161966786e-61 227970.44897959181 … | |
+0.48979591836734693 1.5812080587677226e-59 225247.67346938775 … | |
+0.65306122448979587 4.1011610162925315e-58 222524.89795918373 … | |
+0.81632653061224481 1.0519541383541272e-56 219802.12244897956 … | |
+0.97959183673469385 2.6763190731479816e-55 217079.3469387755 … | |
+1.1428571428571428 6.7480578046779116e-54 214356.57142857148 … | |
+1.3061224489795917 1.6886733431553045e-52 211633.79591836737 … | |
+1.4693877551020407 4.2014680292814615e-51 208911.02040816325 … | |
+1.6326530612244896 1.0461780153631107e-49 206188.24489795923 … | |
+1.7959183673469385 2.7314271957622504e-48 203465.46938775512 … | |
+1.9591836734693877 6.597083182843481e-47 200742.69387755101 … | |
+2.1224489795918364 1.6100963213728277e-45 198019.91836734698 … | |
+2.2857142857142856 3.7694610350639345e-44 195297.14285714287 … | |
+2.4489795918367343 8.7660388411079371e-43 192574.36734693879 … | |
+2.6122448979591835 1.9947643391246297e-41 189851.59183673473 … | |
+2.7755102040816326 4.4841708187153967e-40 187128.81632653062 … | |
+2.9387755102040813 9.9173786927479517e-39 184406.04081632651 … | |
+3.1020408163265305 2.1625544395251741e-37 181683.26530612248 … | |
+3.2653061224489792 4.6446809320392341e-36 178960.48979591837 … | |
+3.4285714285714284 9.8351948726353952e-35 176237.71428571426 … | |
+3.5918367346938771 2.056214875555282e-33 173514.93877551012 … | |
+3.7551020408163263 4.2720485762101163e-32 170792.16326530563 … | |
+3.9183673469387754 9.1707985078169804e-31 168069.38775509957 … | |
+4.0816326530612246 1.8158852420630447e-29 165346.61224488603 … | |
+4.2448979591836729 3.5839389288412137e-28 162623.83673463715 … | |
+4.408163265306122 6.7421941740841374e-27 159901.06122422736 … | |
+4.5714285714285712 1.24437275689543e-25 157178.28571310465 … | |
+4.7346938775510203 2.2236005875553024e-24 154455.51019891651 … | |
+4.8979591836734686 3.8733962665043178e-23 151732.73467196469 … | |
+5.0612244897959178 6.5478880991442329e-22 149009.95909364044 … | |
+5.2244897959183669 1.0746641239785454e-20 146287.18331587056 … | |
+5.3877551020408161 1.7085372409760693e-19 143564.40679289395 … | |
+5.5510204081632653 2.6292083203429361e-18 140841.62759670484 … | |
+5.7142857142857135 3.9150034307970272e-17 138118.83921773965 … | |
+5.8775510204081627 5.6680085299602805e-16 135396.02071467671 … | |
+6.0408163265306118 8.2231925122652833e-15 132673.10810650076 … | |
+6.204081632653061 1.0756245875150242e-13 129949.91638450121 … | |
+6.3673469387755093 1.3511985560294646e-12 127225.94106171315 … | |
+6.5306122448979584 1.5679693009919361e-11 124499.88984956004 … | |
+6.6938775510204076 1.7096950082002292e-10 121768.66523135423 … | |
+6.8571428571428568 1.7240130389917963e-09 119025.34907496796 … | |
+7.0204081632653059 1.6017426070760716e-08 116255.60118291744 … | |
+7.1836734693877542 1.3515414864713714e-07 113431.96964700289 … | |
+7.3469387755102034 1.0194326188631565e-06 110505.9862961421 … | |
+7.5102040816326525 6.6976165278590595e-06 107399.77519752301 … | |
+7.6734693877551017 3.677403069453285e-05 103997.30596495577 … | |
+7.8367346938775508 0.00015624565578113047 100145.2340031373 … | |
+7.9999999999999991 0.00043339853341937203 95759.718457959461 … |