Merge remote-tracking branch 'origin/develop'

benchmarks/basic_tests.py

@@ -865,16 +865,16 @@ def mf6_v5_ies_test():
     pyemu.os_utils.start_workers(t_d, exe_path, "freyberg6_run_ies_mda_loc.pst", num_workers=15,
                                  master_dir=m_d, worker_root=model_d, port=port)
 
-    m_d = os.path.join(model_d, "master_ies_mda_covloc")
-    if os.path.exists(m_d):
-        shutil.rmtree(m_d)
-    pst = pyemu.Pst(os.path.join(t_d, "freyberg6_run_ies.pst"))
-    pst.control_data.noptmax = 3
-    pst.pestpp_options["ies_use_mda"] = True
-    pst.pestpp_options["ies_loc_type"] = "cov"
-    pst.write(os.path.join(t_d, "freyberg6_run_ies_mda_covloc.pst"))
-    pyemu.os_utils.start_workers(t_d, exe_path, "freyberg6_run_ies_mda_covloc.pst", num_workers=15,
-                                 master_dir=m_d, worker_root=model_d, port=port)
+    # m_d = os.path.join(model_d, "master_ies_mda_covloc")
+    # if os.path.exists(m_d):
+    #     shutil.rmtree(m_d)
+    # pst = pyemu.Pst(os.path.join(t_d, "freyberg6_run_ies.pst"))
+    # pst.control_data.noptmax = 3
+    # pst.pestpp_options["ies_use_mda"] = True
+    # pst.pestpp_options["ies_loc_type"] = "cov"
+    # pst.write(os.path.join(t_d, "freyberg6_run_ies_mda_covloc.pst"))
+    # pyemu.os_utils.start_workers(t_d, exe_path, "freyberg6_run_ies_mda_covloc.pst", num_workers=15,
+    #                              master_dir=m_d, worker_root=model_d, port=port)
 
     m_d = os.path.join(model_d, "master_ies_mda_noloc")
     if os.path.exists(m_d):
@@ -1066,7 +1066,12 @@ def fr_fail_test():
 
     assert not os.path.exists(oe_file)
     m_d = os.path.join(model_d,"fr_fail_master")
-    pyemu.os_utils.start_workers(new_d,exe_path,"pest.pst",num_workers=1,worker_root=model_d,master_dir=m_d)
+    try:
+        pyemu.os_utils.start_workers(new_d,exe_path,"pest.pst",num_workers=1,worker_root=model_d,master_dir=m_d)
+    except:
+        pass
+    else:
+        raise Exception("should have failed")
     oe_file = os.path.join(m_d, "pest.0.obs.csv")
     assert not os.path.exists(oe_file)
 
@@ -1218,7 +1223,7 @@ def ins_missing_e_test():
     #da_mf6_freyberg_test_2()
     #shutil.copy2(os.path.join("..","exe","windows","x64","Debug","pestpp-ies.exe"),os.path.join("..","bin","win","pestpp-ies.exe"))
     #tplins1_test()
-    #mf6_v5_ies_test()
+    mf6_v5_ies_test()
     #mf6_v5_sen_test()
 
     #shutil.copy2(os.path.join("..","exe","windows","x64","Debug","pestpp-opt.exe"),os.path.join("..","bin","win","pestpp-opt.exe"))
@@ -1227,4 +1232,5 @@ def ins_missing_e_test():
     #cmdline_test()
     #basic_sqp_test()
     #mf6_v5_ies_test()
-    fr_timeout_test()
+    #fr_timeout_test()
+    #fr_fail_test()

benchmarks/mf6_freyberg/template/sfr.csv

@@ -1,26 +1,26 @@
 time,HEADWATER,TAILWATER,GAGE_1
-1.000000000000,-772.88,-548.87,1404.6
-32.00000000000,-987.41,-700.04,1820.5
-61.00000000000,-1157.2,-829.59,2126.3
-92.00000000000,-1243.4,-893.47,2266.1
-122.0000000000,-1212.7,-868.23,2186.2
-153.0000000000,-1070.2,-758.14,1902.8
-183.0000000000,-860.38,-599.12,1505.3
-214.0000000000,-631.14,-428.75,1087.6
-245.0000000000,-446.91,-295.80,768.31
-275.0000000000,-351.30,-231.36,622.94
-306.0000000000,-368.61,-246.15,682.52
-336.0000000000,-498.39,-344.36,942.53
-367.0000000000,-712.85,-504.26,1343.8
-398.0000000000,-945.17,-677.64,1763.6
-426.0000000000,-1113.4,-802.91,2054.4
-457.0000000000,-1191.9,-858.88,2170.2
-487.0000000000,-1146.3,-822.45,2058.9
-518.0000000000,-988.11,-702.94,1749.7
-548.0000000000,-770.47,-541.43,1346.1
-579.0000000000,-548.23,-379.95,951.98
-610.0000000000,-391.70,-268.91,691.14
-640.0000000000,-348.03,-238.49,639.09
-671.0000000000,-420.31,-291.80,795.76
-701.0000000000,-595.61,-421.35,1131.3
-732.0000000000,-827.75,-593.90,1557.3
+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