Skip to content

Commit 0a39e59

Browse files
jtwhite79jtwhite79
authored
Merge pull request #31 from jtwhite79/hotfix_m2o
Hotfix m2o
2 parents 06dac1a + 89df750 commit 0a39e59

39 files changed

+8189
-1
lines changed

‎pypestutils/helpers.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ def mod2obs_mf6(gridinfo_fname: str,depvar_fname: str,obscsv_fname: str ,model_t
108108
print("warning: the following site(s) failed to have interpolation factors calculated:")
109109
fsites = usitedf.reset_index().site.iloc[interp_fac_results==0].to_list()
110110
print(fsites)
111-
all_results = lib.interp_from_mf6_depvar_file(depvar_fname,fac_file,"binary",depvar_info["ntime"],"head",interp_thresh,True,
111+
all_results = lib.interp_from_mf6_depvar_file(depvar_fname,fac_file,"binary",depvar_info["ntime"],depvar_name,interp_thresh,True,
112112
no_interp_val,usitedf.shape[0])
113113
datetimes = start_datetime+pd.to_timedelta(all_results["simtime"],unit=model_timeunit)
114114
allresults_df = pd.DataFrame(all_results["simstate"],index=datetimes,columns=usitedf.index)

‎tests/data/p09/.DS_Store

6 KB
Binary file not shown.

‎tests/data/p09/gwf-p09-mf6.bud

539 KB
Binary file not shown.

‎tests/data/p09/gwf-p09-mf6.chd

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
# File generated by Flopy version 3.7.0.dev0 on 05/14/2024 at 15:14:54.
2+
BEGIN options
3+
auxiliary CONCENTRATION
4+
END options
5+
6+
BEGIN dimensions
7+
MAXBOUND 28
8+
END dimensions
9+
10+
BEGIN period 1
11+
1 1 1 2.50000000E+02 0.00000000E+00
12+
1 18 1 2.00000000E+01 0.00000000E+00
13+
1 1 2 2.50000000E+02 0.00000000E+00
14+
1 18 2 2.25000000E+01 0.00000000E+00
15+
1 1 3 2.50000000E+02 0.00000000E+00
16+
1 18 3 2.50000000E+01 0.00000000E+00
17+
1 1 4 2.50000000E+02 0.00000000E+00
18+
1 18 4 2.75000000E+01 0.00000000E+00
19+
1 1 5 2.50000000E+02 0.00000000E+00
20+
1 18 5 3.00000000E+01 0.00000000E+00
21+
1 1 6 2.50000000E+02 0.00000000E+00
22+
1 18 6 3.25000000E+01 0.00000000E+00
23+
1 1 7 2.50000000E+02 0.00000000E+00
24+
1 18 7 3.50000000E+01 0.00000000E+00
25+
1 1 8 2.50000000E+02 0.00000000E+00
26+
1 18 8 3.75000000E+01 0.00000000E+00
27+
1 1 9 2.50000000E+02 0.00000000E+00
28+
1 18 9 4.00000000E+01 0.00000000E+00
29+
1 1 10 2.50000000E+02 0.00000000E+00
30+
1 18 10 4.25000000E+01 0.00000000E+00
31+
1 1 11 2.50000000E+02 0.00000000E+00
32+
1 18 11 4.50000000E+01 0.00000000E+00
33+
1 1 12 2.50000000E+02 0.00000000E+00
34+
1 18 12 4.75000000E+01 0.00000000E+00
35+
1 1 13 2.50000000E+02 0.00000000E+00
36+
1 18 13 5.00000000E+01 0.00000000E+00
37+
1 1 14 2.50000000E+02 0.00000000E+00
38+
1 18 14 5.25000000E+01 0.00000000E+00
39+
END period 1
40+

‎tests/data/p09/gwf-p09-mf6.dis

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
# File generated by Flopy version 3.7.0.dev0 on 05/14/2024 at 15:14:54.
2+
BEGIN options
3+
LENGTH_UNITS meters
4+
END options
5+
6+
BEGIN dimensions
7+
NLAY 1
8+
NROW 18
9+
NCOL 14
10+
END dimensions
11+
12+
BEGIN griddata
13+
delr
14+
CONSTANT 100.00000000
15+
delc
16+
CONSTANT 100.00000000
17+
top
18+
CONSTANT 0.00000000
19+
botm
20+
CONSTANT -10.00000000
21+
idomain
22+
INTERNAL FACTOR 1
23+
1 1 1 1 1 1 1 1 1 1 1 1 1 1
24+
1 1 1 1 1 1 1 1 1 1 1 1 1 1
25+
1 1 1 1 1 1 1 1 1 1 1 1 1 1
26+
1 1 1 1 1 1 1 1 1 1 1 1 1 1
27+
1 1 1 1 1 1 1 1 1 1 1 1 1 1
28+
1 1 1 1 1 1 1 1 1 1 1 1 1 1
29+
1 1 1 1 1 1 1 1 1 1 1 1 1 1
30+
1 1 1 1 1 1 1 1 1 1 1 1 1 1
31+
1 1 1 1 1 1 1 1 1 1 1 1 1 1
32+
1 1 1 1 1 1 1 1 1 1 1 1 1 1
33+
1 1 1 1 1 1 1 1 1 1 1 1 1 1
34+
1 1 1 1 1 1 1 1 1 1 1 1 1 1
35+
1 1 1 1 1 1 1 1 1 1 1 1 1 1
36+
1 1 1 1 1 1 1 1 1 1 1 1 1 1
37+
1 1 1 1 1 1 1 1 1 1 1 1 1 1
38+
1 1 1 1 1 1 1 1 1 1 1 1 1 1
39+
1 1 1 1 1 1 1 1 1 1 1 1 1 1
40+
1 1 1 1 1 1 1 1 1 1 1 1 1 1
41+
END griddata
42+

‎tests/data/p09/gwf-p09-mf6.dis.grb

13.6 KB
Binary file not shown.

‎tests/data/p09/gwf-p09-mf6.hds

48.5 KB
Binary file not shown.

‎tests/data/p09/gwf-p09-mf6.hds.all.csv

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
,site1
2+
2000-04-10,0.9201481898615829
3+
2000-07-19,1.8174624075062107
4+
2000-10-27,2.673376944047418
5+
2001-02-04,3.478759967373495
6+
2001-05-15,4.230300686465257
7+
2001-08-23,4.928176343388853
8+
2001-12-01,5.574558339297976
9+
2002-03-11,6.172667022899383
10+
2002-06-19,6.726183761086104
11+
2002-09-27,7.238894344063356
12+
2003-01-05,7.714480997061258
13+
2003-04-15,8.156408812297478
14+
2003-07-24,8.567871250830635
15+
2003-11-01,8.951771778224016
16+
2004-02-09,9.310726863434926
17+
2004-05-19,9.647080926047904
18+
2004-08-27,9.962927316107594
19+
2004-12-05,10.26013168493022
20+
2005-03-15,10.540355572727687
21+
2005-06-23,10.805078976632442
22+
2005-10-01,11.055621253955753
23+
2006-01-09,11.293160081237884
24+
2006-04-19,11.518748409603724
25+
2006-07-28,11.7333294835427

‎tests/data/p09/gwf-p09-mf6.hds.out.csv

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
KSTP,KPER,PERTIM,TOTIM,TEXT,NCOL,NROW,ILAY
2+
1,1,100.000000,100.000000,HEAD,14,18,1
3+
1,2,100.000000,200.000000,HEAD,14,18,1
4+
1,3,100.000000,300.000000,HEAD,14,18,1
5+
1,4,100.000000,400.000000,HEAD,14,18,1
6+
1,5,100.000000,500.000000,HEAD,14,18,1
7+
1,6,100.000000,600.000000,HEAD,14,18,1
8+
1,7,100.000000,700.000000,HEAD,14,18,1
9+
1,8,100.000000,800.000000,HEAD,14,18,1
10+
1,9,100.000000,900.000000,HEAD,14,18,1
11+
1,10,100.000000,1000.00000,HEAD,14,18,1
12+
1,11,100.000000,1100.00000,HEAD,14,18,1
13+
1,12,100.000000,1200.00000,HEAD,14,18,1
14+
1,13,100.000000,1300.00000,HEAD,14,18,1
15+
1,14,100.000000,1400.00000,HEAD,14,18,1
16+
1,15,100.000000,1500.00000,HEAD,14,18,1
17+
1,16,100.000000,1600.00000,HEAD,14,18,1
18+
1,17,100.000000,1700.00000,HEAD,14,18,1
19+
1,18,100.000000,1800.00000,HEAD,14,18,1
20+
1,19,100.000000,1900.00000,HEAD,14,18,1
21+
1,20,100.000000,2000.00000,HEAD,14,18,1
22+
1,21,100.000000,2100.00000,HEAD,14,18,1
23+
1,22,100.000000,2200.00000,HEAD,14,18,1
24+
1,23,100.000000,2300.00000,HEAD,14,18,1
25+
1,24,100.000000,2400.00000,HEAD,14,18,1

‎tests/data/p09/gwf-p09-mf6.ic

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
# File generated by Flopy version 3.7.0.dev0 on 05/14/2024 at 15:14:54.
2+
BEGIN griddata
3+
strt
4+
INTERNAL FACTOR 1.0
5+
250.00000000 250.00000000 250.00000000 250.00000000 250.00000000 250.00000000 250.00000000 250.00000000 250.00000000 250.00000000 250.00000000 250.00000000 250.00000000 250.00000000
6+
0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000
7+
0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000
8+
0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000
9+
0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000
10+
0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000
11+
0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000
12+
0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000
13+
0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000
14+
0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000
15+
0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000
16+
0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000
17+
0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000
18+
0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000
19+
0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000
20+
0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000
21+
0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000
22+
20.00000000 22.50000000 25.00000000 27.50000000 30.00000000 32.50000000 35.00000000 37.50000000 40.00000000 42.50000000 45.00000000 47.50000000 50.00000000 52.50000000
23+
END griddata
24+

0 commit comments

Comments
 (0)