fix(dfns): update MODFLOW 6 dfns for next flopy (3.3.0) and mf6 (6.1.…

…0) releases (#759)

* fix(dfns): update MODFLOW 6 dfns for next release

* fix(dfns): update createpackages.py based on @spaulins-usgs suggestion

* Address @spaulins-usgs mf6 release comments

flopy/mf6/data/dfn/gwf-disu.dfn

@@ -92,6 +92,15 @@ reader readarray
 longname cell surface area
 description is the cell surface area (in plan view).
 
+block griddata
+name idomain
+type integer
+shape (nodes)
+reader readarray
+layered true
+optional true
+longname idomain existence array
+description is an optional array that characterizes the existence status of a cell.  If the IDOMAIN array is not specified, then all model cells exist within the solution.  If the IDOMAIN value for a cell is 0, the cell does not exist in the simulation.  Input and output values will be read and written for the cell, but internal to the program, the cell is excluded from the solution.  If the IDOMAIN value for a cell is 1, the cell exists in the simulation.  IDOMAIN values of -1 cannot be specified for the DISU Package.
 
 # --------------------- gwf disu connectiondata ---------------------
 

flopy/mf6/data/dfn/gwf-lak.dfn

@@ -621,7 +621,7 @@ numeric_index true
 
 block period
 name laksetting
-type keystring status stage rainfall evaporation runoff withdrawal auxiliaryrecord
+type keystring status stage rainfall evaporation runoff inflow withdrawal auxiliaryrecord
 shape
 tagged false
 in_record true
@@ -683,6 +683,17 @@ time_series true
 longname runoff rate
 description real or character value that defines the runoff rate $(L^3 T^{-1})$ for the lake. Value must be greater than or equal to zero. 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.
 
+block period
+name inflow
+type string
+shape
+tagged true
+in_record true
+reader urword
+time_series true
+longname inflow rate
+description real or character value that defines the volumetric inflow rate $(L^3 T^{-1})$ for the lake. 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. By default, inflow rates are zero for each lake.
+
 block period
 name withdrawal
 type string

flopy/mf6/data/dfn/gwf-npf.dfn

@@ -135,6 +135,22 @@ optional true
 longname keyword to save specific discharge
 description keyword to indicate that x, y, and z components of specific discharge will be calculated at cell centers and written to the cell-by-cell flow file, which is specified with ``BUDGET SAVE FILE'' in Output Control.  If this option is activated, then additional information may be required in the discretization packages and the GWF Exchange package (if GWF models are coupled).  Specifically, ANGLDEGX must be specified in the CONNECTIONDATA block of the DISU Package; ANGLDEGX must also be specified for the GWF Exchange as an auxiliary variable.
 
+block options
+name k22overk
+type keyword
+reader urword
+optional true
+longname keyword to indicate that specified K22 is a ratio
+description keyword to indicate that specified K22 is a ratio of K22 divided by K.  If this option is specified, then the K22 array entered in the NPF Package will be multiplied by K after being read.
+
+block options
+name k33overk
+type keyword
+reader urword
+optional true
+longname keyword to indicate that specified K33 is a ratio
+description keyword to indicate that specified K33 is a ratio of K33 divided by K.  If this option is specified, then the K33 array entered in the NPF Package will be multiplied by K after being read.
+
 
 # --------------------- gwf npf griddata ---------------------
 
@@ -171,7 +187,7 @@ reader readarray
 layered true
 optional true
 longname hydraulic conductivity of second ellipsoid axis
-description is the hydraulic conductivity of the second ellipsoid axis; for an unrotated case this is the hydraulic conductivity in the y direction.  If K22 is not included in the GRIDDATA block, then K22 is set equal to K.  For a regular MODFLOW grid (DIS Package is used) in which no rotation angles are specified, K22 is the hydraulic conductivity along columns in the y direction. For an unstructured DISU grid, the user must assign principal x and y axes and provide the angle for each cell face relative to the assigned x direction.  All included cells (IDOMAIN $>$ 0) must have a K22 value greater than zero.
+description is the hydraulic conductivity of the second ellipsoid axis (or the ratio of K22/K if the K22OVERK option is specified); for an unrotated case this is the hydraulic conductivity in the y direction.  If K22 is not included in the GRIDDATA block, then K22 is set equal to K.  For a regular MODFLOW grid (DIS Package is used) in which no rotation angles are specified, K22 is the hydraulic conductivity along columns in the y direction. For an unstructured DISU grid, the user must assign principal x and y axes and provide the angle for each cell face relative to the assigned x direction.  All included cells (IDOMAIN $>$ 0) must have a K22 value greater than zero.
 
 block griddata
 name k33
@@ -182,7 +198,7 @@ reader readarray
 layered true
 optional true
 longname hydraulic conductivity of third ellipsoid axis (L/T)
-description is the hydraulic conductivity of the third ellipsoid axis; for an unrotated case, this is the vertical hydraulic conductivity.  When anisotropy is applied, K33 corresponds to the K33 tensor component.  All included cells (IDOMAIN $>$ 0) must have a K33 value greater than zero.
+description is the hydraulic conductivity of the third ellipsoid axis (or the ratio of K33/K if the K33OVERK option is specified); for an unrotated case, this is the vertical hydraulic conductivity.  When anisotropy is applied, K33 corresponds to the K33 tensor component.  All included cells (IDOMAIN $>$ 0) must have a K33 value greater than zero.
 
 block griddata
 name angle1

flopy/mf6/data/dfn/sim-nam.dfn

@@ -24,6 +24,13 @@ optional true
 longname memory print option
 description is a flag that controls printing of detailed memory manager usage to the end of the simulation list file.  NONE means do not print detailed information. SUMMARY means print only the total memory for each simulation component. ALL means print information for each variable stored in the memory manager. NONE is default if MEMORY\_PRINT\_OPTION is not specified.
 
+block options
+name maxerrors
+type integer
+reader urword
+optional true
+longname maximum number of errors
+description maximum number of errors that will be stored and printed.
 
 
 # --------------------- sim nam timing ---------------------

flopy/mf6/modflow/__init__.py

@@ -35,3 +35,4 @@
 from .mfgwfmvr import ModflowGwfmvr
 from .mfgwfgnc import ModflowGwfgnc
 from .mfgwfoc import ModflowGwfoc
+from .mfgwfcsub import ModflowGwfcsub