commit 93c8bd3292d568775e6a9ef95537f306622eee1f parent d4d32ffeae43f7dde3b89f15e450d655601085ad Author: Anders Damsgaard <anders@adamsgaard.dk> Date: Sat, 6 Jul 2019 10:55:36 +0200 Finalize testing suite and add standards Diffstat:
| M | test/Makefile | | | 39 | ++++++++++++++++++++++----------------- |
| A | test/simple_shear_dry.std | | | 100 | +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
| A | test/simple_shear_dry_norm.std | | | 100 | +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
| A | test/simple_shear_wet.std | | | 100 | +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
| A | test/simple_shear_wet_norm.std | | | 100 | +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
| A | test/simple_shear_wet_vari.std | | | 20 | ++++++++++++++++++++ |
6 files changed, 442 insertions(+), 17 deletions(-)
diff --git a/test/Makefile b/test/Makefile @@ -1,9 +1,17 @@ BIN = ../1d_fd_simple_shear +TESTS := simple_shear_dry \ + simple_shear_dry_norm \ + 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 -W -SIMPLE_SHEAR_WET_NORM_OPTS = -o 0.03 -L 0.64 -P 40e3 -W -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 \ @@ -11,29 +19,26 @@ SIMPLE_SHEAR_WET_VARI_OPTS = --resolution 50 --length 8.0 \ --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 ) > $@ + --time-end $$( echo "60*20" | bc -l ) + +test: $(TESTS) -standards: \ - simple_shear_dry.std \ - simple_shear_dry_norm.std \ - simple_shear_wet.std \ - simple_shear_wet_norm.std \ - simple_shear_wet_vari.std +standards: $(STANDARDS) simple_shear_dry: $(BIN) - ./$< $(SIMPLE_SHEAR_DRY_OPTS) >$ | diff $@.std - + ./$< $(SIMPLE_SHEAR_DRY_OPTS) | diff $@.std - simple_shear_dry_norm: $(BIN) - ./$< $(SIMPLE_SHEAR_DRY_NORM_OPTS) >$ | diff $@.std - + ./$< $(SIMPLE_SHEAR_DRY_NORM_OPTS) | diff $@.std - simple_shear_wet: $(BIN) - ./$< $(SIMPLE_SHEAR_WET_OPTS) >$ | diff $@.std - + ./$< $(SIMPLE_SHEAR_WET_OPTS) | diff $@.std - simple_shear_wet_norm: $(BIN) - ./$< $(SIMPLE_SHEAR_WET_NORM_OPTS) >$ | diff $@.std - + ./$< $(SIMPLE_SHEAR_WET_NORM_OPTS) | diff $@.std - simple_shear_wet_vari: $(BIN) - ./$< $(SIMPLE_SHEAR_WET_VARI_OPTS) >$ | diff $@.std - + ./$< $(SIMPLE_SHEAR_WET_VARI_OPTS) | diff $@.std - @@ -49,8 +54,8 @@ simple_shear_wet.std: $(BIN) simple_shear_wet_norm.std: $(BIN) ./$< $(SIMPLE_SHEAR_WET_NORM_OPTS) > $@ -simple_shear_wet_variable.std: $(BIN) - ./$< --resolution 50 --length 8.0 --normal-stress 150e3 \ +simple_shear_wet_vari.std: $(BIN) + ./$< --resolution 20 --length 4.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 ) \ @@ -64,4 +69,4 @@ $(BIN): clean: $(RM) *.txt -.PHONY: standards clean +.PHONY: $(TESTS) test standards clean diff --git a/test/simple_shear_dry.std b/test/simple_shear_dry.std @@ -0,0 +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 diff --git a/test/simple_shear_dry_norm.std b/test/simple_shear_dry_norm.std @@ -0,0 +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.67000000000000004 1 39426.114999999998 diff --git a/test/simple_shear_wet.std b/test/simple_shear_wet.std @@ -0,0 +1,100 @@ +0.029999999999999999 0 50172.900701113751 1496.0942988862448 0.31889724884184001 1.974009591756961e-06 +0.036464646464646464 2.568140550197167e-08 50065.088671607169 1480.2408738473748 0.31958397407321271 3.9725924135862427e-06 +0.042929292929292928 6.4544866483611638e-08 49957.275508925421 1464.3885819836757 0.32027367059161232 6.0116916205974336e-06 +0.049393939393939393 1.169550104545198e-07 49849.461187477311 1448.5374488863224 0.32096635788752237 8.1071941454998548e-06 +0.055858585858585857 1.8337933402681501e-07 49741.645668695928 1432.6875131222562 0.32166205570615714 1.0275012552589416e-05 +0.062323232323232322 2.643892198601668e-07 49633.828900823108 1416.83882644962 0.32236078405256102 1.2531216714846603e-05 +0.068787878787878787 3.6066127461499046e-07 49526.010818623588 1400.991454103686 0.32306256319726473 1.4892083469886787e-05 +0.075252525252525251 4.7297957050325686e-07 49418.191343029692 1385.1454751521314 0.32376741368250739 1.7374236395216207e-05 +0.081717171717171716 6.0223800618403373e-07 49310.370380718166 1369.3009829181965 0.32447535632903057 1.9994664269370177e-05 +0.088181818181818181 7.4944364053676953e-07 49202.547823620982 1353.4580854699325 0.32518641224344846 2.2770871563938819e-05 +0.094646464646464645 9.1571994322132548e-07 49094.723548372065 1337.6169061733888 0.32590060282619809 2.572086557151724e-05 +0.10111111111111111 1.1023111012908133e-06 48986.897415692772 1321.7775843072286 0.32661794978006631 2.8863319763873896e-05 +0.10757575757575757 1.3105860323584418e-06 48879.069269718697 1305.9402757358469 0.32733847511929276 3.2217528399523789e-05 +0.11404040404040404 1.5420435481714477e-06 48771.238937271439 1290.1051536376578 0.32806220117924151 3.5803584477324343e-05 +0.1205050505050505 1.798317000488226e-06 48663.406227078878 1274.2724092847559 0.32878915062663161 3.9642299655251659e-05 +0.12696969696969695 2.0811801803592374e-06 48555.570928948502 1258.4422528696839 0.32951934647031222 4.3755398136297067e-05 +0.13343434343434343 2.3925524554293951e-06 48447.73281289819 1242.6149143745354 0.33025281207256696 4.8165398799915031e-05 +0.13989898989898991 2.7345052698224463e-06 48339.891628250189 1226.7906444770854 0.33098957116092254 5.2895825976425081e-05 +0.14636363636363636 3.109267611998086e-06 48232.047102693723 1210.9697154880912 0.33172964784043785 5.7971049805294238e-05 +0.15282828282828281 3.5192329580960752e-06 48124.19894132304 1195.1524223133233 0.33247306660643866 6.3416514474532709e-05 +0.15929292929292929 3.9669648819751571e-06 48016.346825657616 1179.339083433294 0.33321985235766366 6.9258531975045497e-05 +0.16575757575757574 4.4552042548849992e-06 47908.49041265242 1163.5300418930312 0.33397003040977624 7.5524527996991225e-05 +0.17222222222222222 4.9868747741857465e-06 47800.629333706369 1147.7256662936286 0.33472362650919502 8.2242783454334343e-05 +0.1786868686868687 5.5650901945668481e-06 47692.763193677878 1131.9263517766672 0.33548066684718636 8.9442697840201669e-05 +0.18515151515151515 6.1931595095792509e-06 47584.891569917119 1116.1325209919764 0.33624117807415799 9.7154472165981103e-05 +0.1916161616161616 6.8745939447286536e-06 47477.014011325053 1100.3446250385832 0.33700518731408424 0.00010540938918717323 +0.19808080808080808 7.6131114769190686e-06 47369.130037450101 1084.5631443680822 0.33777272217898829 0.00011423943076070486 +0.20454545454545456 8.4126432682548675e-06 47261.239137633638 1068.7885896390862 0.33854381078339874 0.00012367757397225651 +0.21101010101010101 9.2773371536447713e-06 47153.340770216419 1053.0215025108544 0.33931848175869056 0.00013375733539625084 +0.21747474747474746 1.0211563137011206e-05 47045.434361818123 1037.2624563636907 0.34009676426721513 0.0001445130818019953 +0.22393939393939394 1.1219915417862458e-05 46937.519306703121 1021.51205693324 0.34087868801611443 0.00015597949344417806 +0.23040404040404042 1.2307216510205869e-05 46829.594966245495 1005.770942845414 0.3416642832707118 0.00016819188772187159 +0.23686868686868687 1.3478517316561708e-05 46721.660668507102 990.03978603835048 0.34245358086736105 0.00018118559348316864 +0.24333333333333332 1.4739099366103521e-05 46613.715707942436 974.31929205756626 0.34324661222563269 0.00019499628578849935 +0.2497979797979798 1.6094472381631724e-05 46505.759345244238 958.61020021031015 0.34404340935970951 0.00020965926333951876 +0.2562626262626263 1.7550374069832475e-05 46397.790807344012 942.91328356507688 0.34484400488885913 0.00022520979239355358 +0.2627272727272727 1.9112764566090404e-05 46289.809287581324 927.22934878231149 0.34564843204684575 0.00024168227988989827 +0.2691919191919192 2.0787823149488248e-05 46181.81394605567 911.55923576251575 0.34645672469014271 0.00025911062461935418 +0.27565656565656566 2.2581938895704723e-05 46073.803910174422 895.90381709830149 0.34726891730480147 0.00027752727949286094 +0.28212121212121211 2.4501703636479589e-05 45965.778275409881 880.26399731739218 0.3480850450118334 0.00029696360833861193 +0.28858585858585861 2.6553898106716263e-05 45857.736106277625 864.64071190418929 0.34890514357096025 0.0003174488321147352 +0.29505050505050501 2.8745480427461573e-05 45749.676437548078 849.03492608828958 0.34972924938258887 0.00033901039024029044 +0.30151515151515151 3.1083567005064394e-05 45641.598275701639 833.44763338926521 0.35055739948786963 0.00036167276747293682 +0.30797979797979802 3.3575415793979159e-05 45533.500600637344 817.87985390811161 0.3513896315666985 0.00038545785953525278 +0.31444444444444442 3.6228401199615962e-05 45425.382367642982 802.33263235702407 0.35222598393353277 0.00041038367993444301 +0.32090909090909092 3.9049991379021869e-05 45317.242509633958 786.80703582058436 0.35306649553089148 0.00043646473087685178 +0.32737373737373743 4.2047716421872685e-05 45209.079939666066 771.3041512430292 0.35391120592042252 0.00046371059256598564 +0.33383838383838382 4.5229138980615424e-05 45100.893553725626 755.82508263801174 0.3547601552714314 0.00049212630205551706 +0.34030303030303033 4.8601815063528867e-05 44992.682233799016 740.37094801917158 0.35561338434676865 0.00052171083157567355 +0.34676767676767672 5.2173257359108847e-05 44884.444851220862 724.94287605186673 0.35647093448599931 0.00055245748009752826 +0.35323232323232323 5.5950888079334279e-05 44776.180270298668 709.54200242860588 0.35733284758577905 0.00058435225203487117 +0.35969696969696974 5.9941994464155515e-05 44667.887352208803 694.1694659730141 0.35819916607739027 0.0006173742689020345 +0.36616161616161613 6.4153673270236444e-05 44559.564959156793 678.82640447957408 0.35906993290139988 0.00065149406531564381 +0.37262626262626264 6.859277811853717e-05 44451.211958792024 663.51395029888283 0.35994519147942727 0.00068667403122151796 +0.37909090909090915 7.3265855441740445e-05 44342.827228864735 648.23322568072376 0.36082498568302568 0.00072286664843300701 +0.38555555555555554 7.8179083578744414e-05 44234.409662110127 632.98533788987447 0.36170935979971092 0.00076001497744280122 +0.39202020202020205 8.3338200279728708e-05 44125.958171342347 617.77137411220167 0.36259835849618377 0.0007980508646835083 +0.39848484848484844 8.8748433762378376e-05 44017.471694737862 602.59239617123512 0.36349202677882897 0.00083689549184737049 +0.40494949494949495 9.4414422232534886e-05 43908.949201285614 587.44943507802145 0.36439040995158994 0.00087645759147733497 +0.41141414141414145 0.00010034013750273124 43800.389696378574 572.34348543961028 0.36529355357134841 0.00091663408085849898 +0.41787878787878785 0.00010652879742163605 43691.79222751873 557.27549975399609 0.36620150340096602 0.00095730833120558957 +0.42434343434343436 0.00011298278311775689 43583.155890105583 542.2463826216914 0.36711430536016743 0.00099835091236869194 +0.43080808080808086 0.0001197045573246445 43474.479833275494 527.25698490631908 0.36803200547447507 0.0010397744476279267 +0.43727272727272726 0.00012669730862311602 43365.76326575772 512.30809787864712 0.36895464982242915 0.0010816912164823141 +0.44373737373737376 0.00013396472325980793 43257.005461710585 497.40044738031986 0.36988228448135585 0.0011241782016132786 +0.45020202020202016 0.00014151076221974605 43148.205766500309 482.53468804514426 0.37081495547196514 0.0011672779016154271 +0.45666666666666667 0.00014933942811234398 43039.363602382873 467.7113976171251 0.3717527087020906 0.0012109967552612444 +0.46313131313131317 0.00015745453715744755 42930.478474049043 452.93107140550433 0.3726955899099007 0.0012553059304144581 +0.46959595959595957 0.00016585948083455121 42821.549973991292 438.19411691780175 0.3736436446069325 0.0013001397250519712 +0.47606060606060607 0.000174556991689249 42712.57778765136 423.50084871227358 0.37459691802131789 0.0013453962103360639 +0.48252525252525258 0.00018354889798487484 42603.561698306905 408.8514835112731 0.37555545504158755 0.0013909355051046209 +0.48898989898989897 0.00019283588073652617 42494.50159165603 394.24613561670037 0.37651930016145119 0.0014365801443960637 +0.49545454545454548 0.00020241721803395611 42385.397460059219 379.68481266805924 0.37748849742596341 0.0014821131131961922 +0.50191919191919188 0.00021229052908176848 42276.249406399234 365.16741178258326 0.37846309037949155 0.0015272778027084751 +0.50838383838383838 0.00022245150314375875 42167.057647520916 350.69371611545165 0.37944312201590547 0.0015717756752141189 +0.51484848484848489 0.00023289362456663273 42057.822517214619 336.26339187628639 0.38042863473141214 0.001615265657600817 +0.52131313131313128 0.00024360787937566787 41948.544468709544 321.87598583591318 0.38141967028045026 0.0016573612907726223 +0.52777777777777779 0.00025458245322097903 41839.224076645216 307.53092335478112 0.38241626973506065 0.0016976293916965732 +0.5342424242424243 0.00026580240645652115 41729.862038493047 293.22750696149728 0.38341847344812824 0.0017355865161229199 +0.54070707070707069 0.00027724933458365443 41620.459175402451 278.96491550664479 0.38442632102088736 0.0017706966946659252 +0.5471717171717172 0.00028890100006734488 41511.016432450182 264.74220391345426 0.38543985127505598 0.0018023670045083653 +0.5536363636363637 0.00030073094204293626 41401.534878275175 250.55830354300176 0.38645910222994551 0.0018299441493492877 +0.5601010101010101 0.00031270805002898484 41292.015704085272 236.41202318745519 0.38748411108487069 0.0018527088915918882 +0.56656565656565661 0.00032479610625409284 41182.460222026762 222.30205070051119 0.38851491420714773 0.0018698711973213974 +0.573030303030303 0.00033695328263762817 41072.869862912223 208.22695526959765 0.38955154712594364 0.0018805632218281245 +0.57949494949494951 0.00034913159488178476 40963.246173306659 194.18519032970525 0.39059404453219976 0.0018838326752679752 +0.58595959595959601 0.00036127629937901247 40853.59081197701 180.17509711389641 0.39164244028481565 0.0018786339769149153 +0.59242424242424241 0.00037332523293766474 40743.905545714784 166.19490883066916 0.39269676742323956 0.0018638194098540199 +0.59888888888888892 0.00038520808033948333 40634.192244546524 152.24275545347436 0.39375705818656564 0.0018381279574688151 +0.60535353535353542 0.00039684556688488853 40524.452876351701 138.31666910284434 0.39482334403919617 0.001800173699992365 +0.61181818181818182 0.00040814855977746418 40414.689500912245 124.41458999684143 0.39589565570307911 0.0017484317130702963 +0.61828282828282832 0.0004190170721448438 40304.904263422715 110.53437294092052 0.39697402319648317 0.0016812230068290336 +0.62474747474747483 0.00042933915176509332 40195.099387494301 96.673794323874105 0.39805847587922621 0.001596696691257344 +0.63121212121212122 0.00043898964426479574 40085.277167690394 82.830559582332498 0.39914904250422267 0.0014928105585477202 +0.63767676767676773 0.00044782881026559051 39975.439961634896 69.002311092374896 0.4002457512751697 0.0013673084907479449 +0.64414141414141413 0.00045570078132857179 39865.590181738611 55.1866364432083 0.40134862991014197 0.0012176955238049165 +0.65060606060606063 0.00046243183052471624 39755.730286591737 41.381077044631361 0.40245770571082329 0.0010412091725285962 +0.65707070707070714 0.00046782843639463819 39645.862772073757 27.583137017153387 0.40357300563705423 0.00083478747050355639 +0.66353535353535353 0.0004716751110991929 39535.990162234237 13.790292311216685 0.40469455638633783 0.00059503249336080566 +0.67000000000000004 0.00047373196389281964 39426.114999999998 0 0.40582238447790253 0.00031816941651413322 diff --git a/test/simple_shear_wet_norm.std b/test/simple_shear_wet_norm.std @@ -0,0 +1,100 @@ +0.029999999999999999 0 50172.900701113751 1496.0942988862448 0.31889724884184001 1.974009591756961e-06 +0.036464646464646464 5.4210835365506401e-05 50065.088671607169 1480.2408738473748 0.31958397407321271 3.9725924135862427e-06 +0.042929292929292928 0.0001362476493104331 49957.275508925421 1464.3885819836757 0.32027367059161232 6.0116916205974336e-06 +0.049393939393939393 0.00024688013342705434 49849.461187477311 1448.5374488863224 0.32096635788752237 8.1071941454998548e-06 +0.055858585858585857 0.00038709512552187421 49741.645668695928 1432.6875131222562 0.32166205570615714 1.0275012552589416e-05 +0.062323232323232322 0.00055809875628317122 49633.828900823108 1416.83882644962 0.32236078405256102 1.2531216714846603e-05 +0.068787878787878787 0.00076131927356413076 49526.010818623588 1400.991454103686 0.32306256319726473 1.4892083469886787e-05 +0.075252525252525251 0.00099841177406865254 49418.191343029692 1385.1454751521314 0.32376741368250739 1.7374236395216207e-05 +0.081717171717171716 0.0012712631869617483 49310.370380718166 1369.3009829181965 0.32447535632903057 1.9994664269370177e-05 +0.088181818181818181 0.0015819993111259192 49202.547823620982 1353.4580854699325 0.32518641224344846 2.2770871563938819e-05 +0.094646464646464645 0.0019329916767628207 49094.723548372065 1337.6169061733888 0.32590060282619809 2.572086557151724e-05 +0.10111111111111111 0.0023268666362150046 48986.897415692772 1321.7775843072286 0.32661794978006631 2.8863319763873896e-05 +0.10757575757575757 0.0027665138353530181 48879.069269718697 1305.9402757358469 0.32733847511929276 3.2217528399523789e-05 +0.11404040404040404 0.0032550971133548639 48771.238937271439 1290.1051536376578 0.32806220117924151 3.5803584477324343e-05 +0.1205050505050505 0.0037960643096801665 48663.406227078878 1274.2724092847559 0.32878915062663161 3.9642299655251659e-05 +0.12696969696969695 0.0043931597168522449 48555.570928948502 1258.4422528696839 0.32951934647031222 4.3755398136297067e-05 +0.13343434343434343 0.0050504349247810151 48447.73281289819 1242.6149143745354 0.33025281207256696 4.8165398799915031e-05 +0.13989898989898991 0.0057722625413579214 48339.891628250189 1226.7906444770854 0.33098957116092254 5.2895825976425081e-05 +0.14636363636363636 0.0065633477345462552 48232.047102693723 1210.9697154880912 0.33172964784043785 5.7971049805294238e-05 +0.15282828282828281 0.0074287428890744862 48124.19894132304 1195.1524223133233 0.33247306660643866 6.3416514474532709e-05 +0.15929292929292929 0.0083738594486579138 48016.346825657616 1179.339083433294 0.33321985235766366 6.9258531975045497e-05 +0.16575757575757574 0.0094044831137739624 47908.49041265242 1163.5300418930312 0.33397003040977624 7.5524527996991225e-05 +0.17222222222222222 0.010526785512226933 47800.629333706369 1147.7256662936286 0.33472362650919502 8.2242783454334343e-05 +0.1786868686868687 0.011747339463515558 47692.763193677878 1131.9263517766672 0.33548066684718636 8.9442697840201669e-05 +0.18515151515151515 0.013073129916520545 47584.891569917119 1116.1325209919764 0.33624117807415799 9.7154472165981103e-05 +0.1916161616161616 0.014511568711213264 47477.014011325053 1100.3446250385832 0.33700518731408424 0.00010540938918717323 +0.19808080808080808 0.016070504118741523 47369.130037450101 1084.5631443680822 0.33777272217898829 0.00011423943076070486 +0.20454545454545456 0.01775823442253139 47261.239137633638 1068.7885896390862 0.33854381078339874 0.00012367757397225651 +0.21101010101010101 0.019583515280264557 47153.340770216419 1053.0215025108544 0.33931848175869056 0.00013375733539625084 +0.21747474747474746 0.021555571325817355 47045.434361818123 1037.2624563636907 0.34009676426721513 0.0001445130818019953 +0.22393939393939394 0.023684100447148481 46937.519306703121 1021.51205693324 0.34087868801611443 0.00015597949344417806 +0.23040404040404042 0.025979282480905887 46829.594966245495 1005.770942845414 0.3416642832707118 0.00016819188772187159 +0.23686868686868687 0.028451779368662528 46721.660668507102 990.03978603835048 0.34245358086736105 0.00018118559348316864 +0.24333333333333332 0.031112739881403055 46613.715707942436 974.31929205756626 0.34324661222563269 0.00019499628578849935 +0.2497979797979798 0.033973794483652467 46505.759345244238 958.61020021031015 0.34404340935970951 0.00020965926333951876 +0.2562626262626263 0.037047054890733934 46397.790807344012 942.91328356507688 0.34484400488885913 0.00022520979239355358 +0.2627272727272727 0.040345102342333412 46289.809287581324 927.22934878231149 0.34564843204684575 0.00024168227988989827 +0.2691919191919192 0.043880980668197907 46181.81394605567 911.55923576251575 0.34645672469014271 0.00025911062461935418 +0.27565656565656566 0.047668176557353462 46073.803910174422 895.90381709830149 0.34726891730480147 0.00027752727949286094 +0.28212121212121211 0.051720604696251872 45965.778275409881 880.26399731739218 0.3480850450118334 0.00029696360833861193 +0.28858585858585861 0.056052578526713047 45857.736106277625 864.64071190418929 0.34890514357096025 0.0003174488321147352 +0.29505050505050501 0.060678785934666524 45749.676437548078 849.03492608828958 0.34972924938258887 0.00033901039024029044 +0.30151515151515151 0.06561424893021775 45641.598275701639 833.44763338926521 0.35055739948786963 0.00036167276747293682 +0.30797979797979802 0.0708742883171284 45533.500600637344 817.87985390811161 0.3513896315666985 0.00038545785953525278 +0.31444444444444442 0.076474470715285153 45425.382367642982 802.33263235702407 0.35222598393353277 0.00041038367993444301 +0.32090909090909092 0.082430560644746381 45317.242509633958 786.80703582058436 0.35306649553089148 0.00043646473087685178 +0.32737373737373743 0.08875845335905147 45209.079939666066 771.3041512430292 0.35391120592042252 0.00046371059256598564 +0.33383838383838382 0.09547411284843843 45100.893553725626 755.82508263801174 0.3547601552714314 0.00049212630205551706 +0.34030303030303033 0.10259348907798181 44992.682233799016 740.37094801917158 0.35561338434676865 0.00052171083157567355 +0.34676767676767672 0.11013244056909971 44884.444851220862 724.94287605186673 0.35647093448599931 0.00055245748009752826 +0.35323232323232323 0.11810663485648393 44776.180270298668 709.54200242860588 0.35733284758577905 0.00058435225203487117 +0.35969696969696974 0.12653145456259987 44667.887352208803 694.1694659730141 0.35819916607739027 0.0006173742689020345 +0.36616161616161613 0.13542188021906626 44559.564959156793 678.82640447957408 0.35906993290139988 0.00065149406531564381 +0.37262626262626264 0.14479237912275658 44451.211958792024 663.51395029888283 0.35994519147942727 0.00068667403122151796 +0.37909090909090915 0.15465677012733009 44342.827228864735 648.23322568072376 0.36082498568302568 0.00072286664843300701 +0.38555555555555554 0.16502809507789976 44234.409662110127 632.98533788987447 0.36170935979971092 0.00076001497744280122 +0.39202020202020205 0.17591846578159906 44125.958171342347 617.77137411220167 0.36259835849618377 0.0007980508646835083 +0.39848484848484844 0.18733891847428186 44017.471694737862 602.59239617123512 0.36349202677882897 0.00083689549184737049 +0.40494949494949495 0.19929924393680104 43908.949201285614 587.44943507802145 0.36439040995158994 0.00087645759147733497 +0.41141414141414145 0.2118078262615036 43800.389696378574 572.34348543961028 0.36529355357134841 0.00091663408085849898 +0.41787878787878785 0.22487145799969255 43691.79222751873 557.27549975399609 0.36620150340096602 0.00095730833120558957 +0.42434343434343436 0.23849516547150043 43583.155890105583 542.2463826216914 0.36711430536016743 0.00099835091236869194 +0.43080808080808086 0.25268414725700727 43474.479833275494 527.25698490631908 0.36803200547447507 0.0010397744476279267 +0.43727272727272726 0.26744513412605803 43365.76326575772 512.30809787864712 0.36895464982242915 0.0010816912164823141 +0.44373737373737376 0.28278590737043241 43257.005461710585 497.40044738031986 0.36988228448135585 0.0011241782016132786 +0.45020202020202016 0.29871482822671097 43148.205766500309 482.53468804514426 0.37081495547196514 0.0011672779016154271 +0.45666666666666667 0.31524034579632365 43039.363602382873 467.7113976171251 0.3717527087020906 0.0012109967552612444 +0.46313131313131317 0.33237051573127785 42930.478474049043 452.93107140550433 0.3726955899099007 0.0012553059304144581 +0.46959595959595957 0.35011249709989251 42821.549973991292 438.19411691780175 0.3736436446069325 0.0013001397250519712 +0.47606060606060607 0.36847205802803285 42712.57778765136 423.50084871227358 0.37459691802131789 0.0013453962103360639 +0.48252525252525258 0.38745305779367295 42603.561698306905 408.8514835112731 0.37555545504158755 0.0013909355051046209 +0.48898989898989897 0.4070569339504283 42494.50159165603 394.24613561670037 0.37651930016145119 0.0014365801443960637 +0.49545454545454548 0.42728216261918178 42385.397460059219 379.68481266805924 0.37748849742596341 0.0014821131131961922 +0.50191919191919188 0.44812371818296504 42276.249406399234 365.16741178258326 0.37846309037949155 0.0015272778027084751 +0.50838383838383838 0.46957250111602711 42167.057647520916 350.69371611545165 0.37944312201590547 0.0015717756752141189 +0.51484848484848489 0.49161475753686779 42057.822517214619 336.26339187628639 0.38042863473141214 0.001615265657600817 +0.52131313131313128 0.51423145986151653 41948.544468709544 321.87598583591318 0.38141967028045026 0.0016573612907726223 +0.52777777777777779 0.53739766919881615 41839.224076645216 307.53092335478112 0.38241626973506065 0.0016976293916965732 +0.5342424242424243 0.56108184947524065 41729.862038493047 293.22750696149728 0.38341847344812824 0.0017355865161229199 +0.54070707070707069 0.5852451506657913 41620.459175402451 278.96491550664479 0.38442632102088736 0.0017706966946659252 +0.5471717171717172 0.60984063159543911 41511.016432450182 264.74220391345426 0.38543985127505598 0.0018023670045083653 +0.5536363636363637 0.6348124360698103 41401.534878275175 250.55830354300176 0.38645910222994551 0.0018299441493492877 +0.5601010101010101 0.66009489302633173 41292.015704085272 236.41202318745519 0.38748411108487069 0.0018527088915918882 +0.56656565656565661 0.68561155043271882 41182.460222026762 222.30205070051119 0.38851491420714773 0.0018698711973213974 +0.573030303030303 0.71127411346442893 41072.869862912223 208.22695526959765 0.38955154712594364 0.0018805632218281245 +0.57949494949494951 0.73698129214851682 40963.246173306659 194.18519032970525 0.39059404453219976 0.0018838326752679752 +0.58595959595959601 0.76261752829654972 40853.59081197701 180.17509711389641 0.39164244028481565 0.0018786339769149153 +0.59242424242424241 0.78805160173259581 40743.905545714784 166.19490883066916 0.39269676742323956 0.0018638194098540199 +0.59888888888888892 0.81313508418155933 40634.192244546524 152.24275545347436 0.39375705818656564 0.0018381279574688151 +0.60535353535353542 0.83770063481440227 40524.452876351701 138.31666910284434 0.39482334403919617 0.001800173699992365 +0.61181818181818182 0.8615601033621757 40414.689500912245 124.41458999684143 0.39589565570307911 0.0017484317130702963 +0.61828282828282832 0.88450242770539567 40304.904263422715 110.53437294092052 0.39697402319648317 0.0016812230068290336 +0.62474747474747483 0.90629128808844728 40195.099387494301 96.673794323874105 0.39805847587922621 0.001596696691257344 +0.63121212121212122 0.92666249635651721 40085.277167690394 82.830559582332498 0.39914904250422267 0.0014928105585477202 +0.63767676767676773 0.94532107689256617 39975.439961634896 69.002311092374896 0.4002457512751697 0.0013673084907479449 +0.64414141414141413 0.96193800727297485 39865.590181738611 55.1866364432083 0.40134862991014197 0.0012176955238049165 +0.65060606060606063 0.97614656761759055 39755.730286591737 41.381077044631361 0.40245770571082329 0.0010412091725285962 +0.65707070707070714 0.98753825380565385 39645.862772073757 27.583137017153387 0.40357300563705423 0.00083478747050355639 +0.66353535353535353 0.99565819292258673 39535.990162234237 13.790292311216685 0.40469455638633783 0.00059503249336080566 +0.67000000000000004 1 39426.114999999998 0 0.40582238447790253 0.00031816941651413322 diff --git a/test/simple_shear_wet_vari.std b/test/simple_shear_wet_vari.std @@ -0,0 +1,20 @@ +0 0 166707.99998450707 59810.000015492937 0.23994049477959895 5.3553386704165363e-22 +0.21052631578947367 2.7584171060296952e-21 163197.0525772252 59293.684264880067 0.24510246581243808 1.3102481253641052e-20 +0.42105263157894735 6.7620272391300262e-20 159686.10504191171 58777.368642298832 0.25049142497089194 3.0809381260503522e-19 +0.63157894736842102 1.5319422029908913e-18 156175.15701642109 58261.053509894715 0.25612268150813633 6.9555291703480577e-18 +0.84210526315789469 3.3174828627447406e-17 152664.20716674425 57744.740201676817 0.26201295472167124 1.5030371051616845e-16 +1.0526315789473684 6.8616093815285105e-16 149153.25081083775 57228.433399688562 0.26818054439007594 3.1016840202456675e-15 +1.263157894736842 1.3594886575567926e-14 145642.27229367738 56712.148758954194 0.27464553642326328 6.1316446777721615e-14 +1.4736842105263157 2.5242232601336545e-13 142131.22190988649 56195.935984850359 0.28143007189061281 1.1344303373295382e-12 +1.6842105263157894 4.3818750958992694e-12 138619.9503474806 55679.944389361495 0.28855875290484112 1.9614900656958044e-11 +1.8947368421052631 7.014895930321882e-11 135108.03489565974 55164.596683287607 0.29605937227116741 3.123936499847679e-10 +2.1052631578947367 1.028425556386938e-09 131594.35235180694 54651.016069245714 0.30396441249289491 4.5518138361476664e-09 +2.3157894736842106 1.362243950414767e-08 128076.11341727671 54141.991845881195 0.31231428665920336 5.9821566251863479e-08 +2.5263157894736841 1.6036169759598144e-07 124546.87395541195 53643.968149851193 0.3211642229922213 6.9701147593621045e-07 +2.7368421052631575 1.6380864135430186e-06 120992.84362387168 53170.735323496738 0.33059806515786416 7.0191924007484273e-06 +2.9473684210526314 1.4027742020027414e-05 117386.83523566221 52749.480553811467 0.34075371330777621 5.8850864130800878e-05 +3.1578947368421053 9.5326199447534323e-05 113679.55127738956 52429.501354189371 0.35186627278635163 0.00038616767278065782 +3.3684210526315788 0.00046537431594745554 109789.94010608022 52291.849367603994 0.36433210512139436 0.0017577285533746259 +3.5789473684210522 0.0012993355561334605 105594.87020437709 52459.656111412405 0.37880628029165314 0.0039613158908835232 +3.7894736842105261 0.0029425347324797792 100929.15543696893 53098.107720925822 0.39631759353203277 0.0078051960876450157 +4 0.0053862100172263703 95699.40939873358 54300.59060126642 0.41797541125190407 0.011607457602546311