Skip to content

fix(ModflowUzf1): fix for loading negative iuzfopt #1408

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 2 commits into from
May 6, 2022
Merged

fix(ModflowUzf1): fix for loading negative iuzfopt #1408

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8e4cb9a
fix(ModflowUzf1): fix for loading negative iuzfopt
jlarsen-usgs May 5, 2022
095b455
remove unused variables from test
jlarsen-usgs May 5, 2022
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
33 changes: 33 additions & 0 deletions autotest/t034_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -622,6 +622,38 @@ def test_load_write_wel_option_line():
assert wel.iunitramp == 20


def test_uzf_negative_iuzfopt():
model_ws = f"{base_dir}_test_uzf_negative_iuzfopt"
test_setup = FlopyTestSetup(verbose=True, test_dirs=model_ws)

ml = flopy.modflow.Modflow(
version="mfnwt",
exe_name="mfnwt.exe",
model_ws=model_ws
)
dis = flopy.modflow.ModflowDis(
ml,
nper=2,
perlen=[1,1],
nstp=[1,1],
tsmult=1,
steady=[True, False]
)
bas = flopy.modflow.ModflowBas(ml)
upw = flopy.modflow.ModflowUpw(ml)
oc = flopy.modflow.ModflowOc(ml)

uzf = flopy.modflow.ModflowUzf1(
ml,
nuztop=3,
iuzfopt=-1,
irunflg=1,
ietflg=1,
irunbnd=1,
specifysurfk=True,
seepsurfk=True
)

if __name__ == "__main__":
test_create_uzf()
test_read_write_nwt_options()
Expand All @@ -632,3 +664,4 @@ def test_load_write_wel_option_line():
test_load_write_wel_option_block()
test_load_write_wel_option_line()
test_uzf_surfk()
test_uzf_negative_iuzfopt()
4 changes: 2 additions & 2 deletions flopy/modflow/mfuzf1.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1005,7 +1005,7 @@ def load_util2d(name, dtype, per=None):
load_util2d("irunbnd", np.int32)

# dataset 4
if iuzfopt in [0, 1]:
if np.abs(iuzfopt) in [0, 1]:
load_util2d("vks", np.float32)

# dataset 4b
Expand Down Expand Up @@ -1049,7 +1049,7 @@ def load_util2d(name, dtype, per=None):
if nuzf1 >= 0:
load_util2d("finf", np.float32, per=per)

if ietflg > 0:
if ietflg > 0 and iuzfopt > 0:
# dataset 11
line = line_parse(f.readline())
nuzf2 = pop_item(line, int)
Expand Down