Skip to content

Commit

Permalink
Fix for UZT test problem (#491)
Browse files Browse the repository at this point in the history 
* Explicit cast to np.array isn't preserved

* Fixes issue in LAK package _init_ routines when only a single lake is active

* Previous alteration worked for one lake, but didn't handle one stage for multiple lakes.  This should account for that condition

* Fix mis-statement

* LMT: Lacking support for keyword 'ALL' following Package_Flows keyword

* Add precision for variable thkmin

* PERLEN variable getting trucated by use of "G" (general form) when number of significant digits was > 4.

* Switching printing of PERLEN in BTN from 10.6G to 10G

* Fix for issue #402 including a new test for checking mtlkt.py

* Remove apostrophe from comment (interferes with Travis build)

* Rename test, another recent commit had the same name

* Remove argument from call to test

* Adding new example notebook for MT3D-USGS that uses SFT, LKT, and UZT, including connections between them

* Fixed a typo, added link for docs/notebook_examples.md in a reasonable section of the document

* An errant capital letter in the new notebook, switched to lowercase

* Removing variable MXUZCON from mtuzt.py.  Variable was in pre-release versions of MT3D-USGS, but didn't make the final cut and was never removed from flopy until now.  Fixes and closes issue #423

* Indexes needed adjusting after removing un-used variable from Item 2 in UZT input file.

* Fixing another index issue brought about by the removal of MXUZCON

* test(t012_test.py): Account for UZT -> UZT2 input file changes

With the release of MT3D-USGS 1.0.1, required UZT input was reduced

#466 and #482

* test(t012_test.py): Adapt flopy src to new UZT2 input requirements

These changes required witth the release of MT3D-USGS 1.0.1

#466 and #482

* docs(releasenotes): update releasenotes with UZT2 fix
  • Loading branch information
@emorway-usgs @langevin-usgs
emorway-usgs authored and langevin-usgs committed Mar 18, 2019
1 parent 3e76eeb commit d1dca80
Show file tree
Hide file tree
Showing 9 changed files with 195 additions and 467 deletions.
6 changes: 3 additions & 3 deletions autotest/t012_test.py
View file
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
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,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

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
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

0 comments on commit d1dca80

Please sign in to comment.