chore(mf6): regenerate mf6 modules

flopy/mf6/modflow/__init__.py

@@ -82,6 +82,7 @@
 from .mfgwtssm import ModflowGwtssm
 from .mfgwtuzt import ModflowGwtuzt
 from .mfims import ModflowIms
+from .mfmve import ModflowMve
 from .mfmvr import ModflowMvr
 from .mfmvt import ModflowMvt
 from .mfnam import ModflowNam
@@ -93,7 +94,6 @@
 from .mfprtnam import ModflowPrtnam
 from .mfprtoc import ModflowPrtoc
 from .mfprtprp import ModflowPrtprp
-from .mfpts import ModflowPts
 from .mfsimulation import MFSimulation
 from .mftdis import ModflowTdis
 from .mfutlats import ModflowUtlats

flopy/mf6/modflow/mfgweadv.py

@@ -20,8 +20,8 @@ class ModflowGweadv(MFPackage):
         Do not set this parameter. It is intended for debugging and internal
         processing purposes only.
     scheme : string
-        scheme used to solve the advection term.  can be upstream, central, or tvd.  if
-        not specified, upstream weighting is the default weighting scheme.
+        scheme used to solve the advection term.  can be upstream, central, tvd, or
+        utvd.  if not specified, upstream weighting is the default weighting scheme.
     ats_percel : double precision
         fractional cell distance submitted by the adv package to the adaptive time
         stepping (ats) package.  if ats_percel is specified and the ats package is

flopy/mf6/modflow/mfgwectp.py

@@ -105,7 +105,7 @@ class ModflowGwectp(MFPackage):
     _package_type = "ctp"
     dfn_file_name = "gwe-ctp.dfn"
     dfn = [
-        ["header", "multi-package"],
+        ["header", "multi-package", "package-type stress-package"],
         [
             "block options",
             "name auxiliary",
@@ -136,23 +136,23 @@ class ModflowGwectp(MFPackage):
             "type keyword",
             "reader urword",
             "optional true",
-            "mf6internal iprflow",
+            "mf6internal iprpak",
         ],
         [
             "block options",
             "name print_flows",
             "type keyword",
             "reader urword",
             "optional true",
-            "mf6internal ipakcb",
+            "mf6internal iprflow",
         ],
         [
             "block options",
             "name save_flows",
             "type keyword",
             "reader urword",
             "optional true",
-            "mf6internal iprpak",
+            "mf6internal ipakcb",
         ],
         [
             "block options",

flopy/mf6/modflow/mfgwedis.py

@@ -54,6 +54,13 @@ class ModflowGwedis(MFPackage):
         modflow 6 simulation input.  this option only has an effect when an output
         model netcdf file is configured and the simulation is run in validate mode,
         otherwise it is ignored.
+    crs : [string]
+        is a real-world coordinate reference system (crs) for the model, for example,
+        an epsg integer code (e.g. 26915), authority string (i.e. epsg:26915), or open
+        geospatial consortium well-known text (wkt) specification. limited to 5000
+        characters. the entry for crs does not affect the model simulation, but it is
+        written to the binary grid file so that postprocessors can locate the grid in
+        space.
     packagedata : record ncf6 filein ncf6_filename
         Contains data for the ncf package. Data can be passed as a dictionary to the
         ncf package with variable names as keys and package data as values. Data for
@@ -95,6 +102,7 @@ class ModflowGwedis(MFPackage):
     """
 
     grb_filerecord = ListTemplateGenerator(("gwe6", "dis", "options", "grb_filerecord"))
+    crs = ArrayTemplateGenerator(("gwe6", "dis", "options", "crs"))
     ncf_filerecord = ListTemplateGenerator(("gwe6", "dis", "options", "ncf_filerecord"))
     delr = ArrayTemplateGenerator(("gwe6", "dis", "griddata", "delr"))
     delc = ArrayTemplateGenerator(("gwe6", "dis", "griddata", "delc"))
@@ -202,7 +210,6 @@ class ModflowGwedis(MFPackage):
             "preserve_case true",
             "reader urword",
             "optional true",
-            "developmode true",
         ],
         [
             "block options",
@@ -330,6 +337,7 @@ def __init__(
         angrot=None,
         export_array_ascii=None,
         export_array_netcdf=None,
+        crs=None,
         packagedata=None,
         nlay=1,
         nrow=2,
@@ -365,6 +373,7 @@ def __init__(
         self.export_array_netcdf = self.build_mfdata(
             "export_array_netcdf", export_array_netcdf
         )
+        self.crs = self.build_mfdata("crs", crs)
         self._ncf_filerecord = self.build_mfdata("ncf_filerecord", None)
         self._ncf_package = self.build_child_package(
             "ncf", packagedata, "packagedata", self._ncf_filerecord

flopy/mf6/modflow/mfgwedisu.py

@@ -58,6 +58,13 @@ class ModflowGwedisu(MFPackage):
     export_array_ascii : keyword
         keyword that specifies input griddata arrays should be written to layered ascii
         output files.
+    crs : [string]
+        is a real-world coordinate reference system (crs) for the model, for example,
+        an epsg integer code (e.g. 26915), authority string (i.e. epsg:26915), or open
+        geospatial consortium well-known text (wkt) specification. limited to 5000
+        characters. the entry for crs does not affect the model simulation, but it is
+        written to the binary grid file so that postprocessors can locate the grid in
+        space.
     nodes : integer
         is the number of cells in the model grid.
     nja : integer
@@ -177,6 +184,7 @@ class ModflowGwedisu(MFPackage):
     grb_filerecord = ListTemplateGenerator(
         ("gwe6", "disu", "options", "grb_filerecord")
     )
+    crs = ArrayTemplateGenerator(("gwe6", "disu", "options", "crs"))
     top = ArrayTemplateGenerator(("gwe6", "disu", "griddata", "top"))
     bot = ArrayTemplateGenerator(("gwe6", "disu", "griddata", "bot"))
     area = ArrayTemplateGenerator(("gwe6", "disu", "griddata", "area"))
@@ -290,7 +298,6 @@ class ModflowGwedisu(MFPackage):
             "preserve_case true",
             "reader urword",
             "optional true",
-            "developmode true",
         ],
         [
             "block dimensions",
@@ -498,6 +505,7 @@ def __init__(
         angrot=None,
         vertical_offset_tolerance=0.0,
         export_array_ascii=None,
+        crs=None,
         nodes=None,
         nja=None,
         nvert=None,
@@ -539,6 +547,7 @@ def __init__(
         self.export_array_ascii = self.build_mfdata(
             "export_array_ascii", export_array_ascii
         )
+        self.crs = self.build_mfdata("crs", crs)
         self.nodes = self.build_mfdata("nodes", nodes)
         self.nja = self.build_mfdata("nja", nja)
         self.nvert = self.build_mfdata("nvert", nvert)

flopy/mf6/modflow/mfgwedisv.py

@@ -57,6 +57,13 @@ class ModflowGwedisv(MFPackage):
         modflow 6 simulation input.  this option only has an effect when an output
         model netcdf file is configured and the simulation is run in validate mode,
         otherwise it is ignored.
+    crs : [string]
+        is a real-world coordinate reference system (crs) for the model, for example,
+        an epsg integer code (e.g. 26915), authority string (i.e. epsg:26915), or open
+        geospatial consortium well-known text (wkt) specification. limited to 5000
+        characters. the entry for crs does not affect the model simulation, but it is
+        written to the binary grid file so that postprocessors can locate the grid in
+        space.
     packagedata : record ncf6 filein ncf6_filename
         Contains data for the ncf package. Data can be passed as a dictionary to the
         ncf package with variable names as keys and package data as values. Data for
@@ -123,6 +130,7 @@ class ModflowGwedisv(MFPackage):
     grb_filerecord = ListTemplateGenerator(
         ("gwe6", "disv", "options", "grb_filerecord")
     )
+    crs = ArrayTemplateGenerator(("gwe6", "disv", "options", "crs"))
     ncf_filerecord = ListTemplateGenerator(
         ("gwe6", "disv", "options", "ncf_filerecord")
     )
@@ -232,7 +240,6 @@ class ModflowGwedisv(MFPackage):
             "preserve_case true",
             "reader urword",
             "optional true",
-            "developmode true",
         ],
         [
             "block options",
@@ -429,6 +436,7 @@ def __init__(
         angrot=None,
         export_array_ascii=None,
         export_array_netcdf=None,
+        crs=None,
         packagedata=None,
         nlay=None,
         ncpl=None,
@@ -464,6 +472,7 @@ def __init__(
         self.export_array_netcdf = self.build_mfdata(
             "export_array_netcdf", export_array_netcdf
         )
+        self.crs = self.build_mfdata("crs", crs)
         self._ncf_filerecord = self.build_mfdata("ncf_filerecord", None)
         self._ncf_package = self.build_child_package(
             "ncf", packagedata, "packagedata", self._ncf_filerecord

flopy/mf6/modflow/mfgweesl.py

@@ -106,7 +106,7 @@ class ModflowGweesl(MFPackage):
     _package_type = "esl"
     dfn_file_name = "gwe-esl.dfn"
     dfn = [
-        ["header", "multi-package"],
+        ["header", "multi-package", "package-type stress-package"],
         [
             "block options",
             "name auxiliary",

flopy/mf6/modflow/mfgwelke.py

@@ -87,6 +87,11 @@ class ModflowGwelke(MFPackage):
         obs package with variable names as keys and package data as values. Data for
         the observations variable is also acceptable. See obs package documentation for
         more information.
+    dev_nonexpanding_matrix : keyword
+        keyword that solves the feature temperature with a general mixing equation and
+        adds the result to the right-hand side of the gwe equations, instead of adding
+        a row to the solution matrix for each feature.  this development option is not
+        supported.
     packagedata : [(lakeno, strt, ktf, rbthcnd, aux, boundname)]
         * lakeno : integer
                 integer value that defines the lake number associated with the specified PERIOD
@@ -205,7 +210,7 @@ class ModflowGwelke(MFPackage):
     _package_type = "lke"
     dfn_file_name = "gwe-lke.dfn"
     dfn = [
-        ["header", "multi-package"],
+        ["header", "multi-package", "package-type advanced-stress-package"],
         [
             "block options",
             "name flow_package_name",
@@ -440,6 +445,13 @@ class ModflowGwelke(MFPackage):
             "reader urword",
             "optional false",
         ],
+        [
+            "block options",
+            "name dev_nonexpanding_matrix",
+            "type keyword",
+            "reader urword",
+            "optional true",
+        ],
         [
             "block packagedata",
             "name packagedata",
@@ -657,6 +669,7 @@ def __init__(
         budgetcsv_filerecord=None,
         timeseries=None,
         observations=None,
+        dev_nonexpanding_matrix=None,
         packagedata=None,
         lakeperioddata=None,
         filename=None,
@@ -704,6 +717,9 @@ def __init__(
         self._obs_package = self.build_child_package(
             "obs", observations, "continuous", self._obs_filerecord
         )
+        self.dev_nonexpanding_matrix = self.build_mfdata(
+            "dev_nonexpanding_matrix", dev_nonexpanding_matrix
+        )
         self.packagedata = self.build_mfdata("packagedata", packagedata)
         self.lakeperioddata = self.build_mfdata("lakeperioddata", lakeperioddata)
 

flopy/mf6/modflow/mfgwemwe.py

@@ -87,6 +87,11 @@ class ModflowGwemwe(MFPackage):
         obs package with variable names as keys and package data as values. Data for
         the observations variable is also acceptable. See obs package documentation for
         more information.
+    dev_nonexpanding_matrix : keyword
+        keyword that solves the feature temperature with a general mixing equation and
+        adds the result to the right-hand side of the gwe equations, instead of adding
+        a row to the solution matrix for each feature.  this development option is not
+        supported.
     packagedata : [(mawno, strt, ktf, fthk, aux, boundname)]
         * mawno : integer
                 integer value that defines the well number associated with the specified PERIOD
@@ -189,7 +194,7 @@ class ModflowGwemwe(MFPackage):
     _package_type = "mwe"
     dfn_file_name = "gwe-mwe.dfn"
     dfn = [
-        ["header", "multi-package"],
+        ["header", "multi-package", "package-type advanced-stress-package"],
         [
             "block options",
             "name flow_package_name",
@@ -424,6 +429,13 @@ class ModflowGwemwe(MFPackage):
             "reader urword",
             "optional false",
         ],
+        [
+            "block options",
+            "name dev_nonexpanding_matrix",
+            "type keyword",
+            "reader urword",
+            "optional true",
+        ],
         [
             "block packagedata",
             "name packagedata",
@@ -611,6 +623,7 @@ def __init__(
         budgetcsv_filerecord=None,
         timeseries=None,
         observations=None,
+        dev_nonexpanding_matrix=None,
         packagedata=None,
         mweperioddata=None,
         filename=None,
@@ -658,6 +671,9 @@ def __init__(
         self._obs_package = self.build_child_package(
             "obs", observations, "continuous", self._obs_filerecord
         )
+        self.dev_nonexpanding_matrix = self.build_mfdata(
+            "dev_nonexpanding_matrix", dev_nonexpanding_matrix
+        )
         self.packagedata = self.build_mfdata("packagedata", packagedata)
         self.mweperioddata = self.build_mfdata("mweperioddata", mweperioddata)
 

flopy/mf6/modflow/mfgweoc.py

@@ -21,13 +21,16 @@ class ModflowGweoc(MFPackage):
         processing purposes only.
     budget_filerecord : (budgetfile)
         * budgetfile : string
-                name of the output file to write budget information.
+                name of the output file to write budget information. Data are written to this
+                file only for time steps in which SAVE BUDGET is specified in a PERIOD block.
+                If SAVE BUDGET is specified in a PERIOD block and this file is not specified,
+                MODFLOW 6 will terminate with an error.
 
     budgetcsv_filerecord : (budgetcsvfile)
         * budgetcsvfile : string
                 name of the comma-separated value (CSV) output file to write budget summary
-                information.  A budget summary record will be written to this file for each
-                time step of the simulation.
+                information. If specified, a budget summary record will be written to this file
+                for every time step of the simulation.
 
     temperature_filerecord : (temperaturefile)
         * temperaturefile : string

flopy/mf6/modflow/mfgwesfe.py

@@ -87,6 +87,11 @@ class ModflowGwesfe(MFPackage):
         obs package with variable names as keys and package data as values. Data for
         the observations variable is also acceptable. See obs package documentation for
         more information.
+    dev_nonexpanding_matrix : keyword
+        keyword that solves the feature temperature with a general mixing equation and
+        adds the result to the right-hand side of the gwe equations, instead of adding
+        a row to the solution matrix for each feature.  this development option is not
+        supported.
     packagedata : [(rno, strt, ktf, rbthcnd, aux, boundname)]
         * rno : integer
                 integer value that defines the reach number associated with the specified
@@ -210,7 +215,7 @@ class ModflowGwesfe(MFPackage):
     _package_type = "sfe"
     dfn_file_name = "gwe-sfe.dfn"
     dfn = [
-        ["header", "multi-package"],
+        ["header", "multi-package", "package-type advanced-stress-package"],
         [
             "block options",
             "name flow_package_name",
@@ -445,6 +450,13 @@ class ModflowGwesfe(MFPackage):
             "reader urword",
             "optional false",
         ],
+        [
+            "block options",
+            "name dev_nonexpanding_matrix",
+            "type keyword",
+            "reader urword",
+            "optional true",
+        ],
         [
             "block packagedata",
             "name packagedata",
@@ -662,6 +674,7 @@ def __init__(
         budgetcsv_filerecord=None,
         timeseries=None,
         observations=None,
+        dev_nonexpanding_matrix=None,
         packagedata=None,
         reachperioddata=None,
         filename=None,
@@ -709,6 +722,9 @@ def __init__(
         self._obs_package = self.build_child_package(
             "obs", observations, "continuous", self._obs_filerecord
         )
+        self.dev_nonexpanding_matrix = self.build_mfdata(
+            "dev_nonexpanding_matrix", dev_nonexpanding_matrix
+        )
         self.packagedata = self.build_mfdata("packagedata", packagedata)
         self.reachperioddata = self.build_mfdata("reachperioddata", reachperioddata)