Skip to content

Fix for UZT test problem #491

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

Merged
christianlangevin merged 37 commits into from
Mar 18, 2019
Merged

Fix for UZT test problem #491

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
a26832b
Explicit cast to np.array isn't preserved
emorway-usgs Aug 27, 2018
1bc1655
Fixes issue in LAK package _init_ routines when only a single lake is…
emorway-usgs Aug 27, 2018
1c28f66
Previous alteration worked for one lake, but didn't handle one stage …
emorway-usgs Aug 27, 2018
0b6a62e
Fix mis-statement
emorway-usgs Aug 29, 2018
c7c65e3
Merge branch 'develop' of github.com:modflowpy/flopy into develop
emorway-usgs Aug 29, 2018
7a9c37d
Merge branch 'develop' of github.com:modflowpy/flopy into develop
emorway-usgs Aug 30, 2018
b51cb22
LMT: Lacking support for keyword 'ALL' following Package_Flows keyword
emorway-usgs Aug 30, 2018
9ddafd1
Add precision for variable thkmin
emorway-usgs Aug 30, 2018
47d8fc2
PERLEN variable getting trucated by use of "G" (general form) when nu…
emorway-usgs Aug 30, 2018
f41a419
Switching printing of PERLEN in BTN from 10.6G to 10G
emorway-usgs Sep 5, 2018
66f137d
Merge branch 'develop' of github.com:modflowpy/flopy into develop
emorway-usgs Sep 5, 2018
c439d8f
Merge branch 'develop' of github.com:modflowpy/flopy into develop
emorway-usgs Oct 7, 2018
69c38a0
Merge branch 'develop' of github.com:modflowpy/flopy into new_develop
emorway-usgs Oct 12, 2018
7fd67ef
Fix for issue #402 including a new test for checking mtlkt.py
emorway-usgs Oct 12, 2018
2a0fd4a
Remove apostrophe from comment (interferes with Travis build)
emorway-usgs Oct 12, 2018
fa15469
Rename test, another recent commit had the same name
emorway-usgs Oct 12, 2018
029a7d5
Remove argument from call to test
emorway-usgs Oct 12, 2018
c02f6c4
Merge branch 'develop' of github.com:modflowpy/flopy into new_develop
emorway-usgs Oct 13, 2018
deb2336
Adding new example notebook for MT3D-USGS that uses SFT, LKT, and UZT…
emorway-usgs Oct 13, 2018
060c2a3
Fixed a typo, added link for docs/notebook_examples.md in a reasonabl…
emorway-usgs Oct 13, 2018
0fdf302
An errant capital letter in the new notebook, switched to lowercase
emorway-usgs Oct 13, 2018
dda4b57
Removing variable MXUZCON from mtuzt.py. Variable was in pre-release…
emorway-usgs Oct 30, 2018
50e08ef
Merge branch 'develop' of github.com:modflowpy/flopy into new_develop
emorway-usgs Oct 30, 2018
a19b468
Indexes needed adjusting after removing un-used variable from Item 2 …
emorway-usgs Oct 30, 2018
9a90c3c
Merge branch 'develop' of github.com:modflowpy/flopy into new_develop
emorway-usgs Oct 30, 2018
e0b3bf2
Fixing another index issue brought about by the removal of MXUZCON
emorway-usgs Oct 30, 2018
930ae10
Merge branch 'develop' of github.com:modflowpy/flopy into new_develop
emorway-usgs Oct 30, 2018
cb5f318
Merge branch 'develop' of github.com:modflowpy/flopy into new_develop
emorway-usgs Nov 9, 2018
442df30
Merge branch 'develop' of github.com:modflowpy/flopy into new_develop
emorway-usgs Nov 27, 2018
43e7a60
Merge branch 'develop' of github.com:modflowpy/flopy into new_develop
emorway-usgs Jan 30, 2019
737866a
Merge branch 'develop' of github.com:modflowpy/flopy into new_develop
emorway-usgs Feb 7, 2019
49fe289
Merge branch 'develop' of github.com:modflowpy/flopy into new_develop
emorway-usgs Mar 9, 2019
2bf4668
Merge branch 'develop' of github.com:modflowpy/flopy into new_develop
emorway-usgs Mar 14, 2019
3f3d2ea
Merge branch 'develop' of github.com:modflowpy/flopy into new_develop
emorway-usgs Mar 17, 2019
eed6c70
test(t012_test.py): Account for UZT -> UZT2 input file changes
emorway-usgs Mar 18, 2019
2ff2626
test(t012_test.py): Adapt flopy src to new UZT2 input requirements
emorway-usgs Mar 18, 2019
326b26b
docs(releasenotes): update releasenotes with UZT2 fix
emorway-usgs Mar 18, 2019
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
6 changes: 3 additions & 3 deletions autotest/t012_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@ def test_mfnwt_LKT():
return


def deactivated_mfnwt_keat_uzf():
def test_mfnwt_keat_uzf():
pth = os.path.join(pthNWT, 'keat_uzf')
namefile = 'Keat_UZF_mf.nam'
mf = flopy.modflow.Modflow.load(namefile, model_ws=pth,
Expand Down Expand Up @@ -397,6 +397,6 @@ def deactivated_mfnwt_keat_uzf():
#test_mf2000_SState()
#test_mf2000_tob()
#test_mf2000_zeroth()
#test_mfnwt_CrnkNic()
test_mfnwt_CrnkNic()
#test_mfnwt_LKT()
deactivated_mfnwt_keat_uzf()
test_mfnwt_keat_uzf()
1 change: 1 addition & 0 deletions docs/version_changes.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ FloPy Changes

* Bug fixes:
* Removed variable MXUZCON from `mtuzt.py` that was present during the development of MT3D-USGS, but was not included in the release version of MT3D-USGS.
* Now account for UZT -> UZT2 changes with the release of MT3D-USGS 1.0.1

### Version 3.2.10
* Added parameter_load variable to `mbase` that is set to true if parameter data are applied in the model (only used in models that support parameters). If this is set to `True` `free_format_input` is set to `True` (if currently `False`) when the `write_input()` method is called. This change preserves the precision of parameter data (which is free format data).
Expand Down
316 changes: 158 additions & 158 deletions examples/data/mt3d_test/mfnwt_mt3dusgs/keat_uzf/Keat_UZF.upw
View file
Open in desktop

Large diffs are not rendered by default.

20 changes: 12 additions & 8 deletions examples/data/mt3d_test/mfnwt_mt3dusgs/keat_uzf/Keat_UZF.uzf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,18 @@
#An unsaturated version of the Keating model
#NUZTOP IUZFOPT IRUNFLG IETFLG IUZFCB1 IUZFCB2 [NTRAIL2 NSETS2] NUZGAG SURFDEP RTSOLUTE
OPTIONS
SPECIFYTHTR
END
3 1 0 0 0 0 20 20 0 0.1 1
INTERNAL 1 (free) -1 #IIUZBND
INTERNAL 1 (free) -1 # IIUZBND
0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 #IUZFBND
CONSTANT 0.85 #VKS
CONSTANT 4.00 #EPS
CONSTANT 0.30 #THTS
1 #NUZF1
INTERNAL 1 (free) -1 #FINF
CONSTANT 0.85 # VKS
CONSTANT 4.00 # EPS
CONSTANT 0.12 # THTS
CONSTANT 0.02 # THTI
1 # NUZF1
INTERNAL 1 (free) -1 # FINF
0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 7.200000E-02 7.200000E-02 7.200000E-02 7.200000E-02 7.200000E-02 7.200000E-02 7.200000E-02 7.200000E-02 7.200000E-02 7.200000E-02 7.200000E-02 7.200000E-02 7.200000E-02 7.200000E-02 7.200000E-02 7.200000E-02 7.200000E-02 7.200000E-02 7.200000E-02 7.200000E-02 7.200000E-02 7.200000E-02 7.200000E-02 7.200000E-02 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.0
-1 #NUZF1 Stress Period 2 (Repeat)
-1 #NUZF2 Stress Period 3 (Repeat)
-1 # NUZF1 Stress Period 2 (Repeat)
-1 # NUZF2 Stress Period 3 (Repeat)

Loading