diff --git a/makefile b/makefile index 69f363a62..d87503ae8 100644 --- a/makefile +++ b/makefile @@ -88,7 +88,7 @@ bint : bin .PHONY : bint_run bint_run : bint - ./testing/$(target) -d ./testing -f files_v31.in + ./testing/$(target) -d ./testing -f files.in # GoogleTest: @@ -121,6 +121,9 @@ clean1 : clean2 : @rm -f $(target) $(lib_target) $(lib_target++) @rm -f testing/$(target) + +.PHONY : bint_clean +bint_clean : @rm -f testing/Output/* .PHONY : test_clean @@ -128,4 +131,4 @@ test_clean : @rm -f gtest-all.o $(lib_gtest) $(bin_test) .PHONY : cleaner -cleaner : clean1 clean2 test_clean +cleaner : clean1 clean2 bint_clean test_clean diff --git a/testing/Input/climate.in b/testing/Input/climate.in new file mode 100644 index 000000000..fcb88da5a --- /dev/null +++ b/testing/Input/climate.in @@ -0,0 +1,5 @@ +71.0 61.0 61.0 51.0 41.0 31.0 23.0 23.0 31.0 41.0 61.0 61.0 # (site: testing), sky cover (sunrise-sunset),%,Climate Atlas of the US,http://cdo.ncdc.noaa.gov/cgi-bin/climaps/climaps.pl +1.3 2.9 3.3 3.8 3.8 3.8 3.3 3.3 2.9 1.3 1.3 1.3 # Wind speed (m/s),Climate Atlas of the US,http://cdo.ncdc.noaa.gov/cgi-bin/climaps/climaps.pl +61.0 61.0 61.0 51.0 51.0 51.0 41.0 41.0 51.0 51.0 61.0 61.0 # rel. Humidity (%),Climate Atlas of the US,http://cdo.ncdc.noaa.gov/cgi-bin/climaps/climaps.pl +1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 # transmissivity (rel), only used in petfunc, but falls out of the equations (a = trans * b, c = a / trans) +213.7 241.6 261.0 308.0 398.1 464.5 0.0 0.0 0.0 140.0 161.6 185.1 # snow density (kg/m3): Brown, R. D. and P. W. Mote. 2009. The response of Northern Hemisphere snow cover to a changing climate. Journal of Climate 22:2124-2145. diff --git a/testing/Input/data_39.0625_-119.4375/cloud_v20.in b/testing/Input/data_39.0625_-119.4375/cloud_v20.in deleted file mode 100755 index 94064516b..000000000 --- a/testing/Input/data_39.0625_-119.4375/cloud_v20.in +++ /dev/null @@ -1,5 +0,0 @@ -71.0 61.0 61.0 51.0 41.0 31.0 23.0 23.0 31.0 41.0 61.0 61.0 # (site: 002_-119.415_39.046 ), sky cover (sunrise-sunset),%,Climate Atlas of the US,http://cdo.ncdc.noaa.gov/cgi-bin/climaps/climaps.pl -1.3 2.9 3.3 3.8 3.8 3.8 3.3 3.3 2.9 1.3 1.3 1.3 # Wind speed (m/s),Climate Atlas of the US,http://cdo.ncdc.noaa.gov/cgi-bin/climaps/climaps.pl -61.0 61.0 61.0 51.0 51.0 51.0 41.0 41.0 51.0 51.0 61.0 61.0 # rel. Humidity (%),Climate Atlas of the US,http://cdo.ncdc.noaa.gov/cgi-bin/climaps/climaps.pl -1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 # transmissivity (rel), only used in petfunc, but falls out of the equations (a = trans * b, c = a / trans) -213.7 241.6 261.0 308.0 398.1 464.5 0.0 0.0 0.0 140.0 161.6 185.1 # snow density (kg/m3): Brown, R. D. and P. W. Mote. 2009. The response of Northern Hemisphere snow cover to a changing climate. Journal of Climate 22:2124-2145. diff --git a/testing/Input/data_39.0625_-119.4375/mkv_covar.in b/testing/Input/data_39.0625_-119.4375/mkv_covar.in deleted file mode 100644 index 7bfce3268..000000000 --- a/testing/Input/data_39.0625_-119.4375/mkv_covar.in +++ /dev/null @@ -1,54 +0,0 @@ -#WEEK T.MAX.C T.MIN.C cov[MIN.MIN] cov[MAX.MIN] cov[MIN.MAX] cov[MAX.MAX] - 1 -2.77041 -15.93794 38.2382 25.7150 25.7150 25.0203 - 2 -3.32240 -15.72406 36.0732 19.4136 19.4136 16.6819 - 3 -2.28668 -15.56124 32.0270 20.0022 20.0022 20.4899 - 4 -2.88760 -16.62157 49.2111 31.9611 31.9611 29.2230 - 5 -2.30641 -15.88111 41.0353 24.7011 24.7011 21.6227 - 6 -2.94908 -16.99585 46.3851 28.2931 28.2931 26.8964 - 7 -0.80664 -14.08677 51.2026 27.7746 27.7746 22.5908 - 8 0.35221 -12.56226 27.0640 14.1788 14.1788 14.9336 - 9 1.85521 -12.16908 28.5904 17.9599 17.9599 21.1117 -10 3.13502 -10.53696 26.2643 16.9031 16.9031 20.9957 -11 4.98664 -8.94641 16.8823 11.2614 11.2614 16.3879 -12 6.53493 -7.57078 14.8206 12.2491 12.2491 23.9087 -13 7.69475 -6.69244 12.9212 12.9305 12.9305 25.6638 -14 8.06051 -6.67355 14.3283 12.9110 12.9110 28.9627 -15 10.50023 -5.39364 13.2460 13.7886 13.7886 29.8267 -16 12.65078 -4.20203 10.2629 10.1077 10.1077 26.7309 -17 13.76908 -2.81613 9.4773 9.7371 9.7371 25.8032 -18 14.22180 -2.06456 7.7032 9.4366 9.4366 28.1285 -19 15.04083 -1.35889 7.7886 7.4127 7.4127 26.5856 -20 16.97622 -0.45106 8.5909 8.4379 8.4379 23.2492 -21 19.20212 1.30217 8.2542 5.4674 5.4674 16.8322 -22 20.15535 1.67244 7.4890 5.7231 5.7231 16.1291 -23 20.93562 2.36710 7.0102 5.2588 5.2588 17.5402 -24 22.00023 2.82926 7.5209 5.9847 5.9847 18.9791 -25 23.86719 3.77641 5.1254 4.5973 4.5973 13.5999 -26 25.75922 4.75889 7.1018 4.1997 4.1997 10.4317 -27 26.77802 6.13986 5.2316 1.9352 1.9352 9.7727 -28 27.30470 7.02594 7.0143 2.8706 2.8706 11.7968 -29 27.74834 7.57682 5.1688 1.5731 1.5731 7.0140 -30 27.76705 7.74963 5.4661 1.3471 1.3471 8.1383 -31 27.42382 7.78267 6.1912 0.5508 0.5508 6.3749 -32 26.91124 7.64203 6.0661 0.5760 0.5760 5.7438 -33 26.48811 6.77461 6.4512 2.1136 2.1136 8.1585 -34 26.26350 6.94903 5.3208 0.9887 0.9887 6.5422 -35 25.49484 5.96484 5.7424 1.6861 1.6861 7.9007 -36 24.69853 4.87908 7.3906 1.9628 1.9628 9.2805 -37 22.77244 3.75641 8.9412 2.9607 2.9607 11.9856 -38 21.21673 1.90742 8.9040 4.1006 4.1006 16.6566 -39 19.14069 0.27272 11.5435 5.4808 5.4808 21.3551 -40 18.65553 -0.84475 11.4739 5.4045 5.4045 24.1350 -41 16.57576 -1.83594 10.1005 5.3625 5.3625 23.3440 -42 15.03171 -3.15313 8.1138 3.1500 3.1500 23.0644 -43 12.61959 -4.65608 10.5844 4.1380 4.1380 24.8174 -44 9.77129 -5.81000 19.5038 16.1477 16.1477 41.4126 -45 8.60161 -6.23972 14.5631 10.1191 10.1191 31.4253 -46 6.22793 -7.41203 20.2763 16.8872 16.8872 36.8622 -47 4.44834 -9.88051 22.3530 19.9116 19.9116 35.2563 -48 2.37843 -11.25046 28.7823 23.3229 23.3229 35.6847 -49 0.11816 -12.52535 28.8494 20.3498 20.3498 25.6309 -50 -1.05452 -14.09000 35.0725 22.2973 22.2973 23.4093 -51 -2.05134 -14.59267 25.3896 17.2452 17.2452 20.4215 -52 -4.28406 -16.99512 40.0276 28.7551 28.7551 27.7279 -53 -3.10353 -15.87294 38.4467 24.5154 24.5154 23.4041 diff --git a/testing/Input/data_39.0625_-119.4375/mkv_prob.in b/testing/Input/data_39.0625_-119.4375/mkv_prob.in deleted file mode 100644 index 77ed2be8a..000000000 --- a/testing/Input/data_39.0625_-119.4375/mkv_prob.in +++ /dev/null @@ -1,367 +0,0 @@ -#DOY p[W|W] p[W|D] PPT_avg PPT_sd CF.max.w CF.max.d CF.min.w CF.min.d - 1 0.65000 0.400000 0.146129 0.50848 1.00000 1.1241 1.00000 1.0869 - 2 0.58824 0.307692 0.207742 0.72885 1.00000 1.1301 1.00000 1.0956 - 3 0.85714 0.187500 0.217097 0.95128 1.00000 1.1296 1.00000 1.0994 - 4 0.86667 0.600000 0.280645 0.70652 1.00000 1.1313 1.00000 1.0937 - 5 0.81818 0.625000 0.391290 0.84692 1.00000 1.1290 1.00000 1.0809 - 6 0.69565 0.428571 0.360000 0.91484 1.00000 1.1313 1.00000 1.0859 - 7 0.63158 0.636364 0.242258 0.82293 1.00000 1.1337 1.00000 1.0903 - 8 0.73684 0.181818 0.216129 0.75048 1.00000 1.1280 1.00000 1.0836 - 9 0.81250 0.428571 0.227742 0.79147 1.00000 1.1258 1.00000 1.0799 - 10 0.78947 0.181818 0.299032 1.15782 1.00000 1.1186 1.00000 1.0764 - 11 0.70588 0.384615 0.338387 1.15534 1.00000 1.1137 1.00000 1.0751 - 12 0.88235 0.384615 0.233548 0.81801 1.00000 1.1205 1.00000 1.0855 - 13 0.70000 0.200000 0.160323 0.52959 1.00000 1.1290 1.00000 1.0926 - 14 0.62500 0.142857 0.169355 0.82114 1.00000 1.1239 1.00000 1.0872 - 15 0.91667 0.500000 0.176129 0.49155 1.00000 1.1247 1.00000 1.0922 - 16 0.80000 0.500000 0.195161 0.62345 1.00000 1.1308 1.00000 1.0893 - 17 0.71429 0.444444 0.179355 0.60253 1.00000 1.1329 1.00000 1.0926 - 18 0.68421 0.181818 0.148710 0.58243 1.00000 1.1289 1.00000 1.0922 - 19 0.73333 0.400000 0.224194 0.65736 1.00000 1.1267 1.00000 1.0901 - 20 0.76471 0.384615 0.148710 0.49668 1.00000 1.1280 1.00000 1.0993 - 21 0.61111 0.166667 0.224194 0.98115 1.00000 1.1276 1.00000 1.0969 - 22 0.84615 0.352941 0.153226 0.47304 1.00000 1.1308 1.00000 1.1031 - 23 0.88235 0.384615 0.198387 0.71280 1.00000 1.1272 1.00000 1.0992 - 24 0.75000 0.200000 0.176129 0.63999 1.00000 1.1229 1.00000 1.0900 - 25 0.70588 0.230769 0.319032 1.23764 1.00000 1.1196 1.00000 1.0823 - 26 0.73333 0.400000 0.145806 0.45148 1.00000 1.1164 1.00000 1.0823 - 27 0.82353 0.153846 0.129677 0.55989 1.00000 1.1179 1.00000 1.0849 - 28 0.81250 0.571429 0.336774 1.10567 1.00000 1.1194 1.00000 1.0810 - 29 0.76190 0.111111 0.194516 0.60893 1.00000 1.1203 1.00000 1.0798 - 30 0.52941 0.461538 0.193226 1.03421 1.00000 1.1269 1.00000 1.0935 - 31 0.60000 0.600000 0.234516 0.90990 1.00000 1.1281 1.00000 1.0986 - 32 0.72222 0.083333 0.143226 0.46740 1.00000 1.1264 1.00000 1.0903 - 33 0.85714 0.437500 0.175161 0.49074 1.00000 1.1252 1.00000 1.0948 - 34 0.68421 0.090909 0.153548 0.65000 1.00000 1.1237 1.00000 1.0923 - 35 0.78571 0.312500 0.167097 0.69597 1.00000 1.1296 1.00000 1.0961 - 36 0.75000 0.000000 0.112258 0.49576 1.00000 1.1292 1.00000 1.1073 - 37 0.75000 0.277778 0.082258 0.29220 1.00000 1.1241 1.00000 1.1054 - 38 0.71429 0.375000 0.146129 0.52831 1.00000 1.1200 1.00000 1.0924 - 39 0.75000 0.428571 0.218710 0.51507 1.00000 1.1182 1.00000 1.0828 - 40 0.77778 0.333333 0.134194 0.38463 1.00000 1.1170 1.00000 1.0820 - 41 0.72222 0.333333 0.189677 0.74362 1.00000 1.1145 1.00000 1.0833 - 42 0.70588 0.307692 0.200645 0.79497 1.00000 1.1210 1.00000 1.0794 - 43 0.75000 0.500000 0.166452 0.49543 1.00000 1.1166 1.00000 1.0831 - 44 0.73684 0.545455 0.276774 0.90776 1.00000 1.1044 1.00000 1.0753 - 45 0.90000 0.500000 0.376129 0.87190 1.00000 1.1048 1.00000 1.0578 - 46 0.69565 0.428571 0.153548 0.43892 1.00000 1.1071 1.00000 1.0657 - 47 0.57895 0.454545 0.105806 0.29474 1.00000 1.1084 1.00000 1.0732 - 48 0.62500 0.571429 0.163548 0.51349 1.00000 1.1040 1.00000 1.0610 - 49 0.83333 0.500000 0.223871 0.83420 1.00000 1.1009 1.00000 1.0550 - 50 0.71429 0.444444 0.327742 1.33817 1.00000 1.0973 1.00000 1.0568 - 51 0.68421 0.454545 0.276774 0.97877 1.00000 1.0990 1.00000 1.0594 - 52 0.83333 0.166667 0.179032 0.57453 1.00000 1.0969 1.00000 1.0622 - 53 0.82353 0.230769 0.150645 0.76107 1.00000 1.0957 1.00000 1.0573 - 54 0.47059 0.384615 0.113226 0.42606 1.00000 1.0930 1.00000 1.0559 - 55 0.84615 0.176471 0.111613 0.43839 1.00000 1.0855 1.00000 1.0591 - 56 0.78571 0.250000 0.193871 0.69822 1.00000 1.0850 1.00000 1.0503 - 57 0.80000 0.333333 0.119032 0.40718 1.00000 1.0921 1.00000 1.0563 - 58 0.64706 0.307692 0.105806 0.47269 1.00000 1.0914 1.00000 1.0542 - 59 0.53333 0.533333 0.117419 0.39158 1.00000 1.0913 1.00000 1.0553 - 60 0.56250 0.214286 0.145161 0.53113 1.00000 1.0860 1.00000 1.0539 - 61 0.75000 0.500000 0.179355 0.58865 1.00000 1.0833 1.00000 1.0528 - 62 0.61111 0.166667 0.205161 0.68931 1.00000 1.0768 1.00000 1.0475 - 63 0.84615 0.352941 0.168387 0.50998 1.00000 1.0803 1.00000 1.0462 - 64 0.64706 0.307692 0.223548 0.85336 1.00000 1.0788 1.00000 1.0488 - 65 0.66667 0.333333 0.134194 0.41948 1.00000 1.0773 1.00000 1.0414 - 66 0.80000 0.400000 0.271613 0.96132 1.00000 1.0781 1.00000 1.0364 - 67 0.77778 0.333333 0.184839 0.58955 1.00000 1.0755 1.00000 1.0396 - 68 0.77778 0.250000 0.185484 0.77372 1.00000 1.0694 1.00000 1.0417 - 69 0.76471 0.076923 0.197097 0.68931 1.00000 1.0687 1.00000 1.0314 - 70 0.64286 0.500000 0.172258 0.54689 1.00000 1.0655 1.00000 1.0261 - 71 0.58824 0.230769 0.119677 0.45433 1.00000 1.0657 1.00000 1.0298 - 72 0.69231 0.294118 0.139355 0.56768 1.00000 1.0640 1.00000 1.0338 - 73 0.64286 0.187500 0.156452 0.53200 1.00000 1.0641 1.00000 1.0366 - 74 0.75000 0.277778 0.179677 0.67341 1.00000 1.0619 1.00000 1.0305 - 75 0.71429 0.312500 0.180968 0.71144 1.00000 1.0543 1.00000 1.0250 - 76 0.86667 0.466667 0.234839 0.60992 1.00000 1.0586 1.00000 1.0176 - 77 0.85000 0.200000 0.186452 0.53288 1.00000 1.0586 1.00000 1.0236 - 78 0.63158 0.272727 0.228387 0.74646 1.00000 1.0554 1.00000 1.0234 - 79 0.60000 0.133333 0.113548 0.46207 1.00000 1.0562 1.00000 1.0268 - 80 0.63636 0.421053 0.134516 0.44929 1.00000 1.0490 1.00000 1.0230 - 81 0.53333 0.400000 0.101613 0.35609 1.00000 1.0413 1.00000 1.0204 - 82 0.71429 0.250000 0.131290 0.50106 1.00000 1.0382 1.00000 1.0128 - 83 0.57143 0.312500 0.161290 0.56422 1.00000 1.0424 1.00000 1.0119 - 84 0.84615 0.647059 0.245806 0.70102 1.00000 1.0459 1.00000 1.0152 - 85 0.59091 0.750000 0.279032 0.84013 1.00000 1.0438 1.00000 1.0124 - 86 0.78947 0.545455 0.202258 0.52558 1.00000 1.0487 1.00000 1.0137 - 87 0.71429 0.666667 0.244839 0.72465 1.00000 1.0505 1.00000 1.0233 - 88 0.80952 0.555556 0.244839 0.69924 1.00000 1.0587 1.00000 1.0212 - 89 0.63636 0.375000 0.148387 0.48423 1.00000 1.0607 1.00000 1.0260 - 90 0.76471 0.461538 0.295484 0.85775 1.00000 1.0462 1.00000 1.0212 - 91 0.68421 0.272727 0.282258 1.09232 1.00000 1.0360 1.00000 1.0125 - 92 0.87500 0.500000 0.241290 0.71122 1.00000 1.0371 1.00000 1.0143 - 93 0.71429 0.222222 0.232258 0.64687 1.00000 1.0366 1.00000 1.0109 - 94 0.64706 0.461538 0.179355 0.58126 1.00000 1.0385 1.00000 1.0085 - 95 0.58824 0.307692 0.156774 0.67327 1.00000 1.0353 1.00000 1.0118 - 96 0.57143 0.375000 0.175161 0.62673 1.00000 1.0292 1.00000 1.0085 - 97 0.85714 0.375000 0.209032 0.70843 1.00000 1.0272 1.00000 1.0056 - 98 0.61111 0.250000 0.189355 0.61464 0.99975 1.0268 1.00000 1.0048 - 99 0.85714 0.250000 0.237097 1.00981 0.99751 1.0245 1.00000 1.0097 -100 0.75000 0.285714 0.204194 0.68174 0.99986 1.0269 1.00000 1.0048 -101 0.75000 0.500000 0.221290 0.55283 0.99868 1.0257 1.00000 1.0036 -102 0.73684 0.000000 0.282258 1.16064 0.99743 1.0245 1.00000 1.0044 -103 0.50000 0.250000 0.119032 0.49116 0.99424 1.0212 1.00000 1.0079 -104 0.36364 0.210526 0.091613 0.55774 0.98654 1.0134 1.00000 1.0047 -105 0.50000 0.272727 0.155484 0.54491 0.97758 1.0044 1.00000 1.0005 -106 0.80000 0.250000 0.172903 0.62625 0.97587 1.0026 0.99880 1.0000 -107 0.84615 0.352941 0.145484 0.55070 0.97231 1.0000 0.99666 1.0000 -108 0.76471 0.230769 0.214516 0.74160 0.97153 1.0000 0.99424 1.0000 -109 0.81250 0.357143 0.354839 1.25710 0.97869 1.0055 0.99834 1.0000 -110 0.66667 0.416667 0.281613 1.33583 0.98562 1.0125 0.99536 1.0000 -111 0.64706 0.307692 0.264194 0.95094 0.98379 1.0106 0.99742 1.0000 -112 0.80000 0.400000 0.210645 0.64033 0.97831 1.0051 0.99607 1.0000 -113 0.83333 0.250000 0.366774 1.73057 0.97736 1.0041 0.99267 1.0000 -114 0.77778 0.500000 0.376452 1.19041 0.97411 1.0008 0.98549 1.0000 -115 0.75000 0.500000 0.286129 0.79707 0.97691 1.0037 0.98715 1.0000 -116 0.65000 0.200000 0.342581 1.08971 0.98390 1.0107 0.99400 1.0000 -117 0.66667 0.333333 0.179677 0.57456 0.98225 1.0091 0.99832 1.0000 -118 0.73333 0.200000 0.298065 1.11410 0.97290 1.0000 0.98927 1.0000 -119 0.85714 0.312500 0.209355 0.72377 0.97359 1.0003 0.99124 1.0000 -120 0.82353 0.230769 0.239355 1.06405 0.97231 1.0000 0.99055 1.0000 -121 0.64706 0.307692 0.207097 0.73880 0.97102 1.0000 0.98617 1.0000 -122 0.66667 0.533333 0.389677 1.37344 0.97253 1.0000 0.98469 1.0000 -123 0.77778 0.416667 0.363226 1.36650 0.97824 1.0050 0.98364 1.0000 -124 0.73684 0.272727 0.184516 0.50717 0.97226 1.0000 0.98357 1.0000 -125 0.82353 0.307692 0.133548 0.41239 0.96757 1.0000 0.98611 1.0000 -126 0.66667 0.083333 0.102903 0.38599 0.96068 1.0000 0.98451 1.0000 -127 0.76923 0.294118 0.191290 0.60594 0.96121 1.0000 0.97943 1.0000 -128 0.80000 0.333333 0.226129 0.67903 0.96202 1.0000 0.98028 1.0000 -129 0.70588 0.307692 0.188710 0.56192 0.96262 1.0000 0.98129 1.0000 -130 0.81250 0.214286 0.185161 0.71681 0.95693 1.0000 0.98034 1.0000 -131 0.81250 0.285714 0.246774 0.83322 0.95756 1.0000 0.97851 1.0000 -132 0.82353 0.307692 0.323871 1.00890 0.95992 1.0000 0.97941 1.0000 -133 0.72222 0.500000 0.201613 0.69783 0.96076 1.0000 0.97926 1.0000 -134 0.63158 0.636364 0.190645 0.57968 0.95298 1.0000 0.97777 1.0000 -135 0.63158 0.272727 0.154516 0.53518 0.94818 1.0000 0.97034 1.0000 -136 0.86667 0.600000 0.156452 0.40751 0.95129 1.0000 0.96396 1.0000 -137 0.45455 0.125000 0.124194 0.49633 0.94659 1.0000 0.96387 1.0000 -138 0.72727 0.263158 0.129355 0.53204 0.93790 1.0000 0.96805 1.0000 -139 0.76923 0.294118 0.221613 1.10514 0.93725 1.0000 0.96475 1.0000 -140 0.66667 0.333333 0.120968 0.41708 0.93927 1.0000 0.96129 1.0000 -141 0.66667 0.266667 0.111613 0.36621 0.93705 1.0000 0.96232 1.0000 -142 0.78571 0.125000 0.153548 0.51770 0.93761 1.0000 0.96497 1.0000 -143 0.69231 0.294118 0.134516 0.48323 0.94139 1.0000 0.96404 1.0000 -144 0.78571 0.250000 0.107742 0.36165 0.93894 1.0000 0.96330 1.0000 -145 0.73333 0.066667 0.126129 0.58100 0.94071 1.0000 0.96580 1.0000 -146 1.00000 0.277778 0.209677 0.62235 0.94126 1.0000 0.96447 1.0000 -147 0.64706 0.230769 0.195161 1.15018 0.93683 1.0000 0.96267 1.0000 -148 0.78571 0.312500 0.147097 0.58854 0.93175 1.0000 0.95680 1.0000 -149 0.81250 0.285714 0.215161 0.96504 0.93031 1.0000 0.95719 1.0000 -150 0.76471 0.307692 0.201290 0.79570 0.93406 1.0000 0.96010 1.0000 -151 0.76471 0.230769 0.121290 0.44163 0.93285 1.0000 0.96424 1.0000 -152 0.81250 0.142857 0.191935 0.64259 0.93352 1.0000 0.95887 1.0000 -153 0.66667 0.400000 0.268387 1.25673 0.93457 1.0000 0.96223 1.0000 -154 0.75000 0.428571 0.159032 0.59774 0.92859 1.0000 0.95940 1.0000 -155 0.61111 0.166667 0.129355 0.42970 0.92404 1.0000 0.95479 1.0000 -156 0.76923 0.176471 0.111290 0.43768 0.92330 1.0000 0.95252 1.0000 -157 0.84615 0.294118 0.117742 0.47841 0.92128 1.0000 0.95040 1.0000 -158 0.75000 0.214286 0.107097 0.47007 0.92156 1.0000 0.95263 1.0000 -159 0.73333 0.266667 0.171613 0.50904 0.92379 1.0000 0.95099 1.0000 -160 1.00000 0.333333 0.183226 0.57992 0.92532 1.0000 0.95076 1.0000 -161 0.80000 0.200000 0.182903 0.60498 0.92378 1.0000 0.95039 1.0000 -162 0.77778 0.250000 0.142258 0.56993 0.91637 1.0000 0.95259 1.0000 -163 0.76471 0.230769 0.196774 0.93371 0.91773 1.0000 0.94934 1.0000 -164 0.56250 0.142857 0.062903 0.30067 0.92322 1.0000 0.95186 1.0000 -165 0.54545 0.210526 0.060000 0.26858 0.91926 1.0000 0.94916 1.0000 -166 0.60000 0.100000 0.071935 0.50983 0.91322 1.0000 0.95238 1.0000 -167 0.87500 0.545455 0.117419 0.62467 0.90935 1.0000 0.94505 1.0000 -168 0.63158 0.272727 0.150968 0.74017 0.91136 1.0000 0.94706 1.0000 -169 0.73333 0.133333 0.065161 0.31283 0.91085 1.0000 0.94826 1.0000 -170 0.46154 0.235294 0.023871 0.11345 0.90277 1.0000 0.94589 1.0000 -171 0.50000 0.200000 0.072903 0.37070 0.89798 1.0000 0.94212 1.0000 -172 0.66667 0.380952 0.070323 0.31328 0.90086 1.0000 0.93982 1.0000 -173 0.35714 0.125000 0.096129 0.58687 0.90226 1.0000 0.94263 1.0000 -174 0.85714 0.130435 0.048387 0.24430 0.89795 1.0000 0.94246 1.0000 -175 0.33333 0.095238 0.040968 0.31289 0.89568 1.0000 0.94103 1.0000 -176 0.60000 0.280000 0.109677 0.59856 0.89560 1.0000 0.93777 1.0000 -177 0.80000 0.250000 0.087742 0.33425 0.89679 1.0000 0.93234 1.0000 -178 0.53846 0.294118 0.091613 0.45078 0.89793 1.0000 0.93429 1.0000 -179 0.58333 0.166667 0.077419 0.45098 0.89534 1.0000 0.93235 1.0000 -180 0.70000 0.100000 0.070645 0.36474 0.89348 1.0000 0.93143 1.0000 -181 0.44444 0.142857 0.027419 0.14376 0.89003 1.0000 0.93073 1.0000 -182 0.85714 0.347826 0.047097 0.16413 0.89042 1.0000 0.92872 1.0000 -183 0.64286 0.250000 0.079355 0.31787 0.88921 1.0000 0.92992 1.0000 -184 0.76923 0.235294 0.128387 0.42499 0.89076 1.0000 0.92665 1.0000 -185 0.35714 0.312500 0.051613 0.22367 0.89153 1.0000 0.93240 1.0000 -186 0.50000 0.300000 0.097742 0.57075 0.88825 1.0000 0.92965 1.0000 -187 0.72727 0.210526 0.072581 0.36679 0.88558 1.0000 0.92700 1.0000 -188 0.50000 0.166667 0.060968 0.38155 0.88425 1.0000 0.92453 1.0000 -189 0.77778 0.428571 0.196129 0.77067 0.88607 1.0000 0.92070 1.0000 -190 0.68750 0.285714 0.199677 0.64712 0.89072 1.0000 0.91910 1.0000 -191 0.60000 0.266667 0.086774 0.38676 0.89059 1.0000 0.92170 1.0000 -192 0.61538 0.352941 0.119355 0.59084 0.88832 1.0000 0.92226 1.0000 -193 0.57143 0.375000 0.138065 0.56758 0.88904 1.0000 0.92034 1.0000 -194 0.71429 0.125000 0.141613 0.72785 0.88581 1.0000 0.92443 1.0000 -195 0.41667 0.277778 0.075806 0.31415 0.88499 1.0000 0.92072 1.0000 -196 0.60000 0.200000 0.048065 0.21990 0.88149 1.0000 0.92186 1.0000 -197 0.60000 0.150000 0.073548 0.37921 0.87961 1.0000 0.92221 1.0000 -198 0.66667 0.285714 0.083548 0.43299 0.88149 1.0000 0.91734 1.0000 -199 0.66667 0.333333 0.090968 0.30320 0.88426 1.0000 0.91831 1.0000 -200 0.85714 0.312500 0.133226 0.44456 0.88430 1.0000 0.91612 1.0000 -201 0.64706 0.153846 0.079677 0.30805 0.88457 1.0000 0.91757 1.0000 -202 0.76923 0.235294 0.072258 0.28825 0.88395 1.0000 0.92006 1.0000 -203 0.71429 0.250000 0.105484 0.55223 0.88321 1.0000 0.91951 1.0000 -204 0.57143 0.375000 0.170000 0.75032 0.88493 1.0000 0.91725 1.0000 -205 0.85714 0.312500 0.220645 0.79723 0.88693 1.0000 0.91750 1.0000 -206 0.76471 0.461538 0.205161 0.61549 0.88803 1.0000 0.91801 1.0000 -207 0.73684 0.363636 0.127097 0.43353 0.89076 1.0000 0.91755 1.0000 -208 0.77778 0.250000 0.095161 0.36044 0.89067 1.0000 0.92078 1.0000 -209 0.41176 0.307692 0.129355 0.76402 0.88840 1.0000 0.91887 1.0000 -210 0.72727 0.315789 0.131290 0.55090 0.88729 1.0000 0.91634 1.0000 -211 0.57143 0.312500 0.175806 0.80900 0.88667 1.0000 0.91829 1.0000 -212 0.76923 0.352941 0.108387 0.34464 0.88733 1.0000 0.91653 1.0000 -213 0.62500 0.428571 0.120323 0.54698 0.88536 1.0000 0.91695 1.0000 -214 0.75000 0.214286 0.095806 0.31999 0.88688 1.0000 0.91760 1.0000 -215 0.73333 0.133333 0.060323 0.26227 0.88851 1.0000 0.91759 1.0000 -216 0.84615 0.411765 0.136129 0.43472 0.89047 1.0000 0.91523 1.0000 -217 0.55556 0.250000 0.094194 0.41562 0.88980 1.0000 0.92168 1.0000 -218 0.76923 0.470588 0.106774 0.35950 0.88798 1.0000 0.92190 1.0000 -219 0.61111 0.250000 0.090000 0.41046 0.88971 1.0000 0.91974 1.0000 -220 0.71429 0.375000 0.133548 0.51304 0.88952 1.0000 0.92230 1.0000 -221 0.68750 0.285714 0.169677 0.64066 0.89084 1.0000 0.92296 1.0000 -222 0.46667 0.333333 0.142581 0.59735 0.89091 1.0000 0.92450 1.0000 -223 0.75000 0.444444 0.105806 0.43923 0.89200 1.0000 0.92111 1.0000 -224 0.76471 0.153846 0.127419 0.59639 0.89441 1.0000 0.92250 1.0000 -225 0.60000 0.400000 0.135484 0.50659 0.89329 1.0000 0.92672 1.0000 -226 0.60000 0.333333 0.110000 0.49735 0.89179 1.0000 0.92729 1.0000 -227 0.64286 0.312500 0.099032 0.36887 0.89208 1.0000 0.92727 1.0000 -228 0.85714 0.375000 0.152903 0.66285 0.89360 1.0000 0.92500 1.0000 -229 0.66667 0.750000 0.090323 0.28610 0.89673 1.0000 0.92489 1.0000 -230 0.66667 0.222222 0.083226 0.25447 0.89543 1.0000 0.92736 1.0000 -231 0.56250 0.500000 0.145484 0.55310 0.89571 1.0000 0.92579 1.0000 -232 0.68750 0.500000 0.143548 0.42390 0.89853 1.0000 0.92353 1.0000 -233 0.72222 0.333333 0.249032 0.88259 0.89823 1.0000 0.92317 1.0000 -234 0.64706 0.384615 0.057419 0.25293 0.89605 1.0000 0.92650 1.0000 -235 0.68750 0.214286 0.131613 0.46545 0.89610 1.0000 0.92747 1.0000 -236 0.64286 0.562500 0.126129 0.48782 0.89841 1.0000 0.92930 1.0000 -237 0.61111 0.416667 0.082903 0.33863 0.89903 1.0000 0.92836 1.0000 -238 0.68750 0.428571 0.137097 0.49151 0.89539 1.0000 0.93120 1.0000 -239 0.70588 0.461538 0.109677 0.38549 0.89769 1.0000 0.93085 1.0000 -240 0.61111 0.166667 0.091613 0.36178 0.89975 1.0000 0.93382 1.0000 -241 0.69231 0.235294 0.090968 0.38475 0.89880 1.0000 0.93345 1.0000 -242 0.61538 0.294118 0.055806 0.21840 0.89787 1.0000 0.93413 1.0000 -243 0.53846 0.411765 0.060968 0.23868 0.90087 1.0000 0.93669 1.0000 -244 0.71429 0.437500 0.087419 0.28904 0.90164 1.0000 0.93786 1.0000 -245 0.70588 0.076923 0.157419 0.77244 0.90439 1.0000 0.93783 1.0000 -246 0.76923 0.470588 0.110645 0.40893 0.90267 1.0000 0.94269 1.0000 -247 0.50000 0.083333 0.091613 0.46825 0.90173 1.0000 0.94079 1.0000 -248 0.50000 0.500000 0.205806 0.82728 0.90228 1.0000 0.94077 1.0000 -249 0.66667 0.333333 0.173548 0.62500 0.90864 1.0000 0.94033 1.0000 -250 0.73333 0.533333 0.139677 0.49427 0.91612 1.0000 0.94312 1.0000 -251 0.73684 0.272727 0.286452 0.82602 0.91698 1.0000 0.94515 1.0000 -252 0.64706 0.230769 0.168387 0.64577 0.91804 1.0000 0.94543 1.0000 -253 0.78571 0.500000 0.136129 0.45574 0.91940 1.0000 0.94670 1.0000 -254 0.78947 0.181818 0.177097 0.51808 0.92257 1.0000 0.95042 1.0000 -255 0.70588 0.307692 0.271290 1.00017 0.92534 1.0000 0.95306 1.0000 -256 0.87500 0.285714 0.250000 0.85573 0.92972 1.0000 0.95248 1.0000 -257 0.72222 0.250000 0.119355 0.46579 0.92872 1.0000 0.95728 1.0000 -258 0.68750 0.285714 0.203871 1.31537 0.92660 1.0000 0.95761 1.0000 -259 0.73333 0.400000 0.246129 1.34440 0.92388 1.0000 0.95881 1.0000 -260 0.70588 0.153846 0.215484 0.83691 0.92567 1.0000 0.95810 1.0000 -261 0.64286 0.312500 0.249032 1.36615 0.92876 1.0000 0.95994 1.0000 -262 0.85714 0.375000 0.278065 1.57342 0.93265 1.0000 0.96144 1.0000 -263 0.72222 0.500000 0.351290 1.50255 0.93698 1.0000 0.96629 1.0000 -264 0.94737 0.090909 0.252258 0.77378 0.94225 1.0000 0.96755 1.0000 -265 0.68421 0.272727 0.252581 0.94899 0.94550 1.0000 0.97323 1.0000 -266 0.75000 0.214286 0.199032 1.08406 0.94417 1.0000 0.97170 1.0000 -267 0.53333 0.200000 0.138387 0.58951 0.94249 1.0000 0.97360 1.0000 -268 0.45455 0.210526 0.103226 0.46945 0.94068 1.0000 0.97605 1.0000 -269 1.00000 0.095238 0.102581 0.45104 0.93674 1.0000 0.97764 1.0000 -270 0.54545 0.157895 0.114194 0.50416 0.93640 1.0000 0.97649 1.0000 -271 0.66667 0.095238 0.110968 0.54075 0.93737 1.0000 0.98005 1.0000 -272 0.62500 0.227273 0.119677 0.71180 0.94031 1.0000 0.97780 1.0000 -273 0.60000 0.250000 0.133871 0.53710 0.94171 1.0000 0.97854 1.0000 -274 0.81818 0.052632 0.119032 0.43837 0.94118 1.0000 0.98123 1.0000 -275 0.80000 0.250000 0.221935 0.73185 0.94428 1.0000 0.97455 1.0000 -276 0.76923 0.235294 0.269032 0.92453 0.94895 1.0000 0.97407 1.0000 -277 0.85714 0.250000 0.278065 1.28092 0.95168 1.0000 0.97733 1.0000 -278 0.62500 0.285714 0.140323 0.49075 0.95550 1.0000 0.98083 1.0000 -279 0.64286 0.312500 0.194839 0.69106 0.95684 1.0000 0.98604 1.0000 -280 0.85714 0.187500 0.309677 1.34805 0.95639 1.0000 0.98505 1.0000 -281 0.66667 0.133333 0.234194 0.95433 0.96461 1.0000 0.99102 1.0000 -282 0.75000 0.166667 0.188710 0.87205 0.96594 1.0000 0.99405 1.0000 -283 0.75000 0.111111 0.076452 0.31777 0.96317 1.0000 0.99160 1.0000 -284 0.72727 0.263158 0.163548 0.63811 0.96387 1.0000 0.99543 1.0000 -285 0.69231 0.235294 0.099677 0.33361 0.96293 1.0000 0.99512 1.0000 -286 0.69231 0.352941 0.146129 0.53326 0.96593 1.0000 0.99333 1.0000 -287 0.66667 0.200000 0.178387 0.70828 0.97126 1.0000 0.99433 1.0000 -288 0.69231 0.117647 0.112258 0.45530 0.96931 1.0000 0.99509 1.0000 -289 0.81818 0.210526 0.143548 0.56629 0.97491 1.0016 1.00000 1.0000 -290 0.69231 0.000000 0.094194 0.33822 0.98116 1.0080 1.00000 1.0010 -291 0.88889 0.285714 0.133548 0.42604 0.98218 1.0090 1.00000 1.0000 -292 0.85714 0.062500 0.132903 0.65473 0.98063 1.0074 1.00000 1.0000 -293 0.69231 0.117647 0.099032 0.42781 0.97866 1.0054 1.00000 1.0016 -294 0.63636 0.210526 0.128387 0.54114 0.98083 1.0076 1.00000 1.0049 -295 0.81818 0.210526 0.151290 0.61980 0.98428 1.0111 1.00000 1.0025 -296 0.53846 0.294118 0.153226 0.60681 0.98942 1.0163 1.00000 1.0057 -297 0.75000 0.111111 0.158065 0.70035 0.99066 1.0176 1.00000 1.0039 -298 0.63636 0.210526 0.169677 0.70033 0.99119 1.0181 1.00000 1.0073 -299 0.72727 0.105263 0.109355 0.44371 0.99328 1.0203 1.00000 1.0073 -300 0.70000 0.250000 0.140968 0.63240 0.99122 1.0182 1.00000 1.0063 -301 0.91667 0.222222 0.149355 0.49153 0.99302 1.0200 1.00000 1.0061 -302 0.73333 0.266667 0.120000 0.40100 1.00000 1.0288 1.00000 1.0064 -303 0.86667 0.400000 0.167419 0.43313 1.00000 1.0345 1.00000 1.0025 -304 0.68421 0.272727 0.251290 0.96605 1.00000 1.0392 1.00000 1.0032 -305 0.75000 0.285714 0.210000 0.52294 1.00000 1.0433 1.00000 1.0092 -306 0.56250 0.071429 0.179355 0.77478 1.00000 1.0515 1.00000 1.0204 -307 0.60000 0.150000 0.161935 0.77348 1.00000 1.0465 1.00000 1.0234 -308 0.66667 0.190476 0.121935 0.56863 1.00000 1.0435 1.00000 1.0208 -309 0.70000 0.250000 0.189355 0.73604 1.00000 1.0387 1.00000 1.0150 -310 0.83333 0.055556 0.186129 0.64967 1.00000 1.0370 1.00000 1.0109 -311 0.72727 0.263158 0.075161 0.43288 1.00000 1.0396 1.00000 1.0179 -312 0.69231 0.470588 0.240645 1.18868 1.00000 1.0437 1.00000 1.0169 -313 0.70588 0.384615 0.294839 1.11722 1.00000 1.0493 1.00000 1.0136 -314 0.82353 0.153846 0.264194 0.80156 1.00000 1.0547 1.00000 1.0169 -315 0.75000 0.285714 0.208387 0.76853 1.00000 1.0553 1.00000 1.0231 -316 0.68750 0.357143 0.255161 0.84192 1.00000 1.0529 1.00000 1.0153 -317 0.68750 0.500000 0.258065 0.80489 1.00000 1.0583 1.00000 1.0223 -318 0.77778 0.250000 0.210323 0.63736 1.00000 1.0668 1.00000 1.0265 -319 0.52941 0.230769 0.204516 0.73170 1.00000 1.0730 1.00000 1.0368 -320 0.58333 0.166667 0.206452 0.91152 1.00000 1.0695 1.00000 1.0482 -321 1.00000 0.300000 0.178710 0.63548 1.00000 1.0667 1.00000 1.0351 -322 0.81250 0.142857 0.183226 0.64899 1.00000 1.0708 1.00000 1.0361 -323 0.60000 0.200000 0.111613 0.48421 1.00000 1.0743 1.00000 1.0387 -324 0.66667 0.222222 0.129355 0.56209 1.00000 1.0708 1.00000 1.0427 -325 1.00000 0.166667 0.212903 0.61645 1.00000 1.0723 1.00000 1.0415 -326 0.66667 0.333333 0.219355 0.97011 1.00000 1.0820 1.00000 1.0476 -327 0.66667 0.266667 0.165806 0.68824 1.00000 1.0861 1.00000 1.0539 -328 0.78571 0.250000 0.187742 0.62280 1.00000 1.0860 1.00000 1.0587 -329 0.73333 0.400000 0.216774 0.71151 1.00000 1.0877 1.00000 1.0545 -330 0.58824 0.461538 0.240645 0.68354 1.00000 1.0893 1.00000 1.0469 -331 0.68750 0.357143 0.156774 0.48542 1.00000 1.1035 1.00000 1.0561 -332 0.75000 0.285714 0.209355 0.82770 1.00000 1.1108 1.00000 1.0682 -333 0.87500 0.285714 0.263871 0.89885 1.00000 1.1132 1.00000 1.0638 -334 0.72222 0.250000 0.180000 0.66242 1.00000 1.1057 1.00000 1.0655 -335 0.87500 0.500000 0.240323 1.10171 1.00000 1.1052 1.00000 1.0636 -336 0.80952 0.222222 0.267742 0.82491 1.00000 1.1042 1.00000 1.0575 -337 0.52632 0.090909 0.046774 0.20464 1.00000 1.0996 1.00000 1.0625 -338 0.63636 0.315789 0.107419 0.41949 1.00000 1.0973 1.00000 1.0677 -339 0.92308 0.411765 0.117097 0.36828 1.00000 1.1008 1.00000 1.0662 -340 0.68421 0.272727 0.192903 0.58239 1.00000 1.1057 1.00000 1.0626 -341 0.87500 0.500000 0.256452 0.73218 1.00000 1.1094 1.00000 1.0598 -342 0.76190 0.000000 0.171935 0.67301 1.00000 1.1110 1.00000 1.0682 -343 0.68750 0.571429 0.153226 0.43883 1.00000 1.1164 1.00000 1.0754 -344 0.78947 0.272727 0.100645 0.29257 1.00000 1.1109 1.00000 1.0732 -345 0.38889 0.333333 0.085806 0.50390 1.00000 1.1104 1.00000 1.0706 -346 0.81818 0.578947 0.174194 0.54662 1.00000 1.1138 1.00000 1.0753 -347 0.85000 0.400000 0.271935 0.75097 1.00000 1.1151 1.00000 1.0678 -348 0.80952 0.111111 0.172581 0.48908 1.00000 1.1123 1.00000 1.0662 -349 0.72222 0.416667 0.234194 0.67460 1.00000 1.1218 1.00000 1.0885 -350 0.66667 0.416667 0.143226 0.40383 1.00000 1.1255 1.00000 1.0849 -351 0.70588 0.307692 0.227419 0.81063 1.00000 1.1268 1.00000 1.0820 -352 0.75000 0.428571 0.136774 0.47521 1.00000 1.1279 1.00000 1.0910 -353 0.72222 0.416667 0.232258 0.70317 1.00000 1.1289 1.00000 1.0851 -354 0.72222 0.166667 0.388065 1.44584 1.00000 1.1263 1.00000 1.0885 -355 0.86667 0.333333 0.225806 0.82306 1.00000 1.1306 1.00000 1.0851 -356 0.83333 0.333333 0.185806 0.72513 1.00000 1.1380 1.00000 1.0974 -357 0.63158 0.545455 0.258387 1.05378 1.00000 1.1398 1.00000 1.0910 -358 0.66667 0.250000 0.161290 0.67799 1.00000 1.1452 1.00000 1.1033 -359 0.53333 0.200000 0.172581 0.97394 1.00000 1.1442 1.00000 1.1144 -360 0.90909 0.315789 0.106129 0.52097 1.00000 1.1363 1.00000 1.1036 -361 0.81250 0.357143 0.212903 0.63871 1.00000 1.1280 1.00000 1.0910 -362 0.72222 0.250000 0.080323 0.30215 1.00000 1.1336 1.00000 1.0959 -363 0.56250 0.642857 0.194516 0.96683 1.00000 1.1287 1.00000 1.0868 -364 0.83333 0.416667 0.256774 0.78805 1.00000 1.1241 1.00000 1.0806 -365 0.75000 0.500000 0.206129 0.74692 1.00000 1.1270 1.00000 1.0806 -366 0.15000 0.000000 0.052500 0.16098 1.00000 1.1028 1.00000 1.0699 diff --git a/testing/Input/data_39.0625_-119.4375/weath.1980 b/testing/Input/data_weather/weath.1980 similarity index 100% rename from testing/Input/data_39.0625_-119.4375/weath.1980 rename to testing/Input/data_weather/weath.1980 diff --git a/testing/Input/data_39.0625_-119.4375/weath.1981 b/testing/Input/data_weather/weath.1981 similarity index 100% rename from testing/Input/data_39.0625_-119.4375/weath.1981 rename to testing/Input/data_weather/weath.1981 diff --git a/testing/Input/data_39.0625_-119.4375/weath.1982 b/testing/Input/data_weather/weath.1982 similarity index 100% rename from testing/Input/data_39.0625_-119.4375/weath.1982 rename to testing/Input/data_weather/weath.1982 diff --git a/testing/Input/data_39.0625_-119.4375/weath.1983 b/testing/Input/data_weather/weath.1983 similarity index 100% rename from testing/Input/data_39.0625_-119.4375/weath.1983 rename to testing/Input/data_weather/weath.1983 diff --git a/testing/Input/data_39.0625_-119.4375/weath.1984 b/testing/Input/data_weather/weath.1984 similarity index 100% rename from testing/Input/data_39.0625_-119.4375/weath.1984 rename to testing/Input/data_weather/weath.1984 diff --git a/testing/Input/data_39.0625_-119.4375/weath.1985 b/testing/Input/data_weather/weath.1985 similarity index 100% rename from testing/Input/data_39.0625_-119.4375/weath.1985 rename to testing/Input/data_weather/weath.1985 diff --git a/testing/Input/data_39.0625_-119.4375/weath.1986 b/testing/Input/data_weather/weath.1986 similarity index 100% rename from testing/Input/data_39.0625_-119.4375/weath.1986 rename to testing/Input/data_weather/weath.1986 diff --git a/testing/Input/data_39.0625_-119.4375/weath.1987 b/testing/Input/data_weather/weath.1987 similarity index 100% rename from testing/Input/data_39.0625_-119.4375/weath.1987 rename to testing/Input/data_weather/weath.1987 diff --git a/testing/Input/data_39.0625_-119.4375/weath.1988 b/testing/Input/data_weather/weath.1988 similarity index 100% rename from testing/Input/data_39.0625_-119.4375/weath.1988 rename to testing/Input/data_weather/weath.1988 diff --git a/testing/Input/data_39.0625_-119.4375/weath.1989 b/testing/Input/data_weather/weath.1989 similarity index 100% rename from testing/Input/data_39.0625_-119.4375/weath.1989 rename to testing/Input/data_weather/weath.1989 diff --git a/testing/Input/data_39.0625_-119.4375/weath.1990 b/testing/Input/data_weather/weath.1990 similarity index 100% rename from testing/Input/data_39.0625_-119.4375/weath.1990 rename to testing/Input/data_weather/weath.1990 diff --git a/testing/Input/data_39.0625_-119.4375/weath.1991 b/testing/Input/data_weather/weath.1991 similarity index 100% rename from testing/Input/data_39.0625_-119.4375/weath.1991 rename to testing/Input/data_weather/weath.1991 diff --git a/testing/Input/data_39.0625_-119.4375/weath.1992 b/testing/Input/data_weather/weath.1992 similarity index 100% rename from testing/Input/data_39.0625_-119.4375/weath.1992 rename to testing/Input/data_weather/weath.1992 diff --git a/testing/Input/data_39.0625_-119.4375/weath.1993 b/testing/Input/data_weather/weath.1993 similarity index 100% rename from testing/Input/data_39.0625_-119.4375/weath.1993 rename to testing/Input/data_weather/weath.1993 diff --git a/testing/Input/data_39.0625_-119.4375/weath.1994 b/testing/Input/data_weather/weath.1994 similarity index 100% rename from testing/Input/data_39.0625_-119.4375/weath.1994 rename to testing/Input/data_weather/weath.1994 diff --git a/testing/Input/data_39.0625_-119.4375/weath.1995 b/testing/Input/data_weather/weath.1995 similarity index 100% rename from testing/Input/data_39.0625_-119.4375/weath.1995 rename to testing/Input/data_weather/weath.1995 diff --git a/testing/Input/data_39.0625_-119.4375/weath.1996 b/testing/Input/data_weather/weath.1996 similarity index 100% rename from testing/Input/data_39.0625_-119.4375/weath.1996 rename to testing/Input/data_weather/weath.1996 diff --git a/testing/Input/data_39.0625_-119.4375/weath.1997 b/testing/Input/data_weather/weath.1997 similarity index 100% rename from testing/Input/data_39.0625_-119.4375/weath.1997 rename to testing/Input/data_weather/weath.1997 diff --git a/testing/Input/data_39.0625_-119.4375/weath.1998 b/testing/Input/data_weather/weath.1998 similarity index 100% rename from testing/Input/data_39.0625_-119.4375/weath.1998 rename to testing/Input/data_weather/weath.1998 diff --git a/testing/Input/data_39.0625_-119.4375/weath.1999 b/testing/Input/data_weather/weath.1999 similarity index 100% rename from testing/Input/data_39.0625_-119.4375/weath.1999 rename to testing/Input/data_weather/weath.1999 diff --git a/testing/Input/data_39.0625_-119.4375/weath.2000 b/testing/Input/data_weather/weath.2000 similarity index 100% rename from testing/Input/data_39.0625_-119.4375/weath.2000 rename to testing/Input/data_weather/weath.2000 diff --git a/testing/Input/data_39.0625_-119.4375/weath.2001 b/testing/Input/data_weather/weath.2001 similarity index 100% rename from testing/Input/data_39.0625_-119.4375/weath.2001 rename to testing/Input/data_weather/weath.2001 diff --git a/testing/Input/data_39.0625_-119.4375/weath.2002 b/testing/Input/data_weather/weath.2002 similarity index 100% rename from testing/Input/data_39.0625_-119.4375/weath.2002 rename to testing/Input/data_weather/weath.2002 diff --git a/testing/Input/data_39.0625_-119.4375/weath.2003 b/testing/Input/data_weather/weath.2003 similarity index 100% rename from testing/Input/data_39.0625_-119.4375/weath.2003 rename to testing/Input/data_weather/weath.2003 diff --git a/testing/Input/data_39.0625_-119.4375/weath.2004 b/testing/Input/data_weather/weath.2004 similarity index 100% rename from testing/Input/data_39.0625_-119.4375/weath.2004 rename to testing/Input/data_weather/weath.2004 diff --git a/testing/Input/data_39.0625_-119.4375/weath.2005 b/testing/Input/data_weather/weath.2005 similarity index 100% rename from testing/Input/data_39.0625_-119.4375/weath.2005 rename to testing/Input/data_weather/weath.2005 diff --git a/testing/Input/data_39.0625_-119.4375/weath.2006 b/testing/Input/data_weather/weath.2006 similarity index 100% rename from testing/Input/data_39.0625_-119.4375/weath.2006 rename to testing/Input/data_weather/weath.2006 diff --git a/testing/Input/data_39.0625_-119.4375/weath.2007 b/testing/Input/data_weather/weath.2007 similarity index 100% rename from testing/Input/data_39.0625_-119.4375/weath.2007 rename to testing/Input/data_weather/weath.2007 diff --git a/testing/Input/data_39.0625_-119.4375/weath.2008 b/testing/Input/data_weather/weath.2008 similarity index 100% rename from testing/Input/data_39.0625_-119.4375/weath.2008 rename to testing/Input/data_weather/weath.2008 diff --git a/testing/Input/data_39.0625_-119.4375/weath.2009 b/testing/Input/data_weather/weath.2009 similarity index 100% rename from testing/Input/data_39.0625_-119.4375/weath.2009 rename to testing/Input/data_weather/weath.2009 diff --git a/testing/Input/data_39.0625_-119.4375/weath.2010 b/testing/Input/data_weather/weath.2010 similarity index 100% rename from testing/Input/data_39.0625_-119.4375/weath.2010 rename to testing/Input/data_weather/weath.2010 diff --git a/testing/Input/estab.in b/testing/Input/estab.in index c07ccb7c0..f48c0366a 100644 --- a/testing/Input/estab.in +++ b/testing/Input/estab.in @@ -1,12 +1,12 @@ # list of filenames for which to check establishment -# each filename pertains to a species and contains the +# each filename pertains to a species and contains the # soil moisture and timing parameters required for the # species to establish in a given year. # There is no limit to the number of files in the list. -# to suppress checking establishment, comment all the +# to suppress checking establishment, comment all the # lines below. -0 # use flag; 1=check establishment, 0=don't check, ignore following +0 # use flag; 1=check establishment, 0=don't check, ignore following Input/bouteloua.estab Input/bromus.estab #Input/aristida.estab diff --git a/testing/Input/mkv_covar.in b/testing/Input/mkv_covar.in new file mode 100755 index 000000000..1db4c3d54 --- /dev/null +++ b/testing/Input/mkv_covar.in @@ -0,0 +1,53 @@ + 1 4.09095 -11.75333 66.69987 47.00704 47.00704 57.94161 + 2 5.07524 -10.93190 53.02502 31.26189 31.26189 46.42581 + 3 6.75619 -8.61286 46.20161 29.47819 29.47819 44.12457 + 4 6.44286 -8.09809 48.85500 25.54369 25.54369 38.53952 + 5 6.41714 -9.43857 59.18382 39.67454 39.67454 51.46308 + 6 6.41762 -10.04238 57.51994 36.14591 36.14591 47.21566 + 7 7.72095 -7.63571 58.77897 38.63592 38.63592 42.72459 + 8 9.41714 -6.12429 37.75597 16.92817 16.92817 28.07678 + 9 9.77524 -5.85810 59.67593 28.78425 28.78425 30.28952 + 10 10.22190 -5.53952 55.71664 29.09484 29.09484 37.85302 + 11 11.39381 -3.99810 44.27666 19.72915 19.72915 24.77043 + 12 11.34238 -4.35143 51.89852 25.60104 25.60104 33.38328 + 13 12.74143 -2.82381 55.43218 22.80525 22.80525 27.26919 + 14 13.95952 -2.12619 51.85478 22.19492 22.19492 23.69275 + 15 15.97048 -0.29286 39.52137 15.10007 15.10007 18.50411 + 16 16.94000 1.00524 46.99831 19.29108 19.29108 23.31380 + 17 18.15191 2.13000 37.37354 15.19548 15.19548 17.69244 + 18 19.20619 2.83381 39.15087 13.50122 13.50122 18.43440 + 19 19.45667 4.05286 37.28177 13.64406 13.64406 15.31714 + 20 22.19381 5.66143 30.50153 9.61995 9.61995 15.10037 + 21 22.37381 7.23810 29.12339 7.12800 7.12800 11.80476 + 22 22.27857 7.35571 32.83803 7.43075 7.43075 13.27004 + 23 24.73476 9.29191 31.09917 9.06215 9.06215 12.95844 + 24 25.95190 10.09524 29.36057 10.07034 10.07034 11.27116 + 25 27.89571 11.02667 25.82768 7.32102 7.32102 8.81851 + 26 30.02143 12.30857 22.53332 7.14346 7.14346 9.54489 + 27 31.35333 12.88238 19.39651 6.23719 6.23719 9.22202 + 28 30.71048 13.58762 21.76540 7.74126 7.74126 8.57852 + 29 30.63952 14.16571 18.77923 3.09218 3.09218 8.10685 + 30 29.89286 13.81810 22.95893 6.47323 6.47323 8.43106 + 31 30.08143 13.51810 25.93157 4.80564 4.80564 10.06589 + 32 29.66238 13.20619 31.11869 5.45778 5.45778 8.01780 + 33 29.41238 12.60667 14.03027 2.58246 2.58246 8.59470 + 34 29.44191 12.24476 17.47980 5.95840 5.95840 13.36840 + 35 29.11190 11.09143 23.30141 8.72382 8.72382 10.70309 + 36 28.11190 9.79905 25.86219 8.07237 8.07237 11.81933 + 37 24.50095 7.99571 41.42058 13.17011 13.17011 15.01103 + 38 23.46857 6.27333 41.75686 16.50865 16.50865 19.83661 + 39 22.94524 5.43762 36.96260 15.94613 15.94613 18.64848 + 40 21.93000 3.75095 30.89134 11.20822 11.20822 15.28586 + 41 19.53762 2.32714 54.85110 22.29983 22.29983 20.72419 + 42 18.04429 1.00857 39.97729 14.03168 14.03168 22.08739 + 43 17.40619 0.15952 33.42622 11.83403 11.83403 17.31008 + 44 13.11381 -2.46286 64.65277 30.42106 30.42106 30.85775 + 45 12.81048 -2.95095 43.62401 21.81805 21.81805 24.92921 + 46 10.62476 -3.81048 52.86667 23.42624 23.42624 24.64496 + 47 9.39524 -6.13095 43.79060 22.86378 22.86378 28.09152 + 48 6.50857 -7.71333 36.09792 20.78557 20.78557 30.67847 + 49 7.62524 -7.49429 61.16229 36.96698 36.96698 43.00993 + 50 6.54333 -8.46190 52.74619 34.71279 34.71279 42.76793 + 51 5.24381 -9.34667 78.88123 50.65813 50.65813 54.39869 + 52 5.02381 -10.59810 50.45092 30.97369 30.97369 43.13578 + 53 4.34000 -11.94333 50.22041 29.30007 29.30007 55.37910 diff --git a/testing/Input/mkv_prob.in b/testing/Input/mkv_prob.in new file mode 100755 index 000000000..b8844e767 --- /dev/null +++ b/testing/Input/mkv_prob.in @@ -0,0 +1,366 @@ + 1 0.0000 0.1000 0.693 0.523 + 2 0.3333 0.0370 0.460 0.608 + 3 0.0000 0.0714 0.090 0.014 + 4 0.0000 0.0714 0.066 0.051 + 5 0.0000 0.0357 0.030 0.000 + 6 0.0000 0.1034 0.097 0.029 + 7 0.3333 0.0741 0.137 0.060 + 8 0.0000 0.0741 0.575 0.559 + 9 1.0000 0.0357 0.380 0.448 + 10 0.3333 0.0000 0.150 0.000 + 11 0.0000 0.0345 0.380 0.000 + 12 1.0000 0.0690 0.275 0.308 + 13 0.0000 0.0370 0.430 0.000 + 14 0.0000 0.0690 0.419 0.485 + 15 1.0000 0.0000 0.140 0.162 + 16 0.0000 0.1429 0.310 0.259 + 17 0.0000 0.1538 0.278 0.357 + 18 0.5000 0.1154 0.210 0.212 + 19 0.2000 0.0800 0.433 0.484 + 20 0.3333 0.0370 0.125 0.035 + 21 0.0000 0.0714 0.030 0 + 22 0.0000 0.1071 0.237 0.120 + 23 0.0000 0.0741 0.070 0.085 + 24 0.0000 0.0714 0.058 0.059 + 25 0.5000 0.0357 0.050 0.042 + 26 0.0000 0.1429 0.515 0.843 + 27 0.0000 0.0385 0.076 0.000 + 28 0.0000 0.1034 0.079 0.061 + 29 0.3333 0.0741 0.384 0.326 + 30 0.3333 0.0000 0.010 0.000 + 31 0.0000 0.0345 0.060 0.000 + 32 0.0000 0.1379 0.529 0.741 + 33 0.2500 0.0000 0.050 0.000 + 34 0.0000 0.1034 0.143 0.101 + 35 0.3333 0.0741 0.180 0.218 + 36 0.6667 0.1481 0.222 0.254 + 37 0.1667 0.1667 0.156 0.201 + 38 0.6000 0.0400 0.036 0.018 + 39 0.0000 0.0769 0.651 0.776 + 40 0.0000 0.0357 0.100 0.000 + 41 0.0000 0.1034 0.170 0.182 + 42 0.6667 0.1852 0.272 0.296 + 43 0.1429 0.1304 0.078 0.046 + 44 0.5000 0.0769 0.166 0.074 + 45 0.2500 0.0385 0.250 0.000 + 46 1.0000 0.1786 0.260 0.268 + 47 0.1429 0.0435 0.075 0.035 + 48 0.0000 0.1429 0.502 0.498 + 49 0.0000 0.0385 0.180 0.000 + 50 0.0000 0.0690 0.065 0.021 + 51 0.5000 0.1429 0.154 0.185 + 52 0.2000 0.1600 0.148 0.119 + 53 0.0000 0.0000 0.000 0.000 + 54 0.0000 0.0000 0.000 0.000 + 55 0.0000 0.1333 0.335 0.288 + 56 0.0000 0.0769 0.126 0.034 + 57 0.5000 0.0714 0.077 0.040 + 58 0.3333 0.0370 0.520 0.552 + 59 0.5000 0.0714 0.093 0.060 + 60 0.3333 0.0000 0.030 0.000 + 61 0.0000 0.0345 0.050 0.000 + 62 0.0000 0.1724 0.474 0.306 + 63 0.4000 0.1200 0.686 0.496 + 64 0.4000 0.2000 0.860 0.866 + 65 0.1429 0.1739 0.948 1.261 + 66 0.6000 0.2000 0.375 0.329 + 67 0.2500 0.0000 0.245 0.163 + 68 0.0000 0.0357 0.460 0.000 + 69 0.0000 0.1379 0.236 0.287 + 70 0.5000 0.0385 0.320 0.233 + 71 0.3333 0.1481 0.272 0.308 + 72 0.0000 0.0400 0.510 0.000 + 73 0.0000 0.1034 0.202 0.089 + 74 0.3333 0.0741 0.264 0.213 + 75 0.3333 0.1111 0.370 0.391 + 76 0.5000 0.0000 0.395 0.516 + 77 0.0000 0.2857 0.372 0.355 + 78 0.3750 0.0909 0.270 0.200 + 79 0.4000 0.1200 0.394 0.212 + 80 0.2000 0.2000 0.250 0.108 + 81 0.3333 0.0833 0.142 0.165 + 82 0.5000 0.2308 0.386 0.266 + 83 0.3750 0.1818 0.439 0.316 + 84 0.4286 0.1739 0.252 0.351 + 85 0.0000 0.0870 0.279 0.324 + 86 0.0000 0.0714 0.215 0.233 + 87 1.0000 0.1071 0.251 0.262 + 88 0.2000 0.1200 0.120 0.040 + 89 0.5000 0.1538 0.762 0.618 + 90 0.3333 0.0833 0.180 0.175 + 91 0.2500 0.1923 0.752 0.667 + 92 0.5000 0.0417 0.444 0.330 + 93 0.2500 0.3077 0.248 0.335 + 94 0.4444 0.3810 0.475 0.343 + 95 0.2500 0.1111 0.493 0.364 + 96 0.0000 0.0000 0.000 0.000 + 97 0.0000 0.1000 0.910 0.523 + 98 0.6667 0.0370 0.220 0.157 + 99 0.0000 0.1481 0.478 0.413 + 100 0.5000 0.1154 0.218 0.213 + 101 0.2000 0.1600 0.334 0.318 + 102 0.8000 0.1200 0.226 0.173 + 103 0.4286 0.0870 0.344 0.413 + 104 0.0000 0.1600 1.298 1.199 + 105 0.2500 0.1923 0.735 0.850 + 106 0.3333 0.0000 0.190 0.198 + 107 0.0000 0.1786 0.170 0.173 + 108 0.2000 0.3600 0.671 0.613 + 109 0.3000 0.3000 0.414 0.500 + 110 0.7778 0.1905 0.196 0.203 + 111 0.4545 0.1053 0.876 1.145 + 112 0.5714 0.2174 0.894 0.930 + 113 0.2222 0.0476 1.514 1.033 + 114 0.3333 0.2222 0.349 0.316 + 115 0.5714 0.2609 0.621 0.505 + 116 0.5000 0.1500 0.649 0.551 + 117 0.1250 0.3182 0.299 0.329 + 118 0.3750 0.1364 0.570 0.725 + 119 0.6667 0.2083 0.352 0.291 + 120 0.4444 0.0476 0.395 0.415 + 121 1.0000 0.2000 0.687 1.048 + 122 0.3000 0.1500 0.626 1.225 + 123 0.6667 0.2083 0.466 0.692 + 124 0.6667 0.1429 0.122 0.131 + 125 0.3333 0.3333 0.512 0.698 + 126 0.5000 0.1000 0.533 0.689 + 127 0.5714 0.1739 0.335 0.359 + 128 0.2500 0.1818 0.332 0.365 + 129 0.5000 0.2083 0.952 1.056 + 130 0.7500 0.1818 0.350 0.415 + 131 0.1000 0.3000 0.399 0.136 + 132 0.5714 0.4348 0.457 0.569 + 133 0.5714 0.1250 0.685 1.028 + 134 0.4000 0.2000 0.192 0.186 + 135 0.6250 0.1818 0.362 0.505 + 136 0.5556 0.3333 0.423 0.485 + 137 0.5833 0.3889 0.721 0.942 + 138 0.7143 0.0625 0.501 0.463 + 139 0.4545 0.0526 0.140 0.115 + 140 0.5000 0.3333 0.505 0.702 + 141 0.4545 0.1579 0.507 0.826 + 142 0.8750 0.1818 0.639 1.006 + 143 0.6364 0.1053 0.422 0.237 + 144 0.4444 0.3333 0.322 0.433 + 145 0.5455 0.1053 0.823 1.439 + 146 0.6250 0.3182 0.475 0.450 + 147 0.6667 0.3333 0.343 0.350 + 148 0.3571 0.3125 0.464 0.674 + 149 0.6000 0.3500 0.653 0.823 + 150 0.6154 0.2941 0.769 0.911 + 151 0.5385 0.2353 0.911 0.902 + 152 0.7273 0.1053 0.385 0.372 + 153 0.3000 0.3000 0.338 0.270 + 154 0.7778 0.1429 0.382 0.292 + 155 0.5000 0.2000 0.951 1.667 + 156 0.5556 0.2857 0.698 0.743 + 157 0.2727 0.0526 0.100 0.089 + 158 0.7500 0.2308 0.943 1.271 + 159 0.5556 0.4286 1.180 1.795 + 160 0.6429 0.2500 0.744 0.747 + 161 0.5385 0.5882 0.469 0.629 + 162 0.4118 0.3846 0.571 0.980 + 163 0.5833 0.3333 1.344 1.103 + 164 0.5385 0.2941 0.282 0.601 + 165 0.5000 0.1111 0.474 0.445 + 166 0.5000 0.1364 1.283 1.484 + 167 0.5714 0.2609 0.755 0.865 + 168 0.5000 0.2500 0.650 0.540 + 169 0.6000 0.2500 0.365 0.293 + 170 0.4545 0.1053 0.663 0.671 + 171 0.2857 0.1739 0.220 0.211 + 172 0.3333 0.2083 0.914 1.335 + 173 0.1429 0.0435 0.090 0.085 + 174 0.0000 0.2857 0.338 0.443 + 175 0.3750 0.1818 0.531 0.546 + 176 0.1429 0.2174 0.593 1.143 + 177 0.5000 0.2083 0.705 0.656 + 178 0.6250 0.2273 0.579 0.632 + 179 0.2000 0.0500 2.267 2.740 + 180 0.6667 0.1852 0.287 0.342 + 181 0.2857 0.1304 0.259 0.246 + 182 0.4000 0.2000 0.763 1.357 + 183 0.2857 0.1739 0.222 0.109 + 184 0.5000 0.2500 0.751 1.128 + 185 0.4444 0.2381 0.203 0.184 + 186 0.3333 0.1429 1.098 1.604 + 187 0.1667 0.1250 0.177 0.088 + 188 0.5000 0.1923 0.226 0.154 + 189 0.2857 0.1739 0.203 0.293 + 190 0.6667 0.2500 0.941 1.270 + 191 0.4000 0.2000 0.580 0.480 + 192 0.6250 0.2273 0.369 0.414 + 193 0.0000 0.1500 1.836 1.340 + 194 0.0000 0.2963 1.201 1.470 + 195 0.2500 0.2727 0.304 0.388 + 196 0.3750 0.1818 0.540 0.690 + 197 0.4286 0.1304 0.300 0.467 + 198 0.1667 0.2917 0.159 0.060 + 199 0.2500 0.2727 0.451 0.494 + 200 0.5000 0.2273 0.499 0.700 + 201 0.4444 0.2381 0.742 0.859 + 202 0.6667 0.4762 0.549 0.681 + 203 0.6875 0.2143 0.594 0.573 + 204 0.4286 0.2500 0.378 0.384 + 205 0.3000 0.2000 0.547 0.350 + 206 0.8571 0.1739 0.456 0.606 + 207 0.2000 0.2500 0.685 0.654 + 208 0.5714 0.2609 0.898 2.058 + 209 0.6000 0.4500 0.807 1.288 + 210 0.2667 0.2667 0.874 1.104 + 211 0.6250 0.1818 0.746 0.974 + 212 0.4444 0.2857 0.493 0.627 + 213 0.5000 0.2500 0.528 0.929 + 214 0.5000 0.1500 0.391 0.599 + 215 0.3750 0.2273 1.122 1.743 + 216 0.6250 0.2273 0.271 0.317 + 217 0.6000 0.3000 0.751 1.277 + 218 0.5000 0.1111 0.436 0.495 + 219 0.3750 0.2273 0.299 0.511 + 220 0.3750 0.2273 0.635 0.686 + 221 0.5000 0.2727 0.691 0.515 + 222 0.5000 0.2000 1.161 1.418 + 223 0.2222 0.0476 0.087 0.060 + 224 0.3333 0.3704 0.370 0.288 + 225 0.3636 0.1053 0.285 0.414 + 226 0.5000 0.1667 0.404 0.327 + 227 0.4286 0.1739 0.348 0.470 + 228 0.2857 0.3043 0.596 0.695 + 229 0.5556 0.1905 0.260 0.249 + 230 0.6667 0.1429 0.302 0.548 + 231 0.6667 0.0952 0.267 0.412 + 232 0.5000 0.2727 0.404 0.446 + 233 0.7000 0.2500 0.227 0.310 + 234 0.5833 0.1667 0.297 0.287 + 235 0.4000 0.2000 0.191 0.153 + 236 0.2500 0.1818 0.123 0.098 + 237 0.5000 0.0833 0.842 0.791 + 238 0.8000 0.1600 0.514 0.576 + 239 0.6250 0.1364 0.330 0.328 + 240 0.5000 0.3182 0.407 0.538 + 241 0.2727 0.0526 0.103 0.046 + 242 0.2500 0.1923 0.271 0.189 + 243 0.1667 0.2083 0.674 1.120 + 244 0.5000 0.2083 0.231 0.164 + 245 0.6250 0.2273 0.877 0.987 + 246 0.4000 0.2500 0.225 0.146 + 247 0.1111 0.1429 0.255 0.176 + 248 0.5000 0.1154 0.202 0.071 + 249 0.2000 0.1200 0.260 0.274 + 250 0.5000 0.2692 0.344 0.260 + 251 0.5556 0.1429 0.622 0.696 + 252 0.3750 0.0909 0.728 0.881 + 253 0.6000 0.1600 0.197 0.115 + 254 0.7143 0.3043 0.606 1.191 + 255 0.5000 0.1667 0.528 0.434 + 256 0.4444 0.1905 0.474 0.592 + 257 0.3750 0.1818 0.835 1.062 + 258 0.7143 0.1304 0.420 0.493 + 259 0.7500 0.2727 0.228 0.276 + 260 0.4167 0.1111 0.721 0.668 + 261 0.2857 0.1739 0.340 0.240 + 262 0.5000 0.1250 0.379 0.417 + 263 0.3333 0.1250 0.602 0.578 + 264 0.6000 0.2000 0.743 0.628 + 265 0.1250 0.1364 0.350 0.374 + 266 0.7500 0.1538 0.465 0.554 + 267 0.4286 0.1304 0.355 0.425 + 268 0.0000 0.1250 0.423 0.201 + 269 0.3333 0.0741 0.543 0.405 + 270 0.6667 0.0000 0.381 0.072 + 271 0.5000 0.0714 0.563 0.281 + 272 1.0000 0.2222 0.471 0.342 + 273 0.3333 0.0952 0.150 0.230 + 274 0.6000 0.0400 0.150 0.209 + 275 0.5000 0.0000 0.020 0.014 + 276 0.5000 0.1429 0.368 0.350 + 277 0.6000 0.1200 0.398 0.648 + 278 0.3333 0.1667 0.405 0.607 + 279 0.3333 0.1667 0.898 1.498 + 280 0.1667 0.0000 0.100 0.000 + 281 0.0000 0.2069 0.623 0.881 + 282 0.3333 0.1667 0.348 0.262 + 283 0.1667 0.1667 0.414 0.439 + 284 0.4000 0.1200 0.224 0.147 + 285 0.4000 0.0800 0.865 0.849 + 286 0.2500 0.1538 0.320 0.415 + 287 0.2000 0.2000 0.126 0.055 + 288 0.3333 0.0833 0.298 0.259 + 289 0.5000 0.1154 0.190 0.156 + 290 1.0000 0.1600 0.369 0.460 + 291 0.4444 0.0000 0.165 0.093 + 292 0.2500 0.0769 1.270 1.654 + 293 0.6667 0.1111 0.287 0.284 + 294 0.0000 0.1200 0.473 0.390 + 295 0.3333 0.1111 0.888 1.057 + 296 0.7500 0.0000 0.197 0.144 + 297 0.6667 0.0741 0.153 0.153 + 298 0.2500 0.2308 0.227 0.285 + 299 0.1429 0.0435 0.460 0.608 + 300 0.5000 0.0714 0.063 0.058 + 301 0.3333 0.0370 0.050 0 + 302 0.0000 0.0714 0.205 0.219 + 303 0.5000 0.1429 0.186 0.183 + 304 0.4000 0.1600 0.342 0.406 + 305 0.1667 0.1667 0.422 0.368 + 306 0.4000 0.2400 0.296 0.350 + 307 0.2500 0.0455 0.202 0.159 + 308 0.3333 0.0741 0.178 0.137 + 309 0.3333 0.0741 0.293 0.240 + 310 0.3333 0.1111 0.122 0.140 + 311 0.2500 0.1923 0.135 0.061 + 312 0.5000 0.0833 0.340 0.197 + 313 0.4000 0.2400 0.290 0.202 + 314 0.2500 0.0455 0.078 0.088 + 315 0.3333 0.0741 0.381 0.376 + 316 0.3333 0.0741 0.365 0.437 + 317 0.0000 0.1852 0.325 0.461 + 318 0.4000 0.0800 0.433 0.419 + 319 0.5000 0.1154 0.431 0.239 + 320 0.4000 0.1200 0.332 0.283 + 321 0.2000 0.1200 0.114 0.101 + 322 0.2500 0.0769 0.099 0.073 + 323 0.3333 0.0741 0.396 0.343 + 324 0.3333 0.0370 0.105 0.106 + 325 0.5000 0.0357 0.163 0.194 + 326 0.0000 0.0714 0.430 0.141 + 327 0.0000 0.1429 0.270 0.254 + 328 0.0000 0.1154 0.390 0.207 + 329 0.3333 0.0000 0.100 0.000 + 330 0.0000 0.1034 0.440 0.066 + 331 0.0000 0.0741 0.470 0.127 + 332 0.5000 0.0714 0.087 0.040 + 333 0.0000 0.0741 0.430 0.071 + 334 0.0000 0.0714 0.115 0.092 + 335 0.0000 0.1071 0.137 0.110 + 336 0.0000 0.0741 0.049 0.043 + 337 0.0000 0.0357 0.152 0.000 + 338 0.0000 0.1034 0.288 0.230 + 339 0.0000 0.0741 0.176 0.105 + 340 0.0000 0.1071 0.067 0.029 + 341 0.0000 0.0370 0.030 0.000 + 342 0.0000 0.0690 0.355 0.035 + 343 0.5000 0.1429 0.300 0.234 + 344 0.2000 0.0400 0.355 0.106 + 345 0.5000 0.0000 0.080 0.000 + 346 0.0000 0.0000 0.000 0.000 + 347 0.0000 0.0000 0.000 0.000 + 348 0.0000 0.1000 0.213 0.088 + 349 0.3333 0.0370 0.315 0.092 + 350 0.5000 0.0357 0.220 0.198 + 351 1.0000 0.1071 0.484 0.490 + 352 0.2000 0.0800 0.095 0.030 + 353 0.0000 0.0370 0.130 0.000 + 354 1.0000 0.1034 0.310 0.221 + 355 0.2500 0.1154 0.211 0.210 + 356 0.0000 0.0000 0.000 0.000 + 357 0.0000 0.0000 0.000 0.000 + 358 0.0000 0.0333 0.180 0.000 + 359 0.0000 0.0690 0.203 0.251 + 360 0.5000 0.0714 0.345 0.371 + 361 0.3333 0.0741 0.400 0.265 + 362 0.3333 0.0741 0.162 0.037 + 363 0.0000 0.0370 0.100 0.000 + 364 0.0000 0.0690 0.100 0 + 365 0.0000 0.0357 0.127 0.000 + 366 0.0000 0.0357 0.127 0.000 diff --git a/testing/Input/outsetup.in b/testing/Input/outsetup.in new file mode 100755 index 000000000..1edb846ec --- /dev/null +++ b/testing/Input/outsetup.in @@ -0,0 +1,68 @@ +# Output setup file for SOILWAT2 +# +# Notes: +# Time periods available: DY,WK,MO,YR +# eg, if DY is chosen then 100,200 would mean to use the second hundred days +# But if YR is chosen, start and end numbers are in days so only those days +# are reported for the yearly average. +# Some keys from older versions (fortran and the c versions mimicking the fortran +# version) are not currently implemented: +# ALLH20, WTHR. +# +# ESTABL only produces yearly output, namely, DOY for each species requested. +# Thus, to minimize typo errors, all flags are ignored except the filename. +# Output is simply the day of the year establishment occurred for each species +# in each year of the model run. Refer to the estabs.in file for more info. +# +# DEEPSWC produces output only if the deepdrain flag is set in siteparam.in. +# +# Filename prefixes should not have a file extension. +# Case is unimportant. +# +# SUMTYPEs are one of the following: +# OFF - no output for this variable +# SUM - sum the variable for each day in the output period +# AVG - average the variable over the output period +# FIN - output value of final day in the period; soil water variables only. +# Note that SUM and AVG are the same if timeperiod = dy. +# +# (3-Sep-03) OUTSEP key indicates the output separator. This method +# allows older files to work with the new version. The default is a +# tab. Other options are 's' or 't' for space or tab (no quotes) +# or any other printable character as itself (eg, :;| etc). The given +# separator will apply to all of the output files. Note that only lowercase +# letters 's' or 't' are synonyms. +# +# (01/17/2013) TIMESTEP key indicates which periods you want to output. +# You can output all the periods at a time, just one, or however many +# you want. To change which periods to output type 'dy' for day, +# 'wk' for week, 'mo' for month, and 'yr' for year after TIMESTEP +# in any order. For example: 'TIMESTEP mo wk' will output for month and week +OUTSEP t +TIMESTEP dy yr + +# key SUMTYPE PERIOD start end filename_prefix comment + TEMP AVG WK 1 end temp_air /* max., min, average temperature (C) */ + PRECIP SUM MO 1 end precip /* total precip = sum(rain, snow), rain, snow-fall, snowmelt, and snowloss (cm) */ + SOILINFILT SUM YR 1 end infiltration /* water to infiltrate in top soil layer (cm), runoff (cm); (not-intercepted rain)+(snowmelt-runoff) */ + RUNOFF SUM WK 1 end runoff /* runoff/runon (cm): net runoff, runoff from ponded water, runoff from snowmelt, runon of surface water from hypothetical upslope neighbor */ + VWCBULK AVG MO 1 end vwc_bulk /* bulk volumetric soilwater (cm / layer) */ + VWCMATRIC AVG YR 1 end vwc_matric /* matric volumetric soilwater (cm / layer) */ + SWCBULK AVG DY 1 end swc_bulk /* bulk soilwater content (cm / cm layer); swc.l1(today) = swc.l1(yesterday)+inf_soil-lyrdrain.l1-transp.l1-evap_soil.l1; swc.li(today) = swc.li(yesterday)+lyrdrain.l(i-1)-lyrdrain.li-transp.li-evap_soil.li; swc.llast(today) = swc.llast(yesterday)+lyrdrain.l(last-1)-deepswc-transp.llast-evap_soil.llast */ + SWABULK AVG MO 1 end swa_bulk /* DEFUNCT: MAY BE REMOVED IN FUTURE VERSIONS; bulk available soil water (cm/layer) = swc - wilting point */ + SWAMATRIC AVG YR 1 end swa_matric /* DEFUNCT: MAY BE REMOVED IN FUTURE VERSIONS; matric available soil water (cm/layer) = swc - wilting point */ + SWPMATRIC AVG WK 1 end swp_matric /* matric soilwater potential (-bars) */ + SURFACEWATER AVG DY 1 end surface_water /* surface water (cm) */ + TRANSP SUM YR 1 end transp /* transpiration from each soil layer (cm): total, trees, shrubs, forbs, grasses */ + EVAPSOIL SUM DY 1 end evap_soil /* bare-soil evaporation from each soil layer (cm) */ + EVAPSURFACE SUM WK 1 end evap_surface /* evaporation (cm): total, trees, shrubs, forbs, grasses, litter, surface water */ + INTERCEPTION SUM MO 1 end interception /* intercepted rain (cm): total, trees, shrubs, forbs, grasses, and litter (cm) */ + LYRDRAIN SUM DY 1 end percolation /* water percolated from each layer (cm) */ + HYDRED SUM WK 1 end hydred /* hydraulic redistribution from each layer (cm): total, trees, shrubs, forbs, grasses */ + AET SUM YR 1 end aet /* actual evapotr. (cm) */ + PET SUM DY 1 end pet /* potential evaptr (cm) */ + WETDAY SUM DY 1 end wetdays /* days above swc_wet */ + SNOWPACK AVG WK 1 end snowpack /* snowpack water equivalent (cm), snowdepth (cm); since snowpack is already summed, use avg - sum sums the sums = nonsense */ + DEEPSWC SUM MO 1 end deep_drain /* deep drainage into lowest layer (cm) */ + SOILTEMP AVG MO 1 end temp_soil /* soil temperature from each soil layer (in celsius) */ + ESTABL OFF YR 1 end estabs /* yearly establishment results */ diff --git a/testing/Input/outsetup_v31.in b/testing/Input/outsetup_v31.in deleted file mode 100755 index de7674207..000000000 --- a/testing/Input/outsetup_v31.in +++ /dev/null @@ -1,68 +0,0 @@ -# Output setup file for SOILWAT -# -# Notes: -# Time periods available: DY,WK,MO,YR -# eg, if DY is chosen then 100,200 would mean to use the second hundred days -# But if YR is chosen, start and end numbers are in days so only those days -# are reported for the yearly average. -# Some keys from older versions (fortran and the c versions mimicking the fortran -# version) are not currently implemented: -# ALLH20, WTHR. -# -# ESTABL only produces yearly output, namely, DOY for each species requested. -# Thus, to minimize typo errors, all flags are ignored except the filename. -# Output is simply the day of the year establishment occurred for each species -# in each year of the model run. Refer to the estabs.in file for more info. -# -# DEEPSWC produces output only if the deepdrain flag is set in siteparam.in. -# -# Filename prefixes should not have a file extension. -# Case is unimportant. -# -# SUMTYPEs are one of the following: -# OFF - no output for this variable -# SUM - sum the variable for each day in the output period -# AVG - average the variable over the output period -# FIN - output value of final day in the period; soil water variables only. -# Note that SUM and AVG are the same if timeperiod = dy. -# -# (3-Sep-03) OUTSEP key indicates the output separator. This method -# allows older files to work with the new version. The default is a -# tab. Other options are 's' or 't' for space or tab (no quotes) -# or any other printable character as itself (eg, :;| etc). The given -# separator will apply to all of the output files. Note that only lowercase -# letters 's' or 't' are synonyms. -# -# (01/17/2013) TIMESTEP key indicates which periods you want to output. -# You can output all the periods at a time, just one, or however many -# you want. To change which periods to output type 'dy' for day, -# 'wk' for week, 'mo' for month, and 'yr' for year after TIMESTEP -# in any order. For example: "TIMESTEP mo wk" will output for month and week -OUTSEP t -TIMESTEP dy wk mo yr - -# key SUMTYPE PERIOD start end filename_prefix -TEMP avg WK 1 end temp_air /* max., min, average air temperature, soil-surface temperature (C) */ -PRECIP sum MO 1 end precip /* total precip = sum(rain, snow), rain, snow-fall, snowmelt, and snowloss (cm) */ -SOILINFILT sum YR 1 end infiltration /* water to infiltrate in top soil layer (cm), runoff (cm); (not-intercepted rain)+(snowmelt-runoff) */ -RUNOFF sum WK 1 end runoff /* runoff (cm): total runoff, runoff from ponded water, runoff from snowmelt */ -VWCBULK avg MO 1 end vwc_bulk /* bulk volumetric soilwater (cm / layer) -VWCMATRIC avg YR 1 end vwc_matric /* matric volumetric soilwater (cm / layer) -SWCBULK avg DY 1 end swc_bulk /* bulk soilwater content (cm / cm layer); swc.l1(today) = swc.l1(yesterday)+inf_soil-lyrdrain.l1-transp.l1-evap_soil.l1; swc.li(today) = swc.li(yesterday)+lyrdrain.l(i-1)-lyrdrain.li-transp.li-evap_soil.li; swc.llast(today) = swc.llast(yesterday)+lyrdrain.l(last-1)-deepswc-transp.llast-evap_soil.llast */ -SWABULK avg MO 1 end swa_bulk /* DEFUNCT: MAY BE REMOVED IN FUTURE VERSIONS; bulk available soil water (cm/layer) = swc - wilting point */ -SWAMATRIC avg YR 1 end swa_matric /* DEFUNCT: MAY BE REMOVED IN FUTURE VERSIONS; matric available soil water (cm/layer) = swc - wilting point */ -SWPMATRIC avg WK 1 end swp_matric /* matric soilwater potential (-bars) */ -SURFACEWATER avg DY 1 end surface_water /* surface water (cm) */ -TRANSP sum YR 1 end transp /* transpiration from each soil layer (cm): total, trees, shrubs, forbs, grasses */ -EVAPSOIL sum DY 1 end evap_soil /* bare-soil evaporation from each soil layer (cm) */ -EVAPSURFACE sum WK 1 end evap_surface /* evaporation (cm): total, trees, shrubs, forbs, grasses, litter, surface water */ -INTERCEPTION sum MO 1 end interception /* intercepted rain (cm): total, trees, shrubs, forbs, grasses, and litter (cm) */ -LYRDRAIN sum DY 1 end percolation /* water percolated from each layer (cm) */ -HYDRED sum WK 1 end hydred /* hydraulic redistribution from each layer (cm): total, trees, shrubs, forbs, grasses */ -AET sum YR 1 end aet /* actual evapotr. (cm) */ -PET sum DY 1 end pet /* potential evaptr (cm) */ -WETDAY sum DY 1 end wetdays /* days above swc_wet */ -SNOWPACK avg WK 1 end snowpack /* snowpack water equivalent (cm), snowdepth (cm); since snowpack is already summed, use avg - sum sums the sums = nonsense */ -DEEPSWC sum MO 1 end deep_drain /* deep drainage into lowest layer (cm) */ -SOILTEMP avg MO 1 end temp_soil /* soil temperature from each soil layer (in celsius) -ESTABL off YR 1 end estabs /* yearly establishment results */ diff --git a/testing/Input/siteparam_v26.in b/testing/Input/siteparam.in similarity index 58% rename from testing/Input/siteparam_v26.in rename to testing/Input/siteparam.in index e98399a23..8e53ff616 100644 --- a/testing/Input/siteparam_v26.in +++ b/testing/Input/siteparam.in @@ -1,7 +1,7 @@ # ---- SWC limits ---- -1.0 # swc_min : cm/cm if 0 - <1.0, -bars if >= 1.0.; if < 0. then estimate residual water content for each layer -15.0 # swc_init: cm/cm if < 1.0, -bars if >= 1.0. -15.0 # swc_wet : cm/cm if < 1.0, -bars if >= 1.0. +15.0 # swc_init: cm/cm if < 1.0, -bars if >= 1.0. +15.0 # swc_wet : cm/cm if < 1.0, -bars if >= 1.0. # ---- Model flags and coefficients ---- 0 # reset (1/0): reset/don't reset swc each new year @@ -27,49 +27,48 @@ # These control the tangent function (tanfunc) which affects the amount of soil # water extractable by evaporation and transpiration. # These constants aren't documented by the ELM doc. -45. # rate shift (x value of inflection point). lower value shifts curve - # leftward, meaning less water lost to evap at a given swp. effectively - # shortens/extends high rate. -.1 # rate slope: lower value (eg .01) straightens S shape meaning more gradual - # reduction effect; higher value (.5) makes abrupt transition -.25 # inflection point (y-value of inflection point) -0.5 # range: diff btw upper and lower rates at the limits +45. # rate shift (x value of inflection point). lower value shifts curve + # leftward, meaning less water lost to evap at a given swp. effectively + # shortens/extends high rate. +.1 # rate slope: lower value (eg .01) straightens S shape meaning more gradual + # reduction effect; higher value (.5) makes abrupt transition +.25 # inflection point (y-value of inflection point) +0.5 # range: diff btw upper and lower rates at the limits # ---- Transpiration Coefficients ---- # comments from Evap constants apply. -45. # rate shift -.1 # rate shape -.5 # inflection point -1.1 # range +45. # rate shift +.1 # rate shape +.5 # inflection point +1.1 # range -# ---- Intrinsic site params: Blak, MT (47.06581° N, -108.5826° E, m elevation) ---- -0.8214533 # latitude of the site in radians -1039 # altitude of site (m a.s.l.) -2 # slope at site (degrees): no slope = 0 +# ---- Intrinsic site params: +0.681 # latitude of the site in radians +1000 # elevation of site (m a.s.l.) +0 # slope at site (degrees): no slope = 0 -1 # aspect at site (degrees): N=0, E=90, S=180, W=270, no slope:-1 # ---- Soil Temperature Constants ---- # from Parton 1978, ch. 2.2.2 Temperature-profile Submodel -300. # biomass limiter, 300 g/m^2 in Parton's equation for T1(avg daily temperature at the top of the soil) -15. # constant for T1 equation (used if biomass <= biomass limiter), 15 in Parton's equation +300. # biomass limiter, 300 g/m^2 in Parton's equation for T1(avg daily temperature at the top of the soil) +15. # constant for T1 equation (used if biomass <= biomass limiter), 15 in Parton's equation -4. # constant for T1 equation (used if biomass > biomass limiter), -4 in Parton's equation -600. # constant for T1 equation (used if biomass > biomass limiter), 600 in Parton's equation -0.00070 # constant for cs (soil-thermal conductivity) equation, 0.00070 in Parton's equation -0.00030 # constant for cs equation, 0.00030 in Parton's equation -0.18 # constant for sh (specific heat capacity) equation, 0.18 in Parton's equation -6.69 # constant mean air temperature (the soil temperature at the lower boundary, 180 cm) in celsius +600. # constant for T1 equation (used if biomass > biomass limiter), 600 in Parton's equation +0.00070 # constant for cs (soil-thermal conductivity) equation, 0.00070 in Parton's equation +0.00030 # constant for cs equation, 0.00030 in Parton's equation +0.18 # constant for sh (specific heat capacity) equation, 0.18 in Parton's equation +4.15 # constant soil temperature (Celsius) at the lower boundary (max depth); approximate by mean annual air temperature of site 15. # deltaX parameter for soil_temperature function, default is 15. (distance between profile points in cm) max depth (the next number) should be evenly divisible by this number -990. # max depth for the soil_temperature function equation, default is 180. this number should be evenly divisible by deltaX +990. # max depth for the soil_temperature function equation, default is 180. this number should be evenly divisible by deltaX 0 # flag, 1 to calculate soil_temperature, 0 to not calculate soil_temperature # ---- Transpiration regions ---- # ndx : 1=shallow, 2=medium, 3=deep, 4=very deep -# layer: deepest layer number of the region. -# Grasses Shrubs Trees Forbs +# layer: deepest layer number of the region. # Layers are defined in soils.in. # ndx layer - 1 2 - 2 4 - 3 5 -# 4 6 + 1 3 + 2 5 + 3 8 +# 4 20 diff --git a/testing/Input/soils.in b/testing/Input/soils.in new file mode 100644 index 000000000..1501c4752 --- /dev/null +++ b/testing/Input/soils.in @@ -0,0 +1,24 @@ +# Soil layer definitions +# Location: +# +# depth = (cm) lower limit of layer; layers must be in order of depth. +# matricd = (g/cm^3) bulk density of soil in this layer. +# gravel_content = the percent volume of each layer composed of gravel (i.e., particles > 2mm) +# evco = (frac) proportion of total baresoil evap from this layer. +# trco = (frac) proportion of total transpiration from this layer for each vegetation type (tree, forb, shrub, grass) +# %sand = (frac) proportion of sand in layer (0-1.0). +# %clay = (frac) proportion of clay in layer (0-1.0). +# imperm = (frac) proportion of 'impermeability' to water percolation(/infiltration/drainage) in layer (0-1.0) +# soiltemp = the initial temperature of each soil layer (in celcius), from the day before the simulation starts +# Note that the evco and trco columns must sum to 1.0 or they will +# be normalized. +# +# depth matricd gravel_content evco trco_grass trco_shrub trco_tree trco_forb %sand %clay imperm soiltemp + 5.000 1.430 0.100 0.812 0.033 0.134 0.033 0.134 0.510 0.150 0.000 1.000 + 10.000 1.410 0.100 0.153 0.033 0.094 0.033 0.094 0.440 0.260 0.000 1.000 + 20.000 1.390 0.100 0.034 0.067 0.176 0.067 0.176 0.350 0.410 0.000 2.000 + 30.000 1.390 0.100 0.000 0.067 0.175 0.067 0.175 0.320 0.450 0.000 3.000 + 40.000 1.380 0.200 0.000 0.067 0.110 0.067 0.110 0.310 0.470 0.000 3.000 + 60.000 1.150 0.200 0.000 0.133 0.179 0.133 0.179 0.320 0.470 0.000 4.000 + 80.000 1.310 0.200 0.000 0.133 0.101 0.133 0.101 0.570 0.280 0.000 4.000 +100.000 1.310 0.200 0.000 0.133 0.101 0.133 0.101 0.570 0.280 0.000 4.000 diff --git a/testing/Input/soils_v30.in b/testing/Input/soils_v30.in deleted file mode 100644 index 454351b8b..000000000 --- a/testing/Input/soils_v30.in +++ /dev/null @@ -1,26 +0,0 @@ -# Soil layer definitions -# Location: -# -# depth = (cm) lower limit of layer; layers must be in order of depth. -# matricd = (g/cm^3) bulk density of soil in this layer. -# gravel_content = the percent volume of each layer composed of gravel (i.e., particles > 2mm) -# evco = (frac) proportion of total baresoil evap from this layer. -# trco = (frac) proportion of total transpiration from this layer for each vegetation type (tree, forb, shrub, grass) -# %sand = (frac) proportion of sand in layer (0-1.0). -# %clay = (frac) proportion of clay in layer (0-1.0). -# imperm = (frac) proportion of 'impermeability' to water percolation(/infiltration/drainage) in layer (0-1.0) -# soiltemp = the initial temperature of each soil layer (in celcius), from the day before the simulation starts -# Note that the evco and trco columns must sum to 1.0 or they will -# be normalized. -# Soil texture data for 3 top layers from Trace's MT data. Rest of soil texture from STATSGO. -# Note: matricd, evco, soil temp for all soil layers from Bradford & Lauenroth 2006 Appendix. - -# depth matricd gravel_content evco trco_grass trco_shrub trco_tree trco_forb %sand %clay imperm soiltemp - 10.000 1.430 0.000 0.500 0.100 0.100 0.100 0.100 0.450 0.18 0.000 0.186 - 20.000 1.410 0.000 0.350 0.250 0.250 0.250 0.250 0.480 0.19 0.000 0.372 - 30.000 1.390 0.000 0.150 0.300 0.300 0.300 0.300 0.530 0.16 0.000 0.744 - 40.000 1.390 0.000 0.000 0.200 0.200 0.200 0.200 0.530 0.16 0.000 1.116 - 60.000 1.380 0.000 0.000 0.100 0.100 0.100 0.100 0.530 0.16 0.000 1.488 - 80.000 1.150 0.000 0.000 0.050 0.050 0.050 0.050 0.530 0.16 0.000 2.232 - 100.00 1.310 0.000 0.000 0.000 0.000 0.000 0.000 0.530 0.16 0.000 2.975 - 150.00 1.310 0.000 0.000 0.000 0.000 0.000 0.000 0.530 0.16 0.000 2.975 diff --git a/testing/Input/swcsetup.in b/testing/Input/swcsetup.in index 870c1dbef..3eaf30696 100755 --- a/testing/Input/swcsetup.in +++ b/testing/Input/swcsetup.in @@ -1,7 +1,7 @@ # Setup parameters for measured swc # Location: - # -0 # 1=use swcdata history data file, 0= don't use -swcdata # input data file prefix -1949 # first year of measurement data files -2 # method: 1=average with model; 2=measured+/- stderr +0 # 1=use swcdata history data file, 0= don't use +swcdata # input data file prefix +1949 # first year of measurement data files +2 # method: 1=average with model; 2=measured+/- stderr diff --git a/testing/Input/sbe_prod_v31.in b/testing/Input/veg.in similarity index 53% rename from testing/Input/sbe_prod_v31.in rename to testing/Input/veg.in index 6814ebe4f..a9e1d70ea 100755 --- a/testing/Input/sbe_prod_v31.in +++ b/testing/Input/veg.in @@ -1,77 +1,77 @@ -# Plant production data file for SOILWAT -# Location: +# Plant production data file for SOILWAT2 +# Location: # ---- Composition of vegetation type components (0-1; must add up to 1) -# Grasses Shrubs Trees Forbs Bare Ground -0.0 0.0 0.0 1.0 0.0 +# Grasses Shrubs Trees Forbs BareGround + 0.2 0.2 0.2 0.2 0.2 # ---- Albedo -# Grasses Shrubs Trees Forbs Bare Ground -0.167 0.143 0.106 0.167 0.15 # albedo: (Houldcroft et al. 2009) MODIS snowfree 'grassland', 'open shrub', ‘evergreen needle forest’ with MODIS albedo aggregated over pure IGBP cells where NDVI is greater than the 98th percentile NDVI +# Grasses Shrubs Trees Forbs BareGround + 0.167 0.143 0.106 0.167 0.15 # albedo: (Houldcroft et al. 2009) MODIS snowfree 'grassland', 'open shrub', ‘evergreen needle forest’ with MODIS albedo aggregated over pure IGBP cells where NDVI is greater than the 98th percentile NDVI # ---- % Cover: divide standing LAI by this to get % cover -# Grasses Shrubs Trees Forbs -3.0 2.22 5. 3.0 +# Grasses Shrubs Trees Forbs + 3.0 2.22 5.0 3.0 # -- Canopy height (cm) parameters either constant through season or as tanfunc with respect to biomass (g/m^2) -# Grasses Shrubs Trees Forbs -300.0 0.0 0.0 300.0 # xinflec -29.5 5.0 5.0 29.5 # yinflec -85. 100. 3000. 85. # range -0.002 0.003 0.00008 0.002 # slope -0. 50. 1200. 0. # if > 0 then constant canopy height (cm) +# Grasses Shrubs Trees Forbs + 300.0 0.0 0.0 300.0 # xinflec + 29.5 5.0 5.0 29.5 # yinflec + 85. 100. 3000. 85. # range + 0.002 0.003 0.00008 0.002 # slope + 0.0 50. 1200. 0.0 # if > 0 then constant canopy height (cm) # --- Vegetation interception parameters for equation: intercepted rain = (a + b*veg) + (c+d*veg) * ppt; Grasses+Shrubs: veg=vegcov, Trees: veg=LAI -# Grasses Shrubs Trees Forbs -0.0182 0. 0.00461 0.0182 # a -0.0065 0.0026 0.01405 0.0065 # b -0.0019 0. 0.0383 0.0019 # c -0.0054 0.0033 0.0337 0.0054 # d +# Grasses Shrubs Trees Forbs + 0.0182 0. 0.00461 0.0182 # a + 0.0065 0.0026 0.01405 0.0065 # b + 0.0019 0. 0.0383 0.0019 # c + 0.0054 0.0033 0.0337 0.0054 # d # --- Litter interception parameters for equation: intercepted rain = (a + b*litter) + (c+d*litter) * ppt -# Grass-Litter Shrub-Litter Tree-Litter Forbs-Litter -0.0151 0.0151 0.0151 0.0151 # a -0.00005 0.00005 0.00005 0.00005 # b -0.0116 0.0116 0.0116 0.0116 # c -0.00002 0.00002 0.00002 0.00002 # d +# Grasses Shrubs Trees Forbs + 0.0151 0.0151 0.0151 0.0151 # a + 0.00005 0.00005 0.00005 0.00005 # b + 0.0116 0.0116 0.0116 0.0116 # c + 0.00002 0.00002 0.00002 0.00002 # d # ---- Parameter for partitioning of bare-soil evaporation and transpiration as in Es = exp(-param*LAI) -# Grasses Shrubs Trees Forbs -1. 1. 0.41 1. # Trees: According to a regression based on a review by Daikoku, K., S. Hattori, A. Deguchi, Y. Aoki, M. Miyashita, K. Matsumoto, J. Akiyama, S. Iida, T. Toba, Y. Fujita, and T. Ohta. 2008. Influence of evaporation from the forest floor on evapotranspiration from the dry canopy. Hydrological Processes 22:4083-4096. +# Grasses Shrubs Trees Forbs + 1. 1. 0.41 1. # Trees: According to a regression based on a review by Daikoku, K., S. Hattori, A. Deguchi, Y. Aoki, M. Miyashita, K. Matsumoto, J. Akiyama, S. Iida, T. Toba, Y. Fujita, and T. Ohta. 2008. Influence of evaporation from the forest floor on evapotranspiration from the dry canopy. Hydrological Processes 22:4083-4096. # ---- Parameter for scaling and limiting bare soil evaporation rate: if totagb (g/m2) > param then no bare-soil evaporation -# Grasses Shrubs Trees Forbs -999. 999. 2099. 999. # +# Grasses Shrubs Trees Forbs + 999. 999. 2099. 999. # -# --- Shade effects on transpiration based on live and dead biomass -# Grasses Shrubs Trees Forbs -0.3 0.3 0.3 0.3 # shade scale -150. 150. 150. 150. # shade maximal dead biomass -300. 300. 0. 300. # tanfunc: xinflec -12. 12. 0. 12. # yinflec -34. 34. 2. 34. # range -0.002 0.002 0.0002 0.002 # slope +# --- Shade effects on transpiration based on live and dead biomass +# Grasses Shrubs Trees Forbs + 0.3 0.3 0.3 0.3 # shade scale + 150. 150. 150. 150. # shade maximal dead biomass + 300. 300. 0. 300. # tanfunc: xinflec + 12. 12. 0. 12. # yinflec + 34. 34. 2. 34. # range + 0.002 0.002 0.0002 0.002 # slope # ---- Hydraulic redistribution: Ryel, Ryel R, Caldwell, Caldwell M, Yoder, Yoder C, Or, Or D, Leffler, Leffler A. 2002. Hydraulic redistribution in a stand of Artemisia tridentata: evaluation of benefits to transpiration assessed with a simulation model. Oecologia 130: 173-184. -# Grasses Shrubs Trees Forbs -1 1 1 1 # flag to turn on/off (1/0) hydraulic redistribution --0.2328 -0.2328 -0.2328 -0.2328 # maxCondroot - maximum radial soil-root conductance of the entire active root system for water (cm/-bar/day) = 0.097 cm/MPa/h -10. 10. 10. 10. # swp50 - soil water potential (-bar) where conductance is reduced by 50% = -1. MPa -3.22 3.22 3.22 3.22 # shapeCond - shaping parameter for the empirical relationship from van Genuchten to model relative soil-root conductance for water +# Grasses Shrubs Trees Forbs + 1 1 1 1 # flag to turn on/off (1/0) hydraulic redistribution + -0.2328 -0.2328 -0.2328 -0.2328 # maxCondroot - maximum radial soil-root conductance of the entire active root system for water (cm/-bar/day) = 0.097 cm/MPa/h + 10. 10. 10. 10. # swp50 - soil water potential (-bar) where conductance is reduced by 50% = -1. MPa + 3.22 3.22 3.22 3.22 # shapeCond - shaping parameter for the empirical relationship from van Genuchten to model relative soil-root conductance for water # ---- Critical soil water potential (MPa), i.e., when transpiration rates cannot sustained anymore, for instance, for many crop species -1.5 MPa is assumed and called wilting point -# Grasses Shrubs Trees Forbs --3.5 -3.9 -2.0 -2.0 +# Grasses Shrubs Trees Forbs + -3.5 -3.9 -2.0 -2.0 # Grasslands component: @@ -112,21 +112,21 @@ 104.3 214.0 0.06 372 # December # Forest component: -#Litter Biomass %Live LAI_conv -2000 15000 0.083 500 # January -2000 15000 0.083 500 # February -2000 15000 0.083 500 # March -2000 15000 0.083 500 # April -2000 15000 0.083 500 # May -2000 15000 0.083 500 # June -2000 15000 0.083 500 # July -2000 15000 0.083 500 # August -2000 15000 0.083 500 # September -2000 15000 0.083 500 # October -2000 15000 0.083 500 # November -2000 15000 0.083 500 # December - -# FORB component: +#Litter Biomass %Live LAI_conv +2000 15000 0.083 500 # January +2000 15000 0.083 500 # February +2000 15000 0.083 500 # March +2000 15000 0.083 500 # April +2000 15000 0.083 500 # May +2000 15000 0.083 500 # June +2000 15000 0.083 500 # July +2000 15000 0.083 500 # August +2000 15000 0.083 500 # September +2000 15000 0.083 500 # October +2000 15000 0.083 500 # November +2000 15000 0.083 500 # December + +# Forb component: #Litter Biomass %Live LAI_conv 75.0 150.0 0.00 300. # January 80.0 150.0 0.00 300. # February diff --git a/testing/Input/weathsetup.in b/testing/Input/weathsetup.in new file mode 100755 index 000000000..1d74f9f6b --- /dev/null +++ b/testing/Input/weathsetup.in @@ -0,0 +1,31 @@ +# Weather setup parameters +# +1 # 1 = simulate snow processes; 0 = no snow effects +0.0 # % of snow drift per snow event (+ indicates snow addition, - indicates snow taken away from site) +0.0 # % of snowmelt water as runoff/on per event (>0 indicates runoff, <0 indicates runon) +0 # 0 = use historical data only; 1 = use markov process for missing weather +1980 # first year to begin historical weather. +5 # number of days to use in the running average of temperature. + +# Monthly scaling parameters: +# Month 1 = January, Month 2 = February, etc. +# PPT = multiplicative for daily PPT; max(0, scale * ppt) +# MaxT = additive for daily max temperature [C]; scale + maxtemp +# MinT = additive for daily min temperature [C]; scale + mintemp +# SkyCover = additive for mean monthly sky cover [%]; min(100, max(0, scale + sky cover)) +# Wind = multiplicative for mean monthly wind speed; max(0, scale * wind speed) +# rH = additive for mean monthly relative humidity [%]; min(100, max(0, scale + rel. Humidity)) +# Transmissivity = multiplicative for mean monthly relative transmissivity; min(1, max(0, scale * transmissivity)) +#Mon PPT MaxT MinT SkyCover Wind rH Transmissivity +1 1.000 0.00 0.00 0.0 1.0 0.0 1.0 +2 1.000 0.00 0.00 0.0 1.0 0.0 1.0 +3 1.000 0.00 0.00 0.0 1.0 0.0 1.0 +4 1.000 0.00 0.00 0.0 1.0 0.0 1.0 +5 1.000 0.00 0.00 0.0 1.0 0.0 1.0 +6 1.000 0.00 0.00 0.0 1.0 0.0 1.0 +7 1.000 0.00 0.00 0.0 1.0 0.0 1.0 +8 1.000 0.00 0.00 0.0 1.0 0.0 1.0 +9 1.000 0.00 0.00 0.0 1.0 0.0 1.0 +10 1.000 0.00 0.00 0.0 1.0 0.0 1.0 +11 1.000 0.00 0.00 0.0 1.0 0.0 1.0 +12 1.000 0.00 0.00 0.0 1.0 0.0 1.0 diff --git a/testing/Input/weathsetup_v20.in b/testing/Input/weathsetup_v20.in deleted file mode 100755 index 369d2660f..000000000 --- a/testing/Input/weathsetup_v20.in +++ /dev/null @@ -1,32 +0,0 @@ -# Weather setup parameters -# Location: Chimney Park, WY (41.068° N, 106.1195° W, 2740 m elevation) -# -1 # 1=allow snow accumulation, 0=no snow effects. -0 # % of snow drift per snow event (+ indicates snow addition, - indicates snow taken away from site) -0 # % of snowmelt water as runoff/on per event (>0 indicates runoff, <0 indicates runon) -1 # 0=use historical data only, 1=use markov process for missing weather. -1980 # first year to begin historical weather. -5 # number of days to use in the running average of temperature. - -# Monthly scaling parameters: -# Month 1 = January, Month 2 = February, etc. -# PPT = multiplicative for daily PPT; max(0, scale * ppt) -# MaxT = additive for daily max temperature [C]; scale + maxtemp -# MinT = additive for daily min temperature [C]; scale + mintemp -# SkyCover = additive for mean monthly sky cover [%]; min(100, max(0, scale + sky cover)) -# Wind = multiplicative for mean monthly wind speed; max(0, scale * wind speed) -# rH = additive for mean monthly relative humidity [%]; min(100, max(0, scale + rel. Humidity)) -# Transmissivity = multiplicative for mean monthly relative transmissivity; min(1, max(0, scale * transmissivity)) -#Mon PPT MaxT MinT SkyCover Wind rH Transmissivity -1 1.000 0.00 0.00 0.0 1.0 0.0 1.0 -2 1.000 0.00 0.00 0.0 1.0 0.0 1.0 -3 1.000 0.00 0.00 0.0 1.0 0.0 1.0 -4 1.000 0.00 0.00 0.0 1.0 0.0 1.0 -5 1.000 0.00 0.00 0.0 1.0 0.0 1.0 -6 1.000 0.00 0.00 0.0 1.0 0.0 1.0 -7 1.000 0.00 0.00 0.0 1.0 0.0 1.0 -8 1.000 0.00 0.00 0.0 1.0 0.0 1.0 -9 1.000 0.00 0.00 0.0 1.0 0.0 1.0 -10 1.000 0.00 0.00 0.0 1.0 0.0 1.0 -11 1.000 0.00 0.00 0.0 1.0 0.0 1.0 -12 1.000 0.00 0.00 0.0 1.0 0.0 1.0 \ No newline at end of file diff --git a/testing/Input/years.in b/testing/Input/years.in index 2ae024a47..b5ff10737 100755 --- a/testing/Input/years.in +++ b/testing/Input/years.in @@ -1,8 +1,7 @@ # Model time definition file -# Location: P1 -1980 # starting year (but see weather and swc inputs) -2280 # ending year -1 # first day of first year -365 # ending day of last year -N # hemisphere (N, S) +1980 # first year of simulation (but see weather and swc inputs) +2010 # last year of simulation +1 # first day of first year +365 # last day of last year +N # hemisphere (N, S) diff --git a/testing/files.in b/testing/files.in new file mode 100755 index 000000000..b594c0b69 --- /dev/null +++ b/testing/files.in @@ -0,0 +1,28 @@ +# List of input files for SOILWAT2 +# This is the first file read. + +# Model +Input/years.in # years for model operation +Output/logfile.log # errors or important info (can also be stdout) + +#Site +Input/siteparam.in # site parameters +Input/soils.in # soil layer definitions + +#Weather & climate +Input/weathsetup.in # weather parameters +Input/data_weather/weath # data file containing historical weather (can include path) +Input/mkv_prob.in # precip probs; required for markov weather +Input/mkv_covar.in # covariance table required for markov weather +Input/climate.in # general atmospheric params + +#Vegetation +Input/veg.in # productivity values +Input/estab.in # plant establishment start file + +#SWC measurements +Input/swcsetup.in # params for handling measured swc + +#Output +Output/ # 'relative' path for output files: / for same directory, or e.g., Output/ +Input/outsetup.in # define output quantities diff --git a/testing/files_step_soilwat.in b/testing/files_step_soilwat.in index 2f7e7e027..89c306a1f 100755 --- a/testing/files_step_soilwat.in +++ b/testing/files_step_soilwat.in @@ -1,23 +1,23 @@ -# List of input files for SOILWAT v32 -# This is the first file read. Simulation information = +# List of input files for SOILWAT2 +# This is the first file read. # Model Input/years.in # years for model operation Output/logfile.log # errors or important info (can also be stdout) #Site -Input/siteparam_v26.in # site parameters -Input/soils_v30.in # soil layer definitions +Input/siteparam.in # site parameters +Input/soils.in # soil layer definitions -#Weather -Input/weathsetup_v20.in # weather parameters -../../sw_src/testing/Input/data_39.0625_-119.4375/weath # data file containing historical weather (can include path) -../../sw_src/testing/Input/data_39.0625_-119.4375/mkv_prob.in # precip probs; required for markov weather -../../sw_src/testing/Input/data_39.0625_-119.4375/mkv_covar.in # covariance table required for markov weather -../../sw_src/testing/Input/data_39.0625_-119.4375/cloud_v20.in # general atmospheric params +#Weather & climate +Input/weathsetup.in # weather parameters +../../sw_src/testing/Input/data_weather/weath # data file containing historical weather (can include path) +../../sw_src/testing/Input/mkv_prob.in # precip probs; required for markov weather +../../sw_src/testing/Input/mkv_covar.in # covariance table required for markov weather +../../sw_src/testing/Input/climate.in # general atmospheric params #Vegetation -Input/sbe_prod_v31.in # productivity values +Input/veg.in # productivity values Input/estab_v32.in # plant establishment start file #SWC measurements @@ -25,4 +25,4 @@ Input/swcsetup.in # params for handling measured swc #Output ../../sw_src/testing/Output/ # 'relative' path for output files: / for same directory, or e.g., Output/ -Input/outsetup_v31.in # define output quantities +Input/outsetup.in # define output quantities diff --git a/testing/files_step_soilwat_grid.in b/testing/files_step_soilwat_grid.in index cd3248ead..5f6d64cf8 100644 --- a/testing/files_step_soilwat_grid.in +++ b/testing/files_step_soilwat_grid.in @@ -1,23 +1,23 @@ -# List of input files for SOILWAT v32 -# This is the first file read. Simulation information = +# List of input files for SOILWAT2 +# This is the first file read. # Model Input/years.in # years for model operation Output/logfile.log # errors or important info (can also be stdout) #Site -Input/siteparam_v26.in # site parameters -Input/soils_v30.in # soil layer definitions +Input/siteparam.in # site parameters +Input/soils.in # soil layer definitions -#Weather -Input/weathsetup_v20.in # weather parameters -../sw_src/testing/Input/data_39.0625_-119.4375/weath # data file containing historical weather (can include path) -../../sw_src/testing/Input/data_39.0625_-119.4375/mkv_prob.in # precip probs; required for markov weather -../../sw_src/testing/Input/data_39.0625_-119.4375/mkv_covar.in # covariance table required for markov weather -../../sw_src/testing/Input/data_39.0625_-119.4375/cloud_v20.in # general atmospheric params +#Weather & climate +Input/weathsetup.in # weather parameters +../sw_src/testing/Input/data_weather/weath # data file containing historical weather (can include path) +../../sw_src/testing/Input/mkv_prob.in # precip probs; required for markov weather +../../sw_src/testing/Input/mkv_covar.in # covariance table required for markov weather +../../sw_src/testing/Input/climate.in # general atmospheric params #Vegetation -Input/sbe_prod_v31.in # productivity values +Input/veg.in # productivity values Input/estab_v32_grid.in # plant establishment start file #SWC measurements @@ -25,4 +25,4 @@ Input/swcsetup.in # params for handling measured swc #Output ../sw_src/testing/Output/ # 'relative' path for output files: / for same directory, or e.g., Output/ -Input/outsetup_v31.in # define output quantities +Input/outsetup.in # define output quantities diff --git a/testing/files_v31.in b/testing/files_v31.in deleted file mode 100755 index 8c5a60b30..000000000 --- a/testing/files_v31.in +++ /dev/null @@ -1,28 +0,0 @@ -# List of input files for SOILWAT v32 -# This is the first file read. Simulation information = - -# Model -Input/years.in # years for model operation -Output/logfile.log # errors or important info (can also be stdout) - -#Site -Input/siteparam_v26.in # site parameters -Input/soils_v30.in # soil layer definitions - -#Weather -Input/weathsetup_v20.in # weather parameters -Input/data_39.0625_-119.4375/weath # data file containing historical weather (can include path) -Input/data_39.0625_-119.4375/mkv_prob.in # precip probs; required for markov weather -Input/data_39.0625_-119.4375/mkv_covar.in # covariance table required for markov weather -Input/data_39.0625_-119.4375/cloud_v20.in # general atmospheric params - -#Vegetation -Input/sbe_prod_v31.in # productivity values -Input/estab.in # plant establishment start file - -#SWC measurements -Input/swcsetup.in # params for handling measured swc - -#Output -Output/ # 'relative' path for output files: / for same directory, or e.g., Output/ -Input/outsetup_v31.in # define output quantities