Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Hydmod interp #11

Open
wants to merge 10 commits into
base: develop
Choose a base branch
from
Open

Hydmod interp #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
63bd5f8
hydmod: revised error for cases where an interpolation point (rather …
Jan 29, 2016
e68cf8c
hydmod: passing through INTYP to the BAS hydrographs in order to allo…
Jan 29, 2016
42bbd3d
First cut at H type interpolation in which heads are substituted at m…
Jan 29, 2016
a4a2cab
Working almost now. Still need to handle a few edge case bugs, but in…
Jan 30, 2016
0130924
Working almost now. Still need to handle a few edge case bugs, but in…
Jan 30, 2016
a8f2377
A couple logic changes. Still have a few remaining issues on edges
Jan 30, 2016
aa347e5
Modifications made to HYDMOD
Feb 1, 2016
ae4aa5e
Merge branch 'develop' of https://github.com/OGW-USGS/mf2005 into hyd…
Feb 2, 2016
3f89ef7
updated test notebook to handle today's changes to flopy hydmod readi…
Feb 2, 2016
50dfc8d
reworked hydmod_test notebook to take advantage of new loading behavi…
Feb 3, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,548 changes: 1,548 additions & 0 deletions hydmod_test/COMPARE_MOD2SMP_WITH_NEW_HYDMOD.ipynb
View file
Open in desktop

Large diffs are not rendered by default.

705 changes: 705 additions & 0 deletions hydmod_test/bore.crds
View file
Open in desktop

Large diffs are not rendered by default.

Binary file added hydmod_test/bores_noisy.xlsx
View file
Open in desktop
Binary file not shown.
5 changes: 5 additions & 0 deletions hydmod_test/freyberg.bas
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Basic package file for MODFLOW, generated by Flopy.
FREE
OPEN/CLOSE ref\ibound.ref 1 (25I3) -1 ibound
-999.99
OPEN/CLOSE ref\strt.ref 1 (10e12.4) -1 strt
696 changes: 696 additions & 0 deletions hydmod_test/freyberg.chk
View file
Open in desktop

Large diffs are not rendered by default.

12 changes: 12 additions & 0 deletions hydmod_test/freyberg.dis
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# Discretization file for MODFLOW, generated by Flopy.
1 40 20 3 4 2
0
INTERNAL 1 (20G15.6) -1 #delr
2.500000E+02 2.500000E+02 2.500000E+02 2.500000E+02 2.500000E+02 2.500000E+02 2.500000E+02 2.500000E+02 2.500000E+02 2.500000E+02 2.500000E+02 2.500000E+02 2.500000E+02 2.500000E+02 2.500000E+02 2.500000E+02 2.500000E+02 2.500000E+02 2.500000E+02 2.500000E+02
INTERNAL 1 (40G15.6) -1 #delc
2.500000E+02 2.500000E+02 2.500000E+02 2.500000E+02 2.500000E+02 2.500000E+02 2.500000E+02 2.500000E+02 2.500000E+02 2.500000E+02 2.500000E+02 2.500000E+02 2.500000E+02 2.500000E+02 2.500000E+02 2.500000E+02 2.500000E+02 2.500000E+02 2.500000E+02 2.500000E+02 2.500000E+02 2.500000E+02 2.500000E+02 2.500000E+02 2.500000E+02 2.500000E+02 2.500000E+02 2.500000E+02 2.500000E+02 2.500000E+02 2.500000E+02 2.500000E+02 2.500000E+02 2.500000E+02 2.500000E+02 2.500000E+02 2.500000E+02 2.500000E+02 2.500000E+02 2.500000E+02
CONSTANT 3.500000E+01 #top
OPEN/CLOSE ref\botm.ref 1 (10e12.4) -1 botm
1.000000 1 1.000000 SS
1825.000000 1 1.000000 TR
1.000000 1 1.000000 SS
1,139 changes: 1,139 additions & 0 deletions hydmod_test/freyberg.drn
View file
Open in desktop

Large diffs are not rendered by default.

13 changes: 13 additions & 0 deletions hydmod_test/freyberg.nam
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# Name file for mf2005, generated by Flopy.
LIST 2 freyberg.list
DIS 11 freyberg.dis
UPW 31 freyberg.upw
BAS6 13 freyberg.bas
RCH 19 freyberg.rch
WEL 20 freyberg.wel
RIV 18 freyberg.riv
OC 14 freyberg.oc
DATA(BINARY) 51 freyberg.hds REPLACE
DATA(BINARY) 52 freyberg.ddn REPLACE
DATA(BINARY) 53 freyberg.cbc REPLACE
NWT 32 freyberg.nwt
2 changes: 2 additions & 0 deletions hydmod_test/freyberg.nwt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# NWT for MODFLOW-NWT, generated by Flopy.
1.0e-04 5.0e+02 100 1.0e-05 1 0 0 COMPLEX
19 changes: 19 additions & 0 deletions hydmod_test/freyberg.oc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# Output control package file for MODFLOW, generated by Flopy.
HEAD PRINT FORMAT 0
HEAD SAVE UNIT 51
DRAWDOWN PRINT FORMAT 0
DRAWDOWN SAVE UNIT 52
COMPACT BUDGET AUX

period 1 step 1
save head
save budget

period 2 step 1
save head
save budget

period 3 step 1
save head
save budget

3 changes: 3 additions & 0 deletions hydmod_test/freyberg.pcg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# PCG for MODFLOW, generated by Flopy.
50 30 1 0
1e-05 1e-05 1.0 0 0 3 1.0
8 changes: 8 additions & 0 deletions hydmod_test/freyberg.rch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# RCH for MODFLOW, generated by Flopy.
3 0
1 -1 # Stress period 1
OPEN/CLOSE ref\rech_0.ref 1 (20G15.6) -1 rech_1
1 -1 # Stress period 2
OPEN/CLOSE ref\rech_1.ref 1 (20G15.6) -1 rech_2
1 -1 # Stress period 3
OPEN/CLOSE ref\rech_2.ref 1 (20G15.6) -1 rech_3
45 changes: 45 additions & 0 deletions hydmod_test/freyberg.riv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
# RIV for MODFLOW, generated by Flopy.
40 0
40 0 # stress period 0
1 1 15 20.100000 2262.809570 20.000000 0.000000
1 2 15 19.870001 5255.834961 19.750000 0.000000
1 3 15 19.650000 5123.994629 19.500000 0.000000
1 4 15 19.420000 6476.518555 19.250000 0.000000
1 5 15 19.190001 3942.536865 19.000000 0.000000
1 6 15 18.969999 1469.835815 18.750000 0.000000
1 7 15 18.740000 1844.688721 18.500000 0.000000
1 8 15 18.510000 3248.889893 18.250000 0.000000
1 9 15 18.280001 5541.192871 18.000000 0.000000
1 10 15 19.059999 5714.499512 17.750000 0.000000
1 11 15 17.830000 5280.313477 17.500000 0.000000
1 12 15 17.600000 6297.982422 17.250000 0.000000
1 13 15 17.379999 3433.340332 17.000000 0.000000
1 14 15 17.150000 4031.775146 16.750000 0.000000
1 15 15 16.920000 8096.818359 16.500000 0.000000
1 16 15 16.700001 6207.698730 16.250000 0.000000
1 17 15 16.469999 4792.523438 16.000000 0.000000
1 18 15 16.240000 7944.267578 15.750000 0.000000
1 19 15 16.020000 8895.833008 15.500000 0.000000
1 20 15 15.790000 5492.111328 15.250000 0.000000
1 21 15 15.560000 5461.965332 15.000000 0.000000
1 22 15 15.330000 5638.295898 14.750000 0.000000
1 23 15 15.110000 7077.810547 14.500000 0.000000
1 24 15 14.880000 6468.176270 14.250000 0.000000
1 25 15 14.650000 3842.095703 14.000000 0.000000
1 26 15 14.430000 2649.697754 13.750000 0.000000
1 27 15 14.200000 1569.015747 13.500000 0.000000
1 28 15 13.970000 2319.031006 13.250000 0.000000
1 29 15 13.750000 4407.562012 13.000000 0.000000
1 30 15 13.520000 3508.939209 12.750000 0.000000
1 31 15 13.290000 3551.883789 12.500000 0.000000
1 32 15 13.070000 3835.308594 12.250000 0.000000
1 33 15 12.840000 5131.004395 12.000000 0.000000
1 34 15 12.610000 5295.542480 11.750000 0.000000
1 35 15 12.380000 3233.627441 11.500000 0.000000
1 36 15 12.160000 3494.095947 11.250000 0.000000
1 37 15 11.930000 5747.663574 11.000000 0.000000
1 38 15 11.700000 7602.311035 10.750000 0.000000
1 39 15 11.480000 7388.273438 10.500000 0.000000
1 40 15 11.250000 6599.120117 10.250000 0.000000
-1 0 # stress period 1
-1 0 # stress period 2
4 changes: 4 additions & 0 deletions hydmod_test/freyberg.spc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
40 20
6.196530E+05 3.353277E+06 0.000000E+00
2.500000E+02 2.500000E+02 2.500000E+02 2.500000E+02 2.500000E+02 2.500000E+02 2.500000E+02 2.500000E+02 2.500000E+02 2.500000E+02 2.500000E+02 2.500000E+02 2.500000E+02 2.500000E+02 2.500000E+02 2.500000E+02 2.500000E+02 2.500000E+02 2.500000E+02 2.500000E+02
2.500000E+02 2.500000E+02 2.500000E+02 2.500000E+02 2.500000E+02 2.500000E+02 2.500000E+02 2.500000E+02 2.500000E+02 2.500000E+02 2.500000E+02 2.500000E+02 2.500000E+02 2.500000E+02 2.500000E+02 2.500000E+02 2.500000E+02 2.500000E+02 2.500000E+02 2.500000E+02 2.500000E+02 2.500000E+02 2.500000E+02 2.500000E+02 2.500000E+02 2.500000E+02 2.500000E+02 2.500000E+02 2.500000E+02 2.500000E+02 2.500000E+02 2.500000E+02 2.500000E+02 2.500000E+02 2.500000E+02 2.500000E+02 2.500000E+02 2.500000E+02 2.500000E+02 2.500000E+02
11 changes: 11 additions & 0 deletions hydmod_test/freyberg.upw
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# UPW for MODFLOW-NWT, generated by Flopy.
53 -1E+30 0 0
1
0
1
0
0
OPEN/CLOSE ref\hk_Layer_1.ref 1 (20G15.6) -1 hk Layer 1
CONSTANT 1.000000E+00 #vka Layer 1
OPEN/CLOSE ref\ss_Layer_1.ref 1 (20G15.6) -1 ss Layer 1
CONSTANT 1.000000E-02 #sy Layer 1
23 changes: 23 additions & 0 deletions hydmod_test/freyberg.wel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# Well file for MODFLOW, generated by Flopy.
6 0
6 0 # stress period 0
1 9 16 -708.479980 0.000000
1 11 13 -354.239990 0.000000
1 20 14 -336.959991 0.000000
1 26 10 -71.711998 0.000000
1 29 6 -62.208000 0.000000
1 34 12 -371.520020 0.000000
6 0 # stress period 1
1 9 16 -885.599976 0.000000
1 11 13 -442.799988 0.000000
1 20 14 -421.199982 0.000000
1 26 10 -89.639999 0.000000
1 29 6 -77.760002 0.000000
1 34 12 -464.400024 0.000000
6 0 # stress period 2
1 9 16 -885.599976 0.000000
1 11 13 -442.799988 0.000000
1 20 14 -421.199982 0.000000
1 26 10 -89.639999 0.000000
1 29 6 -77.760002 0.000000
1 34 12 -464.400024 0.000000
Loading