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

fix(autotests): update use of unit_conversion to length_conversion and time_conversion #1282

Merged
merged 3 commits into from
Aug 15, 2023
Merged

fix(autotests): update use of unit_conversion to length_conversion and time_conversion #1282

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8ede838
fix(autotests): update use of unit_conversion to length_conversion an…
emorway-usgs Jun 29, 2023
f96818f
length_conversion should be the cube of 1.486, not simply 1.486
emorway-usgs Aug 9, 2023
36dba4a
Clean-up value of `length_conversion`
emorway-usgs Aug 14, 2023
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: 4 additions & 2 deletions autotest/test_gwf_multimvr.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -837,7 +837,8 @@ def add_parent_sfr(gwf, gwfname, conns):
print_flows=True,
mover=True,
pname="SFR-parent",
unit_conversion=86400.00,
length_conversion=1.0,
time_conversion=86400.0,
boundnames=False,
nreaches=len(conns),
packagedata=pkdat,
Expand All @@ -857,7 +858,8 @@ def add_child_sfr(gwfc, gwfnamec):
print_flows=True,
mover=True,
pname="SFR-child",
unit_conversion=86400.00,
length_conversion=1.0,
time_conversion=86400.0,
boundnames=False,
nreaches=len(connsc),
packagedata=pkdatc,
Expand Down
6 changes: 4 additions & 2 deletions autotest/test_gwf_npf03_sfr.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@
hbndl = [12.0, 8.0]

# sfr data
unit_conv = 1.0
len_conv = 1.0
time_conv = 1.0
slope = 1.2012012e-03
width = 20.0
bthick = 1.5
Expand Down Expand Up @@ -270,7 +271,8 @@ def build_model(idx, dir):

sfr = flopy.mf6.ModflowGwfsfr(
gwf,
unit_conversion=unit_conv,
length_conversion=len_conv,
time_conversion=time_conv,
print_stage=True,
print_flows=True,
package_convergence_filerecord=cnvgpth,
Expand Down
6 changes: 4 additions & 2 deletions autotest/test_gwf_sfr_evap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,8 @@ def build_model(idx, dir):
print_stage=True,
print_flows=True,
print_input=True,
unit_conversion=1.0 * 86400,
length_conversion=1.0,
time_conversion=86400.0,
budget_filerecord=budpth,
mover=False,
nreaches=nreaches,
Expand Down Expand Up @@ -362,7 +363,8 @@ def build_model(idx, dir):
print_stage=True,
print_flows=True,
print_input=True,
unit_conversion=1.0 * 86400,
length_conversion=1.0,
time_conversion=86400.0,
budget_filerecord=budpth,
mover=False,
nreaches=nreaches,
Expand Down
3 changes: 2 additions & 1 deletion autotest/test_gwf_vsc03_sfr.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,8 @@ def build_model(idx, dir):
print_flows=True,
print_input=False,
auxiliary=["VDUMMY", "TEMPERATURE"],
unit_conversion=1.486 * 86400,
length_conversion=3.28084,
time_conversion=86400.0,
budget_filerecord=budpth,
mover=False,
nreaches=nreaches,
Expand Down
3 changes: 2 additions & 1 deletion autotest/test_gwt_prudic2004t2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,8 @@ def build_model(idx, dir):
budget_filerecord=gwfname + ".sfr.bud",
mover=True,
pname="SFR-1",
unit_conversion=128390.00,
length_conversion=3.28084,
time_conversion=86400.0,
boundnames=True,
nreaches=len(rivlist),
packagedata=sfrpackagedata,
Expand Down
3 changes: 2 additions & 1 deletion autotest/test_gwt_prudic2004t2fmi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,8 @@ def run_flow_model(dir, exe):
budget_filerecord=gwfname + ".sfr.bud",
mover=True,
pname="SFR-1",
unit_conversion=128390.00,
length_conversion=3.28084,
time_conversion=86400.0,
boundnames=True,
nreaches=len(rivlist),
packagedata=sfrpackagedata,
Expand Down
3 changes: 2 additions & 1 deletion autotest/test_gwt_prudic2004t2fmiats.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,8 @@ def run_flow_model(dir, exe):
budget_filerecord=gwfname + ".sfr.bud",
mover=True,
pname="SFR-1",
unit_conversion=128390.00,
length_conversion=3.28084,
time_conversion=86400.0,
boundnames=True,
nreaches=len(rivlist),
packagedata=sfrpackagedata,
Expand Down
3 changes: 2 additions & 1 deletion autotest/test_gwt_prudic2004t2gwtgwt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,8 @@ def build_gwfgwt_combo(
mover=True,
pname=f"SFR-{isfrseg}",
filename=f"{gwfname}.sfr{isfrseg}",
unit_conversion=128390.00,
length_conversion=3.28084,
time_conversion=86400.0,
boundnames=False,
nreaches=nreaches,
packagedata=sfrpd,
Expand Down
3 changes: 2 additions & 1 deletion autotest/test_gwt_ssm06.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,8 @@ def run_flw_and_trnprt_models(dir, exe):
budget_filerecord=gwfname + ".sfr.bud",
save_flows=True,
pname="SFR-1",
unit_conversion=86400.0 * 1.486,
length_conversion=3.28084,
time_conversion=86400.0,
boundnames=False,
nreaches=len(conns),
packagedata=sfr_pkdat,
Expand Down
3 changes: 2 additions & 1 deletion autotest/test_gwt_ssm06fmi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,8 @@ def run_flow_model(dir, exe):
budget_filerecord=gwfname + ".sfr.bud",
save_flows=True,
pname="SFR-1",
unit_conversion=86400.0 * 1.486,
length_conversion=3.28084,
time_conversion=86400.0,
boundnames=False,
nreaches=len(conns),
packagedata=sfr_pkdat,
Expand Down