Skip to content

fix(mfuzf): enforce boolean values for several uzf option arguments #597

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 1 commit into from
Jun 20, 2019
Merged

fix(mfuzf): enforce boolean values for several uzf option arguments #597

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 17 additions & 9 deletions flopy/modflow/mfuzf1.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,7 @@ def __init__(self, model,
surfdep=1.0,
iuzfbnd=1, irunbnd=0, vks=1.0E-6, eps=3.5, thts=0.35,
thtr=0.15, thti=0.20,
specifythtr=0, specifythti=0, nosurfleak=0,
specifythtr=False, specifythti=False, nosurfleak=False,
finf=1.0E-8, pet=5.0E-8, extdp=15.0, extwc=0.1,
nwt_11_fmt=False,
specifysurfk=False, rejectsurfk=False, seepsurfk=False,
Expand Down Expand Up @@ -445,12 +445,12 @@ def __init__(self, model,
" please provide a flopy.utils.OptionBlock object"
" to the options argument", DeprecationWarning)
self.nwt_11_fmt = nwt_11_fmt
self.specifythtr = specifythtr
self.specifythti = specifythti
self.nosurfleak = nosurfleak
self.specifysurfk = specifysurfk
self.rejectsurfk = rejectsurfk
self.seepsurfk = seepsurfk
self.specifythtr = bool(specifythtr)
self.specifythti = bool(specifythti)
self.nosurfleak = bool(nosurfleak)
self.specifysurfk = bool(specifysurfk)
self.rejectsurfk = bool(rejectsurfk)
self.seepsurfk = bool(seepsurfk)
self.etsquare = False
self.smoothfact = None
if etsquare is not None:
Expand Down Expand Up @@ -783,8 +783,14 @@ def load(f, model, ext_unit_dict=None, check=False):
nrow, ncol, nlay, nper = model.get_nrow_ncol_nlay_nper()

# dataset 1a
specifythtr, specifythti, nosurfleak = False, False, False
etsquare, netflux, rejectsurfk, seepsurfk = None, None, False, False
specifythtr = False
specifythti = False
nosurfleak = False
specifysurfk = False
etsquare = None
netflux = None
rejectsurfk = False
seepsurfk = False
options = None
if model.version == 'mfnwt' and 'options' in line.lower():
options = OptionBlock.load_options(f, ModflowUzf1)
Expand All @@ -807,6 +813,7 @@ def load(f, model, ext_unit_dict=None, check=False):
nosurfleak = options.nosurfleak
rejectsurfk = options.rejectsurfk
seepsurfk = options.seepsurfk
specifysurfk = options.specifysurfk

if options.etsquare:
etsquare = options.smoothfact
Expand Down Expand Up @@ -943,6 +950,7 @@ def load_util2d(name, dtype, per=None):
specifythtr=specifythtr, specifythti=specifythti,
nosurfleak=nosurfleak, etsquare=etsquare,
netflux=netflux, seepsurfk=seepsurfk,
specifysurfk=specifysurfk,
rejectsurfk=rejectsurfk,
unitnumber=unitnumber,
filenames=filenames, options=options, **arrays)
Expand Down