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.

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: regenerate classes from mf6 develop #1978

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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 .docs/Notebooks/modpath7_structured_transient_example.py
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,9 @@ def no_flow(w):
[drain[0], drain[1], i + drain[2][0], 322.5, 100000.0, 6]
for i in range(drain[2][1] - drain[2][0])
]
drn = flopy.mf6.modflow.mfgwfdrn.ModflowGwfdrn(gwf, auxiliary=["IFACE"], stress_period_data={0: dd})
drn = flopy.mf6.modflow.mfgwfdrn.ModflowGwfdrn(
gwf, auxiliary=["IFACE"], stress_period_data={0: dd}
)

# output control
headfile = f"{sim_name}.hds"
Expand Down Expand Up @@ -410,5 +412,3 @@ def add_legend(ax):
temp_dir.cleanup()
except:
pass


1 change: 0 additions & 1 deletion autotest/regression/test_mf6_pandas.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@
)
from flopy.mf6.data.mfdataplist import MFPandasList


pytestmark = pytest.mark.mf6


Expand Down
1 change: 0 additions & 1 deletion autotest/test_mbase.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
from flopy.mbase import resolve_exe
from flopy.utils.flopy_io import relpath_safe


_system = system()


Expand Down
2 changes: 1 addition & 1 deletion autotest/test_model_splitter.py
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@ def test_control_records(function_tmpdir):

spd_ls1 = ml1.wel.stress_period_data.get_record(1)
spd_ls2 = ml1.wel.stress_period_data.get_record(2)

if spd_ls1["filename"] is None or spd_ls1["binary"]:
raise AssertionError(
"External ascii files not being preserved for MFList"
Expand Down
15 changes: 15 additions & 0 deletions flopy/mf6/data/dfn/gwf-chd.dfn
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# --------------------- gwf chd options ---------------------
# flopy multi-package
# package-type stress-package
# modflow6 aux-sfac-param head

block options
name auxiliary
Expand Down Expand Up @@ -36,6 +37,7 @@ reader urword
optional true
longname print input to listing file
description REPLACE print_input {'{#1}': 'constant-head'}
mf6internal iprpak

block options
name print_flows
Expand All @@ -44,6 +46,7 @@ reader urword
optional true
longname print CHD flows to listing file
description REPLACE print_flows {'{#1}': 'constant-head'}
mf6internal iprflow

block options
name save_flows
Expand All @@ -52,6 +55,7 @@ reader urword
optional true
longname save CHD flows to budget file
description REPLACE save_flows {'{#1}': 'constant-head'}
mf6internal ipakcb

block options
name ts_filerecord
Expand Down Expand Up @@ -128,6 +132,15 @@ optional false
longname obs6 input filename
description REPLACE obs6_filename {'{#1}': 'constant-head'}

# dev options
block options
name dev_no_newton
type keyword
reader urword
optional true
longname turn off Newton for unconfined cells
description turn off Newton for unconfined cells
mf6internal inewton

# --------------------- gwf chd dimensions ---------------------

Expand Down Expand Up @@ -162,6 +175,7 @@ shape (maxbound)
reader urword
longname
description
mf6internal spd

block period
name cellid
Expand Down Expand Up @@ -195,6 +209,7 @@ optional true
time_series true
longname auxiliary variables
description REPLACE aux {'{#1}': 'constant head'}
mf6internal auxvar

block period
name boundname
Expand Down
15 changes: 15 additions & 0 deletions flopy/mf6/data/dfn/gwf-drn.dfn
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ reader urword
optional true
longname print input to listing file
description REPLACE print_input {'{#1}': 'drain'}
mf6internal iprpak

block options
name print_flows
Expand All @@ -53,6 +54,7 @@ reader urword
optional true
longname print calculated flows to listing file
description REPLACE print_flows {'{#1}': 'drain'}
mf6internal iprflow

block options
name save_flows
Expand All @@ -61,6 +63,7 @@ reader urword
optional true
longname save CHD flows to budget file
description REPLACE save_flows {'{#1}': 'drain'}
mf6internal ipakcb

block options
name ts_filerecord
Expand Down Expand Up @@ -146,6 +149,16 @@ optional true
longname
description REPLACE mover {'{#1}': 'Drain'}

# dev options
block options
name dev_cubic_scaling
type keyword
reader urword
optional true
longname cubic-scaling
description cubic-scaling is used to scale the drain conductance
mf6internal icubicsfac

# --------------------- gwf drn dimensions ---------------------

block dimensions
Expand Down Expand Up @@ -179,6 +192,7 @@ shape (maxbound)
reader urword
longname
description
mf6internal spd

block period
name cellid
Expand Down Expand Up @@ -223,6 +237,7 @@ optional true
time_series true
longname auxiliary variables
description REPLACE aux {'{#1}': 'drain'}
mf6internal auxvar

block period
name boundname
Expand Down
8 changes: 8 additions & 0 deletions flopy/mf6/data/dfn/gwf-evt.dfn
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ reader urword
optional true
longname print input to listing file
description REPLACE print_input {'{#1}': 'evapotranspiration'}
mf6internal iprpak

block options
name print_flows
Expand All @@ -53,6 +54,7 @@ reader urword
optional true
longname print evapotranspiration rates to listing file
description REPLACE print_flows {'{#1}': 'evapotranspiration'}
mf6internal iprflow

block options
name save_flows
Expand All @@ -61,6 +63,7 @@ reader urword
optional true
longname save evapotranspiration rates to budget file
description REPLACE save_flows {'{#1}': 'evapotranspiration'}
mf6internal ipakcb

block options
name ts_filerecord
Expand Down Expand Up @@ -144,6 +147,7 @@ reader urword
optional true
longname specify proportion of evapotranspiration rate at ET surface
description indicates that the proportion of the evapotranspiration rate at the ET surface will be specified as PETM0 in list input.
mf6internal surfratespec

# --------------------- gwf evt dimensions ---------------------

Expand Down Expand Up @@ -185,6 +189,7 @@ shape (maxbound)
reader urword
longname
description
mf6internal spd

block period
name cellid
Expand Down Expand Up @@ -236,6 +241,7 @@ shape (nseg-1)
tagged false
in_record true
reader urword
optional true
time_series true
longname proportion of ET extinction depth
description is the proportion of the ET extinction depth at the bottom of a segment (dimensionless). pxdp is an array of size (nseg - 1). Values in pxdp must be greater than 0.0 and less than 1.0. pxdp values for a cell must increase monotonically. If the Options block includes a TIMESERIESFILE entry (see the ``Time-Variable Input'' section), values can be obtained from a time series by entering the time-series name in place of a numeric value.
Expand All @@ -247,6 +253,7 @@ shape (nseg-1)
tagged false
in_record true
reader urword
optional true
time_series true
longname proportion of maximum ET rate
description is the proportion of the maximum ET flux rate at the bottom of a segment (dimensionless). petm is an array of size (nseg - 1). If the Options block includes a TIMESERIESFILE entry (see the ``Time-Variable Input'' section), values can be obtained from a time series by entering the time-series name in place of a numeric value.
Expand Down Expand Up @@ -274,6 +281,7 @@ optional true
time_series true
longname auxiliary variables
description REPLACE aux {'{#1}': 'evapotranspiration'}
mf6internal auxvar

block period
name boundname
Expand Down
9 changes: 8 additions & 1 deletion flopy/mf6/data/dfn/gwf-evta.dfn
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# --------------------- gwf evta options ---------------------
# flopy multi-package
# package-type stress-package
# modflow6 aux-sfac-param rate

block options
name readasarrays
Expand Down Expand Up @@ -46,6 +47,7 @@ reader urword
optional true
longname print input to listing file
description REPLACE print_input {'{#1}': 'evapotranspiration'}
mf6internal iprpak

block options
name print_flows
Expand All @@ -54,6 +56,7 @@ reader urword
optional true
longname print evapotranspiration rates to listing file
description REPLACE print_flows {'{#1}': 'evapotranspiration'}
mf6internal iprflow

block options
name save_flows
Expand All @@ -62,6 +65,7 @@ reader urword
optional true
longname save CHD flows to budget file
description REPLACE save_flows {'{#1}': 'evapotranspiration'}
mf6internal ipakcb

block options
name tas_filerecord
Expand Down Expand Up @@ -178,6 +182,7 @@ name rate
type double precision
shape (ncol*nrow; ncpl)
reader readarray
time_series true
longname evapotranspiration surface
description is the maximum ET flux rate ($LT^{-1}$).
default_value 1.e-3
Expand All @@ -192,9 +197,11 @@ description is the ET extinction depth ($L$).
default_value 1.0

block period
name aux(iaux)
name aux
type double precision
shape (ncol*nrow; ncpl)
reader readarray
time_series true
longname auxiliary variable iaux
description is an array of values for auxiliary variable AUX(IAUX), where iaux is a value from 1 to NAUX, and AUX(IAUX) must be listed as part of the auxiliary variables. A separate array can be specified for each auxiliary variable. If an array is not specified for an auxiliary variable, then a value of zero is assigned. If the value specified here for the auxiliary variable is the same as auxmultname, then the evapotranspiration rate will be multiplied by this array.
mf6internal auxvar
5 changes: 5 additions & 0 deletions flopy/mf6/data/dfn/gwf-ghb.dfn
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ reader urword
optional true
longname print input to listing file
description REPLACE print_input {'{#1}': 'general-head boundary'}
mf6internal iprpak

block options
name print_flows
Expand All @@ -44,6 +45,7 @@ reader urword
optional true
longname print calculated flows to listing file
description REPLACE print_flows {'{#1}': 'general-head boundary'}
mf6internal iprflow

block options
name save_flows
Expand All @@ -52,6 +54,7 @@ reader urword
optional true
longname save CHD flows to budget file
description REPLACE save_flows {'{#1}': 'general-head boundary'}
mf6internal ipakcb

block options
name ts_filerecord
Expand Down Expand Up @@ -170,6 +173,7 @@ shape (maxbound)
reader urword
longname
description
mf6internal spd

block period
name cellid
Expand Down Expand Up @@ -214,6 +218,7 @@ optional true
time_series true
longname auxiliary variables
description REPLACE aux {'{#1}': 'general-head boundary'}
mf6internal auxvar

block period
name boundname
Expand Down
6 changes: 6 additions & 0 deletions flopy/mf6/data/dfn/gwf-rch.dfn
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# --------------------- gwf rch options ---------------------
# flopy multi-package
# package-type stress-package
# modflow6 aux-sfac-param recharge

block options
name fixed_cell
Expand Down Expand Up @@ -45,6 +46,7 @@ reader urword
optional true
longname print input to listing file
description REPLACE print_input {'{#1}': 'recharge'}
mf6internal iprpak

block options
name print_flows
Expand All @@ -53,6 +55,7 @@ reader urword
optional true
longname print recharge rates to listing file
description REPLACE print_flows {'{#1}': 'recharge'}
mf6internal iprflow

block options
name save_flows
Expand All @@ -61,6 +64,7 @@ reader urword
optional true
longname save recharge to budget file
description REPLACE save_flows {'{#1}': 'recharge'}
mf6internal ipakcb

block options
name ts_filerecord
Expand Down Expand Up @@ -170,6 +174,7 @@ shape (maxbound)
reader urword
longname
description
mf6internal spd

block period
name cellid
Expand Down Expand Up @@ -203,6 +208,7 @@ optional true
time_series true
longname auxiliary variables
description REPLACE aux {'{#1}': 'recharge'}
mf6internal auxvar

block period
name boundname
Expand Down
Loading