Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
jtwhite79 committed Aug 21, 2020
2 parents 08f7d67 + cd916d1 commit 4144b36
Show file tree
Hide file tree
Showing 26 changed files with 9,850 additions and 278 deletions.
7 changes: 5 additions & 2 deletions benchmarks/basic_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -699,6 +699,8 @@ def tplins1_test():
shutil.rmtree(t_d)
shutil.copytree(os.path.join(model_d,"template"),t_d)
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=".")

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"])
Expand Down Expand Up @@ -815,6 +817,7 @@ def ext_stdcol_test():
d = (df.std() - obs.loc[pst.nnz_obs_names,"standard_deviation"]).apply(np.abs)
print(d)
assert d.max() < 0.1,d.max()

obs = pst.observation_data
obs.loc[pst.nnz_obs_names,"upper_bound"] = obs.loc[pst.nnz_obs_names,"obsval"] * 1.1
obs.loc[pst.nnz_obs_names,"lower_bound"] = obs.loc[pst.nnz_obs_names,"obsval"] * 0.9
Expand Down Expand Up @@ -956,8 +959,8 @@ def mf6_v5_glm_test():
#sen_basic_test()
#salib_verf()
#tplins1_test()
#ext_stdcol_test()
ext_stdcol_test()
#mf6_v5_ies_test()
#mf6_v5_sen_test()
#mf6_v5_opt_stack_test()
mf6_v5_glm_test()
#mf6_v5_glm_test()
108 changes: 54 additions & 54 deletions benchmarks/mf6_freyberg/template/freyberg6.wel
Original file line number Diff line number Diff line change
Expand Up @@ -27,21 +27,21 @@ BEGIN PERIOD 2
END PERIOD 2

BEGIN PERIOD 3
3 10 17 -62.632107000000011965
3 12 14 -62.6321070000000119649
3 21 15 -62.6321070000000119649
3 27 11 -62.6321070000000119649
3 30 7 -62.632107000000011965
3 35 13 -62.6321070000000119649
3 10 17 -62.632106999999997754
3 12 14 -62.6321069999999977540
3 21 15 -62.6321069999999977540
3 27 11 -62.6321069999999977540
3 30 7 -62.632106999999997754
3 35 13 -62.6321069999999977540
END PERIOD 3

BEGIN PERIOD 4
3 10 17 -96.436719000000010737
3 12 14 -96.4367190000000107375
3 21 15 -96.4367190000000107375
3 27 11 -96.4367190000000107375
3 30 7 -96.436719000000010737
3 35 13 -96.4367190000000107375
3 10 17 -96.436718999999996527
3 12 14 -96.4367189999999965266
3 21 15 -96.4367189999999965266
3 27 11 -96.4367189999999965266
3 30 7 -96.436718999999996527
3 35 13 -96.4367189999999965266
END PERIOD 4

BEGIN PERIOD 5
Expand All @@ -64,11 +64,11 @@ END PERIOD 6

BEGIN PERIOD 7
3 10 17 -2.436456150000000e+02
3 12 14 -2.4364561500000002e+02
3 21 15 -2.4364561500000002e+02
3 27 11 -2.4364561500000002e+02
3 12 14 -2.4364561499999999e+02
3 21 15 -2.4364561499999999e+02
3 27 11 -2.4364561499999999e+02
3 30 7 -2.436456150000000e+02
3 35 13 -2.4364561500000002e+02
3 35 13 -2.4364561499999999e+02
END PERIOD 7

BEGIN PERIOD 8
Expand All @@ -82,29 +82,29 @@ END PERIOD 8

BEGIN PERIOD 9
3 10 17 -2.598444540000000e+02
3 12 14 -2.5984445400000004e+02
3 21 15 -2.5984445400000004e+02
3 27 11 -2.5984445400000004e+02
3 12 14 -2.5984445399999998e+02
3 21 15 -2.5984445399999998e+02
3 27 11 -2.5984445399999998e+02
3 30 7 -2.598444540000000e+02
3 35 13 -2.5984445400000004e+02
3 35 13 -2.5984445399999998e+02
END PERIOD 9

BEGIN PERIOD 10
3 10 17 -2.462445630000000e+02
3 12 14 -2.4624456300000003e+02
3 21 15 -2.4624456300000003e+02
3 27 11 -2.4624456300000003e+02
3 12 14 -2.4624456300000000e+02
3 21 15 -2.4624456300000000e+02
3 27 11 -2.4624456300000000e+02
3 30 7 -2.462445630000000e+02
3 35 13 -2.4624456300000003e+02
3 35 13 -2.4624456300000000e+02
END PERIOD 10

BEGIN PERIOD 11
3 10 17 -2.0680571700000002e+02
3 12 14 -2.06805717000000016e+02
3 21 15 -2.06805717000000016e+02
3 27 11 -2.06805717000000016e+02
3 30 7 -2.0680571700000002e+02
3 35 13 -2.06805717000000016e+02
3 10 17 -2.0680571699999999e+02
3 12 14 -2.06805716999999987e+02
3 21 15 -2.06805716999999987e+02
3 27 11 -2.06805716999999987e+02
3 30 7 -2.0680571699999999e+02
3 35 13 -2.06805716999999987e+02
END PERIOD 11

BEGIN PERIOD 12
Expand Down Expand Up @@ -144,12 +144,12 @@ BEGIN PERIOD 15
END PERIOD 15

BEGIN PERIOD 16
3 10 17 -76.5318960000000174659
3 12 14 -76.53189600000001746594
3 21 15 -76.53189600000001746594
3 27 11 -76.53189600000001746594
3 30 7 -76.5318960000000174659
3 35 13 -76.53189600000001746594
3 10 17 -76.5318960000000032551
3 12 14 -76.53189600000000325508
3 21 15 -76.53189600000000325508
3 27 11 -76.53189600000000325508
3 30 7 -76.5318960000000032551
3 35 13 -76.53189600000000325508
END PERIOD 16

BEGIN PERIOD 17
Expand All @@ -171,12 +171,12 @@ BEGIN PERIOD 18
END PERIOD 18

BEGIN PERIOD 19
3 10 17 -2.2552768800000004e+02
3 12 14 -2.25527688000000040e+02
3 21 15 -2.25527688000000040e+02
3 27 11 -2.25527688000000040e+02
3 30 7 -2.2552768800000004e+02
3 35 13 -2.25527688000000040e+02
3 10 17 -2.2552768800000001e+02
3 12 14 -2.25527688000000012e+02
3 21 15 -2.25527688000000012e+02
3 27 11 -2.25527688000000012e+02
3 30 7 -2.2552768800000001e+02
3 35 13 -2.25527688000000012e+02
END PERIOD 19

BEGIN PERIOD 20
Expand Down Expand Up @@ -216,20 +216,20 @@ BEGIN PERIOD 23
END PERIOD 23

BEGIN PERIOD 24
3 10 17 -1.2558355200000001e+02
3 12 14 -1.25583552000000012e+02
3 21 15 -1.25583552000000012e+02
3 27 11 -1.25583552000000012e+02
3 30 7 -1.2558355200000001e+02
3 35 13 -1.25583552000000012e+02
3 10 17 -1.2558355200000000e+02
3 12 14 -1.25583551999999997e+02
3 21 15 -1.25583551999999997e+02
3 27 11 -1.25583551999999997e+02
3 30 7 -1.2558355200000000e+02
3 35 13 -1.25583551999999997e+02
END PERIOD 24

BEGIN PERIOD 25
3 10 17 -79.6886235000000198170
3 12 14 -79.68862350000001981698
3 21 15 -79.68862350000001981698
3 27 11 -79.68862350000001981698
3 30 7 -79.6886235000000198170
3 35 13 -79.68862350000001981698
3 10 17 -79.6886235000000056061
3 12 14 -79.68862350000000560613
3 21 15 -79.68862350000000560613
3 27 11 -79.68862350000000560613
3 30 7 -79.6886235000000056061
3 35 13 -79.68862350000000560613
END PERIOD 25

Loading

0 comments on commit 4144b36

Please sign in to comment.