From d3e8a2a4342766288166e2251e96721007f5217f Mon Sep 17 00:00:00 2001 From: wpbonelli Date: Wed, 7 Feb 2024 16:03:01 -0500 Subject: [PATCH] refactor(mf6): update DFNS for mf6.4.3, regen/reformat .py files (#2095) --- .docs/Notebooks/array_output_tutorial.py | 1 + .docs/Notebooks/gridgen_example.py | 1 - .../Notebooks/groundwater_paper_example_1.py | 1 - .docs/Notebooks/mf6_mnw2_tutorial01.py | 1 - .../mf6_parallel_model_splitting_example.py | 4 +-- .docs/Notebooks/mfusg_freyberg_example.py | 3 +- .docs/Notebooks/modelgrid_examples.py | 1 - .../modpath7_unstructured_lateral_example.py | 1 - .docs/Notebooks/mt3dms_examples.py | 1 - .docs/Notebooks/nwt_option_blocks_tutorial.py | 1 - .gitignore | 5 ++- autotest/test_geospatial_util.py | 2 +- autotest/test_grid.py | 20 +++++++----- autotest/test_modflow.py | 4 +-- autotest/test_obs.py | 21 +++++++------ flopy/mf6/data/dfn/exg-gwfgwf.dfn | 5 +++ flopy/mf6/data/dfn/exg-gwtgwt.dfn | 5 +++ flopy/mf6/data/dfn/gwf-chd.dfn | 14 +++++++++ flopy/mf6/data/dfn/gwf-disu.dfn | 4 +-- flopy/mf6/data/dfn/gwf-drn.dfn | 15 +++++++++ flopy/mf6/data/dfn/gwf-evt.dfn | 8 +++++ flopy/mf6/data/dfn/gwf-evta.dfn | 8 ++++- flopy/mf6/data/dfn/gwf-ghb.dfn | 5 +++ flopy/mf6/data/dfn/gwf-maw.dfn | 2 +- flopy/mf6/data/dfn/gwf-rch.dfn | 5 +++ flopy/mf6/data/dfn/gwf-rcha.dfn | 8 ++++- flopy/mf6/data/dfn/gwf-riv.dfn | 5 +++ flopy/mf6/data/dfn/gwf-wel.dfn | 8 +++++ flopy/mf6/data/dfn/gwt-cnc.dfn | 7 +++++ flopy/mf6/data/dfn/gwt-disu.dfn | 4 +-- flopy/mf6/data/dfn/gwt-lkt.dfn | 2 +- flopy/mf6/data/dfn/gwt-mwt.dfn | 2 +- flopy/mf6/data/dfn/utl-spc.dfn | 2 +- flopy/mf6/modflow/mfems.py | 2 +- flopy/mf6/modflow/mfgnc.py | 2 +- flopy/mf6/modflow/mfgwf.py | 2 +- flopy/mf6/modflow/mfgwfapi.py | 2 +- flopy/mf6/modflow/mfgwfbuy.py | 2 +- flopy/mf6/modflow/mfgwfchd.py | 19 +++++++++++- flopy/mf6/modflow/mfgwfcsub.py | 2 +- flopy/mf6/modflow/mfgwfdis.py | 2 +- flopy/mf6/modflow/mfgwfdisu.py | 6 ++-- flopy/mf6/modflow/mfgwfdisv.py | 2 +- flopy/mf6/modflow/mfgwfdrn.py | 22 ++++++++++++- flopy/mf6/modflow/mfgwfevt.py | 10 +++++- flopy/mf6/modflow/mfgwfevta.py | 31 +++++++++++-------- flopy/mf6/modflow/mfgwfghb.py | 7 ++++- flopy/mf6/modflow/mfgwfgnc.py | 2 +- flopy/mf6/modflow/mfgwfgwf.py | 7 ++++- flopy/mf6/modflow/mfgwfgwt.py | 2 +- flopy/mf6/modflow/mfgwfhfb.py | 2 +- flopy/mf6/modflow/mfgwfic.py | 2 +- flopy/mf6/modflow/mfgwflak.py | 2 +- flopy/mf6/modflow/mfgwfmaw.py | 12 +++---- flopy/mf6/modflow/mfgwfmvr.py | 2 +- flopy/mf6/modflow/mfgwfnam.py | 2 +- flopy/mf6/modflow/mfgwfnpf.py | 2 +- flopy/mf6/modflow/mfgwfoc.py | 2 +- flopy/mf6/modflow/mfgwfrch.py | 7 ++++- flopy/mf6/modflow/mfgwfrcha.py | 8 ++++- flopy/mf6/modflow/mfgwfriv.py | 7 ++++- flopy/mf6/modflow/mfgwfsfr.py | 2 +- flopy/mf6/modflow/mfgwfsto.py | 2 +- flopy/mf6/modflow/mfgwfuzf.py | 2 +- flopy/mf6/modflow/mfgwfvsc.py | 2 +- flopy/mf6/modflow/mfgwfwel.py | 10 +++++- flopy/mf6/modflow/mfgwt.py | 2 +- flopy/mf6/modflow/mfgwtadv.py | 2 +- flopy/mf6/modflow/mfgwtapi.py | 2 +- flopy/mf6/modflow/mfgwtcnc.py | 9 +++++- flopy/mf6/modflow/mfgwtdis.py | 2 +- flopy/mf6/modflow/mfgwtdisu.py | 6 ++-- flopy/mf6/modflow/mfgwtdisv.py | 2 +- flopy/mf6/modflow/mfgwtdsp.py | 2 +- flopy/mf6/modflow/mfgwtfmi.py | 2 +- flopy/mf6/modflow/mfgwtgwt.py | 7 ++++- flopy/mf6/modflow/mfgwtic.py | 2 +- flopy/mf6/modflow/mfgwtist.py | 2 +- flopy/mf6/modflow/mfgwtlkt.py | 14 ++++----- flopy/mf6/modflow/mfgwtmst.py | 2 +- flopy/mf6/modflow/mfgwtmvt.py | 2 +- flopy/mf6/modflow/mfgwtmwt.py | 16 +++++----- flopy/mf6/modflow/mfgwtnam.py | 2 +- flopy/mf6/modflow/mfgwtoc.py | 2 +- flopy/mf6/modflow/mfgwtsft.py | 2 +- flopy/mf6/modflow/mfgwtsrc.py | 2 +- flopy/mf6/modflow/mfgwtssm.py | 2 +- flopy/mf6/modflow/mfgwtuzt.py | 2 +- flopy/mf6/modflow/mfims.py | 2 +- flopy/mf6/modflow/mfmvr.py | 2 +- flopy/mf6/modflow/mfmvt.py | 2 +- flopy/mf6/modflow/mfnam.py | 2 +- flopy/mf6/modflow/mfsimulation.py | 2 +- flopy/mf6/modflow/mftdis.py | 2 +- flopy/mf6/modflow/mfutlats.py | 2 +- flopy/mf6/modflow/mfutllaktab.py | 2 +- flopy/mf6/modflow/mfutlobs.py | 2 +- flopy/mf6/modflow/mfutlsfrtab.py | 2 +- flopy/mf6/modflow/mfutlspc.py | 4 +-- flopy/mf6/modflow/mfutlspca.py | 2 +- flopy/mf6/modflow/mfutltas.py | 2 +- flopy/mf6/modflow/mfutlts.py | 2 +- flopy/mf6/modflow/mfutltvk.py | 2 +- flopy/mf6/modflow/mfutltvs.py | 2 +- 104 files changed, 335 insertions(+), 149 deletions(-) diff --git a/.docs/Notebooks/array_output_tutorial.py b/.docs/Notebooks/array_output_tutorial.py index 87b963e231..ba35fa49e2 100644 --- a/.docs/Notebooks/array_output_tutorial.py +++ b/.docs/Notebooks/array_output_tutorial.py @@ -35,6 +35,7 @@ import matplotlib as mpl import matplotlib.pyplot as plt import numpy as np + import flopy # Set name of MODFLOW exe diff --git a/.docs/Notebooks/gridgen_example.py b/.docs/Notebooks/gridgen_example.py index 64a7589b80..a9d944bfa6 100644 --- a/.docs/Notebooks/gridgen_example.py +++ b/.docs/Notebooks/gridgen_example.py @@ -35,7 +35,6 @@ # run installed version of flopy or add local path import flopy - from flopy.utils import flopy_io from flopy.utils.gridgen import Gridgen diff --git a/.docs/Notebooks/groundwater_paper_example_1.py b/.docs/Notebooks/groundwater_paper_example_1.py index 5c3f1b24cf..4afe99585a 100644 --- a/.docs/Notebooks/groundwater_paper_example_1.py +++ b/.docs/Notebooks/groundwater_paper_example_1.py @@ -31,7 +31,6 @@ # run installed version of flopy or add local path import flopy - import flopy.modflow as fpm import flopy.utils as fpu diff --git a/.docs/Notebooks/mf6_mnw2_tutorial01.py b/.docs/Notebooks/mf6_mnw2_tutorial01.py index 6aaa7d05d8..745afbb95d 100644 --- a/.docs/Notebooks/mf6_mnw2_tutorial01.py +++ b/.docs/Notebooks/mf6_mnw2_tutorial01.py @@ -23,7 +23,6 @@ from tempfile import TemporaryDirectory import numpy as np - import pandas as pd import flopy diff --git a/.docs/Notebooks/mf6_parallel_model_splitting_example.py b/.docs/Notebooks/mf6_parallel_model_splitting_example.py index e6f09ced6f..77c4019bea 100644 --- a/.docs/Notebooks/mf6_parallel_model_splitting_example.py +++ b/.docs/Notebooks/mf6_parallel_model_splitting_example.py @@ -21,15 +21,13 @@ # The `Mf6Splitter()` class supports Structured, Vertex, and Unstructured Grid models. import sys - -import flopy - from pathlib import Path from tempfile import TemporaryDirectory import matplotlib.pyplot as plt import numpy as np +import flopy from flopy.mf6.utils import Mf6Splitter from flopy.plot import styles from flopy.utils.geometry import LineString, Polygon diff --git a/.docs/Notebooks/mfusg_freyberg_example.py b/.docs/Notebooks/mfusg_freyberg_example.py index 028c267941..7f92e40f8f 100644 --- a/.docs/Notebooks/mfusg_freyberg_example.py +++ b/.docs/Notebooks/mfusg_freyberg_example.py @@ -23,9 +23,10 @@ # # First we locate the model directory. +from pathlib import Path + # + from pprint import pformat -from pathlib import Path import flopy diff --git a/.docs/Notebooks/modelgrid_examples.py b/.docs/Notebooks/modelgrid_examples.py index 1aa682f1cb..53f711cb63 100644 --- a/.docs/Notebooks/modelgrid_examples.py +++ b/.docs/Notebooks/modelgrid_examples.py @@ -39,7 +39,6 @@ import numpy as np import flopy - from flopy.discretization import StructuredGrid, UnstructuredGrid, VertexGrid print(sys.version) diff --git a/.docs/Notebooks/modpath7_unstructured_lateral_example.py b/.docs/Notebooks/modpath7_unstructured_lateral_example.py index eb9c0fe03e..22ccf7a478 100644 --- a/.docs/Notebooks/modpath7_unstructured_lateral_example.py +++ b/.docs/Notebooks/modpath7_unstructured_lateral_example.py @@ -36,7 +36,6 @@ import flopy - temp_dir = TemporaryDirectory() workspace = Path(temp_dir.name) sim_name = "ex04_mf6" diff --git a/.docs/Notebooks/mt3dms_examples.py b/.docs/Notebooks/mt3dms_examples.py index 2dcc22de37..77996876db 100644 --- a/.docs/Notebooks/mt3dms_examples.py +++ b/.docs/Notebooks/mt3dms_examples.py @@ -45,7 +45,6 @@ import numpy as np import flopy - from flopy.utils.util_array import read1d mpl.rcParams["figure.figsize"] = (8, 8) diff --git a/.docs/Notebooks/nwt_option_blocks_tutorial.py b/.docs/Notebooks/nwt_option_blocks_tutorial.py index cb2f950a28..f9acbb18cc 100644 --- a/.docs/Notebooks/nwt_option_blocks_tutorial.py +++ b/.docs/Notebooks/nwt_option_blocks_tutorial.py @@ -29,7 +29,6 @@ from tempfile import TemporaryDirectory import flopy - from flopy.utils import OptionBlock print(sys.version) diff --git a/.gitignore b/.gitignore index fea24ed341..5b7873e8dc 100644 --- a/.gitignore +++ b/.gitignore @@ -100,4 +100,7 @@ app .vscode # mac files -**.DS_Store \ No newline at end of file +**.DS_Store + +# DFN backups +flopy/mf6/data/dfn_backup/ \ No newline at end of file diff --git a/autotest/test_geospatial_util.py b/autotest/test_geospatial_util.py index cda0c8bf2c..3783fde2be 100644 --- a/autotest/test_geospatial_util.py +++ b/autotest/test_geospatial_util.py @@ -549,4 +549,4 @@ def test_geopandas_dtypes( gi2 = t.__geo_interface__ is_equal = gi2 == gi1[ix] - assert is_equal, "GeoSpatialCollection conversion error" \ No newline at end of file + assert is_equal, "GeoSpatialCollection conversion error" diff --git a/autotest/test_grid.py b/autotest/test_grid.py index 19df6c91a3..7bf27622e0 100644 --- a/autotest/test_grid.py +++ b/autotest/test_grid.py @@ -1091,14 +1091,18 @@ def test_voronoi_vertex_grid(function_tmpdir): @requires_pkg("shapely", "scipy") @pytest.mark.parametrize( "grid_info", - [ - GridCases.voronoi_polygon(), - GridCases.voronoi_rectangle(), - GridCases.voronoi_circle(), - GridCases.voronoi_nested_circles(), - GridCases.voronoi_polygons(), - GridCases.voronoi_many_polygons(), - ] if (has_pkg("shapely", True) and has_pkg("scipy", True)) else [] + ( + [ + GridCases.voronoi_polygon(), + GridCases.voronoi_rectangle(), + GridCases.voronoi_circle(), + GridCases.voronoi_nested_circles(), + GridCases.voronoi_polygons(), + GridCases.voronoi_many_polygons(), + ] + if (has_pkg("shapely", True) and has_pkg("scipy", True)) + else [] + ), ) def test_voronoi_grid(request, function_tmpdir, grid_info): name = ( diff --git a/autotest/test_modflow.py b/autotest/test_modflow.py index 009f119ce7..62675b9b27 100644 --- a/autotest/test_modflow.py +++ b/autotest/test_modflow.py @@ -1292,7 +1292,7 @@ def test_load_with_list_reader(function_tmpdir): @requires_exe("mf2005") @pytest.mark.parametrize( "container", - ["recarray", "dataframe", "dict_of_recarray", "dict_of_dataframe"] + ["recarray", "dataframe", "dict_of_recarray", "dict_of_dataframe"], ) def test_pkg_data_containers(function_tmpdir, container): """Test various containers for package data (list, ndarray, recarray, dataframe, dict of such)""" @@ -1304,7 +1304,6 @@ def test_pkg_data_containers(function_tmpdir, container): name = "pkg_data" ws = function_tmpdir - # create the ghbs ghb_ra = ModflowGhb.get_empty(20) @@ -1360,6 +1359,7 @@ def test_pkg_data_containers(function_tmpdir, container): m.write_input() success, buff = m.run_model(silent=False, report=True) from pprint import pformat + assert success, pformat(buff) diff --git a/autotest/test_obs.py b/autotest/test_obs.py index 187e32a206..215b1893a4 100644 --- a/autotest/test_obs.py +++ b/autotest/test_obs.py @@ -3,9 +3,9 @@ import numpy as np import pytest -import flopy from modflow_devtools.markers import requires_exe +import flopy from flopy.modflow import ( HeadObservation, Modflow, @@ -20,7 +20,6 @@ from flopy.utils.observationfile import Mf6Obs - @requires_exe("mf2005") def test_hob_simple(function_tmpdir): """ @@ -463,21 +462,23 @@ def test_duplicate_observation_names(function_tmpdir): top = 10 botm = [0, -10] - dis = flopy.mf6.ModflowGwfdis(gwf, nlay=nlay, nrow=nrow, ncol=ncol, top=top, - botm=botm) + dis = flopy.mf6.ModflowGwfdis( + gwf, nlay=nlay, nrow=nrow, ncol=ncol, top=top, botm=botm + ) ic = flopy.mf6.ModflowGwfic(gwf, strt=top) npf = flopy.mf6.ModflowGwfnpf(gwf, k=1, k33=1) sto = flopy.mf6.ModflowGwfsto(gwf) obs = flopy.mf6.ModflowUtlobs( gwf, - continuous={"repeat_obs.csv": [ - ("obsdup", "HEAD", (0, 4, 4)), - ("obsdup", "HEAD", (1, 4, 4)) - ] - } + continuous={ + "repeat_obs.csv": [ + ("obsdup", "HEAD", (0, 4, 4)), + ("obsdup", "HEAD", (1, 4, 4)), + ] + }, ) - spd = {0: [((1, 4, 4), -50.)]} + spd = {0: [((1, 4, 4), -50.0)]} wel = flopy.mf6.ModflowGwfwel(gwf, stress_period_data=spd) sim.write_simulation() sim.run_simulation() diff --git a/flopy/mf6/data/dfn/exg-gwfgwf.dfn b/flopy/mf6/data/dfn/exg-gwfgwf.dfn index 66ce83bced..2232bfbdf9 100644 --- a/flopy/mf6/data/dfn/exg-gwfgwf.dfn +++ b/flopy/mf6/data/dfn/exg-gwfgwf.dfn @@ -26,6 +26,7 @@ reader urword optional true longname keyword to print input to list file description keyword to indicate that the list of exchange entries will be echoed to the listing file immediately after it is read. +mf6internal iprpak block options name print_flows @@ -34,6 +35,7 @@ reader urword optional true longname keyword to print gwfgwf flows to list file description keyword to indicate that the list of exchange flow rates will be printed to the listing file for every stress period in which ``SAVE BUDGET'' is specified in Output Control. +mf6internal iprflow block options name save_flows @@ -42,6 +44,7 @@ reader urword optional true longname keyword to save GWFGWF flows description keyword to indicate that cell-by-cell flow terms will be written to the budget file for each model provided that the Output Control for the models are set up with the ``BUDGET SAVE FILE'' option. +mf6internal ipakcb block options name cell_averaging @@ -207,6 +210,7 @@ reader urword optional true longname activate interface model on exchange description activates the interface model mechanism for calculating the coefficients at (and possibly near) the exchange. This keyword should only be used for development purposes. +mf6internal dev_ifmod_on # --------------------- exg gwfgwf dimensions --------------------- @@ -224,6 +228,7 @@ description keyword and integer value specifying the number of GWF-GWF exchanges block exchangedata name exchangedata type recarray cellidm1 cellidm2 ihc cl1 cl2 hwva aux boundname +shape (nexg) reader urword optional false longname exchange data diff --git a/flopy/mf6/data/dfn/exg-gwtgwt.dfn b/flopy/mf6/data/dfn/exg-gwtgwt.dfn index f7956f7368..f5aeb24199 100644 --- a/flopy/mf6/data/dfn/exg-gwtgwt.dfn +++ b/flopy/mf6/data/dfn/exg-gwtgwt.dfn @@ -42,6 +42,7 @@ reader urword optional true longname keyword to print input to list file description keyword to indicate that the list of exchange entries will be echoed to the listing file immediately after it is read. +mf6internal iprpak block options name print_flows @@ -50,6 +51,7 @@ reader urword optional true longname keyword to print gwfgwf flows to list file description keyword to indicate that the list of exchange flow rates will be printed to the listing file for every stress period in which ``SAVE BUDGET'' is specified in Output Control. +mf6internal iprflow block options name save_flows @@ -58,6 +60,7 @@ reader urword optional true longname keyword to save GWFGWF flows description keyword to indicate that cell-by-cell flow terms will be written to the budget file for each model provided that the Output Control for the models are set up with the ``BUDGET SAVE FILE'' option. +mf6internal ipakcb block options name adv_scheme @@ -168,6 +171,7 @@ reader urword optional true longname activate interface model on exchange description activates the interface model mechanism for calculating the coefficients at (and possibly near) the exchange. This keyword should only be used for development purposes. +mf6internal dev_ifmod_on # --------------------- exg gwtgwt dimensions --------------------- @@ -185,6 +189,7 @@ description keyword and integer value specifying the number of GWT-GWT exchanges block exchangedata name exchangedata type recarray cellidm1 cellidm2 ihc cl1 cl2 hwva aux boundname +shape (nexg) reader urword optional false longname exchange data diff --git a/flopy/mf6/data/dfn/gwf-chd.dfn b/flopy/mf6/data/dfn/gwf-chd.dfn index 6fbf9c1220..56e3ca306a 100644 --- a/flopy/mf6/data/dfn/gwf-chd.dfn +++ b/flopy/mf6/data/dfn/gwf-chd.dfn @@ -36,6 +36,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 @@ -44,6 +45,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 @@ -52,6 +54,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 @@ -128,6 +131,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 --------------------- @@ -162,6 +174,7 @@ shape (maxbound) reader urword longname description +mf6internal spd block period name cellid @@ -195,6 +208,7 @@ optional true time_series true longname auxiliary variables description REPLACE aux {'{#1}': 'constant head'} +mf6internal auxvar block period name boundname diff --git a/flopy/mf6/data/dfn/gwf-disu.dfn b/flopy/mf6/data/dfn/gwf-disu.dfn index 8c131363e2..48e18477c1 100644 --- a/flopy/mf6/data/dfn/gwf-disu.dfn +++ b/flopy/mf6/data/dfn/gwf-disu.dfn @@ -176,7 +176,7 @@ name vertices type recarray iv xv yv shape (nvert) reader urword -optional false +optional true longname vertices data description @@ -219,7 +219,7 @@ name cell2d type recarray icell2d xc yc ncvert icvert shape (nodes) reader urword -optional false +optional true longname cell2d data description diff --git a/flopy/mf6/data/dfn/gwf-drn.dfn b/flopy/mf6/data/dfn/gwf-drn.dfn index a1ee3aeb0a..e88cc6f43c 100644 --- a/flopy/mf6/data/dfn/gwf-drn.dfn +++ b/flopy/mf6/data/dfn/gwf-drn.dfn @@ -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 @@ -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 @@ -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 @@ -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 @@ -179,6 +192,7 @@ shape (maxbound) reader urword longname description +mf6internal spd block period name cellid @@ -223,6 +237,7 @@ optional true time_series true longname auxiliary variables description REPLACE aux {'{#1}': 'drain'} +mf6internal auxvar block period name boundname diff --git a/flopy/mf6/data/dfn/gwf-evt.dfn b/flopy/mf6/data/dfn/gwf-evt.dfn index 7073307a0e..33f5a97161 100644 --- a/flopy/mf6/data/dfn/gwf-evt.dfn +++ b/flopy/mf6/data/dfn/gwf-evt.dfn @@ -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 @@ -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 @@ -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 @@ -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 --------------------- @@ -185,6 +189,7 @@ shape (maxbound) reader urword longname description +mf6internal spd block period name cellid @@ -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. @@ -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. @@ -274,6 +281,7 @@ optional true time_series true longname auxiliary variables description REPLACE aux {'{#1}': 'evapotranspiration'} +mf6internal auxvar block period name boundname diff --git a/flopy/mf6/data/dfn/gwf-evta.dfn b/flopy/mf6/data/dfn/gwf-evta.dfn index 22e3060fad..2dc966cb43 100644 --- a/flopy/mf6/data/dfn/gwf-evta.dfn +++ b/flopy/mf6/data/dfn/gwf-evta.dfn @@ -46,6 +46,7 @@ reader urword optional true longname print input to listing file description REPLACE print_input {'{#1}': 'evapotranspiration'} +mf6internal iprpak block options name print_flows @@ -54,6 +55,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 @@ -62,6 +64,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 @@ -178,6 +181,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 @@ -192,9 +196,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 diff --git a/flopy/mf6/data/dfn/gwf-ghb.dfn b/flopy/mf6/data/dfn/gwf-ghb.dfn index bab639ba85..c97c78804b 100644 --- a/flopy/mf6/data/dfn/gwf-ghb.dfn +++ b/flopy/mf6/data/dfn/gwf-ghb.dfn @@ -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 @@ -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 @@ -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 @@ -170,6 +173,7 @@ shape (maxbound) reader urword longname description +mf6internal spd block period name cellid @@ -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 diff --git a/flopy/mf6/data/dfn/gwf-maw.dfn b/flopy/mf6/data/dfn/gwf-maw.dfn index 4a7784baf3..2e957ec2c8 100644 --- a/flopy/mf6/data/dfn/gwf-maw.dfn +++ b/flopy/mf6/data/dfn/gwf-maw.dfn @@ -485,7 +485,7 @@ tagged false in_record true reader urword longname screen bottom -description value that defines the bottom elevation of the screen for the multi-aquifer well connection. If CONDEQN is SPECIFIED, THIEM, SKIN, or COMPOSITE, SCRN\_BOT can be any value is set to the bottom of the cell. If CONDEQN is MEAN, SCRN\_BOT is set to the multi-aquifer well connection cell bottom if the specified value is less than the cell bottom. The program will terminate with an error if the screen bottom is greater than the screen top. +description value that defines the bottom elevation of the screen for the multi-aquifer well connection. If CONDEQN is SPECIFIED, THIEM, SKIN, or COMPOSITE, SCRN\_BOT can be any value and is set to the bottom of the cell. If CONDEQN is MEAN, SCRN\_BOT is set to the multi-aquifer well connection cell bottom if the specified value is less than the cell bottom. The program will terminate with an error if the screen bottom is greater than the screen top. block connectiondata name hk_skin diff --git a/flopy/mf6/data/dfn/gwf-rch.dfn b/flopy/mf6/data/dfn/gwf-rch.dfn index d452cdead4..da53c84986 100644 --- a/flopy/mf6/data/dfn/gwf-rch.dfn +++ b/flopy/mf6/data/dfn/gwf-rch.dfn @@ -45,6 +45,7 @@ reader urword optional true longname print input to listing file description REPLACE print_input {'{#1}': 'recharge'} +mf6internal iprpak block options name print_flows @@ -53,6 +54,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 @@ -61,6 +63,7 @@ reader urword optional true longname save recharge to budget file description REPLACE save_flows {'{#1}': 'recharge'} +mf6internal ipakcb block options name ts_filerecord @@ -170,6 +173,7 @@ shape (maxbound) reader urword longname description +mf6internal spd block period name cellid @@ -203,6 +207,7 @@ optional true time_series true longname auxiliary variables description REPLACE aux {'{#1}': 'recharge'} +mf6internal auxvar block period name boundname diff --git a/flopy/mf6/data/dfn/gwf-rcha.dfn b/flopy/mf6/data/dfn/gwf-rcha.dfn index b38ad9148a..a0fb9ec0f6 100644 --- a/flopy/mf6/data/dfn/gwf-rcha.dfn +++ b/flopy/mf6/data/dfn/gwf-rcha.dfn @@ -46,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 @@ -54,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 @@ -62,6 +64,7 @@ reader urword optional true longname save CHD flows to budget file description REPLACE save_flows {'{#1}': 'recharge'} +mf6internal ipakcb block options name tas_filerecord @@ -104,7 +107,7 @@ reader urword optional false tagged false longname file name of time series information -description defines a time-array-series file defining a time-array series that can be used to assign time-varying values. See the Time-Variable Input section for instructions on using the time-array series capability. +description defines a time-array-series file defining a time-array series that can be used to assign time-varying values. See the ``Time-Variable Input'' section for instructions on using the time-array series capability. block options name obs_filerecord @@ -169,6 +172,7 @@ name recharge type double precision shape (ncol*nrow; ncpl) reader readarray +time_series true longname recharge rate description is the recharge flux rate ($LT^{-1}$). This rate is multiplied inside the program by the surface area of the cell to calculate the volumetric recharge rate. The recharge array may be defined by a time-array series (see the "Using Time-Array Series in a Package" section). default_value 1.e-3 @@ -178,6 +182,8 @@ name aux type double precision shape (ncol*nrow; ncpl) reader readarray +time_series true optional 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 recharge array will be multiplied by this array. +mf6internal auxvar diff --git a/flopy/mf6/data/dfn/gwf-riv.dfn b/flopy/mf6/data/dfn/gwf-riv.dfn index 52105038b2..fca586f17e 100644 --- a/flopy/mf6/data/dfn/gwf-riv.dfn +++ b/flopy/mf6/data/dfn/gwf-riv.dfn @@ -36,6 +36,7 @@ reader urword optional true longname print input to listing file description REPLACE print_input {'{#1}': 'river'} +mf6internal iprpak block options name print_flows @@ -44,6 +45,7 @@ reader urword optional true longname print calculated flows to listing file description REPLACE print_flows {'{#1}': 'river'} +mf6internal iprflow block options name save_flows @@ -52,6 +54,7 @@ reader urword optional true longname save CHD flows to budget file description REPLACE save_flows {'{#1}': 'river'} +mf6internal ipakcb block options name ts_filerecord @@ -170,6 +173,7 @@ shape (maxbound) reader urword longname description +mf6internal spd block period name cellid @@ -225,6 +229,7 @@ optional true time_series true longname auxiliary variables description REPLACE aux {'{#1}': 'river'} +mf6internal auxvar block period name boundname diff --git a/flopy/mf6/data/dfn/gwf-wel.dfn b/flopy/mf6/data/dfn/gwf-wel.dfn index 56a1293f9c..c7de3e7e96 100644 --- a/flopy/mf6/data/dfn/gwf-wel.dfn +++ b/flopy/mf6/data/dfn/gwf-wel.dfn @@ -36,6 +36,7 @@ reader urword optional true longname print input to listing file description REPLACE print_input {'{#1}': 'well'} +mf6internal iprpak block options name print_flows @@ -44,6 +45,7 @@ reader urword optional true longname print calculated flows to listing file description REPLACE print_flows {'{#1}': 'well'} +mf6internal iprflow block options name save_flows @@ -52,6 +54,7 @@ reader urword optional true longname save well flows to budget file description REPLACE save_flows {'{#1}': 'well'} +mf6internal ipakcb block options name auto_flow_reduce @@ -60,6 +63,7 @@ reader urword optional true longname cell fractional thickness for reduced pumping description keyword and real value that defines the fraction of the cell thickness used as an interval for smoothly adjusting negative pumping rates to 0 in cells with head values less than or equal to the bottom of the cell. Negative pumping rates are adjusted to 0 or a smaller negative value when the head in the cell is equal to or less than the calculated interval above the cell bottom. AUTO\_FLOW\_REDUCE is set to 0.1 if the specified value is less than or equal to zero. By default, negative pumping rates are not reduced during a simulation. +mf6internal flowred block options name afrcsv_filerecord @@ -70,6 +74,7 @@ tagged true optional true longname description +mf6internal afrcsv_rec block options name auto_flow_reduce_csv @@ -81,6 +86,7 @@ tagged true optional false longname budget keyword description keyword to specify that record corresponds to the AUTO\_FLOW\_REDUCE output option in which a new record is written for each well and for each time step in which the user-requested extraction rate is reduced by the program. +mf6internal afrcsv block options name fileout @@ -222,6 +228,7 @@ shape (maxbound) reader urword longname description +mf6internal spd block period name cellid @@ -255,6 +262,7 @@ optional true time_series true longname auxiliary variables description REPLACE aux {'{#1}': 'well'} +mf6internal auxvar block period name boundname diff --git a/flopy/mf6/data/dfn/gwt-cnc.dfn b/flopy/mf6/data/dfn/gwt-cnc.dfn index e3ef02bce6..3a75ccb4cf 100644 --- a/flopy/mf6/data/dfn/gwt-cnc.dfn +++ b/flopy/mf6/data/dfn/gwt-cnc.dfn @@ -1,4 +1,5 @@ # --------------------- gwt cnc options --------------------- +# flopy multi-package block options name auxiliary @@ -34,6 +35,7 @@ reader urword optional true longname print input to listing file description REPLACE print_input {'{#1}': 'constant concentration'} +mf6internal iprflow block options name print_flows @@ -42,6 +44,7 @@ reader urword optional true longname print calculated flows to listing file description REPLACE print_flows {'{#1}': 'constant concentration'} +mf6internal ipakcb block options name save_flows @@ -50,6 +53,7 @@ reader urword optional true longname save constant concentration flows to budget file description REPLACE save_flows {'{#1}': 'constant concentration'} +mf6internal iprpak block options name ts_filerecord @@ -160,6 +164,7 @@ shape (maxbound) reader urword longname description +mf6internal spd block period name cellid @@ -181,6 +186,7 @@ reader urword time_series true longname constant concentration value description is the constant concentration value. 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. +mf6internal tspvar block period name aux @@ -193,6 +199,7 @@ optional true time_series true longname auxiliary variables description REPLACE aux {'{#1}': 'constant concentration'} +mf6internal auxvar block period name boundname diff --git a/flopy/mf6/data/dfn/gwt-disu.dfn b/flopy/mf6/data/dfn/gwt-disu.dfn index 09043e92ca..00ffe21ad0 100644 --- a/flopy/mf6/data/dfn/gwt-disu.dfn +++ b/flopy/mf6/data/dfn/gwt-disu.dfn @@ -176,7 +176,7 @@ name vertices type recarray iv xv yv shape (nvert) reader urword -optional false +optional true longname vertices data description @@ -219,7 +219,7 @@ name cell2d type recarray icell2d xc yc ncvert icvert shape (nodes) reader urword -optional false +optional true longname cell2d data description diff --git a/flopy/mf6/data/dfn/gwt-lkt.dfn b/flopy/mf6/data/dfn/gwt-lkt.dfn index 60b5aaf773..6dbca6ffb1 100644 --- a/flopy/mf6/data/dfn/gwt-lkt.dfn +++ b/flopy/mf6/data/dfn/gwt-lkt.dfn @@ -352,7 +352,7 @@ tagged false in_record true reader urword longname -description line of information that is parsed into a keyword and values. Keyword values that can be used to start the LAKSETTING string include: STATUS, CONCENTRATION, RAINFALL, EVAPORATION, RUNOFF, and AUXILIARY. These settings are used to assign the concentration of associated with the corresponding flow terms. Concentrations cannot be specified for all flow terms. For example, the Lake Package supports a ``WITHDRAWAL'' flow term. If this withdrawal term is active, then water will be withdrawn from the lake at the calculated concentration of the lake. +description line of information that is parsed into a keyword and values. Keyword values that can be used to start the LAKSETTING string include: STATUS, CONCENTRATION, RAINFALL, EVAPORATION, RUNOFF, EXT-INFLOW, and AUXILIARY. These settings are used to assign the concentration of associated with the corresponding flow terms. Concentrations cannot be specified for all flow terms. For example, the Lake Package supports a ``WITHDRAWAL'' flow term. If this withdrawal term is active, then water will be withdrawn from the lake at the calculated concentration of the lake. block period name status diff --git a/flopy/mf6/data/dfn/gwt-mwt.dfn b/flopy/mf6/data/dfn/gwt-mwt.dfn index 4eef9970b8..b2b4346785 100644 --- a/flopy/mf6/data/dfn/gwt-mwt.dfn +++ b/flopy/mf6/data/dfn/gwt-mwt.dfn @@ -352,7 +352,7 @@ tagged false in_record true reader urword longname -description line of information that is parsed into a keyword and values. Keyword values that can be used to start the MWTSETTING string include: STATUS, CONCENTRATION, RAINFALL, EVAPORATION, RUNOFF, and AUXILIARY. These settings are used to assign the concentration associated with the corresponding flow terms. Concentrations cannot be specified for all flow terms. For example, the Multi-Aquifer Well Package supports a ``WITHDRAWAL'' flow term. If this withdrawal term is active, then water will be withdrawn from the well at the calculated concentration of the well. +description line of information that is parsed into a keyword and values. Keyword values that can be used to start the MWTSETTING string include: STATUS, CONCENTRATION, RATE, and AUXILIARY. These settings are used to assign the concentration associated with the corresponding flow terms. Concentrations cannot be specified for all flow terms. For example, the Multi-Aquifer Well Package supports a ``WITHDRAWAL'' flow term. If this withdrawal term is active, then water will be withdrawn from the well at the calculated concentration of the well. block period name status diff --git a/flopy/mf6/data/dfn/utl-spc.dfn b/flopy/mf6/data/dfn/utl-spc.dfn index 5ca5bd0ae0..6fabd0c0f6 100644 --- a/flopy/mf6/data/dfn/utl-spc.dfn +++ b/flopy/mf6/data/dfn/utl-spc.dfn @@ -104,7 +104,7 @@ tagged false in_record true reader urword longname -description line of information that is parsed into a keyword and values. Keyword values that can be used to start the MAWSETTING string include: CONCENTRATION. +description line of information that is parsed into a keyword and values. Keyword values that can be used to start the SPCSETTING string include: CONCENTRATION. block period name concentration diff --git a/flopy/mf6/modflow/mfems.py b/flopy/mf6/modflow/mfems.py index b3fa1f5228..5e1f0c05dd 100644 --- a/flopy/mf6/modflow/mfems.py +++ b/flopy/mf6/modflow/mfems.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on September 30, 2023 14:44:04 UTC +# FILE created on February 07, 2024 20:16:08 UTC from .. import mfpackage diff --git a/flopy/mf6/modflow/mfgnc.py b/flopy/mf6/modflow/mfgnc.py index a5206142c0..9b7ddd997c 100644 --- a/flopy/mf6/modflow/mfgnc.py +++ b/flopy/mf6/modflow/mfgnc.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on September 30, 2023 14:44:04 UTC +# FILE created on February 07, 2024 20:16:08 UTC from .. import mfpackage from ..data.mfdatautil import ListTemplateGenerator diff --git a/flopy/mf6/modflow/mfgwf.py b/flopy/mf6/modflow/mfgwf.py index 405ebf1a72..0abb681769 100644 --- a/flopy/mf6/modflow/mfgwf.py +++ b/flopy/mf6/modflow/mfgwf.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on September 30, 2023 14:44:04 UTC +# FILE created on February 07, 2024 20:16:08 UTC from .. import mfmodel from ..data.mfdatautil import ArrayTemplateGenerator, ListTemplateGenerator diff --git a/flopy/mf6/modflow/mfgwfapi.py b/flopy/mf6/modflow/mfgwfapi.py index 1a8e17645a..c4df402fe4 100644 --- a/flopy/mf6/modflow/mfgwfapi.py +++ b/flopy/mf6/modflow/mfgwfapi.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on September 30, 2023 14:44:04 UTC +# FILE created on February 07, 2024 20:16:08 UTC from .. import mfpackage from ..data.mfdatautil import ListTemplateGenerator diff --git a/flopy/mf6/modflow/mfgwfbuy.py b/flopy/mf6/modflow/mfgwfbuy.py index bda007d810..f675f03af0 100644 --- a/flopy/mf6/modflow/mfgwfbuy.py +++ b/flopy/mf6/modflow/mfgwfbuy.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on September 30, 2023 14:44:04 UTC +# FILE created on February 07, 2024 20:16:08 UTC from .. import mfpackage from ..data.mfdatautil import ListTemplateGenerator diff --git a/flopy/mf6/modflow/mfgwfchd.py b/flopy/mf6/modflow/mfgwfchd.py index d667a83f4f..22c7d1626c 100644 --- a/flopy/mf6/modflow/mfgwfchd.py +++ b/flopy/mf6/modflow/mfgwfchd.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on September 30, 2023 14:44:04 UTC +# FILE created on February 07, 2024 20:16:08 UTC from .. import mfpackage from ..data.mfdatautil import ListTemplateGenerator @@ -60,6 +60,8 @@ class ModflowGwfchd(mfpackage.MFPackage): containing data for the obs package with variable names as keys and package data as values. Data just for the observations variable is also acceptable. See obs package documentation for more information. + dev_no_newton : boolean + * dev_no_newton (boolean) turn off Newton for unconfined cells maxbound : integer * maxbound (integer) integer value specifying the maximum number of constant-head cells that will be specified for use during any stress @@ -148,6 +150,7 @@ class ModflowGwfchd(mfpackage.MFPackage): "type keyword", "reader urword", "optional true", + "mf6internal iprpak", ], [ "block options", @@ -155,6 +158,7 @@ class ModflowGwfchd(mfpackage.MFPackage): "type keyword", "reader urword", "optional true", + "mf6internal iprflow", ], [ "block options", @@ -162,6 +166,7 @@ class ModflowGwfchd(mfpackage.MFPackage): "type keyword", "reader urword", "optional true", + "mf6internal ipakcb", ], [ "block options", @@ -237,6 +242,14 @@ class ModflowGwfchd(mfpackage.MFPackage): "reader urword", "optional false", ], + [ + "block options", + "name dev_no_newton", + "type keyword", + "reader urword", + "optional true", + "mf6internal inewton", + ], [ "block dimensions", "name maxbound", @@ -262,6 +275,7 @@ class ModflowGwfchd(mfpackage.MFPackage): "type recarray cellid head aux boundname", "shape (maxbound)", "reader urword", + "mf6internal spd", ], [ "block period", @@ -292,6 +306,7 @@ class ModflowGwfchd(mfpackage.MFPackage): "reader urword", "optional true", "time_series true", + "mf6internal auxvar", ], [ "block period", @@ -317,6 +332,7 @@ def __init__( save_flows=None, timeseries=None, observations=None, + dev_no_newton=None, maxbound=None, stress_period_data=None, filename=None, @@ -342,6 +358,7 @@ def __init__( self._obs_package = self.build_child_package( "obs", observations, "continuous", self._obs_filerecord ) + self.dev_no_newton = self.build_mfdata("dev_no_newton", dev_no_newton) self.maxbound = self.build_mfdata("maxbound", maxbound) self.stress_period_data = self.build_mfdata( "stress_period_data", stress_period_data diff --git a/flopy/mf6/modflow/mfgwfcsub.py b/flopy/mf6/modflow/mfgwfcsub.py index a1204cbc76..c153f71700 100644 --- a/flopy/mf6/modflow/mfgwfcsub.py +++ b/flopy/mf6/modflow/mfgwfcsub.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on September 30, 2023 14:44:04 UTC +# FILE created on February 07, 2024 20:16:08 UTC from .. import mfpackage from ..data.mfdatautil import ArrayTemplateGenerator, ListTemplateGenerator diff --git a/flopy/mf6/modflow/mfgwfdis.py b/flopy/mf6/modflow/mfgwfdis.py index 1e33334a1e..bcf83ee388 100644 --- a/flopy/mf6/modflow/mfgwfdis.py +++ b/flopy/mf6/modflow/mfgwfdis.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on September 30, 2023 14:44:04 UTC +# FILE created on February 07, 2024 20:16:08 UTC from .. import mfpackage from ..data.mfdatautil import ArrayTemplateGenerator diff --git a/flopy/mf6/modflow/mfgwfdisu.py b/flopy/mf6/modflow/mfgwfdisu.py index 5a9ac212b0..e9c84f2636 100644 --- a/flopy/mf6/modflow/mfgwfdisu.py +++ b/flopy/mf6/modflow/mfgwfdisu.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on September 30, 2023 14:44:04 UTC +# FILE created on February 07, 2024 20:16:08 UTC from .. import mfpackage from ..data.mfdatautil import ArrayTemplateGenerator, ListTemplateGenerator @@ -358,7 +358,7 @@ class ModflowGwfdisu(mfpackage.MFPackage): "type recarray iv xv yv", "shape (nvert)", "reader urword", - "optional false", + "optional true", ], [ "block vertices", @@ -394,7 +394,7 @@ class ModflowGwfdisu(mfpackage.MFPackage): "type recarray icell2d xc yc ncvert icvert", "shape (nodes)", "reader urword", - "optional false", + "optional true", ], [ "block cell2d", diff --git a/flopy/mf6/modflow/mfgwfdisv.py b/flopy/mf6/modflow/mfgwfdisv.py index 4e4d2dfe39..cb2d6ad5d6 100644 --- a/flopy/mf6/modflow/mfgwfdisv.py +++ b/flopy/mf6/modflow/mfgwfdisv.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on September 30, 2023 14:44:04 UTC +# FILE created on February 07, 2024 20:16:08 UTC from .. import mfpackage from ..data.mfdatautil import ArrayTemplateGenerator, ListTemplateGenerator diff --git a/flopy/mf6/modflow/mfgwfdrn.py b/flopy/mf6/modflow/mfgwfdrn.py index 82374593b9..c22b20f2db 100644 --- a/flopy/mf6/modflow/mfgwfdrn.py +++ b/flopy/mf6/modflow/mfgwfdrn.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on September 30, 2023 14:44:04 UTC +# FILE created on February 07, 2024 20:16:08 UTC from .. import mfpackage from ..data.mfdatautil import ListTemplateGenerator @@ -79,6 +79,9 @@ class ModflowGwfdrn(mfpackage.MFPackage): Package can be used with the Water Mover (MVR) Package. When the MOVER option is specified, additional memory is allocated within the package to store the available, provided, and received water. + dev_cubic_scaling : boolean + * dev_cubic_scaling (boolean) cubic-scaling is used to scale the drain + conductance maxbound : integer * maxbound (integer) integer value specifying the maximum number of drains cells that will be specified for use during any stress period. @@ -179,6 +182,7 @@ class ModflowGwfdrn(mfpackage.MFPackage): "type keyword", "reader urword", "optional true", + "mf6internal iprpak", ], [ "block options", @@ -186,6 +190,7 @@ class ModflowGwfdrn(mfpackage.MFPackage): "type keyword", "reader urword", "optional true", + "mf6internal iprflow", ], [ "block options", @@ -193,6 +198,7 @@ class ModflowGwfdrn(mfpackage.MFPackage): "type keyword", "reader urword", "optional true", + "mf6internal ipakcb", ], [ "block options", @@ -276,6 +282,14 @@ class ModflowGwfdrn(mfpackage.MFPackage): "reader urword", "optional true", ], + [ + "block options", + "name dev_cubic_scaling", + "type keyword", + "reader urword", + "optional true", + "mf6internal icubicsfac", + ], [ "block dimensions", "name maxbound", @@ -301,6 +315,7 @@ class ModflowGwfdrn(mfpackage.MFPackage): "type recarray cellid elev cond aux boundname", "shape (maxbound)", "reader urword", + "mf6internal spd", ], [ "block period", @@ -341,6 +356,7 @@ class ModflowGwfdrn(mfpackage.MFPackage): "reader urword", "optional true", "time_series true", + "mf6internal auxvar", ], [ "block period", @@ -368,6 +384,7 @@ def __init__( timeseries=None, observations=None, mover=None, + dev_cubic_scaling=None, maxbound=None, stress_period_data=None, filename=None, @@ -395,6 +412,9 @@ def __init__( "obs", observations, "continuous", self._obs_filerecord ) self.mover = self.build_mfdata("mover", mover) + self.dev_cubic_scaling = self.build_mfdata( + "dev_cubic_scaling", dev_cubic_scaling + ) self.maxbound = self.build_mfdata("maxbound", maxbound) self.stress_period_data = self.build_mfdata( "stress_period_data", stress_period_data diff --git a/flopy/mf6/modflow/mfgwfevt.py b/flopy/mf6/modflow/mfgwfevt.py index 232c878d13..81c843e7b9 100644 --- a/flopy/mf6/modflow/mfgwfevt.py +++ b/flopy/mf6/modflow/mfgwfevt.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on September 30, 2023 14:44:04 UTC +# FILE created on February 07, 2024 20:16:08 UTC from .. import mfpackage from ..data.mfdatautil import ListTemplateGenerator @@ -199,6 +199,7 @@ class ModflowGwfevt(mfpackage.MFPackage): "type keyword", "reader urword", "optional true", + "mf6internal iprpak", ], [ "block options", @@ -206,6 +207,7 @@ class ModflowGwfevt(mfpackage.MFPackage): "type keyword", "reader urword", "optional true", + "mf6internal iprflow", ], [ "block options", @@ -213,6 +215,7 @@ class ModflowGwfevt(mfpackage.MFPackage): "type keyword", "reader urword", "optional true", + "mf6internal ipakcb", ], [ "block options", @@ -294,6 +297,7 @@ class ModflowGwfevt(mfpackage.MFPackage): "type keyword", "reader urword", "optional true", + "mf6internal surfratespec", ], [ "block dimensions", @@ -328,6 +332,7 @@ class ModflowGwfevt(mfpackage.MFPackage): "boundname", "shape (maxbound)", "reader urword", + "mf6internal spd", ], [ "block period", @@ -376,6 +381,7 @@ class ModflowGwfevt(mfpackage.MFPackage): "tagged false", "in_record true", "reader urword", + "optional true", "time_series true", ], [ @@ -386,6 +392,7 @@ class ModflowGwfevt(mfpackage.MFPackage): "tagged false", "in_record true", "reader urword", + "optional true", "time_series true", ], [ @@ -409,6 +416,7 @@ class ModflowGwfevt(mfpackage.MFPackage): "reader urword", "optional true", "time_series true", + "mf6internal auxvar", ], [ "block period", diff --git a/flopy/mf6/modflow/mfgwfevta.py b/flopy/mf6/modflow/mfgwfevta.py index ba9f9f5521..677a50d418 100644 --- a/flopy/mf6/modflow/mfgwfevta.py +++ b/flopy/mf6/modflow/mfgwfevta.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on September 30, 2023 14:44:04 UTC +# FILE created on February 07, 2024 20:16:08 UTC from .. import mfpackage from ..data.mfdatautil import ArrayTemplateGenerator, ListTemplateGenerator @@ -81,15 +81,14 @@ class ModflowGwfevta(mfpackage.MFPackage): * rate (double) is the maximum ET flux rate (:math:`LT^{-1}`). depth : [double] * depth (double) is the ET extinction depth (:math:`L`). - aux(iaux) : [double] - * aux(iaux) (double) 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. + aux : [double] + * aux (double) 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. filename : String File name for this package. pname : String @@ -112,7 +111,7 @@ class ModflowGwfevta(mfpackage.MFPackage): surface = ArrayTemplateGenerator(("gwf6", "evta", "period", "surface")) rate = ArrayTemplateGenerator(("gwf6", "evta", "period", "rate")) depth = ArrayTemplateGenerator(("gwf6", "evta", "period", "depth")) - aux = ArrayTemplateGenerator(("gwf6", "evta", "period", "aux(iaux)")) + aux = ArrayTemplateGenerator(("gwf6", "evta", "period", "aux")) package_abbr = "gwfevta" _package_type = "evta" dfn_file_name = "gwf-evta.dfn" @@ -158,6 +157,7 @@ class ModflowGwfevta(mfpackage.MFPackage): "type keyword", "reader urword", "optional true", + "mf6internal iprpak", ], [ "block options", @@ -165,6 +165,7 @@ class ModflowGwfevta(mfpackage.MFPackage): "type keyword", "reader urword", "optional true", + "mf6internal iprflow", ], [ "block options", @@ -172,6 +173,7 @@ class ModflowGwfevta(mfpackage.MFPackage): "type keyword", "reader urword", "optional true", + "mf6internal ipakcb", ], [ "block options", @@ -282,6 +284,7 @@ class ModflowGwfevta(mfpackage.MFPackage): "type double precision", "shape (ncol*nrow; ncpl)", "reader readarray", + "time_series true", "default_value 1.e-3", ], [ @@ -294,10 +297,12 @@ class ModflowGwfevta(mfpackage.MFPackage): ], [ "block period", - "name aux(iaux)", + "name aux", "type double precision", "shape (ncol*nrow; ncpl)", "reader readarray", + "time_series true", + "mf6internal auxvar", ], ] @@ -347,5 +352,5 @@ def __init__( self.surface = self.build_mfdata("surface", surface) self.rate = self.build_mfdata("rate", rate) self.depth = self.build_mfdata("depth", depth) - self.aux = self.build_mfdata("aux(iaux)", aux) + self.aux = self.build_mfdata("aux", aux) self._init_complete = True diff --git a/flopy/mf6/modflow/mfgwfghb.py b/flopy/mf6/modflow/mfgwfghb.py index b14c183a92..b01bff4287 100644 --- a/flopy/mf6/modflow/mfgwfghb.py +++ b/flopy/mf6/modflow/mfgwfghb.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on September 30, 2023 14:44:04 UTC +# FILE created on February 07, 2024 20:16:08 UTC from .. import mfpackage from ..data.mfdatautil import ListTemplateGenerator @@ -159,6 +159,7 @@ class ModflowGwfghb(mfpackage.MFPackage): "type keyword", "reader urword", "optional true", + "mf6internal iprpak", ], [ "block options", @@ -166,6 +167,7 @@ class ModflowGwfghb(mfpackage.MFPackage): "type keyword", "reader urword", "optional true", + "mf6internal iprflow", ], [ "block options", @@ -173,6 +175,7 @@ class ModflowGwfghb(mfpackage.MFPackage): "type keyword", "reader urword", "optional true", + "mf6internal ipakcb", ], [ "block options", @@ -281,6 +284,7 @@ class ModflowGwfghb(mfpackage.MFPackage): "type recarray cellid bhead cond aux boundname", "shape (maxbound)", "reader urword", + "mf6internal spd", ], [ "block period", @@ -321,6 +325,7 @@ class ModflowGwfghb(mfpackage.MFPackage): "reader urword", "optional true", "time_series true", + "mf6internal auxvar", ], [ "block period", diff --git a/flopy/mf6/modflow/mfgwfgnc.py b/flopy/mf6/modflow/mfgwfgnc.py index 3802a3672a..189539306a 100644 --- a/flopy/mf6/modflow/mfgwfgnc.py +++ b/flopy/mf6/modflow/mfgwfgnc.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on September 30, 2023 14:44:04 UTC +# FILE created on February 07, 2024 20:16:08 UTC from .. import mfpackage from ..data.mfdatautil import ListTemplateGenerator diff --git a/flopy/mf6/modflow/mfgwfgwf.py b/flopy/mf6/modflow/mfgwfgwf.py index c8f56e3720..f01443068e 100644 --- a/flopy/mf6/modflow/mfgwfgwf.py +++ b/flopy/mf6/modflow/mfgwfgwf.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on September 30, 2023 14:44:04 UTC +# FILE created on February 07, 2024 20:16:08 UTC from .. import mfpackage from ..data.mfdatautil import ListTemplateGenerator @@ -196,6 +196,7 @@ class ModflowGwfgwf(mfpackage.MFPackage): "type keyword", "reader urword", "optional true", + "mf6internal iprpak", ], [ "block options", @@ -203,6 +204,7 @@ class ModflowGwfgwf(mfpackage.MFPackage): "type keyword", "reader urword", "optional true", + "mf6internal iprflow", ], [ "block options", @@ -210,6 +212,7 @@ class ModflowGwfgwf(mfpackage.MFPackage): "type keyword", "reader urword", "optional true", + "mf6internal ipakcb", ], [ "block options", @@ -367,6 +370,7 @@ class ModflowGwfgwf(mfpackage.MFPackage): "type keyword", "reader urword", "optional true", + "mf6internal dev_ifmod_on", ], [ "block dimensions", @@ -379,6 +383,7 @@ class ModflowGwfgwf(mfpackage.MFPackage): "block exchangedata", "name exchangedata", "type recarray cellidm1 cellidm2 ihc cl1 cl2 hwva aux boundname", + "shape (nexg)", "reader urword", "optional false", ], diff --git a/flopy/mf6/modflow/mfgwfgwt.py b/flopy/mf6/modflow/mfgwfgwt.py index 0b736c156c..917ceb14d6 100644 --- a/flopy/mf6/modflow/mfgwfgwt.py +++ b/flopy/mf6/modflow/mfgwfgwt.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on September 30, 2023 14:44:04 UTC +# FILE created on February 07, 2024 20:16:08 UTC from .. import mfpackage diff --git a/flopy/mf6/modflow/mfgwfhfb.py b/flopy/mf6/modflow/mfgwfhfb.py index afce6426a6..97f4e510b9 100644 --- a/flopy/mf6/modflow/mfgwfhfb.py +++ b/flopy/mf6/modflow/mfgwfhfb.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on September 30, 2023 14:44:04 UTC +# FILE created on February 07, 2024 20:16:08 UTC from .. import mfpackage from ..data.mfdatautil import ListTemplateGenerator diff --git a/flopy/mf6/modflow/mfgwfic.py b/flopy/mf6/modflow/mfgwfic.py index fe8dbe984b..7c81d99bcf 100644 --- a/flopy/mf6/modflow/mfgwfic.py +++ b/flopy/mf6/modflow/mfgwfic.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on September 30, 2023 14:44:04 UTC +# FILE created on February 07, 2024 20:16:08 UTC from .. import mfpackage from ..data.mfdatautil import ArrayTemplateGenerator diff --git a/flopy/mf6/modflow/mfgwflak.py b/flopy/mf6/modflow/mfgwflak.py index 7aeab0b0c3..759e4a65f2 100644 --- a/flopy/mf6/modflow/mfgwflak.py +++ b/flopy/mf6/modflow/mfgwflak.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on September 30, 2023 14:44:04 UTC +# FILE created on February 07, 2024 20:16:08 UTC from .. import mfpackage from ..data.mfdatautil import ListTemplateGenerator diff --git a/flopy/mf6/modflow/mfgwfmaw.py b/flopy/mf6/modflow/mfgwfmaw.py index 7de620b698..9e72fa1d01 100644 --- a/flopy/mf6/modflow/mfgwfmaw.py +++ b/flopy/mf6/modflow/mfgwfmaw.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on September 30, 2023 14:44:04 UTC +# FILE created on February 07, 2024 20:16:08 UTC from .. import mfpackage from ..data.mfdatautil import ListTemplateGenerator @@ -234,11 +234,11 @@ class ModflowGwfmaw(mfpackage.MFPackage): if the screen top is less than the screen bottom. * scrn_bot (double) value that defines the bottom elevation of the screen for the multi-aquifer well connection. If CONDEQN is - SPECIFIED, THIEM, SKIN, or COMPOSITE, SCRN_BOT can be any value is - set to the bottom of the cell. If CONDEQN is MEAN, SCRN_BOT is set to - the multi-aquifer well connection cell bottom if the specified value - is less than the cell bottom. The program will terminate with an - error if the screen bottom is greater than the screen top. + SPECIFIED, THIEM, SKIN, or COMPOSITE, SCRN_BOT can be any value and + is set to the bottom of the cell. If CONDEQN is MEAN, SCRN_BOT is set + to the multi-aquifer well connection cell bottom if the specified + value is less than the cell bottom. The program will terminate with + an error if the screen bottom is greater than the screen top. * hk_skin (double) value that defines the skin (filter pack) hydraulic conductivity (if CONDEQN for the multi-aquifer well is SKIN, CUMULATIVE, or MEAN) or conductance (if CONDEQN for the multi-aquifer diff --git a/flopy/mf6/modflow/mfgwfmvr.py b/flopy/mf6/modflow/mfgwfmvr.py index 203d57f326..1916be7361 100644 --- a/flopy/mf6/modflow/mfgwfmvr.py +++ b/flopy/mf6/modflow/mfgwfmvr.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on September 30, 2023 14:44:04 UTC +# FILE created on February 07, 2024 20:16:08 UTC from .. import mfpackage from ..data.mfdatautil import ListTemplateGenerator diff --git a/flopy/mf6/modflow/mfgwfnam.py b/flopy/mf6/modflow/mfgwfnam.py index b01c1741f7..574df26525 100644 --- a/flopy/mf6/modflow/mfgwfnam.py +++ b/flopy/mf6/modflow/mfgwfnam.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on September 30, 2023 14:44:04 UTC +# FILE created on February 07, 2024 20:16:08 UTC from .. import mfpackage from ..data.mfdatautil import ListTemplateGenerator diff --git a/flopy/mf6/modflow/mfgwfnpf.py b/flopy/mf6/modflow/mfgwfnpf.py index 56c886882f..db25596f2a 100644 --- a/flopy/mf6/modflow/mfgwfnpf.py +++ b/flopy/mf6/modflow/mfgwfnpf.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on September 30, 2023 14:44:04 UTC +# FILE created on February 07, 2024 20:16:08 UTC from .. import mfpackage from ..data.mfdatautil import ArrayTemplateGenerator, ListTemplateGenerator diff --git a/flopy/mf6/modflow/mfgwfoc.py b/flopy/mf6/modflow/mfgwfoc.py index 347a0d938a..c637ebe74a 100644 --- a/flopy/mf6/modflow/mfgwfoc.py +++ b/flopy/mf6/modflow/mfgwfoc.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on September 30, 2023 14:44:04 UTC +# FILE created on February 07, 2024 20:16:08 UTC from .. import mfpackage from ..data.mfdatautil import ListTemplateGenerator diff --git a/flopy/mf6/modflow/mfgwfrch.py b/flopy/mf6/modflow/mfgwfrch.py index 146b1a7fec..4697a7b46a 100644 --- a/flopy/mf6/modflow/mfgwfrch.py +++ b/flopy/mf6/modflow/mfgwfrch.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on September 30, 2023 14:44:04 UTC +# FILE created on February 07, 2024 20:16:08 UTC from .. import mfpackage from ..data.mfdatautil import ListTemplateGenerator @@ -162,6 +162,7 @@ class ModflowGwfrch(mfpackage.MFPackage): "type keyword", "reader urword", "optional true", + "mf6internal iprpak", ], [ "block options", @@ -169,6 +170,7 @@ class ModflowGwfrch(mfpackage.MFPackage): "type keyword", "reader urword", "optional true", + "mf6internal iprflow", ], [ "block options", @@ -176,6 +178,7 @@ class ModflowGwfrch(mfpackage.MFPackage): "type keyword", "reader urword", "optional true", + "mf6internal ipakcb", ], [ "block options", @@ -276,6 +279,7 @@ class ModflowGwfrch(mfpackage.MFPackage): "type recarray cellid recharge aux boundname", "shape (maxbound)", "reader urword", + "mf6internal spd", ], [ "block period", @@ -306,6 +310,7 @@ class ModflowGwfrch(mfpackage.MFPackage): "reader urword", "optional true", "time_series true", + "mf6internal auxvar", ], [ "block period", diff --git a/flopy/mf6/modflow/mfgwfrcha.py b/flopy/mf6/modflow/mfgwfrcha.py index 8b50d52c7c..31f7a253ee 100644 --- a/flopy/mf6/modflow/mfgwfrcha.py +++ b/flopy/mf6/modflow/mfgwfrcha.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on September 30, 2023 14:44:04 UTC +# FILE created on February 07, 2024 20:16:08 UTC from .. import mfpackage from ..data.mfdatautil import ArrayTemplateGenerator, ListTemplateGenerator @@ -156,6 +156,7 @@ class ModflowGwfrcha(mfpackage.MFPackage): "type keyword", "reader urword", "optional true", + "mf6internal iprpak", ], [ "block options", @@ -163,6 +164,7 @@ class ModflowGwfrcha(mfpackage.MFPackage): "type keyword", "reader urword", "optional true", + "mf6internal iprflow", ], [ "block options", @@ -170,6 +172,7 @@ class ModflowGwfrcha(mfpackage.MFPackage): "type keyword", "reader urword", "optional true", + "mf6internal ipakcb", ], [ "block options", @@ -272,6 +275,7 @@ class ModflowGwfrcha(mfpackage.MFPackage): "type double precision", "shape (ncol*nrow; ncpl)", "reader readarray", + "time_series true", "default_value 1.e-3", ], [ @@ -280,7 +284,9 @@ class ModflowGwfrcha(mfpackage.MFPackage): "type double precision", "shape (ncol*nrow; ncpl)", "reader readarray", + "time_series true", "optional true", + "mf6internal auxvar", ], ] diff --git a/flopy/mf6/modflow/mfgwfriv.py b/flopy/mf6/modflow/mfgwfriv.py index 4726e96cd9..13fca28a63 100644 --- a/flopy/mf6/modflow/mfgwfriv.py +++ b/flopy/mf6/modflow/mfgwfriv.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on September 30, 2023 14:44:04 UTC +# FILE created on February 07, 2024 20:16:08 UTC from .. import mfpackage from ..data.mfdatautil import ListTemplateGenerator @@ -160,6 +160,7 @@ class ModflowGwfriv(mfpackage.MFPackage): "type keyword", "reader urword", "optional true", + "mf6internal iprpak", ], [ "block options", @@ -167,6 +168,7 @@ class ModflowGwfriv(mfpackage.MFPackage): "type keyword", "reader urword", "optional true", + "mf6internal iprflow", ], [ "block options", @@ -174,6 +176,7 @@ class ModflowGwfriv(mfpackage.MFPackage): "type keyword", "reader urword", "optional true", + "mf6internal ipakcb", ], [ "block options", @@ -282,6 +285,7 @@ class ModflowGwfriv(mfpackage.MFPackage): "type recarray cellid stage cond rbot aux boundname", "shape (maxbound)", "reader urword", + "mf6internal spd", ], [ "block period", @@ -332,6 +336,7 @@ class ModflowGwfriv(mfpackage.MFPackage): "reader urword", "optional true", "time_series true", + "mf6internal auxvar", ], [ "block period", diff --git a/flopy/mf6/modflow/mfgwfsfr.py b/flopy/mf6/modflow/mfgwfsfr.py index a5e6599131..31ca9b42cb 100644 --- a/flopy/mf6/modflow/mfgwfsfr.py +++ b/flopy/mf6/modflow/mfgwfsfr.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on September 30, 2023 14:44:04 UTC +# FILE created on February 07, 2024 20:16:08 UTC from .. import mfpackage from ..data.mfdatautil import ListTemplateGenerator diff --git a/flopy/mf6/modflow/mfgwfsto.py b/flopy/mf6/modflow/mfgwfsto.py index 2bdb75f272..b4dc1d9fd9 100644 --- a/flopy/mf6/modflow/mfgwfsto.py +++ b/flopy/mf6/modflow/mfgwfsto.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on September 30, 2023 14:44:04 UTC +# FILE created on February 07, 2024 20:16:08 UTC from .. import mfpackage from ..data.mfdatautil import ArrayTemplateGenerator, ListTemplateGenerator diff --git a/flopy/mf6/modflow/mfgwfuzf.py b/flopy/mf6/modflow/mfgwfuzf.py index 49beacecc3..27c1e6df60 100644 --- a/flopy/mf6/modflow/mfgwfuzf.py +++ b/flopy/mf6/modflow/mfgwfuzf.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on September 30, 2023 14:44:04 UTC +# FILE created on February 07, 2024 20:16:08 UTC from .. import mfpackage from ..data.mfdatautil import ListTemplateGenerator diff --git a/flopy/mf6/modflow/mfgwfvsc.py b/flopy/mf6/modflow/mfgwfvsc.py index 5285cbb720..ff62a22ab7 100644 --- a/flopy/mf6/modflow/mfgwfvsc.py +++ b/flopy/mf6/modflow/mfgwfvsc.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on September 30, 2023 14:44:04 UTC +# FILE created on February 07, 2024 20:16:08 UTC from .. import mfpackage from ..data.mfdatautil import ListTemplateGenerator diff --git a/flopy/mf6/modflow/mfgwfwel.py b/flopy/mf6/modflow/mfgwfwel.py index 66a087b6ad..b4a0831e64 100644 --- a/flopy/mf6/modflow/mfgwfwel.py +++ b/flopy/mf6/modflow/mfgwfwel.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on September 30, 2023 14:44:04 UTC +# FILE created on February 07, 2024 20:16:08 UTC from .. import mfpackage from ..data.mfdatautil import ListTemplateGenerator @@ -172,6 +172,7 @@ class ModflowGwfwel(mfpackage.MFPackage): "type keyword", "reader urword", "optional true", + "mf6internal iprpak", ], [ "block options", @@ -179,6 +180,7 @@ class ModflowGwfwel(mfpackage.MFPackage): "type keyword", "reader urword", "optional true", + "mf6internal iprflow", ], [ "block options", @@ -186,6 +188,7 @@ class ModflowGwfwel(mfpackage.MFPackage): "type keyword", "reader urword", "optional true", + "mf6internal ipakcb", ], [ "block options", @@ -193,6 +196,7 @@ class ModflowGwfwel(mfpackage.MFPackage): "type double precision", "reader urword", "optional true", + "mf6internal flowred", ], [ "block options", @@ -202,6 +206,7 @@ class ModflowGwfwel(mfpackage.MFPackage): "reader urword", "tagged true", "optional true", + "mf6internal afrcsv_rec", ], [ "block options", @@ -212,6 +217,7 @@ class ModflowGwfwel(mfpackage.MFPackage): "reader urword", "tagged true", "optional false", + "mf6internal afrcsv", ], [ "block options", @@ -341,6 +347,7 @@ class ModflowGwfwel(mfpackage.MFPackage): "type recarray cellid q aux boundname", "shape (maxbound)", "reader urword", + "mf6internal spd", ], [ "block period", @@ -371,6 +378,7 @@ class ModflowGwfwel(mfpackage.MFPackage): "reader urword", "optional true", "time_series true", + "mf6internal auxvar", ], [ "block period", diff --git a/flopy/mf6/modflow/mfgwt.py b/flopy/mf6/modflow/mfgwt.py index 1c6d476f0f..80aaa1286c 100644 --- a/flopy/mf6/modflow/mfgwt.py +++ b/flopy/mf6/modflow/mfgwt.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on September 30, 2023 14:44:04 UTC +# FILE created on February 07, 2024 20:16:08 UTC from .. import mfmodel from ..data.mfdatautil import ArrayTemplateGenerator, ListTemplateGenerator diff --git a/flopy/mf6/modflow/mfgwtadv.py b/flopy/mf6/modflow/mfgwtadv.py index 9003e73c89..542be274eb 100644 --- a/flopy/mf6/modflow/mfgwtadv.py +++ b/flopy/mf6/modflow/mfgwtadv.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on September 30, 2023 14:44:04 UTC +# FILE created on February 07, 2024 20:16:08 UTC from .. import mfpackage diff --git a/flopy/mf6/modflow/mfgwtapi.py b/flopy/mf6/modflow/mfgwtapi.py index b5ed4050c2..4eef482cbe 100644 --- a/flopy/mf6/modflow/mfgwtapi.py +++ b/flopy/mf6/modflow/mfgwtapi.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on September 30, 2023 14:44:04 UTC +# FILE created on February 07, 2024 20:16:08 UTC from .. import mfpackage from ..data.mfdatautil import ListTemplateGenerator diff --git a/flopy/mf6/modflow/mfgwtcnc.py b/flopy/mf6/modflow/mfgwtcnc.py index fb3b823b63..b5c76de766 100644 --- a/flopy/mf6/modflow/mfgwtcnc.py +++ b/flopy/mf6/modflow/mfgwtcnc.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on September 30, 2023 14:44:04 UTC +# FILE created on February 07, 2024 20:16:08 UTC from .. import mfpackage from ..data.mfdatautil import ListTemplateGenerator @@ -119,6 +119,7 @@ class ModflowGwtcnc(mfpackage.MFPackage): dfn = [ [ "header", + "multi-package", ], [ "block options", @@ -150,6 +151,7 @@ class ModflowGwtcnc(mfpackage.MFPackage): "type keyword", "reader urword", "optional true", + "mf6internal iprflow", ], [ "block options", @@ -157,6 +159,7 @@ class ModflowGwtcnc(mfpackage.MFPackage): "type keyword", "reader urword", "optional true", + "mf6internal ipakcb", ], [ "block options", @@ -164,6 +167,7 @@ class ModflowGwtcnc(mfpackage.MFPackage): "type keyword", "reader urword", "optional true", + "mf6internal iprpak", ], [ "block options", @@ -264,6 +268,7 @@ class ModflowGwtcnc(mfpackage.MFPackage): "type recarray cellid conc aux boundname", "shape (maxbound)", "reader urword", + "mf6internal spd", ], [ "block period", @@ -283,6 +288,7 @@ class ModflowGwtcnc(mfpackage.MFPackage): "in_record true", "reader urword", "time_series true", + "mf6internal tspvar", ], [ "block period", @@ -294,6 +300,7 @@ class ModflowGwtcnc(mfpackage.MFPackage): "reader urword", "optional true", "time_series true", + "mf6internal auxvar", ], [ "block period", diff --git a/flopy/mf6/modflow/mfgwtdis.py b/flopy/mf6/modflow/mfgwtdis.py index dc66d78ad3..7cf93d6868 100644 --- a/flopy/mf6/modflow/mfgwtdis.py +++ b/flopy/mf6/modflow/mfgwtdis.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on September 30, 2023 14:44:04 UTC +# FILE created on February 07, 2024 20:16:08 UTC from .. import mfpackage from ..data.mfdatautil import ArrayTemplateGenerator diff --git a/flopy/mf6/modflow/mfgwtdisu.py b/flopy/mf6/modflow/mfgwtdisu.py index 03fcf41cfc..ea0ac306ea 100644 --- a/flopy/mf6/modflow/mfgwtdisu.py +++ b/flopy/mf6/modflow/mfgwtdisu.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on September 30, 2023 14:44:04 UTC +# FILE created on February 07, 2024 20:16:08 UTC from .. import mfpackage from ..data.mfdatautil import ArrayTemplateGenerator, ListTemplateGenerator @@ -358,7 +358,7 @@ class ModflowGwtdisu(mfpackage.MFPackage): "type recarray iv xv yv", "shape (nvert)", "reader urword", - "optional false", + "optional true", ], [ "block vertices", @@ -394,7 +394,7 @@ class ModflowGwtdisu(mfpackage.MFPackage): "type recarray icell2d xc yc ncvert icvert", "shape (nodes)", "reader urword", - "optional false", + "optional true", ], [ "block cell2d", diff --git a/flopy/mf6/modflow/mfgwtdisv.py b/flopy/mf6/modflow/mfgwtdisv.py index a65194bada..d07731710d 100644 --- a/flopy/mf6/modflow/mfgwtdisv.py +++ b/flopy/mf6/modflow/mfgwtdisv.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on September 30, 2023 14:44:04 UTC +# FILE created on February 07, 2024 20:16:08 UTC from .. import mfpackage from ..data.mfdatautil import ArrayTemplateGenerator, ListTemplateGenerator diff --git a/flopy/mf6/modflow/mfgwtdsp.py b/flopy/mf6/modflow/mfgwtdsp.py index ad263956e4..de1cd4f90e 100644 --- a/flopy/mf6/modflow/mfgwtdsp.py +++ b/flopy/mf6/modflow/mfgwtdsp.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on September 30, 2023 14:44:04 UTC +# FILE created on February 07, 2024 20:16:08 UTC from .. import mfpackage from ..data.mfdatautil import ArrayTemplateGenerator diff --git a/flopy/mf6/modflow/mfgwtfmi.py b/flopy/mf6/modflow/mfgwtfmi.py index 3eeabfaea8..423d428d79 100644 --- a/flopy/mf6/modflow/mfgwtfmi.py +++ b/flopy/mf6/modflow/mfgwtfmi.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on September 30, 2023 14:44:04 UTC +# FILE created on February 07, 2024 20:16:08 UTC from .. import mfpackage from ..data.mfdatautil import ListTemplateGenerator diff --git a/flopy/mf6/modflow/mfgwtgwt.py b/flopy/mf6/modflow/mfgwtgwt.py index 98bd1ce7aa..e90d60ae88 100644 --- a/flopy/mf6/modflow/mfgwtgwt.py +++ b/flopy/mf6/modflow/mfgwtgwt.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on September 30, 2023 14:44:04 UTC +# FILE created on February 07, 2024 20:16:08 UTC from .. import mfpackage from ..data.mfdatautil import ListTemplateGenerator @@ -208,6 +208,7 @@ class ModflowGwtgwt(mfpackage.MFPackage): "type keyword", "reader urword", "optional true", + "mf6internal iprpak", ], [ "block options", @@ -215,6 +216,7 @@ class ModflowGwtgwt(mfpackage.MFPackage): "type keyword", "reader urword", "optional true", + "mf6internal iprflow", ], [ "block options", @@ -222,6 +224,7 @@ class ModflowGwtgwt(mfpackage.MFPackage): "type keyword", "reader urword", "optional true", + "mf6internal ipakcb", ], [ "block options", @@ -327,6 +330,7 @@ class ModflowGwtgwt(mfpackage.MFPackage): "type keyword", "reader urword", "optional true", + "mf6internal dev_ifmod_on", ], [ "block dimensions", @@ -339,6 +343,7 @@ class ModflowGwtgwt(mfpackage.MFPackage): "block exchangedata", "name exchangedata", "type recarray cellidm1 cellidm2 ihc cl1 cl2 hwva aux boundname", + "shape (nexg)", "reader urword", "optional false", ], diff --git a/flopy/mf6/modflow/mfgwtic.py b/flopy/mf6/modflow/mfgwtic.py index 1c8527100f..a7f5fc6352 100644 --- a/flopy/mf6/modflow/mfgwtic.py +++ b/flopy/mf6/modflow/mfgwtic.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on September 30, 2023 14:44:04 UTC +# FILE created on February 07, 2024 20:16:08 UTC from .. import mfpackage from ..data.mfdatautil import ArrayTemplateGenerator diff --git a/flopy/mf6/modflow/mfgwtist.py b/flopy/mf6/modflow/mfgwtist.py index 3018130b07..3df913bd55 100644 --- a/flopy/mf6/modflow/mfgwtist.py +++ b/flopy/mf6/modflow/mfgwtist.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on September 30, 2023 14:44:04 UTC +# FILE created on February 07, 2024 20:16:08 UTC from .. import mfpackage from ..data.mfdatautil import ArrayTemplateGenerator, ListTemplateGenerator diff --git a/flopy/mf6/modflow/mfgwtlkt.py b/flopy/mf6/modflow/mfgwtlkt.py index b4d0fd9648..0b84249cce 100644 --- a/flopy/mf6/modflow/mfgwtlkt.py +++ b/flopy/mf6/modflow/mfgwtlkt.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on September 30, 2023 14:44:04 UTC +# FILE created on February 07, 2024 20:16:08 UTC from .. import mfpackage from ..data.mfdatautil import ListTemplateGenerator @@ -124,12 +124,12 @@ class ModflowGwtlkt(mfpackage.MFPackage): * laksetting (keystring) line of information that is parsed into a keyword and values. Keyword values that can be used to start the LAKSETTING string include: STATUS, CONCENTRATION, RAINFALL, - EVAPORATION, RUNOFF, and AUXILIARY. These settings are used to assign - the concentration of associated with the corresponding flow terms. - Concentrations cannot be specified for all flow terms. For example, - the Lake Package supports a "WITHDRAWAL" flow term. If this - withdrawal term is active, then water will be withdrawn from the lake - at the calculated concentration of the lake. + EVAPORATION, RUNOFF, EXT-INFLOW, and AUXILIARY. These settings are + used to assign the concentration of associated with the corresponding + flow terms. Concentrations cannot be specified for all flow terms. + For example, the Lake Package supports a "WITHDRAWAL" flow term. If + this withdrawal term is active, then water will be withdrawn from the + lake at the calculated concentration of the lake. status : [string] * status (string) keyword option to define lake status. STATUS can be ACTIVE, INACTIVE, or CONSTANT. By default, STATUS is diff --git a/flopy/mf6/modflow/mfgwtmst.py b/flopy/mf6/modflow/mfgwtmst.py index ffe1b4791b..574137096b 100644 --- a/flopy/mf6/modflow/mfgwtmst.py +++ b/flopy/mf6/modflow/mfgwtmst.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on September 30, 2023 14:44:04 UTC +# FILE created on February 07, 2024 20:16:08 UTC from .. import mfpackage from ..data.mfdatautil import ArrayTemplateGenerator diff --git a/flopy/mf6/modflow/mfgwtmvt.py b/flopy/mf6/modflow/mfgwtmvt.py index cf7b668fff..8091829558 100644 --- a/flopy/mf6/modflow/mfgwtmvt.py +++ b/flopy/mf6/modflow/mfgwtmvt.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on September 30, 2023 14:44:04 UTC +# FILE created on February 07, 2024 20:16:08 UTC from .. import mfpackage from ..data.mfdatautil import ListTemplateGenerator diff --git a/flopy/mf6/modflow/mfgwtmwt.py b/flopy/mf6/modflow/mfgwtmwt.py index badd7ae6b6..fb98e11ea2 100644 --- a/flopy/mf6/modflow/mfgwtmwt.py +++ b/flopy/mf6/modflow/mfgwtmwt.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on September 30, 2023 14:44:04 UTC +# FILE created on February 07, 2024 20:16:08 UTC from .. import mfpackage from ..data.mfdatautil import ListTemplateGenerator @@ -123,13 +123,13 @@ class ModflowGwtmwt(mfpackage.MFPackage): index variables. * mwtsetting (keystring) line of information that is parsed into a keyword and values. Keyword values that can be used to start the - MWTSETTING string include: STATUS, CONCENTRATION, RAINFALL, - EVAPORATION, RUNOFF, and AUXILIARY. These settings are used to assign - the concentration associated with the corresponding flow terms. - Concentrations cannot be specified for all flow terms. For example, - the Multi-Aquifer Well Package supports a "WITHDRAWAL" flow term. If - this withdrawal term is active, then water will be withdrawn from the - well at the calculated concentration of the well. + MWTSETTING string include: STATUS, CONCENTRATION, RATE, and + AUXILIARY. These settings are used to assign the concentration + associated with the corresponding flow terms. Concentrations cannot + be specified for all flow terms. For example, the Multi-Aquifer Well + Package supports a "WITHDRAWAL" flow term. If this withdrawal term is + active, then water will be withdrawn from the well at the calculated + concentration of the well. status : [string] * status (string) keyword option to define well status. STATUS can be ACTIVE, INACTIVE, or CONSTANT. By default, STATUS is diff --git a/flopy/mf6/modflow/mfgwtnam.py b/flopy/mf6/modflow/mfgwtnam.py index 218b895451..0a00c376b8 100644 --- a/flopy/mf6/modflow/mfgwtnam.py +++ b/flopy/mf6/modflow/mfgwtnam.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on September 30, 2023 14:44:04 UTC +# FILE created on February 07, 2024 20:16:08 UTC from .. import mfpackage from ..data.mfdatautil import ListTemplateGenerator diff --git a/flopy/mf6/modflow/mfgwtoc.py b/flopy/mf6/modflow/mfgwtoc.py index bffcd7c225..c8a22c5f5d 100644 --- a/flopy/mf6/modflow/mfgwtoc.py +++ b/flopy/mf6/modflow/mfgwtoc.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on September 30, 2023 14:44:04 UTC +# FILE created on February 07, 2024 20:16:08 UTC from .. import mfpackage from ..data.mfdatautil import ListTemplateGenerator diff --git a/flopy/mf6/modflow/mfgwtsft.py b/flopy/mf6/modflow/mfgwtsft.py index 7d447d3549..92b99d45ca 100644 --- a/flopy/mf6/modflow/mfgwtsft.py +++ b/flopy/mf6/modflow/mfgwtsft.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on September 30, 2023 14:44:04 UTC +# FILE created on February 07, 2024 20:16:08 UTC from .. import mfpackage from ..data.mfdatautil import ListTemplateGenerator diff --git a/flopy/mf6/modflow/mfgwtsrc.py b/flopy/mf6/modflow/mfgwtsrc.py index 6cbab49a59..570f0a9979 100644 --- a/flopy/mf6/modflow/mfgwtsrc.py +++ b/flopy/mf6/modflow/mfgwtsrc.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on September 30, 2023 14:44:04 UTC +# FILE created on February 07, 2024 20:16:08 UTC from .. import mfpackage from ..data.mfdatautil import ListTemplateGenerator diff --git a/flopy/mf6/modflow/mfgwtssm.py b/flopy/mf6/modflow/mfgwtssm.py index 592b090bb2..11ad9d00f5 100644 --- a/flopy/mf6/modflow/mfgwtssm.py +++ b/flopy/mf6/modflow/mfgwtssm.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on September 30, 2023 14:44:04 UTC +# FILE created on February 07, 2024 20:16:08 UTC from .. import mfpackage from ..data.mfdatautil import ListTemplateGenerator diff --git a/flopy/mf6/modflow/mfgwtuzt.py b/flopy/mf6/modflow/mfgwtuzt.py index eb9249faee..4d1be08508 100644 --- a/flopy/mf6/modflow/mfgwtuzt.py +++ b/flopy/mf6/modflow/mfgwtuzt.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on September 30, 2023 14:44:04 UTC +# FILE created on February 07, 2024 20:16:08 UTC from .. import mfpackage from ..data.mfdatautil import ListTemplateGenerator diff --git a/flopy/mf6/modflow/mfims.py b/flopy/mf6/modflow/mfims.py index 80e0f905cf..e718e07e56 100644 --- a/flopy/mf6/modflow/mfims.py +++ b/flopy/mf6/modflow/mfims.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on September 30, 2023 14:44:04 UTC +# FILE created on February 07, 2024 20:16:08 UTC from .. import mfpackage from ..data.mfdatautil import ListTemplateGenerator diff --git a/flopy/mf6/modflow/mfmvr.py b/flopy/mf6/modflow/mfmvr.py index 8a3846eda7..fe1b265f8d 100644 --- a/flopy/mf6/modflow/mfmvr.py +++ b/flopy/mf6/modflow/mfmvr.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on September 30, 2023 14:44:04 UTC +# FILE created on February 07, 2024 20:16:08 UTC from .. import mfpackage from ..data.mfdatautil import ListTemplateGenerator diff --git a/flopy/mf6/modflow/mfmvt.py b/flopy/mf6/modflow/mfmvt.py index 372294b09e..0bf2177cc7 100644 --- a/flopy/mf6/modflow/mfmvt.py +++ b/flopy/mf6/modflow/mfmvt.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on September 30, 2023 14:44:04 UTC +# FILE created on February 07, 2024 20:16:08 UTC from .. import mfpackage from ..data.mfdatautil import ListTemplateGenerator diff --git a/flopy/mf6/modflow/mfnam.py b/flopy/mf6/modflow/mfnam.py index 780f56a36d..777597f775 100644 --- a/flopy/mf6/modflow/mfnam.py +++ b/flopy/mf6/modflow/mfnam.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on September 30, 2023 14:44:04 UTC +# FILE created on February 07, 2024 20:16:08 UTC from .. import mfpackage from ..data.mfdatautil import ListTemplateGenerator diff --git a/flopy/mf6/modflow/mfsimulation.py b/flopy/mf6/modflow/mfsimulation.py index 0621712c1b..423d609a71 100644 --- a/flopy/mf6/modflow/mfsimulation.py +++ b/flopy/mf6/modflow/mfsimulation.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on September 26, 2023 15:51:55 UTC +# FILE created on February 07, 2024 20:16:08 UTC import os from typing import Union diff --git a/flopy/mf6/modflow/mftdis.py b/flopy/mf6/modflow/mftdis.py index ee7a280b88..e080348680 100644 --- a/flopy/mf6/modflow/mftdis.py +++ b/flopy/mf6/modflow/mftdis.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on September 30, 2023 14:44:04 UTC +# FILE created on February 07, 2024 20:16:08 UTC from .. import mfpackage from ..data.mfdatautil import ListTemplateGenerator diff --git a/flopy/mf6/modflow/mfutlats.py b/flopy/mf6/modflow/mfutlats.py index 8fd34420f6..0041c07564 100644 --- a/flopy/mf6/modflow/mfutlats.py +++ b/flopy/mf6/modflow/mfutlats.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on September 30, 2023 14:44:04 UTC +# FILE created on February 07, 2024 20:16:08 UTC from .. import mfpackage from ..data.mfdatautil import ListTemplateGenerator diff --git a/flopy/mf6/modflow/mfutllaktab.py b/flopy/mf6/modflow/mfutllaktab.py index ca634be4d1..4455449a67 100644 --- a/flopy/mf6/modflow/mfutllaktab.py +++ b/flopy/mf6/modflow/mfutllaktab.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on September 30, 2023 14:44:04 UTC +# FILE created on February 07, 2024 20:16:08 UTC from .. import mfpackage from ..data.mfdatautil import ListTemplateGenerator diff --git a/flopy/mf6/modflow/mfutlobs.py b/flopy/mf6/modflow/mfutlobs.py index 687ee545ca..3ecb769e93 100644 --- a/flopy/mf6/modflow/mfutlobs.py +++ b/flopy/mf6/modflow/mfutlobs.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on September 30, 2023 14:44:04 UTC +# FILE created on February 07, 2024 20:16:08 UTC from .. import mfpackage from ..data.mfdatautil import ListTemplateGenerator diff --git a/flopy/mf6/modflow/mfutlsfrtab.py b/flopy/mf6/modflow/mfutlsfrtab.py index 04b8db6477..9389d609a5 100644 --- a/flopy/mf6/modflow/mfutlsfrtab.py +++ b/flopy/mf6/modflow/mfutlsfrtab.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on September 30, 2023 14:44:04 UTC +# FILE created on February 07, 2024 20:16:08 UTC from .. import mfpackage from ..data.mfdatautil import ListTemplateGenerator diff --git a/flopy/mf6/modflow/mfutlspc.py b/flopy/mf6/modflow/mfutlspc.py index 0616bda599..3a472dae1d 100644 --- a/flopy/mf6/modflow/mfutlspc.py +++ b/flopy/mf6/modflow/mfutlspc.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on September 30, 2023 14:44:04 UTC +# FILE created on February 07, 2024 20:16:08 UTC from .. import mfpackage from ..data.mfdatautil import ListTemplateGenerator @@ -39,7 +39,7 @@ class ModflowUtlspc(mfpackage.MFPackage): when writing index variables. * spcsetting (keystring) line of information that is parsed into a keyword and values. Keyword values that can be used to start the - MAWSETTING string include: CONCENTRATION. + SPCSETTING string include: CONCENTRATION. concentration : [double] * concentration (double) is the boundary concentration. If the Options block includes a TIMESERIESFILE entry (see the "Time- diff --git a/flopy/mf6/modflow/mfutlspca.py b/flopy/mf6/modflow/mfutlspca.py index b490741248..34537367d8 100644 --- a/flopy/mf6/modflow/mfutlspca.py +++ b/flopy/mf6/modflow/mfutlspca.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on September 30, 2023 14:44:04 UTC +# FILE created on February 07, 2024 20:16:08 UTC from .. import mfpackage from ..data.mfdatautil import ArrayTemplateGenerator, ListTemplateGenerator diff --git a/flopy/mf6/modflow/mfutltas.py b/flopy/mf6/modflow/mfutltas.py index 2db3efb6fb..42322b59b2 100644 --- a/flopy/mf6/modflow/mfutltas.py +++ b/flopy/mf6/modflow/mfutltas.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on September 30, 2023 14:44:04 UTC +# FILE created on February 07, 2024 20:16:08 UTC from .. import mfpackage from ..data.mfdatautil import ArrayTemplateGenerator, ListTemplateGenerator diff --git a/flopy/mf6/modflow/mfutlts.py b/flopy/mf6/modflow/mfutlts.py index b6ddc5f47a..37981fc4ff 100644 --- a/flopy/mf6/modflow/mfutlts.py +++ b/flopy/mf6/modflow/mfutlts.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on September 30, 2023 14:44:04 UTC +# FILE created on February 07, 2024 20:16:08 UTC from .. import mfpackage from ..data.mfdatautil import ListTemplateGenerator diff --git a/flopy/mf6/modflow/mfutltvk.py b/flopy/mf6/modflow/mfutltvk.py index 01f9a782e3..65b8231778 100644 --- a/flopy/mf6/modflow/mfutltvk.py +++ b/flopy/mf6/modflow/mfutltvk.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on September 30, 2023 14:44:04 UTC +# FILE created on February 07, 2024 20:16:08 UTC from .. import mfpackage from ..data.mfdatautil import ListTemplateGenerator diff --git a/flopy/mf6/modflow/mfutltvs.py b/flopy/mf6/modflow/mfutltvs.py index e0f4cb6a93..fda63a1d11 100644 --- a/flopy/mf6/modflow/mfutltvs.py +++ b/flopy/mf6/modflow/mfutltvs.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on September 30, 2023 14:44:04 UTC +# FILE created on February 07, 2024 20:16:08 UTC from .. import mfpackage from ..data.mfdatautil import ListTemplateGenerator