diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-dfw.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-dfw.json index d579e97a..1abd8597 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-dfw.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-dfw.json @@ -70,7 +70,8 @@ "type": "keyword", "longname": "use SWR conductance formulation", "description": "use the conductance formulation in the Surface Water Routing (SWR) Process for MODFLOW-2005.", - "optional": true + "optional": true, + "developmode": true } } }, diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-dfw.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-dfw.toml index 71ca8f94..28d2363b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-dfw.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-dfw.toml @@ -66,6 +66,7 @@ type = "keyword" longname = "use SWR conductance formulation" description = "use the conductance formulation in the Surface Water Routing (SWR) Process for MODFLOW-2005." optional = true +developmode = true [blocks.griddata.fields.manningsn] type = "array" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-dfw.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-dfw.yaml index c4dc1c7e..71d9e7e6 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-dfw.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-dfw.yaml @@ -83,6 +83,7 @@ blocks: longname: use SWR conductance formulation description: use the conductance formulation in the Surface Water Routing (SWR) Process for MODFLOW-2005. optional: true + developmode: true griddata: fields: manningsn: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-ic.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-ic.json index 9fe39275..8c542f93 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-ic.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-ic.json @@ -22,6 +22,7 @@ "description": "is the initial (starting) stage---that is, stage at the beginning of the CHF Model simulation. STRT must be specified for all CHF Model simulations. One value is read for every model reach.", "default": 0.0, "dtype": "double", + "layered": true, "shape": [ "nodes" ] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-ic.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-ic.toml index 5464ab7f..bda58cb9 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-ic.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-ic.toml @@ -15,6 +15,7 @@ longname = "starting concentration" description = "is the initial (starting) stage---that is, stage at the beginning of the CHF Model simulation. STRT must be specified for all CHF Model simulations. One value is read for every model reach." default = 0.0 dtype = "double" +layered = true shape = [ "nodes", ] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-ic.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-ic.yaml index b5b9add5..7414c920 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-ic.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-ic.yaml @@ -21,5 +21,6 @@ blocks: model reach. default: 0.0 dtype: double + layered: true shape: - nodes diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwegwe.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwegwe.json index 94a53663..1111ca2b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwegwe.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwegwe.json @@ -120,7 +120,8 @@ "type": "keyword", "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.", - "optional": true + "optional": true, + "developmode": true } } }, diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwegwe.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwegwe.toml index 5036af62..0a352ae7 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwegwe.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwegwe.toml @@ -112,6 +112,7 @@ type = "keyword" 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." optional = true +developmode = true [blocks.dimensions.fields.nexg] type = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwegwe.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwegwe.yaml index 488699f1..2687a713 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwegwe.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwegwe.yaml @@ -124,6 +124,7 @@ blocks: 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. optional: true + developmode: true dimensions: fields: nexg: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwfgwf.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwfgwf.json index e13d0fde..5836f99d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwfgwf.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwfgwf.json @@ -147,7 +147,8 @@ "type": "keyword", "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.", - "optional": true + "optional": true, + "developmode": true } } }, diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwfgwf.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwfgwf.toml index eb138f9b..ec950330 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwfgwf.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwfgwf.toml @@ -135,6 +135,7 @@ type = "keyword" 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." optional = true +developmode = true [blocks.dimensions.fields.nexg] type = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwfgwf.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwfgwf.yaml index c053f5fb..c10c5191 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwfgwf.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwfgwf.yaml @@ -169,6 +169,7 @@ blocks: 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. optional: true + developmode: true dimensions: fields: nexg: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwtgwt.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwtgwt.json index e705daa3..1f53c332 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwtgwt.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwtgwt.json @@ -120,7 +120,8 @@ "type": "keyword", "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.", - "optional": true + "optional": true, + "developmode": true } } }, diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwtgwt.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwtgwt.toml index 932f4d90..056033de 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwtgwt.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwtgwt.toml @@ -112,6 +112,7 @@ type = "keyword" 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." optional = true +developmode = true [blocks.dimensions.fields.nexg] type = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwtgwt.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwtgwt.yaml index cbe078fd..be30a96c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwtgwt.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwtgwt.yaml @@ -122,6 +122,7 @@ blocks: 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. optional: true + developmode: true dimensions: fields: nexg: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-cnd.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-cnd.json index b7f6d5d5..708aa49b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-cnd.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-cnd.json @@ -41,6 +41,7 @@ "optional": true, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] @@ -52,6 +53,7 @@ "optional": true, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] @@ -63,6 +65,7 @@ "optional": true, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] @@ -74,6 +77,7 @@ "optional": true, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] @@ -85,6 +89,7 @@ "optional": true, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] @@ -96,6 +101,7 @@ "optional": true, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] @@ -107,6 +113,7 @@ "optional": true, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-cnd.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-cnd.toml index 3e6efef2..14bf4b6b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-cnd.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-cnd.toml @@ -34,6 +34,7 @@ description = "longitudinal dispersivity in horizontal direction. If flow is st optional = true netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] @@ -45,6 +46,7 @@ description = "longitudinal dispersivity in vertical direction. If flow is stri optional = true netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] @@ -56,6 +58,7 @@ description = "transverse dispersivity in horizontal direction. This is the tra optional = true netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] @@ -67,6 +70,7 @@ description = "transverse dispersivity in horizontal direction. This is the tra optional = true netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] @@ -78,6 +82,7 @@ description = "transverse dispersivity when flow is in vertical direction. If f optional = true netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] @@ -89,6 +94,7 @@ description = "thermal conductivity of the simulated fluid. Note that the CND optional = true netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] @@ -100,6 +106,7 @@ description = "thermal conductivity of the solid aquifer material" optional = true netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-cnd.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-cnd.yaml index 40c7049f..66786d01 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-cnd.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-cnd.yaml @@ -48,6 +48,7 @@ blocks: optional: true netcdf: true dtype: double + layered: true shape: - nodes alv: @@ -61,6 +62,7 @@ blocks: optional: true netcdf: true dtype: double + layered: true shape: - nodes ath1: @@ -74,6 +76,7 @@ blocks: optional: true netcdf: true dtype: double + layered: true shape: - nodes ath2: @@ -87,6 +90,7 @@ blocks: optional: true netcdf: true dtype: double + layered: true shape: - nodes atv: @@ -99,6 +103,7 @@ blocks: optional: true netcdf: true dtype: double + layered: true shape: - nodes ktw: @@ -111,6 +116,7 @@ blocks: optional: true netcdf: true dtype: double + layered: true shape: - nodes kts: @@ -120,5 +126,6 @@ blocks: optional: true netcdf: true dtype: double + layered: true shape: - nodes diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-dis.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-dis.json index d4edb349..7eb97a2b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-dis.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-dis.json @@ -185,6 +185,7 @@ "default": 0.0, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "ncol", "nrow", @@ -198,6 +199,7 @@ "optional": true, "netcdf": true, "dtype": "integer", + "layered": true, "shape": [ "ncol", "nrow", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-dis.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-dis.toml index 25ef27b3..7d32dff5 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-dis.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-dis.toml @@ -168,6 +168,7 @@ description = "is the bottom elevation for each cell." default = 0.0 netcdf = true dtype = "double" +layered = true shape = [ "ncol", "nrow", @@ -181,6 +182,7 @@ description = "is an optional array that characterizes the existence status of a optional = true netcdf = true dtype = "integer" +layered = true shape = [ "ncol", "nrow", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-dis.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-dis.yaml index 6816bc47..d08a67fc 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-dis.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-dis.yaml @@ -165,6 +165,7 @@ blocks: default: 0.0 netcdf: true dtype: double + layered: true shape: - ncol - nrow @@ -183,6 +184,7 @@ blocks: optional: true netcdf: true dtype: integer + layered: true shape: - ncol - nrow diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-disv.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-disv.json index 25ad3bb7..9bb9900b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-disv.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-disv.json @@ -153,6 +153,7 @@ "description": "is the bottom elevation for each cell.", "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "ncpl", "nlay" @@ -165,6 +166,7 @@ "optional": true, "netcdf": true, "dtype": "integer", + "layered": true, "shape": [ "ncpl", "nlay" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-disv.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-disv.toml index 1f497730..f7bf5d9f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-disv.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-disv.toml @@ -136,6 +136,7 @@ longname = "model bottom elevation" description = "is the bottom elevation for each cell." netcdf = true dtype = "double" +layered = true shape = [ "ncpl", "nlay", @@ -148,6 +149,7 @@ description = "is an optional array that characterizes the existence status of a optional = true netcdf = true dtype = "integer" +layered = true shape = [ "ncpl", "nlay", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-disv.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-disv.yaml index 108b33aa..1bbf8826 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-disv.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-disv.yaml @@ -142,6 +142,7 @@ blocks: description: is the bottom elevation for each cell. netcdf: true dtype: double + layered: true shape: - ncpl - nlay @@ -159,6 +160,7 @@ blocks: optional: true netcdf: true dtype: integer + layered: true shape: - ncpl - nlay diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-est.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-est.json index bdb18396..d13d56f1 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-est.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-est.json @@ -54,6 +54,7 @@ "longname": "porosity", "description": "is the mobile domain porosity, defined as the mobile domain pore volume per mobile domain volume. The GWE model does not support the concept of an immobile domain in the context of heat transport.", "dtype": "double", + "layered": true, "shape": [ "nodes" ] @@ -64,6 +65,7 @@ "description": "is the rate coefficient for zero-order decay for the aqueous phase of the mobile domain. A negative value indicates heat (energy) production. The dimensions of zero-order decay in the aqueous phase are energy per length cubed (volume of water) per time. Zero-order decay in the aqueous phase will have no effect on simulation results unless ZERO_ORDER_DECAY_WATER is specified in the options block.", "optional": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] @@ -74,6 +76,7 @@ "description": "is the rate coefficient for zero-order decay for the solid phase. A negative value indicates heat (energy) production. The dimensions of zero-order decay in the solid phase are energy per mass of solid per time. Zero-order decay in the solid phase will have no effect on simulation results unless ZERO_ORDER_DECAY_SOLID is specified in the options block.", "optional": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] @@ -83,6 +86,7 @@ "longname": "heat capacity of the aquifer material", "description": "is the mass-based heat capacity of dry solids (aquifer material). For example, units of J/kg/C may be used (or equivalent).", "dtype": "double", + "layered": true, "shape": [ "nodes" ] @@ -92,6 +96,7 @@ "longname": "density of aquifer material", "description": "is a user-specified value of the density of aquifer material not considering the voids. Value will remain fixed for the entire simulation. For example, if working in SI units, values may be entered as kilograms per cubic meter.", "dtype": "double", + "layered": true, "shape": [ "nodes" ] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-est.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-est.toml index c8832b83..9bed2706 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-est.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-est.toml @@ -47,6 +47,7 @@ type = "array" longname = "porosity" description = "is the mobile domain porosity, defined as the mobile domain pore volume per mobile domain volume. The GWE model does not support the concept of an immobile domain in the context of heat transport." dtype = "double" +layered = true shape = [ "nodes", ] @@ -57,6 +58,7 @@ longname = "aqueous phase decay rate coefficient" description = "is the rate coefficient for zero-order decay for the aqueous phase of the mobile domain. A negative value indicates heat (energy) production. The dimensions of zero-order decay in the aqueous phase are energy per length cubed (volume of water) per time. Zero-order decay in the aqueous phase will have no effect on simulation results unless ZERO_ORDER_DECAY_WATER is specified in the options block." optional = true dtype = "double" +layered = true shape = [ "nodes", ] @@ -67,6 +69,7 @@ longname = "solid phase decay rate coefficient" description = "is the rate coefficient for zero-order decay for the solid phase. A negative value indicates heat (energy) production. The dimensions of zero-order decay in the solid phase are energy per mass of solid per time. Zero-order decay in the solid phase will have no effect on simulation results unless ZERO_ORDER_DECAY_SOLID is specified in the options block." optional = true dtype = "double" +layered = true shape = [ "nodes", ] @@ -76,6 +79,7 @@ type = "array" longname = "heat capacity of the aquifer material" description = "is the mass-based heat capacity of dry solids (aquifer material). For example, units of J/kg/C may be used (or equivalent)." dtype = "double" +layered = true shape = [ "nodes", ] @@ -85,6 +89,7 @@ type = "array" longname = "density of aquifer material" description = "is a user-specified value of the density of aquifer material not considering the voids. Value will remain fixed for the entire simulation. For example, if working in SI units, values may be entered as kilograms per cubic meter." dtype = "double" +layered = true shape = [ "nodes", ] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-est.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-est.yaml index de869662..6612f84d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-est.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-est.yaml @@ -67,6 +67,7 @@ blocks: domain volume. The GWE model does not support the concept of an immobile domain in the context of heat transport. dtype: double + layered: true shape: - nodes decay_water: @@ -79,6 +80,7 @@ blocks: is specified in the options block. optional: true dtype: double + layered: true shape: - nodes decay_solid: @@ -90,6 +92,7 @@ blocks: simulation results unless ZERO_ORDER_DECAY_SOLID is specified in the options block. optional: true dtype: double + layered: true shape: - nodes heat_capacity_solid: @@ -98,6 +101,7 @@ blocks: description: is the mass-based heat capacity of dry solids (aquifer material). For example, units of J/kg/C may be used (or equivalent). dtype: double + layered: true shape: - nodes density_solid: @@ -107,5 +111,6 @@ blocks: voids. Value will remain fixed for the entire simulation. For example, if working in SI units, values may be entered as kilograms per cubic meter. dtype: double + layered: true shape: - nodes diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-ic.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-ic.json index af7a487b..0bf4eeb0 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-ic.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-ic.json @@ -29,6 +29,7 @@ "default": 0.0, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-ic.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-ic.toml index 91f5219b..e74a2f1f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-ic.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-ic.toml @@ -22,6 +22,7 @@ description = "is the initial (starting) temperature---that is, the temperature default = 0.0 netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-ic.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-ic.yaml index 34c3bb9e..2514d05a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-ic.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-ic.yaml @@ -30,5 +30,6 @@ blocks: default: 0.0 netcdf: true dtype: double + layered: true shape: - nodes diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-buy.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-buy.json index bac0acc0..afe07904 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-buy.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-buy.json @@ -47,7 +47,8 @@ "type": "keyword", "longname": "use equivalent freshwater head formulation", "description": "use the variable-density equivalent freshwater head formulation instead of the hydraulic head head formulation. This dev option has only been implemented for confined aquifer conditions and should generally not be used.", - "optional": true + "optional": true, + "developmode": true } } }, diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-buy.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-buy.toml index 83f88be0..2eac90c5 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-buy.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-buy.toml @@ -41,6 +41,7 @@ type = "keyword" longname = "use equivalent freshwater head formulation" description = "use the variable-density equivalent freshwater head formulation instead of the hydraulic head head formulation. This dev option has only been implemented for confined aquifer conditions and should generally not be used." optional = true +developmode = true [blocks.dimensions.fields.nrhospecies] type = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-buy.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-buy.yaml index 6a4c6ece..0bae73b3 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-buy.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-buy.yaml @@ -47,6 +47,7 @@ blocks: head head formulation. This dev option has only been implemented for confined aquifer conditions and should generally not be used. optional: true + developmode: true dimensions: fields: nrhospecies: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chd.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chd.json index ef3ac69f..cb5290af 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chd.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chd.json @@ -93,7 +93,8 @@ "type": "keyword", "longname": "turn off Newton for unconfined cells", "description": "turn off Newton for unconfined cells", - "optional": true + "optional": true, + "developmode": true } } }, diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chd.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chd.toml index 4879bf52..e00e75f6 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chd.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chd.toml @@ -85,6 +85,7 @@ type = "keyword" longname = "turn off Newton for unconfined cells" description = "turn off Newton for unconfined cells" optional = true +developmode = true [blocks.dimensions.fields.maxbound] type = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chd.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chd.yaml index 71037236..6a07a8d5 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chd.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chd.yaml @@ -93,6 +93,7 @@ blocks: longname: turn off Newton for unconfined cells description: turn off Newton for unconfined cells optional: true + developmode: true dimensions: fields: maxbound: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chdg.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chdg.json index 76aad594..56e6f914 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chdg.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chdg.json @@ -83,7 +83,8 @@ "type": "keyword", "longname": "turn off Newton for unconfined cells", "description": "turn off Newton for unconfined cells", - "optional": true + "optional": true, + "developmode": true } } }, @@ -106,6 +107,7 @@ "default": 3e+30, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] @@ -117,6 +119,7 @@ "optional": true, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chdg.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chdg.toml index 05dd6112..43769449 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chdg.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chdg.toml @@ -77,6 +77,7 @@ type = "keyword" longname = "turn off Newton for unconfined cells" description = "turn off Newton for unconfined cells" optional = true +developmode = true [blocks.dimensions.fields.maxbound] type = "integer" @@ -91,6 +92,7 @@ description = "is the head at the boundary." default = 3e+30 netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] @@ -102,6 +104,7 @@ description = "is an array of values for auxiliary variable aux(iaux), where iau optional = true netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chdg.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chdg.yaml index 0f5f7961..5841757c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chdg.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chdg.yaml @@ -90,6 +90,7 @@ blocks: longname: turn off Newton for unconfined cells description: turn off Newton for unconfined cells optional: true + developmode: true dimensions: fields: maxbound: @@ -107,6 +108,7 @@ blocks: default: 3.0e+30 netcdf: true dtype: double + layered: true shape: - nodes aux: @@ -119,6 +121,7 @@ blocks: optional: true netcdf: true dtype: double + layered: true shape: - nodes header: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-csub.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-csub.json index 95644528..fa7894bb 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-csub.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-csub.json @@ -331,6 +331,7 @@ "default": 1e-05, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] @@ -342,6 +343,7 @@ "default": 0.2, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] @@ -353,6 +355,7 @@ "optional": true, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] @@ -364,6 +367,7 @@ "optional": true, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-csub.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-csub.toml index c5a2acdf..d46cfdcd 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-csub.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-csub.toml @@ -296,6 +296,7 @@ description = "is the initial elastic coarse-grained material specific storage o default = 1e-05 netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] @@ -307,6 +308,7 @@ description = "is the initial porosity of coarse-grained materials." default = 0.2 netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] @@ -318,6 +320,7 @@ description = "is the specific gravity of moist or unsaturated sediments. If no optional = true netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] @@ -329,6 +332,7 @@ description = "is the specific gravity of saturated sediments. If not specified, optional = true netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-csub.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-csub.yaml index b6514e8e..2da9ae05 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-csub.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-csub.yaml @@ -320,6 +320,7 @@ blocks: default: 1.0e-05 netcdf: true dtype: double + layered: true shape: - nodes cg_theta: @@ -329,6 +330,7 @@ blocks: default: 0.2 netcdf: true dtype: double + layered: true shape: - nodes sgm: @@ -339,6 +341,7 @@ blocks: optional: true netcdf: true dtype: double + layered: true shape: - nodes sgs: @@ -349,6 +352,7 @@ blocks: optional: true netcdf: true dtype: double + layered: true shape: - nodes packagedata: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-dis.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-dis.json index 6aa43b77..85218bed 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-dis.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-dis.json @@ -185,6 +185,7 @@ "default": 0.0, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "ncol", "nrow", @@ -198,6 +199,7 @@ "optional": true, "netcdf": true, "dtype": "integer", + "layered": true, "shape": [ "ncol", "nrow", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-dis.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-dis.toml index 33440798..2ec52846 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-dis.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-dis.toml @@ -168,6 +168,7 @@ description = "is the bottom elevation for each cell." default = 0.0 netcdf = true dtype = "double" +layered = true shape = [ "ncol", "nrow", @@ -181,6 +182,7 @@ description = "is an optional array that characterizes the existence status of a optional = true netcdf = true dtype = "integer" +layered = true shape = [ "ncol", "nrow", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-dis.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-dis.yaml index b71b2771..781909e3 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-dis.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-dis.yaml @@ -165,6 +165,7 @@ blocks: default: 0.0 netcdf: true dtype: double + layered: true shape: - ncol - nrow @@ -183,6 +184,7 @@ blocks: optional: true netcdf: true dtype: integer + layered: true shape: - ncol - nrow diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-disv.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-disv.json index 56be2810..3e8c6114 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-disv.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-disv.json @@ -153,6 +153,7 @@ "description": "is the bottom elevation for each cell.", "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "ncpl", "nlay" @@ -165,6 +166,7 @@ "optional": true, "netcdf": true, "dtype": "integer", + "layered": true, "shape": [ "ncpl", "nlay" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-disv.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-disv.toml index fd97b218..44af7726 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-disv.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-disv.toml @@ -136,6 +136,7 @@ longname = "model bottom elevation" description = "is the bottom elevation for each cell." netcdf = true dtype = "double" +layered = true shape = [ "ncpl", "nlay", @@ -148,6 +149,7 @@ description = "is an optional array that characterizes the existence status of a optional = true netcdf = true dtype = "integer" +layered = true shape = [ "ncpl", "nlay", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-disv.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-disv.yaml index 692eebfa..370982a3 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-disv.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-disv.yaml @@ -142,6 +142,7 @@ blocks: description: is the bottom elevation for each cell. netcdf: true dtype: double + layered: true shape: - ncpl - nlay @@ -159,6 +160,7 @@ blocks: optional: true netcdf: true dtype: integer + layered: true shape: - ncpl - nlay diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drn.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drn.json index 15355eda..487f80c2 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drn.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drn.json @@ -104,7 +104,8 @@ "type": "keyword", "longname": "cubic-scaling", "description": "cubic-scaling is used to scale the drain conductance", - "optional": true + "optional": true, + "developmode": true } } }, diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drn.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drn.toml index c7e351e1..7c16e765 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drn.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drn.toml @@ -96,6 +96,7 @@ type = "keyword" longname = "cubic-scaling" description = "cubic-scaling is used to scale the drain conductance" optional = true +developmode = true [blocks.dimensions.fields.maxbound] type = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drn.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drn.yaml index 02a84ebf..4040e20c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drn.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drn.yaml @@ -111,6 +111,7 @@ blocks: longname: cubic-scaling description: cubic-scaling is used to scale the drain conductance optional: true + developmode: true dimensions: fields: maxbound: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drng.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drng.json index 88c77eb3..a4e46e9e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drng.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drng.json @@ -94,7 +94,8 @@ "type": "keyword", "longname": "cubic-scaling", "description": "cubic-scaling is used to scale the drain conductance", - "optional": true + "optional": true, + "developmode": true } } }, @@ -117,6 +118,7 @@ "default": 3e+30, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] @@ -128,6 +130,7 @@ "default": 3e+30, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] @@ -139,6 +142,7 @@ "optional": true, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drng.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drng.toml index c007b7c7..ee18d2c6 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drng.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drng.toml @@ -88,6 +88,7 @@ type = "keyword" longname = "cubic-scaling" description = "cubic-scaling is used to scale the drain conductance" optional = true +developmode = true [blocks.dimensions.fields.maxbound] type = "integer" @@ -102,6 +103,7 @@ description = "is the elevation of the drain." default = 3e+30 netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] @@ -113,6 +115,7 @@ description = "is the hydraulic conductance of the interface between the aquifer default = 3e+30 netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] @@ -124,6 +127,7 @@ description = "is an array of values for auxiliary variable aux(iaux), where iau optional = true netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drng.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drng.yaml index 9bc845a7..84a560f0 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drng.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drng.yaml @@ -109,6 +109,7 @@ blocks: longname: cubic-scaling description: cubic-scaling is used to scale the drain conductance optional: true + developmode: true dimensions: fields: maxbound: @@ -126,6 +127,7 @@ blocks: default: 3.0e+30 netcdf: true dtype: double + layered: true shape: - nodes cond: @@ -135,6 +137,7 @@ blocks: default: 3.0e+30 netcdf: true dtype: double + layered: true shape: - nodes aux: @@ -147,6 +150,7 @@ blocks: optional: true netcdf: true dtype: double + layered: true shape: - nodes header: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghbg.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghbg.json index d93c33b5..386b91fc 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghbg.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghbg.json @@ -105,6 +105,7 @@ "default": 3e+30, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] @@ -116,6 +117,7 @@ "default": 3e+30, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] @@ -127,6 +129,7 @@ "optional": true, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghbg.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghbg.toml index e44eb688..f040b735 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghbg.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghbg.toml @@ -90,6 +90,7 @@ description = "is the boundary head." default = 3e+30 netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] @@ -101,6 +102,7 @@ description = "is the hydraulic conductance of the interface between the aquifer default = 3e+30 netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] @@ -112,6 +114,7 @@ description = "is an array of values for auxiliary variable aux(iaux), where iau optional = true netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghbg.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghbg.yaml index 4dd890b4..fa7366a5 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghbg.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghbg.yaml @@ -109,6 +109,7 @@ blocks: default: 3.0e+30 netcdf: true dtype: double + layered: true shape: - nodes cond: @@ -118,6 +119,7 @@ blocks: default: 3.0e+30 netcdf: true dtype: double + layered: true shape: - nodes aux: @@ -130,6 +132,7 @@ blocks: optional: true netcdf: true dtype: double + layered: true shape: - nodes header: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ic.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ic.json index 47ee7800..fcd4aa5c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ic.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ic.json @@ -29,6 +29,7 @@ "default": 1.0, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ic.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ic.toml index a8b671a8..83474caa 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ic.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ic.toml @@ -22,6 +22,7 @@ description = "is the initial (starting) head---that is, head at the beginning o default = 1.0 netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ic.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ic.yaml index 33c3a3d6..d0d073ef 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ic.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ic.yaml @@ -34,5 +34,6 @@ blocks: default: 1.0 netcdf: true dtype: double + layered: true shape: - nodes diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-npf.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-npf.json index 8cf24005..8b730454 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-npf.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-npf.json @@ -169,13 +169,15 @@ "type": "keyword", "longname": "turn off Newton for unconfined cells", "description": "turn off Newton for unconfined cells", - "optional": true + "optional": true, + "developmode": true }, "dev_omega": { "type": "double", "longname": "set saturation omega value", "description": "set saturation omega value", - "optional": true + "optional": true, + "developmode": true } } }, @@ -188,6 +190,7 @@ "default": 0, "netcdf": true, "dtype": "integer", + "layered": true, "shape": [ "nodes" ] @@ -199,6 +202,7 @@ "default": 1.0, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] @@ -210,6 +214,7 @@ "optional": true, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] @@ -221,6 +226,7 @@ "optional": true, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] @@ -232,6 +238,7 @@ "optional": true, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] @@ -243,6 +250,7 @@ "optional": true, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] @@ -254,6 +262,7 @@ "optional": true, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] @@ -265,6 +274,7 @@ "optional": true, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-npf.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-npf.toml index 0ee8fe37..2ee1d616 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-npf.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-npf.toml @@ -159,12 +159,14 @@ type = "keyword" longname = "turn off Newton for unconfined cells" description = "turn off Newton for unconfined cells" optional = true +developmode = true [blocks.options.fields.dev_omega] type = "double" longname = "set saturation omega value" description = "set saturation omega value" optional = true +developmode = true [blocks.griddata.fields.icelltype] type = "array" @@ -173,6 +175,7 @@ description = "flag for each cell that specifies how saturated thickness is trea default = 0 netcdf = true dtype = "integer" +layered = true shape = [ "nodes", ] @@ -184,6 +187,7 @@ description = "is the hydraulic conductivity. For the common case in which the default = 1.0 netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] @@ -195,6 +199,7 @@ description = "is the hydraulic conductivity of the second ellipsoid axis (or th optional = true netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] @@ -206,6 +211,7 @@ description = "is the hydraulic conductivity of the third ellipsoid axis (or the optional = true netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] @@ -217,6 +223,7 @@ description = "is a rotation angle of the hydraulic conductivity tensor in degre optional = true netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] @@ -228,6 +235,7 @@ description = "is a rotation angle of the hydraulic conductivity tensor in degre optional = true netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] @@ -239,6 +247,7 @@ description = "is a rotation angle of the hydraulic conductivity tensor in degre optional = true netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] @@ -250,6 +259,7 @@ description = "is a combination of the wetting threshold and a flag to indicate optional = true netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-npf.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-npf.yaml index 7084999d..2a8aab93 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-npf.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-npf.yaml @@ -208,11 +208,13 @@ blocks: longname: turn off Newton for unconfined cells description: turn off Newton for unconfined cells optional: true + developmode: true dev_omega: type: double longname: set saturation omega value description: set saturation omega value optional: true + developmode: true griddata: fields: icelltype: @@ -229,6 +231,7 @@ blocks: default: 0 netcdf: true dtype: integer + layered: true shape: - nodes k: @@ -243,6 +246,7 @@ blocks: default: 1.0 netcdf: true dtype: double + layered: true shape: - nodes k22: @@ -259,6 +263,7 @@ blocks: optional: true netcdf: true dtype: double + layered: true shape: - nodes k33: @@ -271,6 +276,7 @@ blocks: optional: true netcdf: true dtype: double + layered: true shape: - nodes angle1: @@ -288,6 +294,7 @@ blocks: optional: true netcdf: true dtype: double + layered: true shape: - nodes angle2: @@ -306,6 +313,7 @@ blocks: optional: true netcdf: true dtype: double + layered: true shape: - nodes angle3: @@ -321,6 +329,7 @@ blocks: optional: true netcdf: true dtype: double + layered: true shape: - nodes wetdry: @@ -338,5 +347,6 @@ blocks: optional: true netcdf: true dtype: double + layered: true shape: - nodes diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rivg.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rivg.json index 70311fc5..ed054032 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rivg.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rivg.json @@ -105,6 +105,7 @@ "default": 3e+30, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] @@ -116,6 +117,7 @@ "default": 3e+30, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] @@ -127,6 +129,7 @@ "default": 3e+30, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] @@ -138,6 +141,7 @@ "optional": true, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rivg.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rivg.toml index 55231875..d2569afc 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rivg.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rivg.toml @@ -90,6 +90,7 @@ description = "is the head in the river." default = 3e+30 netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] @@ -101,6 +102,7 @@ description = "is the riverbed hydraulic conductance." default = 3e+30 netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] @@ -112,6 +114,7 @@ description = "is the elevation of the bottom of the riverbed." default = 3e+30 netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] @@ -123,6 +126,7 @@ description = "is an array of values for auxiliary variable aux(iaux), where iau optional = true netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rivg.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rivg.yaml index dfee2e1d..bb8ad619 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rivg.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rivg.yaml @@ -108,6 +108,7 @@ blocks: default: 3.0e+30 netcdf: true dtype: double + layered: true shape: - nodes cond: @@ -117,6 +118,7 @@ blocks: default: 3.0e+30 netcdf: true dtype: double + layered: true shape: - nodes rbot: @@ -126,6 +128,7 @@ blocks: default: 3.0e+30 netcdf: true dtype: double + layered: true shape: - nodes aux: @@ -138,6 +141,7 @@ blocks: optional: true netcdf: true dtype: double + layered: true shape: - nodes header: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sfr.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sfr.json index db7943c2..9d5d0f79 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sfr.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sfr.json @@ -194,7 +194,8 @@ "type": "double", "longname": "conversion factor", "description": "real value that is used to convert user-specified Manning's roughness coefficients from seconds per meters$^{1/3}$ to model length and time units. A constant of 1.486 is used for flow units of cubic feet per second, and a constant of 1.0 is used for units of cubic meters per second. The constant must be multiplied by 86,400 when using time units of days in the simulation.", - "optional": true + "optional": true, + "deprecated": "6.4.2" }, "length_conversion": { "type": "double", @@ -212,7 +213,8 @@ "type": "double", "longname": "reach storage time weighting", "description": "real number value that defines the time weighting factor used to calculate the change in channel storage. STORAGE_WEIGHT must have a value between 0.5 and 1. Default STORAGE_WEIGHT value is 1.", - "optional": true + "optional": true, + "developmode": true } } }, diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sfr.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sfr.toml index f09b9d22..6b790a4b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sfr.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sfr.toml @@ -178,6 +178,7 @@ type = "double" longname = "conversion factor" description = "real value that is used to convert user-specified Manning's roughness coefficients from seconds per meters$^{1/3}$ to model length and time units. A constant of 1.486 is used for flow units of cubic feet per second, and a constant of 1.0 is used for units of cubic meters per second. The constant must be multiplied by 86,400 when using time units of days in the simulation." optional = true +deprecated = "6.4.2" [blocks.options.fields.length_conversion] type = "double" @@ -196,6 +197,7 @@ type = "double" longname = "reach storage time weighting" description = "real number value that defines the time weighting factor used to calculate the change in channel storage. STORAGE_WEIGHT must have a value between 0.5 and 1. Default STORAGE_WEIGHT value is 1." optional = true +developmode = true [blocks.dimensions.fields.nreaches] type = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sfr.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sfr.yaml index 2fad499d..ee53ea13 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sfr.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sfr.yaml @@ -195,6 +195,7 @@ blocks: for flow units of cubic feet per second, and a constant of 1.0 is used for units of cubic meters per second. The constant must be multiplied by 86,400 when using time units of days in the simulation. optional: true + deprecated: 6.4.2 length_conversion: type: double longname: length conversion factor @@ -219,6 +220,7 @@ blocks: in channel storage. STORAGE_WEIGHT must have a value between 0.5 and 1. Default STORAGE_WEIGHT value is 1. optional: true + developmode: true dimensions: fields: nreaches: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sto.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sto.json index 3fab9a7c..0fa4a594 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sto.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sto.json @@ -58,13 +58,15 @@ "type": "keyword", "longname": "development option for original specific storage", "description": "flag indicating the original storage specific storage formulation should be used", - "optional": true + "optional": true, + "developmode": true }, "dev_oldstorageformulation": { "type": "keyword", "longname": "development option flag for old storage formulation", "description": "development option flag for old storage formulation", - "optional": true + "optional": true, + "developmode": true } } }, @@ -77,6 +79,7 @@ "default": 0, "netcdf": true, "dtype": "integer", + "layered": true, "shape": [ "nodes" ] @@ -88,6 +91,7 @@ "default": 1e-05, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] @@ -99,6 +103,7 @@ "default": 0.15, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sto.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sto.toml index c42b0c85..18273222 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sto.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sto.toml @@ -54,12 +54,14 @@ type = "keyword" longname = "development option for original specific storage" description = "flag indicating the original storage specific storage formulation should be used" optional = true +developmode = true [blocks.options.fields.dev_oldstorageformulation] type = "keyword" longname = "development option flag for old storage formulation" description = "development option flag for old storage formulation" optional = true +developmode = true [blocks.griddata.fields.iconvert] type = "array" @@ -68,6 +70,7 @@ description = "is a flag for each cell that specifies whether or not a cell is c default = 0 netcdf = true dtype = "integer" +layered = true shape = [ "nodes", ] @@ -79,6 +82,7 @@ description = "is specific storage (or the storage coefficient if STORAGECOEFFIC default = 1e-05 netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] @@ -90,6 +94,7 @@ description = "is specific yield. Specific yield values must be greater than or default = 0.15 netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sto.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sto.yaml index d45cc089..e24372f2 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sto.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sto.yaml @@ -62,11 +62,13 @@ blocks: longname: development option for original specific storage description: flag indicating the original storage specific storage formulation should be used optional: true + developmode: true dev_oldstorageformulation: type: keyword longname: development option flag for old storage formulation description: development option flag for old storage formulation optional: true + developmode: true griddata: fields: iconvert: @@ -79,6 +81,7 @@ blocks: default: 0 netcdf: true dtype: integer + layered: true shape: - nodes ss: @@ -90,6 +93,7 @@ blocks: default: 1.0e-05 netcdf: true dtype: double + layered: true shape: - nodes sy: @@ -100,6 +104,7 @@ blocks: default: 0.15 netcdf: true dtype: double + layered: true shape: - nodes period: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-uzf.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-uzf.json index d2091901..ff42b9ca 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-uzf.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-uzf.json @@ -195,7 +195,8 @@ "type": "keyword", "longname": "activate seepage", "description": "keyword specifying that groundwater discharge (GWSEEP) to land surface will be simulated. Groundwater discharge is nonzero when groundwater head is greater than land surface. This option is no longer recommended; a better approach is to use the Drain Package with discharge scaling as a way to handle seepage to land surface. The Drain Package with discharge scaling is described in Chapter 3 of the Supplemental Technical Information.", - "optional": true + "optional": true, + "deprecated": "6.5.0" }, "unsat_etwc": { "type": "keyword", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-uzf.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-uzf.toml index b10fa293..3bf1a9c4 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-uzf.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-uzf.toml @@ -179,6 +179,7 @@ type = "keyword" longname = "activate seepage" description = "keyword specifying that groundwater discharge (GWSEEP) to land surface will be simulated. Groundwater discharge is nonzero when groundwater head is greater than land surface. This option is no longer recommended; a better approach is to use the Drain Package with discharge scaling as a way to handle seepage to land surface. The Drain Package with discharge scaling is described in Chapter 3 of the Supplemental Technical Information." optional = true +deprecated = "6.5.0" [blocks.options.fields.unsat_etwc] type = "keyword" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-uzf.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-uzf.yaml index 28ae16b5..9910c70f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-uzf.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-uzf.yaml @@ -187,6 +187,7 @@ blocks: as a way to handle seepage to land surface. The Drain Package with discharge scaling is described in Chapter 3 of the Supplemental Technical Information. optional: true + deprecated: 6.5.0 unsat_etwc: type: keyword longname: use PET for theta greater than extwc diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-welg.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-welg.json index 2c35edd6..0230fd86 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-welg.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-welg.json @@ -135,6 +135,7 @@ "default": 3e+30, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] @@ -146,6 +147,7 @@ "optional": true, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-welg.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-welg.toml index c3f9f55d..0272f47a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-welg.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-welg.toml @@ -118,6 +118,7 @@ description = "is the volumetric well rate. A positive value indicates recharge default = 3e+30 netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] @@ -129,6 +130,7 @@ description = "is an array of values for auxiliary variable aux(iaux), where iau optional = true netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-welg.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-welg.yaml index e3f0aa4d..588a1e59 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-welg.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-welg.yaml @@ -149,6 +149,7 @@ blocks: default: 3.0e+30 netcdf: true dtype: double + layered: true shape: - nodes aux: @@ -161,6 +162,7 @@ blocks: optional: true netcdf: true dtype: double + layered: true shape: - nodes header: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-dis.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-dis.json index bc9ff203..47a04f7a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-dis.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-dis.json @@ -185,6 +185,7 @@ "default": 0.0, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "ncol", "nrow", @@ -198,6 +199,7 @@ "optional": true, "netcdf": true, "dtype": "integer", + "layered": true, "shape": [ "ncol", "nrow", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-dis.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-dis.toml index eadc9395..1834b2a0 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-dis.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-dis.toml @@ -168,6 +168,7 @@ description = "is the bottom elevation for each cell." default = 0.0 netcdf = true dtype = "double" +layered = true shape = [ "ncol", "nrow", @@ -181,6 +182,7 @@ description = "is an optional array that characterizes the existence status of a optional = true netcdf = true dtype = "integer" +layered = true shape = [ "ncol", "nrow", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-dis.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-dis.yaml index 338f9bc2..5bda9ed5 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-dis.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-dis.yaml @@ -165,6 +165,7 @@ blocks: default: 0.0 netcdf: true dtype: double + layered: true shape: - ncol - nrow @@ -183,6 +184,7 @@ blocks: optional: true netcdf: true dtype: integer + layered: true shape: - ncol - nrow diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-disv.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-disv.json index 991b447d..ae0eafd5 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-disv.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-disv.json @@ -153,6 +153,7 @@ "description": "is the bottom elevation for each cell.", "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "ncpl", "nlay" @@ -165,6 +166,7 @@ "optional": true, "netcdf": true, "dtype": "integer", + "layered": true, "shape": [ "ncpl", "nlay" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-disv.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-disv.toml index cc675f07..b3d08e78 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-disv.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-disv.toml @@ -136,6 +136,7 @@ longname = "model bottom elevation" description = "is the bottom elevation for each cell." netcdf = true dtype = "double" +layered = true shape = [ "ncpl", "nlay", @@ -148,6 +149,7 @@ description = "is an optional array that characterizes the existence status of a optional = true netcdf = true dtype = "integer" +layered = true shape = [ "ncpl", "nlay", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-disv.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-disv.yaml index a5eaa749..98bea1e3 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-disv.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-disv.yaml @@ -142,6 +142,7 @@ blocks: description: is the bottom elevation for each cell. netcdf: true dtype: double + layered: true shape: - ncpl - nlay @@ -159,6 +160,7 @@ blocks: optional: true netcdf: true dtype: integer + layered: true shape: - ncpl - nlay diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-dsp.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-dsp.json index d46568e0..431ed712 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-dsp.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-dsp.json @@ -41,6 +41,7 @@ "optional": true, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] @@ -52,6 +53,7 @@ "optional": true, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] @@ -63,6 +65,7 @@ "optional": true, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] @@ -74,6 +77,7 @@ "optional": true, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] @@ -85,6 +89,7 @@ "optional": true, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] @@ -96,6 +101,7 @@ "optional": true, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-dsp.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-dsp.toml index 107cbe8b..05d7dce3 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-dsp.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-dsp.toml @@ -34,6 +34,7 @@ description = "effective molecular diffusion coefficient." optional = true netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] @@ -45,6 +46,7 @@ description = "longitudinal dispersivity in horizontal direction. If flow is st optional = true netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] @@ -56,6 +58,7 @@ description = "longitudinal dispersivity in vertical direction. If flow is stri optional = true netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] @@ -67,6 +70,7 @@ description = "transverse dispersivity in horizontal direction. This is the tra optional = true netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] @@ -78,6 +82,7 @@ description = "transverse dispersivity in horizontal direction. This is the tra optional = true netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] @@ -89,6 +94,7 @@ description = "transverse dispersivity when flow is in vertical direction. If f optional = true netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-dsp.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-dsp.yaml index f543a103..1b34e9fe 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-dsp.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-dsp.yaml @@ -44,6 +44,7 @@ blocks: optional: true netcdf: true dtype: double + layered: true shape: - nodes alh: @@ -57,6 +58,7 @@ blocks: optional: true netcdf: true dtype: double + layered: true shape: - nodes alv: @@ -70,6 +72,7 @@ blocks: optional: true netcdf: true dtype: double + layered: true shape: - nodes ath1: @@ -83,6 +86,7 @@ blocks: optional: true netcdf: true dtype: double + layered: true shape: - nodes ath2: @@ -96,6 +100,7 @@ blocks: optional: true netcdf: true dtype: double + layered: true shape: - nodes atv: @@ -108,5 +113,6 @@ blocks: optional: true netcdf: true dtype: double + layered: true shape: - nodes diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-ic.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-ic.json index d53123c2..a859f237 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-ic.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-ic.json @@ -29,6 +29,7 @@ "default": 0.0, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-ic.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-ic.toml index 04cffc8e..1db58d3f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-ic.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-ic.toml @@ -22,6 +22,7 @@ description = "is the initial (starting) concentration---that is, concentration default = 0.0 netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-ic.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-ic.yaml index f98dea8f..5365eb04 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-ic.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-ic.yaml @@ -30,5 +30,6 @@ blocks: default: 0.0 netcdf: true dtype: double + layered: true shape: - nodes diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-ist.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-ist.json index 6178ba81..2f63b264 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-ist.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-ist.json @@ -172,6 +172,7 @@ "description": "porosity of the immobile domain specified as the immobile domain pore volume per immobile domain volume.", "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] @@ -182,6 +183,7 @@ "description": "fraction of the cell volume that consists of this immobile domain. The sum of all immobile domain volume fractions must be less than one.", "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] @@ -192,6 +194,7 @@ "description": "mass transfer rate coefficient between the mobile and immobile domains, in dimensions of per time.", "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] @@ -203,6 +206,7 @@ "optional": true, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] @@ -214,6 +218,7 @@ "optional": true, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] @@ -225,6 +230,7 @@ "optional": true, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] @@ -236,6 +242,7 @@ "optional": true, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] @@ -247,6 +254,7 @@ "optional": true, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] @@ -258,6 +266,7 @@ "optional": true, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-ist.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-ist.toml index 412c95ee..ef3dd46a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-ist.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-ist.toml @@ -153,6 +153,7 @@ longname = "porosity of the immobile domain" description = "porosity of the immobile domain specified as the immobile domain pore volume per immobile domain volume." netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] @@ -163,6 +164,7 @@ longname = "volume fraction of this immobile domain" description = "fraction of the cell volume that consists of this immobile domain. The sum of all immobile domain volume fractions must be less than one." netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] @@ -173,6 +175,7 @@ longname = "mass transfer rate coefficient between the mobile and immobile domai description = "mass transfer rate coefficient between the mobile and immobile domains, in dimensions of per time." netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] @@ -184,6 +187,7 @@ description = "initial concentration of the immobile domain in mass per length c optional = true netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] @@ -195,6 +199,7 @@ description = "is the rate coefficient for first or zero-order decay for the aqu optional = true netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] @@ -206,6 +211,7 @@ description = "is the rate coefficient for first or zero-order decay for the sor optional = true netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] @@ -217,6 +223,7 @@ description = "is the bulk density of this immobile domain in mass per length cu optional = true netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] @@ -228,6 +235,7 @@ description = "is the distribution coefficient for the equilibrium-controlled li optional = true netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] @@ -239,6 +247,7 @@ description = "is the exponent for the Freundlich isotherm and the sorption capa optional = true netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-ist.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-ist.yaml index 0354cf1b..b5cb6193 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-ist.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-ist.yaml @@ -155,6 +155,7 @@ blocks: immobile domain volume. netcdf: true dtype: double + layered: true shape: - nodes volfrac: @@ -164,6 +165,7 @@ blocks: immobile domain volume fractions must be less than one. netcdf: true dtype: double + layered: true shape: - nodes zetaim: @@ -173,6 +175,7 @@ blocks: of per time. netcdf: true dtype: double + layered: true shape: - nodes cim: @@ -183,6 +186,7 @@ blocks: optional: true netcdf: true dtype: double + layered: true shape: - nodes decay: @@ -196,6 +200,7 @@ blocks: optional: true netcdf: true dtype: double + layered: true shape: - nodes decay_sorbed: @@ -211,6 +216,7 @@ blocks: optional: true netcdf: true dtype: double + layered: true shape: - nodes bulk_density: @@ -224,6 +230,7 @@ blocks: optional: true netcdf: true dtype: double + layered: true shape: - nodes distcoef: @@ -236,6 +243,7 @@ blocks: optional: true netcdf: true dtype: double + layered: true shape: - nodes sp2: @@ -249,5 +257,6 @@ blocks: optional: true netcdf: true dtype: double + layered: true shape: - nodes diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-mst.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-mst.json index 38c74532..b39f6fae 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-mst.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-mst.json @@ -75,6 +75,7 @@ "description": "is the mobile domain porosity, defined as the mobile domain pore volume per mobile domain volume. Additional information on porosity within the context of mobile and immobile domain transport simulations is included in the MODFLOW 6 Supplemental Technical Information document.", "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] @@ -86,6 +87,7 @@ "optional": true, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] @@ -97,6 +99,7 @@ "optional": true, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] @@ -108,6 +111,7 @@ "optional": true, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] @@ -119,6 +123,7 @@ "optional": true, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] @@ -130,6 +135,7 @@ "optional": true, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-mst.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-mst.toml index 161dcc0e..a06ea634 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-mst.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-mst.toml @@ -66,6 +66,7 @@ longname = "porosity" description = "is the mobile domain porosity, defined as the mobile domain pore volume per mobile domain volume. Additional information on porosity within the context of mobile and immobile domain transport simulations is included in the MODFLOW 6 Supplemental Technical Information document." netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] @@ -77,6 +78,7 @@ description = "is the rate coefficient for first or zero-order decay for the aqu optional = true netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] @@ -88,6 +90,7 @@ description = "is the rate coefficient for first or zero-order decay for the sor optional = true netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] @@ -99,6 +102,7 @@ description = "is the bulk density of the aquifer in mass per length cubed. bul optional = true netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] @@ -110,6 +114,7 @@ description = "is the distribution coefficient for the equilibrium-controlled li optional = true netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] @@ -121,6 +126,7 @@ description = "is the exponent for the Freundlich isotherm and the sorption capa optional = true netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-mst.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-mst.yaml index 2b0f8e8b..927ec440 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-mst.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-mst.yaml @@ -76,6 +76,7 @@ blocks: document. netcdf: true dtype: double + layered: true shape: - nodes decay: @@ -89,6 +90,7 @@ blocks: optional: true netcdf: true dtype: double + layered: true shape: - nodes decay_sorbed: @@ -104,6 +106,7 @@ blocks: optional: true netcdf: true dtype: double + layered: true shape: - nodes bulk_density: @@ -116,6 +119,7 @@ blocks: optional: true netcdf: true dtype: double + layered: true shape: - nodes distcoef: @@ -128,6 +132,7 @@ blocks: optional: true netcdf: true dtype: double + layered: true shape: - nodes sp2: @@ -140,5 +145,6 @@ blocks: optional: true netcdf: true dtype: double + layered: true shape: - nodes diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-dfw.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-dfw.json index d6f14dc9..1bfd262d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-dfw.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-dfw.json @@ -70,7 +70,8 @@ "type": "keyword", "longname": "use SWR conductance formulation", "description": "use the conductance formulation in the Surface Water Routing (SWR) Process for MODFLOW-2005.", - "optional": true + "optional": true, + "developmode": true } } }, diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-dfw.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-dfw.toml index 1c614e45..3b6d3186 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-dfw.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-dfw.toml @@ -66,6 +66,7 @@ type = "keyword" longname = "use SWR conductance formulation" description = "use the conductance formulation in the Surface Water Routing (SWR) Process for MODFLOW-2005." optional = true +developmode = true [blocks.griddata.fields.manningsn] type = "array" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-dfw.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-dfw.yaml index 49aba973..e705fcb0 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-dfw.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-dfw.yaml @@ -83,6 +83,7 @@ blocks: longname: use SWR conductance formulation description: use the conductance formulation in the Surface Water Routing (SWR) Process for MODFLOW-2005. optional: true + developmode: true griddata: fields: manningsn: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-ic.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-ic.json index 17be05ab..f912d839 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-ic.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-ic.json @@ -22,6 +22,7 @@ "description": "is the initial (starting) stage---that is, stage at the beginning of the OLF Model simulation. STRT must be specified for all OLF Model simulations. One value is read for every model reach.", "default": 0.0, "dtype": "double", + "layered": true, "shape": [ "nodes" ] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-ic.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-ic.toml index fc44cab7..e2c112df 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-ic.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-ic.toml @@ -15,6 +15,7 @@ longname = "starting concentration" description = "is the initial (starting) stage---that is, stage at the beginning of the OLF Model simulation. STRT must be specified for all OLF Model simulations. One value is read for every model reach." default = 0.0 dtype = "double" +layered = true shape = [ "nodes", ] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-ic.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-ic.yaml index 57f6b342..c0e9bd07 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-ic.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-ic.yaml @@ -21,5 +21,6 @@ blocks: model reach. default: 0.0 dtype: double + layered: true shape: - nodes diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-dis.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-dis.json index 161c0ab6..2eb7b00b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-dis.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-dis.json @@ -181,6 +181,7 @@ "description": "is the bottom elevation for each cell.", "default": 0.0, "dtype": "double", + "layered": true, "shape": [ "ncol", "nrow", @@ -193,6 +194,7 @@ "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. If the IDOMAIN value for a cell is -1, the cell does not exist in the simulation. Furthermore, the first existing cell above will be connected to the first existing cell below. This type of cell is referred to as a 'vertical pass through' cell.", "optional": true, "dtype": "integer", + "layered": true, "shape": [ "ncol", "nrow", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-dis.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-dis.toml index 63555b3b..8acc6b2a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-dis.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-dis.toml @@ -164,6 +164,7 @@ longname = "cell bottom elevation" description = "is the bottom elevation for each cell." default = 0.0 dtype = "double" +layered = true shape = [ "ncol", "nrow", @@ -176,6 +177,7 @@ 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. If the IDOMAIN value for a cell is -1, the cell does not exist in the simulation. Furthermore, the first existing cell above will be connected to the first existing cell below. This type of cell is referred to as a 'vertical pass through' cell." optional = true dtype = "integer" +layered = true shape = [ "ncol", "nrow", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-dis.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-dis.yaml index 6c64b911..49dd71f3 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-dis.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-dis.yaml @@ -161,6 +161,7 @@ blocks: description: is the bottom elevation for each cell. default: 0.0 dtype: double + layered: true shape: - ncol - nrow @@ -178,6 +179,7 @@ blocks: to as a 'vertical pass through' cell. optional: true dtype: integer + layered: true shape: - ncol - nrow diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-disv.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-disv.json index b4e97da2..b10c9506 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-disv.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-disv.json @@ -151,6 +151,7 @@ "longname": "model bottom elevation", "description": "is the bottom elevation for each cell.", "dtype": "double", + "layered": true, "shape": [ "ncpl", "nlay" @@ -162,6 +163,7 @@ "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. If the IDOMAIN value for a cell is -1, the cell does not exist in the simulation. Furthermore, the first existing cell above will be connected to the first existing cell below. This type of cell is referred to as a 'vertical pass through' cell.", "optional": true, "dtype": "integer", + "layered": true, "shape": [ "ncpl", "nlay" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-disv.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-disv.toml index 517359a0..b0f991d9 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-disv.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-disv.toml @@ -134,6 +134,7 @@ type = "array" longname = "model bottom elevation" description = "is the bottom elevation for each cell." dtype = "double" +layered = true shape = [ "ncpl", "nlay", @@ -145,6 +146,7 @@ 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. If the IDOMAIN value for a cell is -1, the cell does not exist in the simulation. Furthermore, the first existing cell above will be connected to the first existing cell below. This type of cell is referred to as a 'vertical pass through' cell." optional = true dtype = "integer" +layered = true shape = [ "ncpl", "nlay", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-disv.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-disv.yaml index 02263fda..a6d69f1f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-disv.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-disv.yaml @@ -139,6 +139,7 @@ blocks: longname: model bottom elevation description: is the bottom elevation for each cell. dtype: double + layered: true shape: - ncpl - nlay @@ -155,6 +156,7 @@ blocks: to as a 'vertical pass through' cell. optional: true dtype: integer + layered: true shape: - ncpl - nlay diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-mip.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-mip.json index ea90520d..6d3bf059 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-mip.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-mip.json @@ -21,6 +21,7 @@ "longname": "porosity", "description": "is the aquifer porosity.", "dtype": "double", + "layered": true, "shape": [ "nodes" ] @@ -31,6 +32,7 @@ "description": "is a real value by which velocity is divided within a given cell. RETFACTOR can be used to account for solute retardation, i.e., the apparent effect of linear sorption on the velocity of particles that track solute advection. RETFACTOR may be assigned any real value. A RETFACTOR value greater than 1 represents particle retardation (slowing), and a value of 1 represents no retardation. The effect of specifying a RETFACTOR value for each cell is the same as the effect of directly multiplying the POROSITY in each cell by the proposed RETFACTOR value for each cell. RETFACTOR allows conceptual isolation of effects such as retardation from the effect of porosity. The default value is 1.", "optional": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] @@ -41,6 +43,7 @@ "description": "is an integer zone number assigned to each cell. IZONE may be positive, negative, or zero. The current cell's zone number is recorded with each particle track datum. If a PRP package's ISTOPZONE option is set to any value other than zero, particles released by that PRP Package terminate if they enter a cell whose IZONE value matches ISTOPZONE. If ISTOPZONE is not specified or is set to zero in a PRP Package, IZONE has no effect on the termination of particles released by that PRP Package. Each PRP Package may configure a single ISTOPZONE value.", "optional": true, "dtype": "integer", + "layered": true, "shape": [ "nodes" ] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-mip.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-mip.toml index 906b8e04..2b81b644 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-mip.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-mip.toml @@ -14,6 +14,7 @@ type = "array" longname = "porosity" description = "is the aquifer porosity." dtype = "double" +layered = true shape = [ "nodes", ] @@ -24,6 +25,7 @@ longname = "retardation factor" description = "is a real value by which velocity is divided within a given cell. RETFACTOR can be used to account for solute retardation, i.e., the apparent effect of linear sorption on the velocity of particles that track solute advection. RETFACTOR may be assigned any real value. A RETFACTOR value greater than 1 represents particle retardation (slowing), and a value of 1 represents no retardation. The effect of specifying a RETFACTOR value for each cell is the same as the effect of directly multiplying the POROSITY in each cell by the proposed RETFACTOR value for each cell. RETFACTOR allows conceptual isolation of effects such as retardation from the effect of porosity. The default value is 1." optional = true dtype = "double" +layered = true shape = [ "nodes", ] @@ -34,6 +36,7 @@ longname = "zone number" description = "is an integer zone number assigned to each cell. IZONE may be positive, negative, or zero. The current cell's zone number is recorded with each particle track datum. If a PRP package's ISTOPZONE option is set to any value other than zero, particles released by that PRP Package terminate if they enter a cell whose IZONE value matches ISTOPZONE. If ISTOPZONE is not specified or is set to zero in a PRP Package, IZONE has no effect on the termination of particles released by that PRP Package. Each PRP Package may configure a single ISTOPZONE value." optional = true dtype = "integer" +layered = true shape = [ "nodes", ] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-mip.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-mip.yaml index 8c41cf64..46049f2d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-mip.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-mip.yaml @@ -18,6 +18,7 @@ blocks: longname: porosity description: is the aquifer porosity. dtype: double + layered: true shape: - nodes retfactor: @@ -33,6 +34,7 @@ blocks: of porosity. The default value is 1. optional: true dtype: double + layered: true shape: - nodes izone: @@ -46,5 +48,6 @@ blocks: particles released by that PRP Package. Each PRP Package may configure a single ISTOPZONE value. optional: true dtype: integer + layered: true shape: - nodes diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-oc.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-oc.json index 7c2d7af2..1338875f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-oc.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-oc.json @@ -135,16 +135,19 @@ "track_timesrecord": { "type": "record", "optional": true, + "removed": "6.6.0", "fields": { "track_times": { "type": "keyword", - "description": "keyword indicating tracking times will follow" + "description": "keyword indicating tracking times will follow", + "removed": "6.6.0" }, "times": { "type": "array", "longname": "tracking times", "description": "times to track, relative to the beginning of the simulation.", "tagged": false, + "removed": "6.6.0", "dtype": "double" } } @@ -152,16 +155,19 @@ "track_timesfilerecord": { "type": "record", "optional": true, + "removed": "6.6.0", "fields": { "track_timesfile": { "type": "keyword", - "description": "keyword indicating tracking times file name will follow" + "description": "keyword indicating tracking times file name will follow", + "removed": "6.6.0" }, "timesfile": { "type": "string", "longname": "file keyword", "description": "name of the tracking times file", "tagged": false, + "removed": "6.6.0", "case_sensitive": true } } @@ -170,7 +176,8 @@ "type": "keyword", "longname": "print particle tracking events", "description": "print a verbose particle tracking event trace to standard output", - "optional": true + "optional": true, + "developmode": true } } }, diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-oc.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-oc.toml index 158e662f..2d1f4949 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-oc.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-oc.toml @@ -122,31 +122,37 @@ optional = true [blocks.options.fields.track_timesrecord] type = "record" optional = true +removed = "6.6.0" [blocks.options.fields.track_timesrecord.fields.track_times] type = "keyword" description = "keyword indicating tracking times will follow" +removed = "6.6.0" [blocks.options.fields.track_timesrecord.fields.times] type = "array" longname = "tracking times" description = "times to track, relative to the beginning of the simulation." tagged = false +removed = "6.6.0" dtype = "double" [blocks.options.fields.track_timesfilerecord] type = "record" optional = true +removed = "6.6.0" [blocks.options.fields.track_timesfilerecord.fields.track_timesfile] type = "keyword" description = "keyword indicating tracking times file name will follow" +removed = "6.6.0" [blocks.options.fields.track_timesfilerecord.fields.timesfile] type = "string" longname = "file keyword" description = "name of the tracking times file" tagged = false +removed = "6.6.0" case_sensitive = true [blocks.options.fields.dev_dump_event_trace] @@ -154,6 +160,7 @@ type = "keyword" longname = "print particle tracking events" description = "print a verbose particle tracking event trace to standard output" optional = true +developmode = true [blocks.dimensions.fields.ntracktimes] type = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-oc.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-oc.yaml index fbb8999b..6807f07c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-oc.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-oc.yaml @@ -121,34 +121,41 @@ blocks: track_timesrecord: type: record optional: true + removed: 6.6.0 fields: track_times: type: keyword description: keyword indicating tracking times will follow + removed: 6.6.0 times: type: array longname: tracking times description: times to track, relative to the beginning of the simulation. tagged: false + removed: 6.6.0 dtype: double track_timesfilerecord: type: record optional: true + removed: 6.6.0 fields: track_timesfile: type: keyword description: keyword indicating tracking times file name will follow + removed: 6.6.0 timesfile: type: string longname: file keyword description: name of the tracking times file tagged: false + removed: 6.6.0 case_sensitive: true dev_dump_event_trace: type: keyword longname: print particle tracking events description: print a verbose particle tracking event trace to standard output optional: true + developmode: true dimensions: fields: ntracktimes: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-prp.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-prp.json index 356e332e..8e10de45 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-prp.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-prp.json @@ -33,7 +33,8 @@ "type": "integer", "longname": "exit solve method", "description": "the method for iterative solution of particle exit location and time in the generalized Pollock's method. 0 default, 1 Brent, 2 Chandrupatla. The default is Brent's method.", - "optional": true + "optional": true, + "developmode": true }, "exit_solve_tolerance": { "type": "double", @@ -123,16 +124,19 @@ "release_timesrecord": { "type": "record", "optional": true, + "removed": "6.6.0", "fields": { "release_times": { "type": "keyword", - "description": "keyword indicating release times will follow" + "description": "keyword indicating release times will follow", + "removed": "6.6.0" }, "times": { "type": "array", "longname": "release times", "description": "times to release, relative to the beginning of the simulation. RELEASE_TIMES and RELEASE_TIMESFILE are mutually exclusive.", "tagged": false, + "removed": "6.6.0", "dtype": "double" } } @@ -140,16 +144,19 @@ "release_timesfilerecord": { "type": "record", "optional": true, + "removed": "6.6.0", "fields": { "release_timesfile": { "type": "keyword", - "description": "keyword indicating release times file name will follow" + "description": "keyword indicating release times file name will follow", + "removed": "6.6.0" }, "timesfile": { "type": "string", "longname": "file keyword", "description": "name of the release times file. RELEASE_TIMES and RELEASE_TIMESFILE are mutually exclusive.", "tagged": false, + "removed": "6.6.0", "case_sensitive": true } } @@ -168,7 +175,8 @@ "dev_forceternary": { "type": "keyword", "longname": "force ternary tracking method", - "description": "force use of the ternary tracking method regardless of cell type in DISV grids." + "description": "force use of the ternary tracking method regardless of cell type in DISV grids.", + "developmode": true }, "release_time_tolerance": { "type": "double", @@ -197,7 +205,8 @@ "type": "integer", "longname": "cycle detection window size", "description": "integer value defining the size of the window (number of consecutive exit events) used for cycle detection. Defaults to 0, disabling cycle detection. With detection enabled, particle pathlines with duplicate cell exit events (i.e., exiting the same cell through the same face twice) will cause the program to terminate with an error. A larger window size provides more robust cycle detection at the cost of more runtime operations per cell exit.", - "optional": true + "optional": true, + "developmode": true } } }, @@ -327,6 +336,7 @@ "type": "array", "description": "release particles after the specified fraction of the time step has elapsed. If FRACTION is not set, particles are released at the start of the specified time step(s). FRACTION must be a single value when used with ALL, FIRST, or FREQUENCY. When used with STEPS, FRACTION may be a single value or an array of the same length as STEPS. If a single FRACTION value is provided with STEPS, the fraction applies to all steps. NOTE: The FRACTION option has been removed. For fine control over release timing, specify times explicitly using the RELEASETIMES block.", "optional": true, + "removed": "6.6.0", "dtype": "double" } } diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-prp.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-prp.toml index d88cc33d..51d195e5 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-prp.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-prp.toml @@ -29,6 +29,7 @@ type = "integer" longname = "exit solve method" description = "the method for iterative solution of particle exit location and time in the generalized Pollock's method. 0 default, 1 Brent, 2 Chandrupatla. The default is Brent's method." optional = true +developmode = true [blocks.options.fields.exit_solve_tolerance] type = "double" @@ -114,31 +115,37 @@ optional = true [blocks.options.fields.release_timesrecord] type = "record" optional = true +removed = "6.6.0" [blocks.options.fields.release_timesrecord.fields.release_times] type = "keyword" description = "keyword indicating release times will follow" +removed = "6.6.0" [blocks.options.fields.release_timesrecord.fields.times] type = "array" longname = "release times" description = "times to release, relative to the beginning of the simulation. RELEASE_TIMES and RELEASE_TIMESFILE are mutually exclusive." tagged = false +removed = "6.6.0" dtype = "double" [blocks.options.fields.release_timesfilerecord] type = "record" optional = true +removed = "6.6.0" [blocks.options.fields.release_timesfilerecord.fields.release_timesfile] type = "keyword" description = "keyword indicating release times file name will follow" +removed = "6.6.0" [blocks.options.fields.release_timesfilerecord.fields.timesfile] type = "string" longname = "file keyword" description = "name of the release times file. RELEASE_TIMES and RELEASE_TIMESFILE are mutually exclusive." tagged = false +removed = "6.6.0" case_sensitive = true [blocks.options.fields.dry_tracking_method] @@ -156,6 +163,7 @@ valid = [ type = "keyword" longname = "force ternary tracking method" description = "force use of the ternary tracking method regardless of cell type in DISV grids." +developmode = true [blocks.options.fields.release_time_tolerance] type = "double" @@ -185,6 +193,7 @@ type = "integer" longname = "cycle detection window size" description = "integer value defining the size of the window (number of consecutive exit events) used for cycle detection. Defaults to 0, disabling cycle detection. With detection enabled, particle pathlines with duplicate cell exit events (i.e., exiting the same cell through the same face twice) will cause the program to terminate with an error. A larger window size provides more robust cycle detection at the cost of more runtime operations per cell exit." optional = true +developmode = true [blocks.dimensions.fields.nreleasepts] type = "integer" @@ -295,6 +304,7 @@ dtype = "integer" type = "array" description = "release particles after the specified fraction of the time step has elapsed. If FRACTION is not set, particles are released at the start of the specified time step(s). FRACTION must be a single value when used with ALL, FIRST, or FREQUENCY. When used with STEPS, FRACTION may be a single value or an array of the same length as STEPS. If a single FRACTION value is provided with STEPS, the fraction applies to all steps. NOTE: The FRACTION option has been removed. For fine control over release timing, specify times explicitly using the RELEASETIMES block." optional = true +removed = "6.6.0" dtype = "double" [blocks.period.header] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-prp.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-prp.yaml index b98578ea..ec7ddbb1 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-prp.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-prp.yaml @@ -31,6 +31,7 @@ blocks: description: the method for iterative solution of particle exit location and time in the generalized Pollock's method. 0 default, 1 Brent, 2 Chandrupatla. The default is Brent's method. optional: true + developmode: true exit_solve_tolerance: type: double longname: exit solve tolerance @@ -139,30 +140,36 @@ blocks: release_timesrecord: type: record optional: true + removed: 6.6.0 fields: release_times: type: keyword description: keyword indicating release times will follow + removed: 6.6.0 times: type: array longname: release times description: times to release, relative to the beginning of the simulation. RELEASE_TIMES and RELEASE_TIMESFILE are mutually exclusive. tagged: false + removed: 6.6.0 dtype: double release_timesfilerecord: type: record optional: true + removed: 6.6.0 fields: release_timesfile: type: keyword description: keyword indicating release times file name will follow + removed: 6.6.0 timesfile: type: string longname: file keyword description: name of the release times file. RELEASE_TIMES and RELEASE_TIMESFILE are mutually exclusive. tagged: false + removed: 6.6.0 case_sensitive: true dry_tracking_method: type: string @@ -180,6 +187,7 @@ blocks: type: keyword longname: force ternary tracking method description: force use of the ternary tracking method regardless of cell type in DISV grids. + developmode: true release_time_tolerance: type: double longname: release time coincidence tolerance @@ -217,6 +225,7 @@ blocks: same face twice) will cause the program to terminate with an error. A larger window size provides more robust cycle detection at the cost of more runtime operations per cell exit. optional: true + developmode: true dimensions: fields: nreleasepts: @@ -351,6 +360,7 @@ blocks: option has been removed. For fine control over release timing, specify times explicitly using the RELEASETIMES block.' optional: true + removed: 6.6.0 dtype: double header: name: iper diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/sln-ims.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/sln-ims.json index 9fe00501..43c13fb3 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/sln-ims.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/sln-ims.json @@ -22,17 +22,20 @@ "csv_output_filerecord": { "type": "record", "optional": true, + "deprecated": "6.1.1", "fields": { "csv_output": { "type": "keyword", "longname": "budget keyword", - "description": "keyword to specify that the record corresponds to the comma separated values solver convergence output. The CSV_OUTPUT option has been deprecated and split into the CSV_OUTER_OUTPUT and CSV_INNER_OUTPUT options. Starting with MODFLOW 6 version 6.1.1 if the CSV_OUTPUT option is specified, then it is treated as the CSV_OUTER_OUTPUT option." + "description": "keyword to specify that the record corresponds to the comma separated values solver convergence output. The CSV_OUTPUT option has been deprecated and split into the CSV_OUTER_OUTPUT and CSV_INNER_OUTPUT options. Starting with MODFLOW 6 version 6.1.1 if the CSV_OUTPUT option is specified, then it is treated as the CSV_OUTER_OUTPUT option.", + "deprecated": "6.1.1" }, "csvfile": { "type": "file", "longname": "file keyword", "description": "name of the ascii comma separated values output file to write solver convergence information. If PRINT_OPTION is NONE or SUMMARY, comma separated values output includes maximum head change convergence information at the end of each outer iteration for each time step. If PRINT_OPTION is ALL, comma separated values output includes maximum head change and maximum residual convergence information for the solution and each model (if the solution includes more than one model) and linear acceleration information for each inner iteration.", "tagged": false, + "deprecated": "6.1.1", "direction": "out" } } @@ -106,7 +109,8 @@ "type": "double", "longname": "head change criterion", "description": "real value defining the head change criterion for convergence of the outer (nonlinear) iterations, in units of length. When the maximum absolute value of the head change at all nodes during an iteration is less than or equal to OUTER_HCLOSE, iteration stops. Commonly, OUTER_HCLOSE equals 0.01. The OUTER_HCLOSE option has been deprecated in favor of the more general OUTER_DVCLOSE (for dependent variable), however either one can be specified in order to maintain backward compatibility.", - "optional": true + "optional": true, + "deprecated": "6.1.1" }, "outer_dvclose": { "type": "double", @@ -117,7 +121,8 @@ "type": "double", "longname": "boundary package flow residual tolerance", "description": "real value defining the residual tolerance for convergence of model packages that solve a separate equation not solved by the IMS linear solver. This value represents the maximum allowable residual between successive outer iterations at any single model package element. An example of a model package that would use OUTER_RCLOSEBND to evaluate convergence is the SFR package which solves a continuity equation for each reach. The OUTER_RCLOSEBND option is deprecated and has no effect on simulation results as of version 6.1.1. The keyword, OUTER_RCLOSEBND can be still be specified for backward compatibility with previous versions of MODFLOW 6 but eventually specification of OUTER_RCLOSEBND will cause MODFLOW 6 to terminate with an error.", - "optional": true + "optional": true, + "deprecated": "6.1.1" }, "outer_maximum": { "type": "integer", @@ -191,7 +196,8 @@ "type": "double", "longname": "head change tolerance", "description": "real value defining the head change criterion for convergence of the inner (linear) iterations, in units of length. When the maximum absolute value of the head change at all nodes during an iteration is less than or equal to INNER_HCLOSE, the matrix solver assumes convergence. Commonly, INNER_HCLOSE is set equal to or an order of magnitude less than the OUTER_HCLOSE value specified for the NONLINEAR block. The INNER_HCLOSE keyword has been deprecated in favor of the more general INNER_DVCLOSE (for dependent variable), however either one can be specified in order to maintain backward compatibility.", - "optional": true + "optional": true, + "deprecated": "6.1.1" }, "inner_dvclose": { "type": "double", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/sln-ims.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/sln-ims.toml index b813451b..7efec774 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/sln-ims.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/sln-ims.toml @@ -19,17 +19,20 @@ optional = true [blocks.options.fields.csv_output_filerecord] type = "record" optional = true +deprecated = "6.1.1" [blocks.options.fields.csv_output_filerecord.fields.csv_output] type = "keyword" longname = "budget keyword" description = "keyword to specify that the record corresponds to the comma separated values solver convergence output. The CSV_OUTPUT option has been deprecated and split into the CSV_OUTER_OUTPUT and CSV_INNER_OUTPUT options. Starting with MODFLOW 6 version 6.1.1 if the CSV_OUTPUT option is specified, then it is treated as the CSV_OUTER_OUTPUT option." +deprecated = "6.1.1" [blocks.options.fields.csv_output_filerecord.fields.csvfile] type = "file" longname = "file keyword" description = "name of the ascii comma separated values output file to write solver convergence information. If PRINT_OPTION is NONE or SUMMARY, comma separated values output includes maximum head change convergence information at the end of each outer iteration for each time step. If PRINT_OPTION is ALL, comma separated values output includes maximum head change and maximum residual convergence information for the solution and each model (if the solution includes more than one model) and linear acceleration information for each inner iteration." tagged = false +deprecated = "6.1.1" direction = "out" [blocks.options.fields.csv_outer_output_filerecord] @@ -92,6 +95,7 @@ type = "double" longname = "head change criterion" description = "real value defining the head change criterion for convergence of the outer (nonlinear) iterations, in units of length. When the maximum absolute value of the head change at all nodes during an iteration is less than or equal to OUTER_HCLOSE, iteration stops. Commonly, OUTER_HCLOSE equals 0.01. The OUTER_HCLOSE option has been deprecated in favor of the more general OUTER_DVCLOSE (for dependent variable), however either one can be specified in order to maintain backward compatibility." optional = true +deprecated = "6.1.1" [blocks.nonlinear.fields.outer_dvclose] type = "double" @@ -103,6 +107,7 @@ type = "double" longname = "boundary package flow residual tolerance" description = "real value defining the residual tolerance for convergence of model packages that solve a separate equation not solved by the IMS linear solver. This value represents the maximum allowable residual between successive outer iterations at any single model package element. An example of a model package that would use OUTER_RCLOSEBND to evaluate convergence is the SFR package which solves a continuity equation for each reach. The OUTER_RCLOSEBND option is deprecated and has no effect on simulation results as of version 6.1.1. The keyword, OUTER_RCLOSEBND can be still be specified for backward compatibility with previous versions of MODFLOW 6 but eventually specification of OUTER_RCLOSEBND will cause MODFLOW 6 to terminate with an error." optional = true +deprecated = "6.1.1" [blocks.nonlinear.fields.outer_maximum] type = "integer" @@ -173,6 +178,7 @@ type = "double" longname = "head change tolerance" description = "real value defining the head change criterion for convergence of the inner (linear) iterations, in units of length. When the maximum absolute value of the head change at all nodes during an iteration is less than or equal to INNER_HCLOSE, the matrix solver assumes convergence. Commonly, INNER_HCLOSE is set equal to or an order of magnitude less than the OUTER_HCLOSE value specified for the NONLINEAR block. The INNER_HCLOSE keyword has been deprecated in favor of the more general INNER_DVCLOSE (for dependent variable), however either one can be specified in order to maintain backward compatibility." optional = true +deprecated = "6.1.1" [blocks.linear.fields.inner_dvclose] type = "double" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/sln-ims.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/sln-ims.yaml index 9e3875a2..8448c33e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/sln-ims.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/sln-ims.yaml @@ -37,6 +37,7 @@ blocks: csv_output_filerecord: type: record optional: true + deprecated: 6.1.1 fields: csv_output: type: keyword @@ -45,6 +46,7 @@ blocks: solver convergence output. The CSV_OUTPUT option has been deprecated and split into the CSV_OUTER_OUTPUT and CSV_INNER_OUTPUT options. Starting with MODFLOW 6 version 6.1.1 if the CSV_OUTPUT option is specified, then it is treated as the CSV_OUTER_OUTPUT option. + deprecated: 6.1.1 csvfile: type: file longname: file keyword @@ -55,6 +57,7 @@ blocks: and maximum residual convergence information for the solution and each model (if the solution includes more than one model) and linear acceleration information for each inner iteration. tagged: false + deprecated: 6.1.1 direction: out csv_outer_output_filerecord: type: record @@ -147,6 +150,7 @@ blocks: (for dependent variable), however either one can be specified in order to maintain backward compatibility. optional: true + deprecated: 6.1.1 outer_dvclose: type: double longname: dependent-variable change criterion @@ -169,6 +173,7 @@ blocks: can be still be specified for backward compatibility with previous versions of MODFLOW 6 but eventually specification of OUTER_RCLOSEBND will cause MODFLOW 6 to terminate with an error. optional: true + deprecated: 6.1.1 outer_maximum: type: integer longname: outer maximum iterations @@ -294,6 +299,7 @@ blocks: the more general INNER_DVCLOSE (for dependent variable), however either one can be specified in order to maintain backward compatibility. optional: true + deprecated: 6.1.1 inner_dvclose: type: double longname: dependent-variable change tolerance diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/sln-pts.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/sln-pts.json index 460b5a6e..3f03a81e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/sln-pts.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/sln-pts.json @@ -22,17 +22,20 @@ "csv_output_filerecord": { "type": "record", "optional": true, + "deprecated": "6.1.1", "fields": { "csv_output": { "type": "keyword", "longname": "budget keyword", - "description": "keyword to specify that the record corresponds to the comma separated values solver convergence output. The CSV_OUTPUT option has been deprecated and split into the CSV_OUTER_OUTPUT and CSV_INNER_OUTPUT options. Starting with MODFLOW 6 version 6.1.1 if the CSV_OUTPUT option is specified, then it is treated as the CSV_OUTER_OUTPUT option." + "description": "keyword to specify that the record corresponds to the comma separated values solver convergence output. The CSV_OUTPUT option has been deprecated and split into the CSV_OUTER_OUTPUT and CSV_INNER_OUTPUT options. Starting with MODFLOW 6 version 6.1.1 if the CSV_OUTPUT option is specified, then it is treated as the CSV_OUTER_OUTPUT option.", + "deprecated": "6.1.1" }, "csvfile": { "type": "file", "longname": "file keyword", "description": "name of the ascii comma separated values output file to write solver convergence information. If PRINT_OPTION is NONE or SUMMARY, comma separated values output includes maximum head change convergence information at the end of each outer iteration for each time step. If PRINT_OPTION is ALL, comma separated values output includes maximum head change and maximum residual convergence information for the solution and each model (if the solution includes more than one model) and linear acceleration information for each inner iteration.", "tagged": false, + "deprecated": "6.1.1", "direction": "out" } } diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/sln-pts.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/sln-pts.toml index 36c1fea3..fef48e5b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/sln-pts.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/sln-pts.toml @@ -19,17 +19,20 @@ optional = true [blocks.options.fields.csv_output_filerecord] type = "record" optional = true +deprecated = "6.1.1" [blocks.options.fields.csv_output_filerecord.fields.csv_output] type = "keyword" longname = "budget keyword" description = "keyword to specify that the record corresponds to the comma separated values solver convergence output. The CSV_OUTPUT option has been deprecated and split into the CSV_OUTER_OUTPUT and CSV_INNER_OUTPUT options. Starting with MODFLOW 6 version 6.1.1 if the CSV_OUTPUT option is specified, then it is treated as the CSV_OUTER_OUTPUT option." +deprecated = "6.1.1" [blocks.options.fields.csv_output_filerecord.fields.csvfile] type = "file" longname = "file keyword" description = "name of the ascii comma separated values output file to write solver convergence information. If PRINT_OPTION is NONE or SUMMARY, comma separated values output includes maximum head change convergence information at the end of each outer iteration for each time step. If PRINT_OPTION is ALL, comma separated values output includes maximum head change and maximum residual convergence information for the solution and each model (if the solution includes more than one model) and linear acceleration information for each inner iteration." tagged = false +deprecated = "6.1.1" direction = "out" [blocks.options.fields.csv_outer_output_filerecord] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/sln-pts.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/sln-pts.yaml index 188c7ddd..42da6409 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/sln-pts.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/sln-pts.yaml @@ -37,6 +37,7 @@ blocks: csv_output_filerecord: type: record optional: true + deprecated: 6.1.1 fields: csv_output: type: keyword @@ -45,6 +46,7 @@ blocks: solver convergence output. The CSV_OUTPUT option has been deprecated and split into the CSV_OUTER_OUTPUT and CSV_INNER_OUTPUT options. Starting with MODFLOW 6 version 6.1.1 if the CSV_OUTPUT option is specified, then it is treated as the CSV_OUTER_OUTPUT option. + deprecated: 6.1.1 csvfile: type: file longname: file keyword @@ -55,6 +57,7 @@ blocks: and maximum residual convergence information for the solution and each model (if the solution includes more than one model) and linear acceleration information for each inner iteration. tagged: false + deprecated: 6.1.1 direction: out csv_outer_output_filerecord: type: record diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-dfw.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-dfw.json index 941546dd..5c7d6ec8 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-dfw.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-dfw.json @@ -70,7 +70,8 @@ "type": "keyword", "longname": "use SWR conductance formulation", "description": "use the conductance formulation in the Surface Water Routing (SWR) Process for MODFLOW-2005.", - "optional": true + "optional": true, + "developmode": true } } }, diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-dfw.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-dfw.toml index 835d7858..a0dc1a50 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-dfw.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-dfw.toml @@ -66,6 +66,7 @@ type = "keyword" longname = "use SWR conductance formulation" description = "use the conductance formulation in the Surface Water Routing (SWR) Process for MODFLOW-2005." optional = true +developmode = true [blocks.griddata.fields.manningsn] type = "array" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-dfw.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-dfw.yaml index 7dfa8a2d..57d8d347 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-dfw.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-dfw.yaml @@ -83,6 +83,7 @@ blocks: longname: use SWR conductance formulation description: use the conductance formulation in the Surface Water Routing (SWR) Process for MODFLOW-2005. optional: true + developmode: true griddata: fields: manningsn: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-ic.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-ic.json index 01586dfd..1d8c5b80 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-ic.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-ic.json @@ -22,6 +22,7 @@ "description": "is the initial (starting) stage---that is, stage at the beginning of the SWF Model simulation. STRT must be specified for all SWF Model simulations. One value is read for every model reach.", "default": 0.0, "dtype": "double", + "layered": true, "shape": [ "nodes" ] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-ic.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-ic.toml index f33ae48b..0ad03d49 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-ic.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-ic.toml @@ -15,6 +15,7 @@ longname = "starting concentration" description = "is the initial (starting) stage---that is, stage at the beginning of the SWF Model simulation. STRT must be specified for all SWF Model simulations. One value is read for every model reach." default = 0.0 dtype = "double" +layered = true shape = [ "nodes", ] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-ic.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-ic.yaml index f34257cc..491bc870 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-ic.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-ic.yaml @@ -21,5 +21,6 @@ blocks: model reach. default: 0.0 dtype: double + layered: true shape: - nodes diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-hpc.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-hpc.json index fccd3317..da11b809 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-hpc.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-hpc.json @@ -17,7 +17,8 @@ "type": "keyword", "longname": "log mpi traffic", "description": "keyword to enable (extremely verbose) logging of mpi traffic to file.", - "optional": true + "optional": true, + "developmode": true } } }, diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-hpc.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-hpc.toml index da6f921f..7804cc5a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-hpc.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-hpc.toml @@ -15,6 +15,7 @@ type = "keyword" longname = "log mpi traffic" description = "keyword to enable (extremely verbose) logging of mpi traffic to file." optional = true +developmode = true [blocks.partitions.fields.partitions] type = "list" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-hpc.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-hpc.yaml index 0102c55f..bb54a24e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-hpc.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-hpc.yaml @@ -16,6 +16,7 @@ blocks: longname: log mpi traffic description: keyword to enable (extremely verbose) logging of mpi traffic to file. optional: true + developmode: true partitions: fields: partitions: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-dfw.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-dfw.json index 98be405b..7ac429ef 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-dfw.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-dfw.json @@ -75,7 +75,8 @@ "type": "keyword", "longname": "use SWR conductance formulation", "description": "use the conductance formulation in the Surface Water Routing (SWR) Process for MODFLOW-2005.", - "optional": true + "optional": true, + "developmode": true } } }, diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-dfw.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-dfw.toml index 0eaf5960..074d7bb4 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-dfw.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-dfw.toml @@ -69,6 +69,7 @@ type = "keyword" longname = "use SWR conductance formulation" description = "use the conductance formulation in the Surface Water Routing (SWR) Process for MODFLOW-2005." optional = true +developmode = true [blocks.griddata.fields.manningsn] type = "array" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-dfw.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-dfw.yaml index 4f863b5d..081a6e59 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-dfw.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-dfw.yaml @@ -86,6 +86,7 @@ blocks: longname: use SWR conductance formulation description: use the conductance formulation in the Surface Water Routing (SWR) Process for MODFLOW-2005. optional: true + developmode: true griddata: fields: manningsn: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-ic.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-ic.json index 5f907706..0e0220ac 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-ic.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-ic.json @@ -27,6 +27,7 @@ "description": "is the initial (starting) stage---that is, stage at the beginning of the CHF Model simulation. STRT must be specified for all CHF Model simulations. One value is read for every model reach.", "default": 0.0, "dtype": "double", + "layered": true, "shape": [ "nodes" ] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-ic.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-ic.toml index e31a862b..d875559c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-ic.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-ic.toml @@ -18,6 +18,7 @@ longname = "starting concentration" description = "is the initial (starting) stage---that is, stage at the beginning of the CHF Model simulation. STRT must be specified for all CHF Model simulations. One value is read for every model reach." default = 0.0 dtype = "double" +layered = true shape = [ "nodes", ] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-ic.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-ic.yaml index 8254718a..5bfbb96e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-ic.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-ic.yaml @@ -24,6 +24,7 @@ blocks: model reach. default: 0.0 dtype: double + layered: true shape: - nodes memory: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwegwe.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwegwe.json index 7e35127b..e1503513 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwegwe.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwegwe.json @@ -123,7 +123,8 @@ "type": "keyword", "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.", - "optional": true + "optional": true, + "developmode": true } } }, diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwegwe.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwegwe.toml index 68002198..bf8765d9 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwegwe.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwegwe.toml @@ -115,6 +115,7 @@ type = "keyword" 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." optional = true +developmode = true [blocks.dimensions.fields.nexg] type = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwegwe.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwegwe.yaml index 56e006d5..b7e00f6b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwegwe.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwegwe.yaml @@ -126,6 +126,7 @@ blocks: 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. optional: true + developmode: true dimensions: fields: nexg: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwfgwf.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwfgwf.json index fa2f1dc1..1d82f46a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwfgwf.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwfgwf.json @@ -150,7 +150,8 @@ "type": "keyword", "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.", - "optional": true + "optional": true, + "developmode": true } } }, diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwfgwf.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwfgwf.toml index efdc7273..8170dcb9 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwfgwf.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwfgwf.toml @@ -138,6 +138,7 @@ type = "keyword" 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." optional = true +developmode = true [blocks.dimensions.fields.nexg] type = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwfgwf.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwfgwf.yaml index a6007d32..69976659 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwfgwf.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwfgwf.yaml @@ -171,6 +171,7 @@ blocks: 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. optional: true + developmode: true dimensions: fields: nexg: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwtgwt.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwtgwt.json index f5e0c612..f675993a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwtgwt.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwtgwt.json @@ -123,7 +123,8 @@ "type": "keyword", "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.", - "optional": true + "optional": true, + "developmode": true } } }, diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwtgwt.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwtgwt.toml index 2d1757a4..133746e1 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwtgwt.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwtgwt.toml @@ -115,6 +115,7 @@ type = "keyword" 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." optional = true +developmode = true [blocks.dimensions.fields.nexg] type = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwtgwt.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwtgwt.yaml index b0a5aa53..0f9a2f14 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwtgwt.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwtgwt.yaml @@ -124,6 +124,7 @@ blocks: 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. optional: true + developmode: true dimensions: fields: nexg: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-cnd.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-cnd.json index f263708a..a877ff21 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-cnd.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-cnd.json @@ -46,6 +46,7 @@ "optional": true, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] @@ -57,6 +58,7 @@ "optional": true, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] @@ -68,6 +70,7 @@ "optional": true, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] @@ -79,6 +82,7 @@ "optional": true, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] @@ -90,6 +94,7 @@ "optional": true, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] @@ -101,6 +106,7 @@ "optional": true, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] @@ -112,6 +118,7 @@ "optional": true, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-cnd.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-cnd.toml index 28d7564e..8372c1b8 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-cnd.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-cnd.toml @@ -37,6 +37,7 @@ description = "longitudinal dispersivity in horizontal direction. If flow is st optional = true netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] @@ -48,6 +49,7 @@ description = "longitudinal dispersivity in vertical direction. If flow is stri optional = true netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] @@ -59,6 +61,7 @@ description = "transverse dispersivity in horizontal direction. This is the tra optional = true netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] @@ -70,6 +73,7 @@ description = "transverse dispersivity in horizontal direction. This is the tra optional = true netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] @@ -81,6 +85,7 @@ description = "transverse dispersivity when flow is in vertical direction. If f optional = true netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] @@ -92,6 +97,7 @@ description = "thermal conductivity of the simulated fluid. Note that the CND optional = true netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] @@ -103,6 +109,7 @@ description = "thermal conductivity of the solid aquifer material" optional = true netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-cnd.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-cnd.yaml index 04b04a08..945b4002 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-cnd.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-cnd.yaml @@ -51,6 +51,7 @@ blocks: optional: true netcdf: true dtype: double + layered: true shape: - nodes alv: @@ -64,6 +65,7 @@ blocks: optional: true netcdf: true dtype: double + layered: true shape: - nodes ath1: @@ -77,6 +79,7 @@ blocks: optional: true netcdf: true dtype: double + layered: true shape: - nodes ath2: @@ -90,6 +93,7 @@ blocks: optional: true netcdf: true dtype: double + layered: true shape: - nodes atv: @@ -102,6 +106,7 @@ blocks: optional: true netcdf: true dtype: double + layered: true shape: - nodes ktw: @@ -114,6 +119,7 @@ blocks: optional: true netcdf: true dtype: double + layered: true shape: - nodes kts: @@ -123,6 +129,7 @@ blocks: optional: true netcdf: true dtype: double + layered: true shape: - nodes memory: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-dis.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-dis.json index caab0b44..a3cb7321 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-dis.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-dis.json @@ -185,6 +185,7 @@ "default": 0.0, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "ncol", "nrow", @@ -198,6 +199,7 @@ "optional": true, "netcdf": true, "dtype": "integer", + "layered": true, "shape": [ "ncol", "nrow", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-dis.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-dis.toml index e3e8ba91..85f341f7 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-dis.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-dis.toml @@ -168,6 +168,7 @@ description = "is the bottom elevation for each cell." default = 0.0 netcdf = true dtype = "double" +layered = true shape = [ "ncol", "nrow", @@ -181,6 +182,7 @@ description = "is an optional array that characterizes the existence status of a optional = true netcdf = true dtype = "integer" +layered = true shape = [ "ncol", "nrow", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-dis.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-dis.yaml index c65ff7ad..575eb0b6 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-dis.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-dis.yaml @@ -165,6 +165,7 @@ blocks: default: 0.0 netcdf: true dtype: double + layered: true shape: - ncol - nrow @@ -183,6 +184,7 @@ blocks: optional: true netcdf: true dtype: integer + layered: true shape: - ncol - nrow diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-disv.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-disv.json index 51f84b32..b95a184c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-disv.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-disv.json @@ -153,6 +153,7 @@ "description": "is the bottom elevation for each cell.", "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "ncpl", "nlay" @@ -165,6 +166,7 @@ "optional": true, "netcdf": true, "dtype": "integer", + "layered": true, "shape": [ "ncpl", "nlay" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-disv.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-disv.toml index 6cfc383a..c12caa01 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-disv.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-disv.toml @@ -136,6 +136,7 @@ longname = "model bottom elevation" description = "is the bottom elevation for each cell." netcdf = true dtype = "double" +layered = true shape = [ "ncpl", "nlay", @@ -148,6 +149,7 @@ description = "is an optional array that characterizes the existence status of a optional = true netcdf = true dtype = "integer" +layered = true shape = [ "ncpl", "nlay", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-disv.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-disv.yaml index b85eb894..c0894511 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-disv.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-disv.yaml @@ -142,6 +142,7 @@ blocks: description: is the bottom elevation for each cell. netcdf: true dtype: double + layered: true shape: - ncpl - nlay @@ -159,6 +160,7 @@ blocks: optional: true netcdf: true dtype: integer + layered: true shape: - ncpl - nlay diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-est.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-est.json index b9c101fb..1f3217a5 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-est.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-est.json @@ -59,6 +59,7 @@ "longname": "porosity", "description": "is the mobile domain porosity, defined as the mobile domain pore volume per mobile domain volume. The GWE model does not support the concept of an immobile domain in the context of heat transport.", "dtype": "double", + "layered": true, "shape": [ "nodes" ] @@ -69,6 +70,7 @@ "description": "is the rate coefficient for zero-order decay for the aqueous phase of the mobile domain. A negative value indicates heat (energy) production. The dimensions of zero-order decay in the aqueous phase are energy per length cubed (volume of water) per time. Zero-order decay in the aqueous phase will have no effect on simulation results unless ZERO_ORDER_DECAY_WATER is specified in the options block.", "optional": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] @@ -79,6 +81,7 @@ "description": "is the rate coefficient for zero-order decay for the solid phase. A negative value indicates heat (energy) production. The dimensions of zero-order decay in the solid phase are energy per mass of solid per time. Zero-order decay in the solid phase will have no effect on simulation results unless ZERO_ORDER_DECAY_SOLID is specified in the options block.", "optional": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] @@ -88,6 +91,7 @@ "longname": "heat capacity of the aquifer material", "description": "is the mass-based heat capacity of dry solids (aquifer material). For example, units of J/kg/C may be used (or equivalent).", "dtype": "double", + "layered": true, "shape": [ "nodes" ] @@ -97,6 +101,7 @@ "longname": "density of aquifer material", "description": "is a user-specified value of the density of aquifer material not considering the voids. Value will remain fixed for the entire simulation. For example, if working in SI units, values may be entered as kilograms per cubic meter.", "dtype": "double", + "layered": true, "shape": [ "nodes" ] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-est.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-est.toml index 31c77a80..3afb3cf8 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-est.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-est.toml @@ -50,6 +50,7 @@ type = "array" longname = "porosity" description = "is the mobile domain porosity, defined as the mobile domain pore volume per mobile domain volume. The GWE model does not support the concept of an immobile domain in the context of heat transport." dtype = "double" +layered = true shape = [ "nodes", ] @@ -60,6 +61,7 @@ longname = "aqueous phase decay rate coefficient" description = "is the rate coefficient for zero-order decay for the aqueous phase of the mobile domain. A negative value indicates heat (energy) production. The dimensions of zero-order decay in the aqueous phase are energy per length cubed (volume of water) per time. Zero-order decay in the aqueous phase will have no effect on simulation results unless ZERO_ORDER_DECAY_WATER is specified in the options block." optional = true dtype = "double" +layered = true shape = [ "nodes", ] @@ -70,6 +72,7 @@ longname = "solid phase decay rate coefficient" description = "is the rate coefficient for zero-order decay for the solid phase. A negative value indicates heat (energy) production. The dimensions of zero-order decay in the solid phase are energy per mass of solid per time. Zero-order decay in the solid phase will have no effect on simulation results unless ZERO_ORDER_DECAY_SOLID is specified in the options block." optional = true dtype = "double" +layered = true shape = [ "nodes", ] @@ -79,6 +82,7 @@ type = "array" longname = "heat capacity of the aquifer material" description = "is the mass-based heat capacity of dry solids (aquifer material). For example, units of J/kg/C may be used (or equivalent)." dtype = "double" +layered = true shape = [ "nodes", ] @@ -88,6 +92,7 @@ type = "array" longname = "density of aquifer material" description = "is a user-specified value of the density of aquifer material not considering the voids. Value will remain fixed for the entire simulation. For example, if working in SI units, values may be entered as kilograms per cubic meter." dtype = "double" +layered = true shape = [ "nodes", ] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-est.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-est.yaml index 8004561a..b4bc6dd6 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-est.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-est.yaml @@ -70,6 +70,7 @@ blocks: domain volume. The GWE model does not support the concept of an immobile domain in the context of heat transport. dtype: double + layered: true shape: - nodes decay_water: @@ -82,6 +83,7 @@ blocks: is specified in the options block. optional: true dtype: double + layered: true shape: - nodes decay_solid: @@ -93,6 +95,7 @@ blocks: simulation results unless ZERO_ORDER_DECAY_SOLID is specified in the options block. optional: true dtype: double + layered: true shape: - nodes heat_capacity_solid: @@ -101,6 +104,7 @@ blocks: description: is the mass-based heat capacity of dry solids (aquifer material). For example, units of J/kg/C may be used (or equivalent). dtype: double + layered: true shape: - nodes density_solid: @@ -110,6 +114,7 @@ blocks: voids. Value will remain fixed for the entire simulation. For example, if working in SI units, values may be entered as kilograms per cubic meter. dtype: double + layered: true shape: - nodes memory: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ic.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ic.json index 89535ace..dd84ad1e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ic.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ic.json @@ -34,6 +34,7 @@ "default": 0.0, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ic.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ic.toml index 337d3130..3079da5f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ic.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ic.toml @@ -25,6 +25,7 @@ description = "is the initial (starting) temperature---that is, the temperature default = 0.0 netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ic.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ic.yaml index 8facc854..d3782582 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ic.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ic.yaml @@ -33,6 +33,7 @@ blocks: default: 0.0 netcdf: true dtype: double + layered: true shape: - nodes memory: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-buy.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-buy.json index e45866c2..8426d48a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-buy.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-buy.json @@ -47,7 +47,8 @@ "type": "keyword", "longname": "use equivalent freshwater head formulation", "description": "use the variable-density equivalent freshwater head formulation instead of the hydraulic head head formulation. This dev option has only been implemented for confined aquifer conditions and should generally not be used.", - "optional": true + "optional": true, + "developmode": true } } }, diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-buy.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-buy.toml index fc20ba0a..dc45f78a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-buy.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-buy.toml @@ -41,6 +41,7 @@ type = "keyword" longname = "use equivalent freshwater head formulation" description = "use the variable-density equivalent freshwater head formulation instead of the hydraulic head head formulation. This dev option has only been implemented for confined aquifer conditions and should generally not be used." optional = true +developmode = true [blocks.dimensions.fields.nrhospecies] type = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-buy.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-buy.yaml index 4900c104..f3fd6d1d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-buy.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-buy.yaml @@ -47,6 +47,7 @@ blocks: head head formulation. This dev option has only been implemented for confined aquifer conditions and should generally not be used. optional: true + developmode: true dimensions: fields: nrhospecies: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chd.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chd.json index fe6a329d..6fe10d4c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chd.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chd.json @@ -102,7 +102,8 @@ "type": "keyword", "longname": "turn off Newton for unconfined cells", "description": "turn off Newton for unconfined cells", - "optional": true + "optional": true, + "developmode": true } } }, diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chd.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chd.toml index d5a3445d..29d5950a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chd.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chd.toml @@ -94,6 +94,7 @@ type = "keyword" longname = "turn off Newton for unconfined cells" description = "turn off Newton for unconfined cells" optional = true +developmode = true [blocks.dimensions.fields.maxbound] type = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chd.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chd.yaml index 4eb6d438..e9854919 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chd.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chd.yaml @@ -99,6 +99,7 @@ blocks: longname: turn off Newton for unconfined cells description: turn off Newton for unconfined cells optional: true + developmode: true dimensions: fields: maxbound: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chdg.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chdg.json index f8438e61..03dd1a6e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chdg.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chdg.json @@ -92,7 +92,8 @@ "type": "keyword", "longname": "turn off Newton for unconfined cells", "description": "turn off Newton for unconfined cells", - "optional": true + "optional": true, + "developmode": true } } }, @@ -115,6 +116,7 @@ "default": 3e+30, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] @@ -126,6 +128,7 @@ "optional": true, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chdg.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chdg.toml index a041cf5b..42a09d98 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chdg.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chdg.toml @@ -86,6 +86,7 @@ type = "keyword" longname = "turn off Newton for unconfined cells" description = "turn off Newton for unconfined cells" optional = true +developmode = true [blocks.dimensions.fields.maxbound] type = "integer" @@ -100,6 +101,7 @@ description = "is the head at the boundary." default = 3e+30 netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] @@ -111,6 +113,7 @@ description = "is an array of values for auxiliary variable aux(iaux), where iau optional = true netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chdg.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chdg.yaml index 6bf5e593..88d77c3f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chdg.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chdg.yaml @@ -96,6 +96,7 @@ blocks: longname: turn off Newton for unconfined cells description: turn off Newton for unconfined cells optional: true + developmode: true dimensions: fields: maxbound: @@ -113,6 +114,7 @@ blocks: default: 3.0e+30 netcdf: true dtype: double + layered: true shape: - nodes aux: @@ -125,6 +127,7 @@ blocks: optional: true netcdf: true dtype: double + layered: true shape: - nodes header: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-csub.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-csub.json index 6ee89647..50daefed 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-csub.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-csub.json @@ -337,6 +337,7 @@ "default": 1e-05, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] @@ -348,6 +349,7 @@ "default": 0.2, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] @@ -359,6 +361,7 @@ "optional": true, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] @@ -370,6 +373,7 @@ "optional": true, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-csub.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-csub.toml index 1a2cafa1..06cc926e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-csub.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-csub.toml @@ -302,6 +302,7 @@ description = "is the initial elastic coarse-grained material specific storage o default = 1e-05 netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] @@ -313,6 +314,7 @@ description = "is the initial porosity of coarse-grained materials." default = 0.2 netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] @@ -324,6 +326,7 @@ description = "is the specific gravity of moist or unsaturated sediments. If no optional = true netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] @@ -335,6 +338,7 @@ description = "is the specific gravity of saturated sediments. If not specified, optional = true netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-csub.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-csub.yaml index 7f904525..20f0504f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-csub.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-csub.yaml @@ -324,6 +324,7 @@ blocks: default: 1.0e-05 netcdf: true dtype: double + layered: true shape: - nodes cg_theta: @@ -333,6 +334,7 @@ blocks: default: 0.2 netcdf: true dtype: double + layered: true shape: - nodes sgm: @@ -343,6 +345,7 @@ blocks: optional: true netcdf: true dtype: double + layered: true shape: - nodes sgs: @@ -353,6 +356,7 @@ blocks: optional: true netcdf: true dtype: double + layered: true shape: - nodes packagedata: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-dis.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-dis.json index a2634ce3..14b99fce 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-dis.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-dis.json @@ -185,6 +185,7 @@ "default": 0.0, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "ncol", "nrow", @@ -198,6 +199,7 @@ "optional": true, "netcdf": true, "dtype": "integer", + "layered": true, "shape": [ "ncol", "nrow", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-dis.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-dis.toml index 6040e82b..c87525c3 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-dis.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-dis.toml @@ -168,6 +168,7 @@ description = "is the bottom elevation for each cell." default = 0.0 netcdf = true dtype = "double" +layered = true shape = [ "ncol", "nrow", @@ -181,6 +182,7 @@ description = "is an optional array that characterizes the existence status of a optional = true netcdf = true dtype = "integer" +layered = true shape = [ "ncol", "nrow", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-dis.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-dis.yaml index 86607b90..a24f8216 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-dis.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-dis.yaml @@ -165,6 +165,7 @@ blocks: default: 0.0 netcdf: true dtype: double + layered: true shape: - ncol - nrow @@ -183,6 +184,7 @@ blocks: optional: true netcdf: true dtype: integer + layered: true shape: - ncol - nrow diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-disv.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-disv.json index 06f40f1e..6de02950 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-disv.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-disv.json @@ -153,6 +153,7 @@ "description": "is the bottom elevation for each cell.", "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "ncpl", "nlay" @@ -165,6 +166,7 @@ "optional": true, "netcdf": true, "dtype": "integer", + "layered": true, "shape": [ "ncpl", "nlay" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-disv.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-disv.toml index f1dd5dc6..29a3046b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-disv.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-disv.toml @@ -136,6 +136,7 @@ longname = "model bottom elevation" description = "is the bottom elevation for each cell." netcdf = true dtype = "double" +layered = true shape = [ "ncpl", "nlay", @@ -148,6 +149,7 @@ description = "is an optional array that characterizes the existence status of a optional = true netcdf = true dtype = "integer" +layered = true shape = [ "ncpl", "nlay", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-disv.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-disv.yaml index 3305427a..b78fd480 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-disv.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-disv.yaml @@ -142,6 +142,7 @@ blocks: description: is the bottom elevation for each cell. netcdf: true dtype: double + layered: true shape: - ncpl - nlay @@ -159,6 +160,7 @@ blocks: optional: true netcdf: true dtype: integer + layered: true shape: - ncpl - nlay diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drn.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drn.json index 603784f6..f5820d1f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drn.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drn.json @@ -113,7 +113,8 @@ "type": "keyword", "longname": "cubic-scaling", "description": "cubic-scaling is used to scale the drain conductance", - "optional": true + "optional": true, + "developmode": true } } }, diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drn.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drn.toml index f9c0c846..b762208f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drn.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drn.toml @@ -105,6 +105,7 @@ type = "keyword" longname = "cubic-scaling" description = "cubic-scaling is used to scale the drain conductance" optional = true +developmode = true [blocks.dimensions.fields.maxbound] type = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drn.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drn.yaml index bfd4004e..73ddbc36 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drn.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drn.yaml @@ -117,6 +117,7 @@ blocks: longname: cubic-scaling description: cubic-scaling is used to scale the drain conductance optional: true + developmode: true dimensions: fields: maxbound: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drng.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drng.json index 6d0abe18..2606d974 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drng.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drng.json @@ -103,7 +103,8 @@ "type": "keyword", "longname": "cubic-scaling", "description": "cubic-scaling is used to scale the drain conductance", - "optional": true + "optional": true, + "developmode": true } } }, @@ -126,6 +127,7 @@ "default": 3e+30, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] @@ -137,6 +139,7 @@ "default": 3e+30, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] @@ -148,6 +151,7 @@ "optional": true, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drng.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drng.toml index 248435fe..f6f32e1c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drng.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drng.toml @@ -97,6 +97,7 @@ type = "keyword" longname = "cubic-scaling" description = "cubic-scaling is used to scale the drain conductance" optional = true +developmode = true [blocks.dimensions.fields.maxbound] type = "integer" @@ -111,6 +112,7 @@ description = "is the elevation of the drain." default = 3e+30 netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] @@ -122,6 +124,7 @@ description = "is the hydraulic conductance of the interface between the aquifer default = 3e+30 netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] @@ -133,6 +136,7 @@ description = "is an array of values for auxiliary variable aux(iaux), where iau optional = true netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drng.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drng.yaml index 836270c8..052dcaa4 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drng.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drng.yaml @@ -115,6 +115,7 @@ blocks: longname: cubic-scaling description: cubic-scaling is used to scale the drain conductance optional: true + developmode: true dimensions: fields: maxbound: @@ -132,6 +133,7 @@ blocks: default: 3.0e+30 netcdf: true dtype: double + layered: true shape: - nodes cond: @@ -141,6 +143,7 @@ blocks: default: 3.0e+30 netcdf: true dtype: double + layered: true shape: - nodes aux: @@ -153,6 +156,7 @@ blocks: optional: true netcdf: true dtype: double + layered: true shape: - nodes header: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghbg.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghbg.json index 47d66c71..992cf762 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghbg.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghbg.json @@ -114,6 +114,7 @@ "default": 3e+30, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] @@ -125,6 +126,7 @@ "default": 3e+30, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] @@ -136,6 +138,7 @@ "optional": true, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghbg.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghbg.toml index a11ebe82..b56d7a3b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghbg.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghbg.toml @@ -99,6 +99,7 @@ description = "is the boundary head." default = 3e+30 netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] @@ -110,6 +111,7 @@ description = "is the hydraulic conductance of the interface between the aquifer default = 3e+30 netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] @@ -121,6 +123,7 @@ description = "is an array of values for auxiliary variable aux(iaux), where iau optional = true netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghbg.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghbg.yaml index 78e23ca3..452a5d92 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghbg.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghbg.yaml @@ -115,6 +115,7 @@ blocks: default: 3.0e+30 netcdf: true dtype: double + layered: true shape: - nodes cond: @@ -124,6 +125,7 @@ blocks: default: 3.0e+30 netcdf: true dtype: double + layered: true shape: - nodes aux: @@ -136,6 +138,7 @@ blocks: optional: true netcdf: true dtype: double + layered: true shape: - nodes header: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ic.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ic.json index af9bb39d..688b3448 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ic.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ic.json @@ -34,6 +34,7 @@ "default": 1.0, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ic.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ic.toml index 2d60e3c4..caf105b3 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ic.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ic.toml @@ -25,6 +25,7 @@ description = "is the initial (starting) head---that is, head at the beginning o default = 1.0 netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ic.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ic.yaml index f3b33a7c..db82f1dd 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ic.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ic.yaml @@ -37,6 +37,7 @@ blocks: default: 1.0 netcdf: true dtype: double + layered: true shape: - nodes memory: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-npf.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-npf.json index 9ad1b430..6a1746f8 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-npf.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-npf.json @@ -177,13 +177,15 @@ "type": "keyword", "longname": "turn off Newton for unconfined cells", "description": "turn off Newton for unconfined cells", - "optional": true + "optional": true, + "developmode": true }, "dev_omega": { "type": "double", "longname": "set saturation omega value", "description": "set saturation omega value", - "optional": true + "optional": true, + "developmode": true } } }, @@ -196,6 +198,7 @@ "default": 0, "netcdf": true, "dtype": "integer", + "layered": true, "shape": [ "nodes" ] @@ -207,6 +210,7 @@ "default": 1.0, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] @@ -218,6 +222,7 @@ "optional": true, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] @@ -229,6 +234,7 @@ "optional": true, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] @@ -240,6 +246,7 @@ "optional": true, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] @@ -251,6 +258,7 @@ "optional": true, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] @@ -262,6 +270,7 @@ "optional": true, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] @@ -273,6 +282,7 @@ "optional": true, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-npf.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-npf.toml index 033e6898..6fb54828 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-npf.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-npf.toml @@ -165,12 +165,14 @@ type = "keyword" longname = "turn off Newton for unconfined cells" description = "turn off Newton for unconfined cells" optional = true +developmode = true [blocks.options.fields.dev_omega] type = "double" longname = "set saturation omega value" description = "set saturation omega value" optional = true +developmode = true [blocks.griddata.fields.icelltype] type = "array" @@ -179,6 +181,7 @@ description = "flag for each cell that specifies how saturated thickness is trea default = 0 netcdf = true dtype = "integer" +layered = true shape = [ "nodes", ] @@ -190,6 +193,7 @@ description = "is the hydraulic conductivity. For the common case in which the default = 1.0 netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] @@ -201,6 +205,7 @@ description = "is the hydraulic conductivity of the second ellipsoid axis (or th optional = true netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] @@ -212,6 +217,7 @@ description = "is the hydraulic conductivity of the third ellipsoid axis (or the optional = true netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] @@ -223,6 +229,7 @@ description = "is a rotation angle of the hydraulic conductivity tensor in degre optional = true netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] @@ -234,6 +241,7 @@ description = "is a rotation angle of the hydraulic conductivity tensor in degre optional = true netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] @@ -245,6 +253,7 @@ description = "is a rotation angle of the hydraulic conductivity tensor in degre optional = true netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] @@ -256,6 +265,7 @@ description = "is a combination of the wetting threshold and a flag to indicate optional = true netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-npf.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-npf.yaml index 91df546d..d183a09a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-npf.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-npf.yaml @@ -213,11 +213,13 @@ blocks: longname: turn off Newton for unconfined cells description: turn off Newton for unconfined cells optional: true + developmode: true dev_omega: type: double longname: set saturation omega value description: set saturation omega value optional: true + developmode: true griddata: fields: icelltype: @@ -234,6 +236,7 @@ blocks: default: 0 netcdf: true dtype: integer + layered: true shape: - nodes k: @@ -248,6 +251,7 @@ blocks: default: 1.0 netcdf: true dtype: double + layered: true shape: - nodes k22: @@ -264,6 +268,7 @@ blocks: optional: true netcdf: true dtype: double + layered: true shape: - nodes k33: @@ -276,6 +281,7 @@ blocks: optional: true netcdf: true dtype: double + layered: true shape: - nodes angle1: @@ -293,6 +299,7 @@ blocks: optional: true netcdf: true dtype: double + layered: true shape: - nodes angle2: @@ -311,6 +318,7 @@ blocks: optional: true netcdf: true dtype: double + layered: true shape: - nodes angle3: @@ -326,6 +334,7 @@ blocks: optional: true netcdf: true dtype: double + layered: true shape: - nodes wetdry: @@ -343,6 +352,7 @@ blocks: optional: true netcdf: true dtype: double + layered: true shape: - nodes memory: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rivg.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rivg.json index c09a6ebf..65e81593 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rivg.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rivg.json @@ -114,6 +114,7 @@ "default": 3e+30, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] @@ -125,6 +126,7 @@ "default": 3e+30, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] @@ -136,6 +138,7 @@ "default": 3e+30, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] @@ -147,6 +150,7 @@ "optional": true, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rivg.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rivg.toml index eed5fe83..7eba9b17 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rivg.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rivg.toml @@ -99,6 +99,7 @@ description = "is the head in the river." default = 3e+30 netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] @@ -110,6 +111,7 @@ description = "is the riverbed hydraulic conductance." default = 3e+30 netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] @@ -121,6 +123,7 @@ description = "is the elevation of the bottom of the riverbed." default = 3e+30 netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] @@ -132,6 +135,7 @@ description = "is an array of values for auxiliary variable aux(iaux), where iau optional = true netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rivg.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rivg.yaml index 2f7bbef3..f4cfb9e0 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rivg.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rivg.yaml @@ -114,6 +114,7 @@ blocks: default: 3.0e+30 netcdf: true dtype: double + layered: true shape: - nodes cond: @@ -123,6 +124,7 @@ blocks: default: 3.0e+30 netcdf: true dtype: double + layered: true shape: - nodes rbot: @@ -132,6 +134,7 @@ blocks: default: 3.0e+30 netcdf: true dtype: double + layered: true shape: - nodes aux: @@ -144,6 +147,7 @@ blocks: optional: true netcdf: true dtype: double + layered: true shape: - nodes header: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sfr.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sfr.json index b1a66530..ecc8f9bb 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sfr.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sfr.json @@ -197,7 +197,8 @@ "type": "double", "longname": "conversion factor", "description": "real value that is used to convert user-specified Manning's roughness coefficients from seconds per meters$^{1/3}$ to model length and time units. A constant of 1.486 is used for flow units of cubic feet per second, and a constant of 1.0 is used for units of cubic meters per second. The constant must be multiplied by 86,400 when using time units of days in the simulation.", - "optional": true + "optional": true, + "deprecated": "6.4.2" }, "length_conversion": { "type": "double", @@ -215,7 +216,8 @@ "type": "double", "longname": "reach storage time weighting", "description": "real number value that defines the time weighting factor used to calculate the change in channel storage. STORAGE_WEIGHT must have a value between 0.5 and 1. Default STORAGE_WEIGHT value is 1.", - "optional": true + "optional": true, + "developmode": true } } }, diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sfr.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sfr.toml index 0c459715..be2fab4b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sfr.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sfr.toml @@ -181,6 +181,7 @@ type = "double" longname = "conversion factor" description = "real value that is used to convert user-specified Manning's roughness coefficients from seconds per meters$^{1/3}$ to model length and time units. A constant of 1.486 is used for flow units of cubic feet per second, and a constant of 1.0 is used for units of cubic meters per second. The constant must be multiplied by 86,400 when using time units of days in the simulation." optional = true +deprecated = "6.4.2" [blocks.options.fields.length_conversion] type = "double" @@ -199,6 +200,7 @@ type = "double" longname = "reach storage time weighting" description = "real number value that defines the time weighting factor used to calculate the change in channel storage. STORAGE_WEIGHT must have a value between 0.5 and 1. Default STORAGE_WEIGHT value is 1." optional = true +developmode = true [blocks.dimensions.fields.nreaches] type = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sfr.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sfr.yaml index e29bfd48..8acb8442 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sfr.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sfr.yaml @@ -197,6 +197,7 @@ blocks: for flow units of cubic feet per second, and a constant of 1.0 is used for units of cubic meters per second. The constant must be multiplied by 86,400 when using time units of days in the simulation. optional: true + deprecated: 6.4.2 length_conversion: type: double longname: length conversion factor @@ -221,6 +222,7 @@ blocks: in channel storage. STORAGE_WEIGHT must have a value between 0.5 and 1. Default STORAGE_WEIGHT value is 1. optional: true + developmode: true dimensions: fields: nreaches: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sto.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sto.json index 822ece1e..adaa3ae8 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sto.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sto.json @@ -63,13 +63,15 @@ "type": "keyword", "longname": "development option for original specific storage", "description": "flag indicating the original storage specific storage formulation should be used", - "optional": true + "optional": true, + "developmode": true }, "dev_oldstorageformulation": { "type": "keyword", "longname": "development option flag for old storage formulation", "description": "development option flag for old storage formulation", - "optional": true + "optional": true, + "developmode": true } } }, @@ -82,6 +84,7 @@ "default": 0, "netcdf": true, "dtype": "integer", + "layered": true, "shape": [ "nodes" ] @@ -93,6 +96,7 @@ "default": 1e-05, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] @@ -104,6 +108,7 @@ "default": 0.15, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sto.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sto.toml index d347b14e..7c5468fd 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sto.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sto.toml @@ -57,12 +57,14 @@ type = "keyword" longname = "development option for original specific storage" description = "flag indicating the original storage specific storage formulation should be used" optional = true +developmode = true [blocks.options.fields.dev_oldstorageformulation] type = "keyword" longname = "development option flag for old storage formulation" description = "development option flag for old storage formulation" optional = true +developmode = true [blocks.griddata.fields.iconvert] type = "array" @@ -71,6 +73,7 @@ description = "is a flag for each cell that specifies whether or not a cell is c default = 0 netcdf = true dtype = "integer" +layered = true shape = [ "nodes", ] @@ -82,6 +85,7 @@ description = "is specific storage (or the storage coefficient if STORAGECOEFFIC default = 1e-05 netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] @@ -93,6 +97,7 @@ description = "is specific yield. Specific yield values must be greater than or default = 0.15 netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sto.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sto.yaml index 6dc29f2e..3f741534 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sto.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sto.yaml @@ -65,11 +65,13 @@ blocks: longname: development option for original specific storage description: flag indicating the original storage specific storage formulation should be used optional: true + developmode: true dev_oldstorageformulation: type: keyword longname: development option flag for old storage formulation description: development option flag for old storage formulation optional: true + developmode: true griddata: fields: iconvert: @@ -82,6 +84,7 @@ blocks: default: 0 netcdf: true dtype: integer + layered: true shape: - nodes ss: @@ -93,6 +96,7 @@ blocks: default: 1.0e-05 netcdf: true dtype: double + layered: true shape: - nodes sy: @@ -103,6 +107,7 @@ blocks: default: 0.15 netcdf: true dtype: double + layered: true shape: - nodes period: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-uzf.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-uzf.json index f5bf2dc6..a4cd651c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-uzf.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-uzf.json @@ -195,7 +195,8 @@ "type": "keyword", "longname": "activate seepage", "description": "keyword specifying that groundwater discharge (GWSEEP) to land surface will be simulated. Groundwater discharge is nonzero when groundwater head is greater than land surface. This option is no longer recommended; a better approach is to use the Drain Package with discharge scaling as a way to handle seepage to land surface. The Drain Package with discharge scaling is described in Chapter 3 of the Supplemental Technical Information.", - "optional": true + "optional": true, + "deprecated": "6.5.0" }, "unsat_etwc": { "type": "keyword", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-uzf.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-uzf.toml index d030da7e..64532d05 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-uzf.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-uzf.toml @@ -179,6 +179,7 @@ type = "keyword" longname = "activate seepage" description = "keyword specifying that groundwater discharge (GWSEEP) to land surface will be simulated. Groundwater discharge is nonzero when groundwater head is greater than land surface. This option is no longer recommended; a better approach is to use the Drain Package with discharge scaling as a way to handle seepage to land surface. The Drain Package with discharge scaling is described in Chapter 3 of the Supplemental Technical Information." optional = true +deprecated = "6.5.0" [blocks.options.fields.unsat_etwc] type = "keyword" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-uzf.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-uzf.yaml index cd341d9f..e9026608 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-uzf.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-uzf.yaml @@ -187,6 +187,7 @@ blocks: as a way to handle seepage to land surface. The Drain Package with discharge scaling is described in Chapter 3 of the Supplemental Technical Information. optional: true + deprecated: 6.5.0 unsat_etwc: type: keyword longname: use PET for theta greater than extwc diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-welg.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-welg.json index bfb7f34b..091eeb49 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-welg.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-welg.json @@ -144,6 +144,7 @@ "default": 3e+30, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] @@ -155,6 +156,7 @@ "optional": true, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-welg.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-welg.toml index e15610cf..c59b270e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-welg.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-welg.toml @@ -127,6 +127,7 @@ description = "is the volumetric well rate. A positive value indicates recharge default = 3e+30 netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] @@ -138,6 +139,7 @@ description = "is an array of values for auxiliary variable aux(iaux), where iau optional = true netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-welg.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-welg.yaml index c67e3af6..bf1bae7c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-welg.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-welg.yaml @@ -155,6 +155,7 @@ blocks: default: 3.0e+30 netcdf: true dtype: double + layered: true shape: - nodes aux: @@ -167,6 +168,7 @@ blocks: optional: true netcdf: true dtype: double + layered: true shape: - nodes header: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-dis.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-dis.json index f372cda5..b901094b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-dis.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-dis.json @@ -185,6 +185,7 @@ "default": 0.0, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "ncol", "nrow", @@ -198,6 +199,7 @@ "optional": true, "netcdf": true, "dtype": "integer", + "layered": true, "shape": [ "ncol", "nrow", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-dis.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-dis.toml index 259fbbc6..296be006 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-dis.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-dis.toml @@ -168,6 +168,7 @@ description = "is the bottom elevation for each cell." default = 0.0 netcdf = true dtype = "double" +layered = true shape = [ "ncol", "nrow", @@ -181,6 +182,7 @@ description = "is an optional array that characterizes the existence status of a optional = true netcdf = true dtype = "integer" +layered = true shape = [ "ncol", "nrow", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-dis.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-dis.yaml index 6182bf09..16c0b1e4 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-dis.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-dis.yaml @@ -165,6 +165,7 @@ blocks: default: 0.0 netcdf: true dtype: double + layered: true shape: - ncol - nrow @@ -183,6 +184,7 @@ blocks: optional: true netcdf: true dtype: integer + layered: true shape: - ncol - nrow diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-disv.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-disv.json index 52b03d9d..b91448bb 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-disv.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-disv.json @@ -153,6 +153,7 @@ "description": "is the bottom elevation for each cell.", "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "ncpl", "nlay" @@ -165,6 +166,7 @@ "optional": true, "netcdf": true, "dtype": "integer", + "layered": true, "shape": [ "ncpl", "nlay" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-disv.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-disv.toml index c61b2be7..a5abdea6 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-disv.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-disv.toml @@ -136,6 +136,7 @@ longname = "model bottom elevation" description = "is the bottom elevation for each cell." netcdf = true dtype = "double" +layered = true shape = [ "ncpl", "nlay", @@ -148,6 +149,7 @@ description = "is an optional array that characterizes the existence status of a optional = true netcdf = true dtype = "integer" +layered = true shape = [ "ncpl", "nlay", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-disv.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-disv.yaml index 20a8662d..6eee1636 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-disv.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-disv.yaml @@ -142,6 +142,7 @@ blocks: description: is the bottom elevation for each cell. netcdf: true dtype: double + layered: true shape: - ncpl - nlay @@ -159,6 +160,7 @@ blocks: optional: true netcdf: true dtype: integer + layered: true shape: - ncpl - nlay diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-dsp.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-dsp.json index 2f2cf8ce..c596f307 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-dsp.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-dsp.json @@ -46,6 +46,7 @@ "optional": true, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] @@ -57,6 +58,7 @@ "optional": true, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] @@ -68,6 +70,7 @@ "optional": true, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] @@ -79,6 +82,7 @@ "optional": true, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] @@ -90,6 +94,7 @@ "optional": true, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] @@ -101,6 +106,7 @@ "optional": true, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-dsp.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-dsp.toml index 159e6dda..1cddb0d0 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-dsp.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-dsp.toml @@ -37,6 +37,7 @@ description = "effective molecular diffusion coefficient." optional = true netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] @@ -48,6 +49,7 @@ description = "longitudinal dispersivity in horizontal direction. If flow is st optional = true netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] @@ -59,6 +61,7 @@ description = "longitudinal dispersivity in vertical direction. If flow is stri optional = true netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] @@ -70,6 +73,7 @@ description = "transverse dispersivity in horizontal direction. This is the tra optional = true netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] @@ -81,6 +85,7 @@ description = "transverse dispersivity in horizontal direction. This is the tra optional = true netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] @@ -92,6 +97,7 @@ description = "transverse dispersivity when flow is in vertical direction. If f optional = true netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-dsp.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-dsp.yaml index a77bf89a..8f3f3a13 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-dsp.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-dsp.yaml @@ -47,6 +47,7 @@ blocks: optional: true netcdf: true dtype: double + layered: true shape: - nodes alh: @@ -60,6 +61,7 @@ blocks: optional: true netcdf: true dtype: double + layered: true shape: - nodes alv: @@ -73,6 +75,7 @@ blocks: optional: true netcdf: true dtype: double + layered: true shape: - nodes ath1: @@ -86,6 +89,7 @@ blocks: optional: true netcdf: true dtype: double + layered: true shape: - nodes ath2: @@ -99,6 +103,7 @@ blocks: optional: true netcdf: true dtype: double + layered: true shape: - nodes atv: @@ -111,6 +116,7 @@ blocks: optional: true netcdf: true dtype: double + layered: true shape: - nodes memory: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-ic.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-ic.json index 81c97536..c9c23d27 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-ic.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-ic.json @@ -34,6 +34,7 @@ "default": 0.0, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-ic.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-ic.toml index 6d432f79..03342681 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-ic.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-ic.toml @@ -25,6 +25,7 @@ description = "is the initial (starting) concentration---that is, concentration default = 0.0 netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-ic.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-ic.yaml index 141533ee..5d6577eb 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-ic.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-ic.yaml @@ -33,6 +33,7 @@ blocks: default: 0.0 netcdf: true dtype: double + layered: true shape: - nodes memory: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-ist.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-ist.json index d30419ea..2ef806e5 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-ist.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-ist.json @@ -177,6 +177,7 @@ "description": "porosity of the immobile domain specified as the immobile domain pore volume per immobile domain volume.", "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] @@ -187,6 +188,7 @@ "description": "fraction of the cell volume that consists of this immobile domain. The sum of all immobile domain volume fractions must be less than one.", "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] @@ -197,6 +199,7 @@ "description": "mass transfer rate coefficient between the mobile and immobile domains, in dimensions of per time.", "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] @@ -208,6 +211,7 @@ "optional": true, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] @@ -219,6 +223,7 @@ "optional": true, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] @@ -230,6 +235,7 @@ "optional": true, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] @@ -241,6 +247,7 @@ "optional": true, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] @@ -252,6 +259,7 @@ "optional": true, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] @@ -263,6 +271,7 @@ "optional": true, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-ist.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-ist.toml index 75deb4d7..2c7dce40 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-ist.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-ist.toml @@ -156,6 +156,7 @@ longname = "porosity of the immobile domain" description = "porosity of the immobile domain specified as the immobile domain pore volume per immobile domain volume." netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] @@ -166,6 +167,7 @@ longname = "volume fraction of this immobile domain" description = "fraction of the cell volume that consists of this immobile domain. The sum of all immobile domain volume fractions must be less than one." netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] @@ -176,6 +178,7 @@ longname = "mass transfer rate coefficient between the mobile and immobile domai description = "mass transfer rate coefficient between the mobile and immobile domains, in dimensions of per time." netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] @@ -187,6 +190,7 @@ description = "initial concentration of the immobile domain in mass per length c optional = true netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] @@ -198,6 +202,7 @@ description = "is the rate coefficient for first or zero-order decay for the aqu optional = true netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] @@ -209,6 +214,7 @@ description = "is the rate coefficient for first or zero-order decay for the sor optional = true netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] @@ -220,6 +226,7 @@ description = "is the bulk density of this immobile domain in mass per length cu optional = true netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] @@ -231,6 +238,7 @@ description = "is the distribution coefficient for the equilibrium-controlled li optional = true netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] @@ -242,6 +250,7 @@ description = "is the exponent for the Freundlich isotherm and the sorption capa optional = true netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-ist.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-ist.yaml index cd25dad9..e409914a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-ist.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-ist.yaml @@ -158,6 +158,7 @@ blocks: immobile domain volume. netcdf: true dtype: double + layered: true shape: - nodes volfrac: @@ -167,6 +168,7 @@ blocks: immobile domain volume fractions must be less than one. netcdf: true dtype: double + layered: true shape: - nodes zetaim: @@ -176,6 +178,7 @@ blocks: of per time. netcdf: true dtype: double + layered: true shape: - nodes cim: @@ -186,6 +189,7 @@ blocks: optional: true netcdf: true dtype: double + layered: true shape: - nodes decay: @@ -199,6 +203,7 @@ blocks: optional: true netcdf: true dtype: double + layered: true shape: - nodes decay_sorbed: @@ -214,6 +219,7 @@ blocks: optional: true netcdf: true dtype: double + layered: true shape: - nodes bulk_density: @@ -227,6 +233,7 @@ blocks: optional: true netcdf: true dtype: double + layered: true shape: - nodes distcoef: @@ -239,6 +246,7 @@ blocks: optional: true netcdf: true dtype: double + layered: true shape: - nodes sp2: @@ -252,6 +260,7 @@ blocks: optional: true netcdf: true dtype: double + layered: true shape: - nodes memory: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-mst.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-mst.json index f6a6ca60..fb5f4460 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-mst.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-mst.json @@ -80,6 +80,7 @@ "description": "is the mobile domain porosity, defined as the mobile domain pore volume per mobile domain volume. Additional information on porosity within the context of mobile and immobile domain transport simulations is included in the MODFLOW 6 Supplemental Technical Information document.", "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] @@ -91,6 +92,7 @@ "optional": true, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] @@ -102,6 +104,7 @@ "optional": true, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] @@ -113,6 +116,7 @@ "optional": true, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] @@ -124,6 +128,7 @@ "optional": true, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] @@ -135,6 +140,7 @@ "optional": true, "netcdf": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-mst.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-mst.toml index 366147e3..27954db4 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-mst.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-mst.toml @@ -69,6 +69,7 @@ longname = "porosity" description = "is the mobile domain porosity, defined as the mobile domain pore volume per mobile domain volume. Additional information on porosity within the context of mobile and immobile domain transport simulations is included in the MODFLOW 6 Supplemental Technical Information document." netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] @@ -80,6 +81,7 @@ description = "is the rate coefficient for first or zero-order decay for the aqu optional = true netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] @@ -91,6 +93,7 @@ description = "is the rate coefficient for first or zero-order decay for the sor optional = true netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] @@ -102,6 +105,7 @@ description = "is the bulk density of the aquifer in mass per length cubed. bul optional = true netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] @@ -113,6 +117,7 @@ description = "is the distribution coefficient for the equilibrium-controlled li optional = true netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] @@ -124,6 +129,7 @@ description = "is the exponent for the Freundlich isotherm and the sorption capa optional = true netcdf = true dtype = "double" +layered = true shape = [ "nodes", ] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-mst.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-mst.yaml index c13809ab..c4eb3e71 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-mst.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-mst.yaml @@ -79,6 +79,7 @@ blocks: document. netcdf: true dtype: double + layered: true shape: - nodes decay: @@ -92,6 +93,7 @@ blocks: optional: true netcdf: true dtype: double + layered: true shape: - nodes decay_sorbed: @@ -107,6 +109,7 @@ blocks: optional: true netcdf: true dtype: double + layered: true shape: - nodes bulk_density: @@ -119,6 +122,7 @@ blocks: optional: true netcdf: true dtype: double + layered: true shape: - nodes distcoef: @@ -131,6 +135,7 @@ blocks: optional: true netcdf: true dtype: double + layered: true shape: - nodes sp2: @@ -143,6 +148,7 @@ blocks: optional: true netcdf: true dtype: double + layered: true shape: - nodes memory: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-dfw.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-dfw.json index 58a3f2a8..d53e9f3a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-dfw.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-dfw.json @@ -75,7 +75,8 @@ "type": "keyword", "longname": "use SWR conductance formulation", "description": "use the conductance formulation in the Surface Water Routing (SWR) Process for MODFLOW-2005.", - "optional": true + "optional": true, + "developmode": true } } }, diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-dfw.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-dfw.toml index 98c74ae9..48c512e9 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-dfw.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-dfw.toml @@ -69,6 +69,7 @@ type = "keyword" longname = "use SWR conductance formulation" description = "use the conductance formulation in the Surface Water Routing (SWR) Process for MODFLOW-2005." optional = true +developmode = true [blocks.griddata.fields.manningsn] type = "array" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-dfw.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-dfw.yaml index ec1403f5..ace64bb8 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-dfw.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-dfw.yaml @@ -86,6 +86,7 @@ blocks: longname: use SWR conductance formulation description: use the conductance formulation in the Surface Water Routing (SWR) Process for MODFLOW-2005. optional: true + developmode: true griddata: fields: manningsn: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-ic.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-ic.json index d067e4ce..cb85529b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-ic.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-ic.json @@ -27,6 +27,7 @@ "description": "is the initial (starting) stage---that is, stage at the beginning of the OLF Model simulation. STRT must be specified for all OLF Model simulations. One value is read for every model reach.", "default": 0.0, "dtype": "double", + "layered": true, "shape": [ "nodes" ] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-ic.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-ic.toml index a24d6c57..16fafe77 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-ic.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-ic.toml @@ -18,6 +18,7 @@ longname = "starting concentration" description = "is the initial (starting) stage---that is, stage at the beginning of the OLF Model simulation. STRT must be specified for all OLF Model simulations. One value is read for every model reach." default = 0.0 dtype = "double" +layered = true shape = [ "nodes", ] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-ic.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-ic.yaml index 99123925..3629aa10 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-ic.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-ic.yaml @@ -24,6 +24,7 @@ blocks: model reach. default: 0.0 dtype: double + layered: true shape: - nodes memory: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-dis.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-dis.json index dcc519fa..c2bcbe1f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-dis.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-dis.json @@ -181,6 +181,7 @@ "description": "is the bottom elevation for each cell.", "default": 0.0, "dtype": "double", + "layered": true, "shape": [ "ncol", "nrow", @@ -193,6 +194,7 @@ "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. If the IDOMAIN value for a cell is -1, the cell does not exist in the simulation. Furthermore, the first existing cell above will be connected to the first existing cell below. This type of cell is referred to as a 'vertical pass through' cell.", "optional": true, "dtype": "integer", + "layered": true, "shape": [ "ncol", "nrow", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-dis.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-dis.toml index 3a5a690a..b3a9a015 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-dis.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-dis.toml @@ -164,6 +164,7 @@ longname = "cell bottom elevation" description = "is the bottom elevation for each cell." default = 0.0 dtype = "double" +layered = true shape = [ "ncol", "nrow", @@ -176,6 +177,7 @@ 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. If the IDOMAIN value for a cell is -1, the cell does not exist in the simulation. Furthermore, the first existing cell above will be connected to the first existing cell below. This type of cell is referred to as a 'vertical pass through' cell." optional = true dtype = "integer" +layered = true shape = [ "ncol", "nrow", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-dis.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-dis.yaml index 98e572be..a2998899 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-dis.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-dis.yaml @@ -161,6 +161,7 @@ blocks: description: is the bottom elevation for each cell. default: 0.0 dtype: double + layered: true shape: - ncol - nrow @@ -178,6 +179,7 @@ blocks: to as a 'vertical pass through' cell. optional: true dtype: integer + layered: true shape: - ncol - nrow diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-disv.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-disv.json index 4dc612ef..a9fb5d7b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-disv.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-disv.json @@ -151,6 +151,7 @@ "longname": "model bottom elevation", "description": "is the bottom elevation for each cell.", "dtype": "double", + "layered": true, "shape": [ "ncpl", "nlay" @@ -162,6 +163,7 @@ "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. If the IDOMAIN value for a cell is -1, the cell does not exist in the simulation. Furthermore, the first existing cell above will be connected to the first existing cell below. This type of cell is referred to as a 'vertical pass through' cell.", "optional": true, "dtype": "integer", + "layered": true, "shape": [ "ncpl", "nlay" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-disv.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-disv.toml index f927e6b9..84e0714e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-disv.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-disv.toml @@ -134,6 +134,7 @@ type = "array" longname = "model bottom elevation" description = "is the bottom elevation for each cell." dtype = "double" +layered = true shape = [ "ncpl", "nlay", @@ -145,6 +146,7 @@ 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. If the IDOMAIN value for a cell is -1, the cell does not exist in the simulation. Furthermore, the first existing cell above will be connected to the first existing cell below. This type of cell is referred to as a 'vertical pass through' cell." optional = true dtype = "integer" +layered = true shape = [ "ncpl", "nlay", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-disv.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-disv.yaml index 2d3b1df8..210018db 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-disv.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-disv.yaml @@ -139,6 +139,7 @@ blocks: longname: model bottom elevation description: is the bottom elevation for each cell. dtype: double + layered: true shape: - ncpl - nlay @@ -155,6 +156,7 @@ blocks: to as a 'vertical pass through' cell. optional: true dtype: integer + layered: true shape: - ncpl - nlay diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-mip.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-mip.json index 432843b2..5fef47cd 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-mip.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-mip.json @@ -26,6 +26,7 @@ "longname": "porosity", "description": "is the aquifer porosity.", "dtype": "double", + "layered": true, "shape": [ "nodes" ] @@ -36,6 +37,7 @@ "description": "is a real value by which velocity is divided within a given cell. RETFACTOR can be used to account for solute retardation, i.e., the apparent effect of linear sorption on the velocity of particles that track solute advection. RETFACTOR may be assigned any real value. A RETFACTOR value greater than 1 represents particle retardation (slowing), and a value of 1 represents no retardation. The effect of specifying a RETFACTOR value for each cell is the same as the effect of directly multiplying the POROSITY in each cell by the proposed RETFACTOR value for each cell. RETFACTOR allows conceptual isolation of effects such as retardation from the effect of porosity. The default value is 1.", "optional": true, "dtype": "double", + "layered": true, "shape": [ "nodes" ] @@ -46,6 +48,7 @@ "description": "is an integer zone number assigned to each cell. IZONE may be positive, negative, or zero. The current cell's zone number is recorded with each particle track datum. If a PRP package's ISTOPZONE option is set to any value other than zero, particles released by that PRP Package terminate if they enter a cell whose IZONE value matches ISTOPZONE. If ISTOPZONE is not specified or is set to zero in a PRP Package, IZONE has no effect on the termination of particles released by that PRP Package. Each PRP Package may configure a single ISTOPZONE value.", "optional": true, "dtype": "integer", + "layered": true, "shape": [ "nodes" ] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-mip.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-mip.toml index 60a6f2b5..f53f7741 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-mip.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-mip.toml @@ -17,6 +17,7 @@ type = "array" longname = "porosity" description = "is the aquifer porosity." dtype = "double" +layered = true shape = [ "nodes", ] @@ -27,6 +28,7 @@ longname = "retardation factor" description = "is a real value by which velocity is divided within a given cell. RETFACTOR can be used to account for solute retardation, i.e., the apparent effect of linear sorption on the velocity of particles that track solute advection. RETFACTOR may be assigned any real value. A RETFACTOR value greater than 1 represents particle retardation (slowing), and a value of 1 represents no retardation. The effect of specifying a RETFACTOR value for each cell is the same as the effect of directly multiplying the POROSITY in each cell by the proposed RETFACTOR value for each cell. RETFACTOR allows conceptual isolation of effects such as retardation from the effect of porosity. The default value is 1." optional = true dtype = "double" +layered = true shape = [ "nodes", ] @@ -37,6 +39,7 @@ longname = "zone number" description = "is an integer zone number assigned to each cell. IZONE may be positive, negative, or zero. The current cell's zone number is recorded with each particle track datum. If a PRP package's ISTOPZONE option is set to any value other than zero, particles released by that PRP Package terminate if they enter a cell whose IZONE value matches ISTOPZONE. If ISTOPZONE is not specified or is set to zero in a PRP Package, IZONE has no effect on the termination of particles released by that PRP Package. Each PRP Package may configure a single ISTOPZONE value." optional = true dtype = "integer" +layered = true shape = [ "nodes", ] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-mip.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-mip.yaml index 5b0e3738..e5c7ea90 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-mip.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-mip.yaml @@ -21,6 +21,7 @@ blocks: longname: porosity description: is the aquifer porosity. dtype: double + layered: true shape: - nodes retfactor: @@ -36,6 +37,7 @@ blocks: of porosity. The default value is 1. optional: true dtype: double + layered: true shape: - nodes izone: @@ -49,6 +51,7 @@ blocks: particles released by that PRP Package. Each PRP Package may configure a single ISTOPZONE value. optional: true dtype: integer + layered: true shape: - nodes memory: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-oc.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-oc.json index 6a93777a..3069e8a1 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-oc.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-oc.json @@ -135,16 +135,19 @@ "track_timesrecord": { "type": "record", "optional": true, + "removed": "6.6.0", "fields": { "track_times": { "type": "keyword", - "description": "keyword indicating tracking times will follow" + "description": "keyword indicating tracking times will follow", + "removed": "6.6.0" }, "times": { "type": "array", "longname": "tracking times", "description": "times to track, relative to the beginning of the simulation.", "tagged": false, + "removed": "6.6.0", "dtype": "double" } } @@ -152,16 +155,19 @@ "track_timesfilerecord": { "type": "record", "optional": true, + "removed": "6.6.0", "fields": { "track_timesfile": { "type": "keyword", - "description": "keyword indicating tracking times file name will follow" + "description": "keyword indicating tracking times file name will follow", + "removed": "6.6.0" }, "timesfile": { "type": "string", "longname": "file keyword", "description": "name of the tracking times file", "tagged": false, + "removed": "6.6.0", "case_sensitive": true } } @@ -170,7 +176,8 @@ "type": "keyword", "longname": "print particle tracking events", "description": "print a verbose particle tracking event trace to standard output", - "optional": true + "optional": true, + "developmode": true } } }, diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-oc.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-oc.toml index 6c1e16b7..79f23635 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-oc.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-oc.toml @@ -122,31 +122,37 @@ optional = true [blocks.options.fields.track_timesrecord] type = "record" optional = true +removed = "6.6.0" [blocks.options.fields.track_timesrecord.fields.track_times] type = "keyword" description = "keyword indicating tracking times will follow" +removed = "6.6.0" [blocks.options.fields.track_timesrecord.fields.times] type = "array" longname = "tracking times" description = "times to track, relative to the beginning of the simulation." tagged = false +removed = "6.6.0" dtype = "double" [blocks.options.fields.track_timesfilerecord] type = "record" optional = true +removed = "6.6.0" [blocks.options.fields.track_timesfilerecord.fields.track_timesfile] type = "keyword" description = "keyword indicating tracking times file name will follow" +removed = "6.6.0" [blocks.options.fields.track_timesfilerecord.fields.timesfile] type = "string" longname = "file keyword" description = "name of the tracking times file" tagged = false +removed = "6.6.0" case_sensitive = true [blocks.options.fields.dev_dump_event_trace] @@ -154,6 +160,7 @@ type = "keyword" longname = "print particle tracking events" description = "print a verbose particle tracking event trace to standard output" optional = true +developmode = true [blocks.dimensions.fields.ntracktimes] type = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-oc.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-oc.yaml index a3bc243d..118c4c5d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-oc.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-oc.yaml @@ -121,34 +121,41 @@ blocks: track_timesrecord: type: record optional: true + removed: 6.6.0 fields: track_times: type: keyword description: keyword indicating tracking times will follow + removed: 6.6.0 times: type: array longname: tracking times description: times to track, relative to the beginning of the simulation. tagged: false + removed: 6.6.0 dtype: double track_timesfilerecord: type: record optional: true + removed: 6.6.0 fields: track_timesfile: type: keyword description: keyword indicating tracking times file name will follow + removed: 6.6.0 timesfile: type: string longname: file keyword description: name of the tracking times file tagged: false + removed: 6.6.0 case_sensitive: true dev_dump_event_trace: type: keyword longname: print particle tracking events description: print a verbose particle tracking event trace to standard output optional: true + developmode: true dimensions: fields: ntracktimes: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-prp.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-prp.json index c86ed446..c3a34a0f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-prp.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-prp.json @@ -42,7 +42,8 @@ "type": "integer", "longname": "exit solve method", "description": "the method for iterative solution of particle exit location and time in the generalized Pollock's method. 0 default, 1 Brent, 2 Chandrupatla. The default is Brent's method.", - "optional": true + "optional": true, + "developmode": true }, "exit_solve_tolerance": { "type": "double", @@ -132,16 +133,19 @@ "release_timesrecord": { "type": "record", "optional": true, + "removed": "6.6.0", "fields": { "release_times": { "type": "keyword", - "description": "keyword indicating release times will follow" + "description": "keyword indicating release times will follow", + "removed": "6.6.0" }, "times": { "type": "array", "longname": "release times", "description": "times to release, relative to the beginning of the simulation. RELEASE_TIMES and RELEASE_TIMESFILE are mutually exclusive.", "tagged": false, + "removed": "6.6.0", "dtype": "double" } } @@ -149,16 +153,19 @@ "release_timesfilerecord": { "type": "record", "optional": true, + "removed": "6.6.0", "fields": { "release_timesfile": { "type": "keyword", - "description": "keyword indicating release times file name will follow" + "description": "keyword indicating release times file name will follow", + "removed": "6.6.0" }, "timesfile": { "type": "string", "longname": "file keyword", "description": "name of the release times file. RELEASE_TIMES and RELEASE_TIMESFILE are mutually exclusive.", "tagged": false, + "removed": "6.6.0", "case_sensitive": true } } @@ -177,7 +184,8 @@ "dev_forceternary": { "type": "keyword", "longname": "force ternary tracking method", - "description": "force use of the ternary tracking method regardless of cell type in DISV grids." + "description": "force use of the ternary tracking method regardless of cell type in DISV grids.", + "developmode": true }, "release_time_tolerance": { "type": "double", @@ -206,7 +214,8 @@ "type": "integer", "longname": "cycle detection window size", "description": "integer value defining the size of the window (number of consecutive exit events) used for cycle detection. Defaults to 0, disabling cycle detection. With detection enabled, particle pathlines with duplicate cell exit events (i.e., exiting the same cell through the same face twice) will cause the program to terminate with an error. A larger window size provides more robust cycle detection at the cost of more runtime operations per cell exit.", - "optional": true + "optional": true, + "developmode": true } } }, @@ -336,6 +345,7 @@ "type": "array", "description": "release particles after the specified fraction of the time step has elapsed. If FRACTION is not set, particles are released at the start of the specified time step(s). FRACTION must be a single value when used with ALL, FIRST, or FREQUENCY. When used with STEPS, FRACTION may be a single value or an array of the same length as STEPS. If a single FRACTION value is provided with STEPS, the fraction applies to all steps. NOTE: The FRACTION option has been removed. For fine control over release timing, specify times explicitly using the RELEASETIMES block.", "optional": true, + "removed": "6.6.0", "dtype": "double" } } diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-prp.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-prp.toml index 8f93a98e..5017be19 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-prp.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-prp.toml @@ -38,6 +38,7 @@ type = "integer" longname = "exit solve method" description = "the method for iterative solution of particle exit location and time in the generalized Pollock's method. 0 default, 1 Brent, 2 Chandrupatla. The default is Brent's method." optional = true +developmode = true [blocks.options.fields.exit_solve_tolerance] type = "double" @@ -123,31 +124,37 @@ optional = true [blocks.options.fields.release_timesrecord] type = "record" optional = true +removed = "6.6.0" [blocks.options.fields.release_timesrecord.fields.release_times] type = "keyword" description = "keyword indicating release times will follow" +removed = "6.6.0" [blocks.options.fields.release_timesrecord.fields.times] type = "array" longname = "release times" description = "times to release, relative to the beginning of the simulation. RELEASE_TIMES and RELEASE_TIMESFILE are mutually exclusive." tagged = false +removed = "6.6.0" dtype = "double" [blocks.options.fields.release_timesfilerecord] type = "record" optional = true +removed = "6.6.0" [blocks.options.fields.release_timesfilerecord.fields.release_timesfile] type = "keyword" description = "keyword indicating release times file name will follow" +removed = "6.6.0" [blocks.options.fields.release_timesfilerecord.fields.timesfile] type = "string" longname = "file keyword" description = "name of the release times file. RELEASE_TIMES and RELEASE_TIMESFILE are mutually exclusive." tagged = false +removed = "6.6.0" case_sensitive = true [blocks.options.fields.dry_tracking_method] @@ -165,6 +172,7 @@ valid = [ type = "keyword" longname = "force ternary tracking method" description = "force use of the ternary tracking method regardless of cell type in DISV grids." +developmode = true [blocks.options.fields.release_time_tolerance] type = "double" @@ -194,6 +202,7 @@ type = "integer" longname = "cycle detection window size" description = "integer value defining the size of the window (number of consecutive exit events) used for cycle detection. Defaults to 0, disabling cycle detection. With detection enabled, particle pathlines with duplicate cell exit events (i.e., exiting the same cell through the same face twice) will cause the program to terminate with an error. A larger window size provides more robust cycle detection at the cost of more runtime operations per cell exit." optional = true +developmode = true [blocks.dimensions.fields.nreleasepts] type = "integer" @@ -304,6 +313,7 @@ dtype = "integer" type = "array" description = "release particles after the specified fraction of the time step has elapsed. If FRACTION is not set, particles are released at the start of the specified time step(s). FRACTION must be a single value when used with ALL, FIRST, or FREQUENCY. When used with STEPS, FRACTION may be a single value or an array of the same length as STEPS. If a single FRACTION value is provided with STEPS, the fraction applies to all steps. NOTE: The FRACTION option has been removed. For fine control over release timing, specify times explicitly using the RELEASETIMES block." optional = true +removed = "6.6.0" dtype = "double" [blocks.period.header] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-prp.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-prp.yaml index ce084a87..57ff4d77 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-prp.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-prp.yaml @@ -37,6 +37,7 @@ blocks: description: the method for iterative solution of particle exit location and time in the generalized Pollock's method. 0 default, 1 Brent, 2 Chandrupatla. The default is Brent's method. optional: true + developmode: true exit_solve_tolerance: type: double longname: exit solve tolerance @@ -145,30 +146,36 @@ blocks: release_timesrecord: type: record optional: true + removed: 6.6.0 fields: release_times: type: keyword description: keyword indicating release times will follow + removed: 6.6.0 times: type: array longname: release times description: times to release, relative to the beginning of the simulation. RELEASE_TIMES and RELEASE_TIMESFILE are mutually exclusive. tagged: false + removed: 6.6.0 dtype: double release_timesfilerecord: type: record optional: true + removed: 6.6.0 fields: release_timesfile: type: keyword description: keyword indicating release times file name will follow + removed: 6.6.0 timesfile: type: string longname: file keyword description: name of the release times file. RELEASE_TIMES and RELEASE_TIMESFILE are mutually exclusive. tagged: false + removed: 6.6.0 case_sensitive: true dry_tracking_method: type: string @@ -186,6 +193,7 @@ blocks: type: keyword longname: force ternary tracking method description: force use of the ternary tracking method regardless of cell type in DISV grids. + developmode: true release_time_tolerance: type: double longname: release time coincidence tolerance @@ -223,6 +231,7 @@ blocks: same face twice) will cause the program to terminate with an error. A larger window size provides more robust cycle detection at the cost of more runtime operations per cell exit. optional: true + developmode: true dimensions: fields: nreleasepts: @@ -357,6 +366,7 @@ blocks: option has been removed. For fine control over release timing, specify times explicitly using the RELEASETIMES block.' optional: true + removed: 6.6.0 dtype: double header: name: iper diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/sln-ims.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/sln-ims.json index 21e21db9..d94b29d3 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/sln-ims.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/sln-ims.json @@ -22,17 +22,20 @@ "csv_output_filerecord": { "type": "record", "optional": true, + "deprecated": "6.1.1", "fields": { "csv_output": { "type": "keyword", "longname": "budget keyword", - "description": "keyword to specify that the record corresponds to the comma separated values solver convergence output. The CSV_OUTPUT option has been deprecated and split into the CSV_OUTER_OUTPUT and CSV_INNER_OUTPUT options. Starting with MODFLOW 6 version 6.1.1 if the CSV_OUTPUT option is specified, then it is treated as the CSV_OUTER_OUTPUT option." + "description": "keyword to specify that the record corresponds to the comma separated values solver convergence output. The CSV_OUTPUT option has been deprecated and split into the CSV_OUTER_OUTPUT and CSV_INNER_OUTPUT options. Starting with MODFLOW 6 version 6.1.1 if the CSV_OUTPUT option is specified, then it is treated as the CSV_OUTER_OUTPUT option.", + "deprecated": "6.1.1" }, "csvfile": { "type": "file", "longname": "file keyword", "description": "name of the ascii comma separated values output file to write solver convergence information. If PRINT_OPTION is NONE or SUMMARY, comma separated values output includes maximum head change convergence information at the end of each outer iteration for each time step. If PRINT_OPTION is ALL, comma separated values output includes maximum head change and maximum residual convergence information for the solution and each model (if the solution includes more than one model) and linear acceleration information for each inner iteration.", "tagged": false, + "deprecated": "6.1.1", "direction": "out" } } @@ -106,7 +109,8 @@ "type": "double", "longname": "head change criterion", "description": "real value defining the head change criterion for convergence of the outer (nonlinear) iterations, in units of length. When the maximum absolute value of the head change at all nodes during an iteration is less than or equal to OUTER_HCLOSE, iteration stops. Commonly, OUTER_HCLOSE equals 0.01. The OUTER_HCLOSE option has been deprecated in favor of the more general OUTER_DVCLOSE (for dependent variable), however either one can be specified in order to maintain backward compatibility.", - "optional": true + "optional": true, + "deprecated": "6.1.1" }, "outer_dvclose": { "type": "double", @@ -117,7 +121,8 @@ "type": "double", "longname": "boundary package flow residual tolerance", "description": "real value defining the residual tolerance for convergence of model packages that solve a separate equation not solved by the IMS linear solver. This value represents the maximum allowable residual between successive outer iterations at any single model package element. An example of a model package that would use OUTER_RCLOSEBND to evaluate convergence is the SFR package which solves a continuity equation for each reach. The OUTER_RCLOSEBND option is deprecated and has no effect on simulation results as of version 6.1.1. The keyword, OUTER_RCLOSEBND can be still be specified for backward compatibility with previous versions of MODFLOW 6 but eventually specification of OUTER_RCLOSEBND will cause MODFLOW 6 to terminate with an error.", - "optional": true + "optional": true, + "deprecated": "6.1.1" }, "outer_maximum": { "type": "integer", @@ -191,7 +196,8 @@ "type": "double", "longname": "head change tolerance", "description": "real value defining the head change criterion for convergence of the inner (linear) iterations, in units of length. When the maximum absolute value of the head change at all nodes during an iteration is less than or equal to INNER_HCLOSE, the matrix solver assumes convergence. Commonly, INNER_HCLOSE is set equal to or an order of magnitude less than the OUTER_HCLOSE value specified for the NONLINEAR block. The INNER_HCLOSE keyword has been deprecated in favor of the more general INNER_DVCLOSE (for dependent variable), however either one can be specified in order to maintain backward compatibility.", - "optional": true + "optional": true, + "deprecated": "6.1.1" }, "inner_dvclose": { "type": "double", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/sln-ims.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/sln-ims.toml index bc0b3ebc..56c3d630 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/sln-ims.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/sln-ims.toml @@ -19,17 +19,20 @@ optional = true [blocks.options.fields.csv_output_filerecord] type = "record" optional = true +deprecated = "6.1.1" [blocks.options.fields.csv_output_filerecord.fields.csv_output] type = "keyword" longname = "budget keyword" description = "keyword to specify that the record corresponds to the comma separated values solver convergence output. The CSV_OUTPUT option has been deprecated and split into the CSV_OUTER_OUTPUT and CSV_INNER_OUTPUT options. Starting with MODFLOW 6 version 6.1.1 if the CSV_OUTPUT option is specified, then it is treated as the CSV_OUTER_OUTPUT option." +deprecated = "6.1.1" [blocks.options.fields.csv_output_filerecord.fields.csvfile] type = "file" longname = "file keyword" description = "name of the ascii comma separated values output file to write solver convergence information. If PRINT_OPTION is NONE or SUMMARY, comma separated values output includes maximum head change convergence information at the end of each outer iteration for each time step. If PRINT_OPTION is ALL, comma separated values output includes maximum head change and maximum residual convergence information for the solution and each model (if the solution includes more than one model) and linear acceleration information for each inner iteration." tagged = false +deprecated = "6.1.1" direction = "out" [blocks.options.fields.csv_outer_output_filerecord] @@ -92,6 +95,7 @@ type = "double" longname = "head change criterion" description = "real value defining the head change criterion for convergence of the outer (nonlinear) iterations, in units of length. When the maximum absolute value of the head change at all nodes during an iteration is less than or equal to OUTER_HCLOSE, iteration stops. Commonly, OUTER_HCLOSE equals 0.01. The OUTER_HCLOSE option has been deprecated in favor of the more general OUTER_DVCLOSE (for dependent variable), however either one can be specified in order to maintain backward compatibility." optional = true +deprecated = "6.1.1" [blocks.nonlinear.fields.outer_dvclose] type = "double" @@ -103,6 +107,7 @@ type = "double" longname = "boundary package flow residual tolerance" description = "real value defining the residual tolerance for convergence of model packages that solve a separate equation not solved by the IMS linear solver. This value represents the maximum allowable residual between successive outer iterations at any single model package element. An example of a model package that would use OUTER_RCLOSEBND to evaluate convergence is the SFR package which solves a continuity equation for each reach. The OUTER_RCLOSEBND option is deprecated and has no effect on simulation results as of version 6.1.1. The keyword, OUTER_RCLOSEBND can be still be specified for backward compatibility with previous versions of MODFLOW 6 but eventually specification of OUTER_RCLOSEBND will cause MODFLOW 6 to terminate with an error." optional = true +deprecated = "6.1.1" [blocks.nonlinear.fields.outer_maximum] type = "integer" @@ -173,6 +178,7 @@ type = "double" longname = "head change tolerance" description = "real value defining the head change criterion for convergence of the inner (linear) iterations, in units of length. When the maximum absolute value of the head change at all nodes during an iteration is less than or equal to INNER_HCLOSE, the matrix solver assumes convergence. Commonly, INNER_HCLOSE is set equal to or an order of magnitude less than the OUTER_HCLOSE value specified for the NONLINEAR block. The INNER_HCLOSE keyword has been deprecated in favor of the more general INNER_DVCLOSE (for dependent variable), however either one can be specified in order to maintain backward compatibility." optional = true +deprecated = "6.1.1" [blocks.linear.fields.inner_dvclose] type = "double" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/sln-ims.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/sln-ims.yaml index 89a63d63..9f2d5fcc 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/sln-ims.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/sln-ims.yaml @@ -37,6 +37,7 @@ blocks: csv_output_filerecord: type: record optional: true + deprecated: 6.1.1 fields: csv_output: type: keyword @@ -45,6 +46,7 @@ blocks: solver convergence output. The CSV_OUTPUT option has been deprecated and split into the CSV_OUTER_OUTPUT and CSV_INNER_OUTPUT options. Starting with MODFLOW 6 version 6.1.1 if the CSV_OUTPUT option is specified, then it is treated as the CSV_OUTER_OUTPUT option. + deprecated: 6.1.1 csvfile: type: file longname: file keyword @@ -55,6 +57,7 @@ blocks: and maximum residual convergence information for the solution and each model (if the solution includes more than one model) and linear acceleration information for each inner iteration. tagged: false + deprecated: 6.1.1 direction: out csv_outer_output_filerecord: type: record @@ -147,6 +150,7 @@ blocks: (for dependent variable), however either one can be specified in order to maintain backward compatibility. optional: true + deprecated: 6.1.1 outer_dvclose: type: double longname: dependent-variable change criterion @@ -169,6 +173,7 @@ blocks: can be still be specified for backward compatibility with previous versions of MODFLOW 6 but eventually specification of OUTER_RCLOSEBND will cause MODFLOW 6 to terminate with an error. optional: true + deprecated: 6.1.1 outer_maximum: type: integer longname: outer maximum iterations @@ -294,6 +299,7 @@ blocks: the more general INNER_DVCLOSE (for dependent variable), however either one can be specified in order to maintain backward compatibility. optional: true + deprecated: 6.1.1 inner_dvclose: type: double longname: dependent-variable change tolerance diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/sln-pts.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/sln-pts.json index ea50dd99..44dbb337 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/sln-pts.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/sln-pts.json @@ -22,17 +22,20 @@ "csv_output_filerecord": { "type": "record", "optional": true, + "deprecated": "6.1.1", "fields": { "csv_output": { "type": "keyword", "longname": "budget keyword", - "description": "keyword to specify that the record corresponds to the comma separated values solver convergence output. The CSV_OUTPUT option has been deprecated and split into the CSV_OUTER_OUTPUT and CSV_INNER_OUTPUT options. Starting with MODFLOW 6 version 6.1.1 if the CSV_OUTPUT option is specified, then it is treated as the CSV_OUTER_OUTPUT option." + "description": "keyword to specify that the record corresponds to the comma separated values solver convergence output. The CSV_OUTPUT option has been deprecated and split into the CSV_OUTER_OUTPUT and CSV_INNER_OUTPUT options. Starting with MODFLOW 6 version 6.1.1 if the CSV_OUTPUT option is specified, then it is treated as the CSV_OUTER_OUTPUT option.", + "deprecated": "6.1.1" }, "csvfile": { "type": "file", "longname": "file keyword", "description": "name of the ascii comma separated values output file to write solver convergence information. If PRINT_OPTION is NONE or SUMMARY, comma separated values output includes maximum head change convergence information at the end of each outer iteration for each time step. If PRINT_OPTION is ALL, comma separated values output includes maximum head change and maximum residual convergence information for the solution and each model (if the solution includes more than one model) and linear acceleration information for each inner iteration.", "tagged": false, + "deprecated": "6.1.1", "direction": "out" } } diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/sln-pts.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/sln-pts.toml index 8b4cfa7c..6ae04373 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/sln-pts.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/sln-pts.toml @@ -19,17 +19,20 @@ optional = true [blocks.options.fields.csv_output_filerecord] type = "record" optional = true +deprecated = "6.1.1" [blocks.options.fields.csv_output_filerecord.fields.csv_output] type = "keyword" longname = "budget keyword" description = "keyword to specify that the record corresponds to the comma separated values solver convergence output. The CSV_OUTPUT option has been deprecated and split into the CSV_OUTER_OUTPUT and CSV_INNER_OUTPUT options. Starting with MODFLOW 6 version 6.1.1 if the CSV_OUTPUT option is specified, then it is treated as the CSV_OUTER_OUTPUT option." +deprecated = "6.1.1" [blocks.options.fields.csv_output_filerecord.fields.csvfile] type = "file" longname = "file keyword" description = "name of the ascii comma separated values output file to write solver convergence information. If PRINT_OPTION is NONE or SUMMARY, comma separated values output includes maximum head change convergence information at the end of each outer iteration for each time step. If PRINT_OPTION is ALL, comma separated values output includes maximum head change and maximum residual convergence information for the solution and each model (if the solution includes more than one model) and linear acceleration information for each inner iteration." tagged = false +deprecated = "6.1.1" direction = "out" [blocks.options.fields.csv_outer_output_filerecord] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/sln-pts.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/sln-pts.yaml index 3e491ff0..5fd84579 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/sln-pts.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/sln-pts.yaml @@ -37,6 +37,7 @@ blocks: csv_output_filerecord: type: record optional: true + deprecated: 6.1.1 fields: csv_output: type: keyword @@ -45,6 +46,7 @@ blocks: solver convergence output. The CSV_OUTPUT option has been deprecated and split into the CSV_OUTER_OUTPUT and CSV_INNER_OUTPUT options. Starting with MODFLOW 6 version 6.1.1 if the CSV_OUTPUT option is specified, then it is treated as the CSV_OUTER_OUTPUT option. + deprecated: 6.1.1 csvfile: type: file longname: file keyword @@ -55,6 +57,7 @@ blocks: and maximum residual convergence information for the solution and each model (if the solution includes more than one model) and linear acceleration information for each inner iteration. tagged: false + deprecated: 6.1.1 direction: out csv_outer_output_filerecord: type: record diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-dfw.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-dfw.json index 656cd003..c647e3f4 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-dfw.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-dfw.json @@ -75,7 +75,8 @@ "type": "keyword", "longname": "use SWR conductance formulation", "description": "use the conductance formulation in the Surface Water Routing (SWR) Process for MODFLOW-2005.", - "optional": true + "optional": true, + "developmode": true } } }, diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-dfw.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-dfw.toml index 1fad6969..b78365a1 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-dfw.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-dfw.toml @@ -69,6 +69,7 @@ type = "keyword" longname = "use SWR conductance formulation" description = "use the conductance formulation in the Surface Water Routing (SWR) Process for MODFLOW-2005." optional = true +developmode = true [blocks.griddata.fields.manningsn] type = "array" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-dfw.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-dfw.yaml index 42f02820..062a1c56 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-dfw.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-dfw.yaml @@ -86,6 +86,7 @@ blocks: longname: use SWR conductance formulation description: use the conductance formulation in the Surface Water Routing (SWR) Process for MODFLOW-2005. optional: true + developmode: true griddata: fields: manningsn: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-ic.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-ic.json index e0f7e1f1..b32721b1 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-ic.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-ic.json @@ -27,6 +27,7 @@ "description": "is the initial (starting) stage---that is, stage at the beginning of the SWF Model simulation. STRT must be specified for all SWF Model simulations. One value is read for every model reach.", "default": 0.0, "dtype": "double", + "layered": true, "shape": [ "nodes" ] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-ic.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-ic.toml index 547d65d8..21adca02 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-ic.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-ic.toml @@ -18,6 +18,7 @@ longname = "starting concentration" description = "is the initial (starting) stage---that is, stage at the beginning of the SWF Model simulation. STRT must be specified for all SWF Model simulations. One value is read for every model reach." default = 0.0 dtype = "double" +layered = true shape = [ "nodes", ] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-ic.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-ic.yaml index c93213de..c53e34bb 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-ic.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-ic.yaml @@ -24,6 +24,7 @@ blocks: model reach. default: 0.0 dtype: double + layered: true shape: - nodes memory: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-hpc.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-hpc.json index c5bc33c4..cd55459d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-hpc.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-hpc.json @@ -17,7 +17,8 @@ "type": "keyword", "longname": "log mpi traffic", "description": "keyword to enable (extremely verbose) logging of mpi traffic to file.", - "optional": true + "optional": true, + "developmode": true } } }, diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-hpc.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-hpc.toml index 1195be06..e23823e5 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-hpc.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-hpc.toml @@ -15,6 +15,7 @@ type = "keyword" longname = "log mpi traffic" description = "keyword to enable (extremely verbose) logging of mpi traffic to file." optional = true +developmode = true [blocks.partitions.fields.partitions] type = "list" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-hpc.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-hpc.yaml index 35064c66..711d70d3 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-hpc.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-hpc.yaml @@ -16,6 +16,7 @@ blocks: longname: log mpi traffic description: keyword to enable (extremely verbose) logging of mpi traffic to file. optional: true + developmode: true partitions: fields: partitions: diff --git a/autotest/dfns/test_schema.py b/autotest/dfns/test_schema.py index 97fb76d4..fa389584 100644 --- a/autotest/dfns/test_schema.py +++ b/autotest/dfns/test_schema.py @@ -8,6 +8,7 @@ from modflow_devtools.dfns.schema import ( Array, Block, + Double, File, Integer, Keyword, @@ -348,7 +349,7 @@ def test_render_respects_tagged_scalars_in_record(dev3_spec): def test_render_respects_untagged_arrays_in_record(dev3_spec): """Untagged Array subfields of a Record (e.g. cellid) must render without a keyword.""" render = dev3_spec.components["gwf-chd"].blocks["period"].render() - assert " " in render + assert " <@head@>" in render assert "CELLID" not in render @@ -390,6 +391,31 @@ def test_render_block_header_record(dev3_spec): assert render.startswith("BEGIN CONTINUOUS FILEOUT [BINARY]\n") +def test_render_griddata_layered_and_netcdf(dev3_spec): + """Matches mf6io.pdf's GRIDDATA structure block for gwf-npf: every array is + both layered and netcdf-exportable.""" + render = dev3_spec.components["gwf-npf"].blocks["griddata"].render() + assert "ICELLTYPE [LAYERED] $[NETCDF]$\n -- READARRAY" in render + assert "K [LAYERED] $[NETCDF]$\n -- READARRAY" in render + + +def test_render_griddata_layered_only(dev3_spec): + """chf-ic's strt is layered but not netcdf-exportable.""" + render = dev3_spec.components["chf-ic"].blocks["griddata"].render() + assert "STRT [LAYERED]\n -- READARRAY" in render + assert "NETCDF" not in render + + +def test_render_period_netcdf_only_suppresses_time_series(dev3_spec): + """gwf-rcha's recharge is both netcdf-exportable and time-series-enabled, but + it's read via READARRAY, so only the netcdf marker shows — matches mf6io.pdf, + which never shows `@...@` on a READARRAY block-level array.""" + render = dev3_spec.components["gwf-rcha"].blocks["period"].render() + assert "RECHARGE $[NETCDF]$\n ), not the tag keyword (e.g. ).""" @@ -492,6 +518,46 @@ def test_render_array_with_shape(): assert field.render(inline=True) == "K " +def test_render_array_layered(): + """A layered array gets a `[LAYERED]` marker on the READARRAY line only.""" + field = Array(name="k", dtype="double", shape=["nodes"], tagged=True, layered=True) + assert field.render() == "K [LAYERED]\n -- READARRAY" + assert field.render(inline=True) == "K " + + +def test_render_array_netcdf(): + """A netcdf-exportable array gets a `$[NETCDF]$` marker on the READARRAY line only.""" + field = Array(name="k", dtype="double", shape=["nodes"], tagged=True, netcdf=True) + assert field.render() == "K $[NETCDF]$\n -- READARRAY" + assert field.render(inline=True) == "K " + + +def test_render_array_layered_and_netcdf(): + """Both markers stack, layered first, in that order regardless of construction order.""" + field = Array(name="k", dtype="double", shape=["nodes"], tagged=True, layered=True, netcdf=True) + assert field.render() == "K [LAYERED] $[NETCDF]$\n -- READARRAY" + + +def test_render_scalar_time_series(): + """A time-series-enabled scalar wraps its token in `@...@`, tag unaffected.""" + tagged = Double(name="rate", tagged=True, time_series=True) + assert tagged.render() == "RATE <@rate@>" + untagged = Double(name="head", tagged=False, time_series=True) + assert untagged.render() == "<@head@>" + assert untagged.render(inline=True) == "<@head@>" + + +def test_render_array_time_series_inline(): + """A time-series-enabled Array wraps name+shape in `@...@` when rendered inline + (i.e. embedded in a Record row); the marker never appears on the READARRAY + block-level form, since MF6 ignores time series for array-based input.""" + field = Array(name="aux", dtype="double", shape=["naux"], tagged=False, time_series=True) + assert field.render(inline=True) == "<@aux(naux)@>" + # Rendered at block level (not inline), the array takes its READARRAY form, + # where the time-series marker doesn't apply. + assert field.render() == "AUX\n -- READARRAY" + + def test_render_record(): """Record inline-expands its children the same way whether inline or not.""" field = Record( @@ -591,6 +657,30 @@ def test_render_block_matches_per_field_assembly(dev3_spec): begin = f"{begin} {block.header.render(inline=True)}" lines = [begin] for field in block.fields.values(): + if field.removed is not None or field.deprecated is not None: + continue + if field.developmode: + continue lines.extend(f" {line}" for line in field.render().split("\n")) lines.append(f"END {block.name.upper()}") assert block.render() == "\n".join(lines) + + +def test_render_excludes_removed_and_deprecated_fields(dev3_spec): + """render() never shows removed/deprecated fields as current syntax.""" + render = dev3_spec.components["prt-oc"].blocks["options"].render() + # TRACK_TIMESTEP is current and must stay; TRACK_TIMES/TRACK_TIMESFILE (both + # `removed 6.6.0` in the v1 corpus) must not appear as their own rows. + assert "TRACK_TIMESTEP" in render + assert "TRACK_TIMES <" not in render + assert "TRACK_TIMESFILE <" not in render + + +def test_render_excludes_developmode_fields_by_default(dev3_spec): + """render() hides developmode fields (including v1's `dev_`-prefix convention, + folded into `developmode` by the migration) by default, but can include them + via `developmode=True`.""" + render = dev3_spec.components["gwf-dis"].blocks["options"].render() + assert "CRS" not in render + render_dev = dev3_spec.components["gwf-dis"].blocks["options"].render(developmode=True) + assert "CRS " in render_dev diff --git a/modflow_devtools/dfn/schema.py b/modflow_devtools/dfn/schema.py index 746425c8..dc707e94 100644 --- a/modflow_devtools/dfn/schema.py +++ b/modflow_devtools/dfn/schema.py @@ -77,8 +77,12 @@ class Field(TypedDict): layered: NotRequired[bool | None] preserve_case: NotRequired[bool] numeric_index: NotRequired[bool] - deprecated: NotRequired[bool] - removed: NotRequired[bool] + # Version strings (e.g. "6.6.0"), not booleans -- `load_dfn` stores every + # attribute's raw text verbatim (see `field[key] = value` above), and unlike + # the boolean-flag attributes here, nothing coerces these two via + # `try_parse_bool` downstream. + deprecated: NotRequired[str | None] + removed: NotRequired[str | None] mf6internal: NotRequired[str | None] block_variable: NotRequired[bool] just_data: NotRequired[bool] diff --git a/modflow_devtools/dfns/migrate_to_v2_0_0_dev2.py b/modflow_devtools/dfns/migrate_to_v2_0_0_dev2.py index dc822087..5f2dca94 100644 --- a/modflow_devtools/dfns/migrate_to_v2_0_0_dev2.py +++ b/modflow_devtools/dfns/migrate_to_v2_0_0_dev2.py @@ -1029,11 +1029,18 @@ def _map_field(f: v1.Field) -> v2.Field: description: str | None = f.get("description") or None longname: str | None = f.get("longname") or None optional: bool = try_parse_bool(f.get("optional"), False) - developmode: bool = try_parse_bool(f.get("developmode"), False) + # `dev_`-prefixed names are v1's de facto (and only-ever-used) convention for + # marking a field internal/undocumented; the `developmode` attribute itself is + # declared in zero DFN files in the wild, so fold the name convention into it + # here rather than leaving `render()` to special-case a naming pattern. + developmode: bool = try_parse_bool(f.get("developmode"), False) or _name.startswith("dev_") netcdf: bool = try_parse_bool(f.get("netcdf"), False) tagged: bool = try_parse_bool(f.get("tagged"), True) preserve_case: bool = try_parse_bool(f.get("preserve_case"), False) time_series: bool = try_parse_bool(f.get("time_series"), False) + layered: bool = try_parse_bool(f.get("layered"), False) + removed: str | None = f.get("removed") or None + deprecated: str | None = f.get("deprecated") or None valid = f.get("valid") _default_raw = f.get("default", f.get("default_value", None)) default = ( @@ -1090,6 +1097,8 @@ def _to_scalar() -> v2.Scalar: default=default, developmode=developmode, netcdf=netcdf, + removed=removed, + deprecated=deprecated, ) if _type == "string": return v2.String( @@ -1100,6 +1109,8 @@ def _to_scalar() -> v2.Scalar: default=default, developmode=developmode, netcdf=netcdf, + removed=removed, + deprecated=deprecated, tagged=tagged, valid=_parse_valid(valid), case_sensitive=preserve_case, @@ -1114,6 +1125,8 @@ def _to_scalar() -> v2.Scalar: default=default, developmode=developmode, netcdf=netcdf, + removed=removed, + deprecated=deprecated, tagged=tagged, valid=_parse_valid(valid, int), time_series=time_series, @@ -1127,6 +1140,8 @@ def _to_scalar() -> v2.Scalar: default=default, developmode=developmode, netcdf=netcdf, + removed=removed, + deprecated=deprecated, tagged=tagged, time_series=time_series, ) @@ -1215,6 +1230,8 @@ def _subfield_map() -> dict: default=default, developmode=developmode, netcdf=netcdf, + removed=removed, + deprecated=deprecated, item=item, shape=list_shape, ) @@ -1228,6 +1245,8 @@ def _subfield_map() -> dict: optional=optional, default=default, developmode=developmode, + removed=removed, + deprecated=deprecated, arms=arms, # type: ignore[arg-type] ) @@ -1305,8 +1324,11 @@ def _lookup(rname: str) -> dict | None: longname=m.get("longname") or None, description=m.get("description") or None, optional=try_parse_bool(m.get("optional"), False), - developmode=try_parse_bool(m.get("developmode"), False), + developmode=try_parse_bool(m.get("developmode"), False) + or (m.get("name") or "").startswith("dev_"), netcdf=try_parse_bool(m.get("netcdf"), False), + removed=m.get("removed") or None, + deprecated=m.get("deprecated") or None, tagged=False, direction="in" if file_mode == "filein" else "out", ) @@ -1325,6 +1347,8 @@ def _lookup(rname: str) -> dict | None: optional=optional, default=default, developmode=developmode, + removed=removed, + deprecated=deprecated, fields=rec_fields, # type: ignore[arg-type] ) @@ -1348,8 +1372,11 @@ def _lookup(rname: str) -> dict | None: default=default, developmode=developmode, netcdf=netcdf, + removed=removed, + deprecated=deprecated, tagged=tagged, time_series=time_series, + layered=layered, dtype="string", shape=[], ) @@ -1365,8 +1392,11 @@ def _lookup(rname: str) -> dict | None: default=default, developmode=developmode, netcdf=netcdf, + removed=removed, + deprecated=deprecated, tagged=tagged, time_series=time_series, + layered=layered, dtype=dtype, shape=parsed_shape, ) diff --git a/modflow_devtools/dfns/schema.py b/modflow_devtools/dfns/schema.py index 93e98867..561d3a0f 100644 --- a/modflow_devtools/dfns/schema.py +++ b/modflow_devtools/dfns/schema.py @@ -29,6 +29,13 @@ class FieldBase(BaseModel): developmode: bool = False netcdf: bool = False tagged: bool = True + # Version this field was deprecated/removed as of (e.g. "6.6.0"), or None if + # neither. MF6 may still parse a deprecated field; a removed one no longer + # parses at all. Both are excluded from render() unconditionally — never + # shown as valid current syntax — but kept as data for other consumers (e.g. + # a linter that wants to warn on deprecated-but-still-accepted input). + removed: str | None = None + deprecated: str | None = None @model_serializer(mode="wrap") def _serialize(self, handler: Any, info: SerializationInfo) -> dict[str, Any]: @@ -114,6 +121,7 @@ class Array(FieldBase): dtype: Literal["keyword", "integer", "double", "string"] shape: list[str] = [] time_series: bool = False + layered: bool = False repeat: str | None = None @@ -191,6 +199,11 @@ def _tag(field: "Field", inner: str) -> str: return f"{field.name.upper()} {inner}" if field.tagged else inner +def _ts_token(token: str, *, time_series: bool) -> str: + """Wrap a bare `` in `@...@` time-series markers if flagged.""" + return f"<@{token}@>" if time_series else f"<{token}>" + + def _render_rows(item: "Record | Union") -> list[str]: """Return one or more rendered row strings for a List item. @@ -226,13 +239,22 @@ def _wrap(token: str) -> str: case Keyword(): return _wrap(field.name.upper()) case String() | Integer() | Double(): - return _wrap(_tag(field, f"<{field.name}>")) + token = _ts_token(field.name, time_series=field.time_series) + return _wrap(_tag(field, token)) case File(): return _wrap(_render_file(field)) case Array(): if inline or not field.shape: - return _wrap(_tag(field, f"<{field.name}{_render_shape(field)}>")) - body = f"{field.name.upper()}\n <{field.name}{_render_shape(field)}> -- READARRAY" + token = _ts_token( + f"{field.name}{_render_shape(field)}", time_series=field.time_series + ) + return _wrap(_tag(field, token)) + name_line = field.name.upper() + if field.layered: + name_line += " [LAYERED]" + if field.netcdf: + name_line += " $[NETCDF]$" + body = f"{name_line}\n <{field.name}{_render_shape(field)}> -- READARRAY" return _wrap(body) case Record(): return _wrap(" ".join(_render_field(f, inline=True) for f in field.fields.values())) @@ -258,13 +280,31 @@ def _wrap(token: str) -> str: return f"{rows[0]}\n{rows[0]}\n..." -def _render_block(block: "Block", indent: str = " ") -> str: +def _field_is_current(field: "Field", *, developmode: bool) -> bool: + """Whether a field belongs in render() output. + + Removed/deprecated fields are never current syntax, so they're always + excluded (MF6 no longer parses a removed field at all, and a deprecated one + is discouraged even where still accepted) — there's no flag to see them in + render() output, matching mf6io.pdf. Fields flagged `Field.developmode` + (which subsumes v1's `dev_`-name convention; see `_map_field` in the + migration) are internal/undocumented and excluded by default, but callers + doing internal tooling can opt in via the `developmode` parameter. + """ + if field.removed is not None or field.deprecated is not None: + return False + return developmode or not field.developmode + + +def _render_block(block: "Block", indent: str = " ", *, developmode: bool = False) -> str: """Render a Block as a BEGIN/END template string.""" begin = f"BEGIN {block.name.upper()}" if block.header is not None: begin = f"{begin} {block.header.render(inline=True)}" lines = [begin] for field in block.fields.values(): + if not _field_is_current(field, developmode=developmode): + continue lines.extend(f"{indent}{line}" for line in field.render().split("\n")) lines.append(f"END {block.name.upper()}") return "\n".join(lines) @@ -543,8 +583,8 @@ def repeats(self) -> bool: """Whether the block may appear multiple times, each labeled by `header`.""" return self.header is not None - def render(self) -> str: - return _render_block(self) + def render(self, *, developmode: bool = False) -> str: + return _render_block(self, developmode=developmode) Blocks = Mapping[str, Block] @@ -635,8 +675,10 @@ def get_block(self, field_name: str) -> Block | None: return block return None - def render(self) -> str: - return "\n\n".join(_render_block(b) for b in (self.blocks or {}).values()) + def render(self, *, developmode: bool = False) -> str: + return "\n\n".join( + _render_block(b, developmode=developmode) for b in (self.blocks or {}).values() + ) class Simulation(ComponentBase):