Merge remote-tracking branch 'origin/develop'

Author: jdub

.github/workflows/ci.yml

@@ -90,7 +90,7 @@ jobs:
       uses: conda-incubator/setup-miniconda@v2.0.0
       with:
         python-version: ${{ matrix.python-version }}
-        mamba-version: "*"
+        mamba-version: "0.20.0"
         channels: conda-forge
         auto-update-conda: true
         activate-environment: pyemu
@@ -102,7 +102,7 @@ jobs:
         if [ "$RUNNER_OS" == "Windows" ]; then
           conda env update --name pyemu --file etc/environment.yml
         else
-          mamba env update --name pyemu --file etc/environment.yml
+          conda env update --name pyemu --file etc/environment.yml
         fi
     
     - name: Install Flopy & pyemu?

benchmarks/basic_tests.py

@@ -702,8 +702,22 @@ def tplins1_test():
     pst = pyemu.Pst(os.path.join(t_d,"pest.pst"))
     ins_file = os.path.join(t_d,"AOC_obs.txt.ins")
     pst.add_observations(ins_file,ins_file.replace(".ins",""),pst_path=".")
-
+    pst.parameter_data.loc["k_10","parval1"] = 12345
+    pst.parameter_data.loc["k_10","parubnd"] = 200000
+    pst.pestpp_options["tpl_force_decimal"] = True
+    pst.control_data.noptmax = 0
+    pst.write(os.path.join(t_d,"pest.pst"))
+    pyemu.os_utils.run("{0} pest.pst".format(exe_path),cwd=t_d)
+    with open(os.path.join(t_d,"hk_Layer_1.ref"),'r') as f:
+        for line in f:
+            if "e" in line.lower():
+                raise Exception(line)
+    pst.pestpp_options.pop("tpl_force_decimal")
+    pst.control_data.noptmax = -1
+    pst.parameter_data.loc["k_10","parval1"] = 120
+    pst.parameter_data.loc["k_10","parubnd"] = 200
     pst.write(os.path.join(t_d,"pest.pst"))
+    
 
     pyemu.os_utils.run("{0} pest.pst".format(exe_path.replace("-ies","-glm")),cwd=t_d)
     obf_df = pd.read_csv(os.path.join(t_d,"out1.dat.obf"),delim_whitespace=True,header=None,names=["obsnme","obsval"])
@@ -721,7 +735,7 @@ def tplins1_test():
 
     # check the input file - the last two number should be the same
     arr = np.loadtxt(os.path.join(t_d,"hk_Layer_1.ref"))
-    assert arr[-2] == arr[-1]
+    assert arr[-2] == arr[-1],arr[-2] - arr[-1]
 
     lines_tpl = open(os.path.join(t_d,"hk_Layer_1.ref.tpl"),'r').readlines()
     lines_in = open(os.path.join(t_d,"hk_Layer_1.ref"),'r').readlines()
@@ -1222,7 +1236,8 @@ def ins_missing_e_test():
     #glm_long_name_test()
     #sen_plusplus_test()
     #parchglim_test()
-    unc_file_test()
+    #unc_file_test()
+    #cmdline_test()
     #secondary_marker_test()
     #basic_test("ies_10par_xsec")
     #glm_save_binary_test()
@@ -1233,7 +1248,7 @@ def ins_missing_e_test():
     #salib_verf()
     #tplins1_test()
     #secondary_marker_test()
-    #ext_stdcol_test()
+    ext_stdcol_test()
 
     # parallel_consist_test()
     # ext_stdcol_test()
@@ -1254,6 +1269,7 @@ def ins_missing_e_test():
     #shutil.copy2(os.path.join("..","exe","windows","x64","Debug","pestpp-opt.exe"),os.path.join("..","bin","win","pestpp-opt.exe"))
     #mf6_v5_opt_stack_test()
     #mf6_v5_glm_test()
+    #mf6_v5_ies_test()
     #cmdline_test()
     #basic_sqp_test()
     #mf6_v5_ies_test()

benchmarks/mf6_freyberg/template/heads.csv

@@ -1,26 +1,26 @@
 time,HEADWATER,TAILWATER,GAGE_1
-1.000000000000,-772.8788083252136,-548.8745128068740,1404.565667925947
-32.00000000000,-987.9132299900953,-700.4036426764281,1821.365319728114
-61.00000000000,-1157.993090755917,-830.1883048251300,2127.739225982110
-92.00000000000,-1244.297869194846,-894.0756612807590,2267.622864882735
-122.0000000000,-1213.399825690534,-868.6516885787423,2187.243888890993
-153.0000000000,-1070.444733700651,-758.2480778589327,1903.117880166641
-183.0000000000,-860.0946733785761,-598.8334999301461,1504.690245043461
-214.0000000000,-630.3892899473603,-428.1727141074034,1086.302692489777
-245.0000000000,-445.8521581885284,-295.0305471008319,766.5091750313338
-275.0000000000,-349.5609004513094,-229.9014585376549,619.7780007429161
-306.0000000000,-367.1790339033132,-245.1011799764444,680.0651938775972
-336.0000000000,-497.5291246021083,-343.7942318133781,941.1186750293865
-367.0000000000,-712.6283407129865,-504.1808398423253,1343.519536879846
-398.0000000000,-945.6168324532568,-678.0569149222124,1764.429802823879
-426.0000000000,-1114.098192636426,-803.5207912779151,2055.783909180650
-457.0000000000,-1192.649743477781,-859.4602370556032,2171.534487542263
-487.0000000000,-1146.865376653554,-822.8205206281807,2059.770873706951
-518.0000000000,-988.1784316821294,-702.9749603313621,1749.831473472655
-548.0000000000,-770.0206685835454,-541.0800202454222,1345.291402913240
-579.0000000000,-547.3544591674084,-379.3187787043530,950.4963925030570
-610.0000000000,-390.6344131538315,-268.1831721090138,689.3679648432914
-640.0000000000,-347.0740675963589,-237.8508338886238,637.5159151776743
-671.0000000000,-419.6700940741129,-291.3977397070901,794.7185213583601
-701.0000000000,-595.4767921454061,-421.3108133411012,1131.143770710990
-732.0000000000,-828.0769493061788,-594.1529221810590,1557.876447689238
+1.000000000000,-782.5897307055999,-555.2110789588528,1420.429712922068
+32.00000000000,-996.4960694347295,-704.6042290926780,1834.042501606914
+61.00000000000,-1164.807015002724,-833.2456042914904,2137.529794436578
+92.00000000000,-1250.552685252406,-896.6666569701438,2276.409030328604
+122.0000000000,-1218.746742823914,-870.8843440355566,2194.768418476863
+153.0000000000,-1075.067371665147,-760.4719010490238,1909.906930845352
+183.0000000000,-864.6693343047368,-601.4839018305257,1511.847609850041
+214.0000000000,-634.6740090737476,-430.7676215876723,1093.114516700983
+245.0000000000,-449.6820791519509,-297.2270898673042,772.4850723473868
+275.0000000000,-353.8265232433924,-232.2535221137914,626.3219511529396
+306.0000000000,-369.8007284781992,-246.8599029712211,684.4194301175154
+336.0000000000,-500.2521330863310,-344.8368896080982,944.8617773891568
+367.0000000000,-715.1046826504441,-505.2719142615514,1347.061884495036
+398.0000000000,-947.3874552481137,-678.9201651253069,1767.044029432649
+426.0000000000,-1116.122240410673,-804.9416099003635,2059.189446510720
+457.0000000000,-1193.278407397413,-859.7021124922913,2172.423230542127
+487.0000000000,-1148.742220460744,-824.1985786976667,2062.959122145192
+518.0000000000,-989.5391784128605,-703.8554491656442,1752.040334315073
+548.0000000000,-771.0589700085794,-541.7096450284805,1346.943861797008
+579.0000000000,-547.3504419301695,-378.5281045111182,949.7361426386774
+610.0000000000,-389.0444934180061,-265.8670071997200,685.5596592484158
+640.0000000000,-345.6669458554459,-236.0633484855006,634.3694108653171
+671.0000000000,-419.3970363122128,-290.8545394058599,793.9112010921268
+701.0000000000,-595.1957002293823,-421.1552391651531,1130.715417342686
+732.0000000000,-827.8860512370015,-594.1470379549924,1557.664109631441