fix(dfns): type number-or-word fields as unions

autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-lak.json

@@ -329,10 +329,19 @@
                 "tagged": false
               },
               "bedleak": {
-                "type": "string",
+                "type": "union",
                 "longname": "bed leakance",
                 "description": "real value or character string that defines the bed leakance for the lake-GWF connection. BEDLEAK must be greater than or equal to zero, equal to the DNODATA value (3.0E+30), or specified to be NONE. If DNODATA or NONE is specified for BEDLEAK, the lake-GWF connection conductance is solely a function of aquifer properties in the connected GWF cell and lakebed sediments are assumed to be absent. Warning messages will be issued if NONE is specified. Eventually the ability to specify NONE will be deprecated and cause MODFLOW 6 to terminate with an error.",
-                "tagged": false
+                "tagged": false,
+                "arms": {
+                  "none": {
+                    "type": "keyword"
+                  },
+                  "value": {
+                    "type": "double",
+                    "tagged": false
+                  }
+                }
               },
               "belev": {
                 "type": "double",

autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-lak.toml

@@ -302,11 +302,18 @@ description = "character string that defines the lake-GWF connection type for th
 tagged = false
 
 [blocks.connectiondata.fields.connectiondata.item.fields.bedleak]
-type = "string"
+type = "union"
 longname = "bed leakance"
 description = "real value or character string that defines the bed leakance for the lake-GWF connection. BEDLEAK must be greater than or equal to zero, equal to the DNODATA value (3.0E+30), or specified to be NONE. If DNODATA or NONE is specified for BEDLEAK, the lake-GWF connection conductance is solely a function of aquifer properties in the connected GWF cell and lakebed sediments are assumed to be absent. Warning messages will be issued if NONE is specified. Eventually the ability to specify NONE will be deprecated and cause MODFLOW 6 to terminate with an error."
 tagged = false
 
+[blocks.connectiondata.fields.connectiondata.item.fields.bedleak.arms.none]
+type = "keyword"
+
+[blocks.connectiondata.fields.connectiondata.item.fields.bedleak.arms.value]
+type = "double"
+tagged = false
+
 [blocks.connectiondata.fields.connectiondata.item.fields.belev]
 type = "double"
 longname = "bottom elevation"

autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-lak.yaml

@@ -340,7 +340,7 @@ blocks:
                 cell (NLAKECONN = 1) and there must be a lake table associated with each embedded lake.'
               tagged: false
             bedleak:
-              type: string
+              type: union
               longname: bed leakance
               description: real value or character string that defines the bed leakance for the lake-GWF
                 connection. BEDLEAK must be greater than or equal to zero, equal to the DNODATA value
@@ -350,6 +350,12 @@ blocks:
                 NONE is specified. Eventually the ability to specify NONE will be deprecated and cause
                 MODFLOW 6 to terminate with an error.
               tagged: false
+              arms:
+                none:
+                  type: keyword
+                value:
+                  type: double
+                  tagged: false
             belev:
               type: double
               longname: bottom elevation

autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-maw.json

@@ -415,10 +415,28 @@
                     "description": "is the head in the multi-aquifer well. WELL_HEAD is only applied to constant head (STATUS is CONSTANT) and inactive (STATUS is INACTIVE) multi-aquifer wells. If the Options block includes a TIMESERIESFILE entry (see the 'Time-Variable Input' section), values can be obtained from a time series by entering the time-series name in place of a numeric value. The program will terminate with an error if WELL_HEAD is less than the bottom of the well.",
                     "time_series": true
                   },
-                  "head_limit": {
-                    "type": "string",
-                    "longname": "head limit",
-                    "description": "is the limiting water level (head) in the well, which is the minimum of the well RATE or the well inflow rate from the aquifer. HEAD_LIMIT can be applied to extraction wells (RATE $<$ 0) or injection wells (RATE $>$ 0). HEAD_LIMIT can be deactivated by specifying the text string `OFF'. The HEAD_LIMIT option is based on the HEAD_LIMIT functionality available in the MNW2~citep{konikow2009} package for MODFLOW-2005. The HEAD_LIMIT option has been included to facilitate backward compatibility with previous versions of MODFLOW but use of the RATE_SCALING option instead of the HEAD_LIMIT option is recommended. By default, HEAD_LIMIT is `OFF'."
+                  "head_limitrecord": {
+                    "type": "record",
+                    "fields": {
+                      "head_limit": {
+                        "type": "keyword"
+                      },
+                      "head_limit_value": {
+                        "type": "union",
+                        "longname": "head limit",
+                        "description": "is the limiting water level (head) in the well, which is the minimum of the well RATE or the well inflow rate from the aquifer. HEAD_LIMIT can be applied to extraction wells (RATE $<$ 0) or injection wells (RATE $>$ 0). HEAD_LIMIT can be deactivated by specifying the text string `OFF'. The HEAD_LIMIT option is based on the HEAD_LIMIT functionality available in the MNW2~citep{konikow2009} package for MODFLOW-2005. The HEAD_LIMIT option has been included to facilitate backward compatibility with previous versions of MODFLOW but use of the RATE_SCALING option instead of the HEAD_LIMIT option is recommended. By default, HEAD_LIMIT is `OFF'.",
+                        "tagged": false,
+                        "arms": {
+                          "off": {
+                            "type": "keyword"
+                          },
+                          "value": {
+                            "type": "double",
+                            "tagged": false
+                          }
+                        }
+                      }
+                    }
                   },
                   "shutoffrecord": {
                     "type": "record",

autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-maw.toml

@@ -377,10 +377,24 @@ longname = "well head"
 description = "is the head in the multi-aquifer well. WELL_HEAD is only applied to constant head (STATUS is CONSTANT) and inactive (STATUS is INACTIVE) multi-aquifer wells. If the Options block includes a TIMESERIESFILE entry (see the 'Time-Variable Input' section), values can be obtained from a time series by entering the time-series name in place of a numeric value. The program will terminate with an error if WELL_HEAD is less than the bottom of the well."
 time_series = true
 
-[blocks.period.fields.perioddata.item.fields.mawsetting.arms.head_limit]
-type = "string"
+[blocks.period.fields.perioddata.item.fields.mawsetting.arms.head_limitrecord]
+type = "record"
+
+[blocks.period.fields.perioddata.item.fields.mawsetting.arms.head_limitrecord.fields.head_limit]
+type = "keyword"
+
+[blocks.period.fields.perioddata.item.fields.mawsetting.arms.head_limitrecord.fields.head_limit_value]
+type = "union"
 longname = "head limit"
 description = "is the limiting water level (head) in the well, which is the minimum of the well RATE or the well inflow rate from the aquifer. HEAD_LIMIT can be applied to extraction wells (RATE $<$ 0) or injection wells (RATE $>$ 0). HEAD_LIMIT can be deactivated by specifying the text string `OFF'. The HEAD_LIMIT option is based on the HEAD_LIMIT functionality available in the MNW2~citep{konikow2009} package for MODFLOW-2005. The HEAD_LIMIT option has been included to facilitate backward compatibility with previous versions of MODFLOW but use of the RATE_SCALING option instead of the HEAD_LIMIT option is recommended. By default, HEAD_LIMIT is `OFF'."
+tagged = false
+
+[blocks.period.fields.perioddata.item.fields.mawsetting.arms.head_limitrecord.fields.head_limit_value.arms.off]
+type = "keyword"
+
+[blocks.period.fields.perioddata.item.fields.mawsetting.arms.head_limitrecord.fields.head_limit_value.arms.value]
+type = "double"
+tagged = false
 
 [blocks.period.fields.perioddata.item.fields.mawsetting.arms.shutoffrecord]
 type = "record"

autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-maw.yaml

@@ -472,17 +472,29 @@ blocks:
                     of a numeric value. The program will terminate with an error if WELL_HEAD is less
                     than the bottom of the well.
                   time_series: true
-                head_limit:
-                  type: string
-                  longname: head limit
-                  description: is the limiting water level (head) in the well, which is the minimum of
-                    the well RATE or the well inflow rate from the aquifer. HEAD_LIMIT can be applied
-                    to extraction wells (RATE $<$ 0) or injection wells (RATE $>$ 0). HEAD_LIMIT can be
-                    deactivated by specifying the text string `OFF'. The HEAD_LIMIT option is based on
-                    the HEAD_LIMIT functionality available in the MNW2~citep{konikow2009} package for
-                    MODFLOW-2005. The HEAD_LIMIT option has been included to facilitate backward compatibility
-                    with previous versions of MODFLOW but use of the RATE_SCALING option instead of the
-                    HEAD_LIMIT option is recommended. By default, HEAD_LIMIT is `OFF'.
+                head_limitrecord:
+                  type: record
+                  fields:
+                    head_limit:
+                      type: keyword
+                    head_limit_value:
+                      type: union
+                      longname: head limit
+                      description: is the limiting water level (head) in the well, which is the minimum
+                        of the well RATE or the well inflow rate from the aquifer. HEAD_LIMIT can be applied
+                        to extraction wells (RATE $<$ 0) or injection wells (RATE $>$ 0). HEAD_LIMIT can
+                        be deactivated by specifying the text string `OFF'. The HEAD_LIMIT option is based
+                        on the HEAD_LIMIT functionality available in the MNW2~citep{konikow2009} package
+                        for MODFLOW-2005. The HEAD_LIMIT option has been included to facilitate backward
+                        compatibility with previous versions of MODFLOW but use of the RATE_SCALING option
+                        instead of the HEAD_LIMIT option is recommended. By default, HEAD_LIMIT is `OFF'.
+                      tagged: false
+                      arms:
+                        'off':
+                          type: keyword
+                        value:
+                          type: double
+                          tagged: false
                 shutoffrecord:
                   type: record
                   fields:

autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-uzf.json

@@ -347,49 +347,49 @@
                 "fk": "packagedata.ifno"
               },
               "finf": {
-                "type": "string",
+                "type": "double",
                 "longname": "infiltration rate",
                 "description": "real or character value that defines the applied infiltration rate of the UZF cell ($LT^{-1}$). If the Options block includes a TIMESERIESFILE entry (see the 'Time-Variable Input' section), values can be obtained from a time series by entering the time-series name in place of a numeric value.",
                 "tagged": false,
                 "time_series": true
               },
               "pet": {
-                "type": "string",
+                "type": "double",
                 "longname": "potential ET rate",
                 "description": "real or character value that defines the potential evapotranspiration rate of the UZF cell and specified GWF cell. Evapotranspiration is first removed from the unsaturated zone and any remaining potential evapotranspiration is applied to the saturated zone. If IVERTCON is greater than zero then residual potential evapotranspiration not satisfied in the UZF cell is applied to the underlying UZF and GWF cells. PET is always specified, but is only used if SIMULATE_ET is specified in the OPTIONS block. If the Options block includes a TIMESERIESFILE entry (see the 'Time-Variable Input' section), values can be obtained from a time series by entering the time-series name in place of a numeric value.",
                 "tagged": false,
                 "time_series": true
               },
               "extdp": {
-                "type": "string",
+                "type": "double",
                 "longname": "extinction depth",
                 "description": "real or character value that defines the evapotranspiration extinction depth of the UZF cell. If IVERTCON is greater than zero and EXTDP extends below the GWF cell bottom then remaining potential evapotranspiration is applied to the underlying UZF and GWF cells. EXTDP is always specified, but is only used if SIMULATE_ET is specified in the OPTIONS block. If the Options block includes a TIMESERIESFILE entry (see the 'Time-Variable Input' section), values can be obtained from a time series by entering the time-series name in place of a numeric value.",
                 "tagged": false,
                 "time_series": true
               },
               "extwc": {
-                "type": "string",
+                "type": "double",
                 "longname": "extinction water content",
                 "description": "real or character value that defines the evapotranspiration extinction water content of the UZF cell. EXTWC is always specified, but is only used if SIMULATE_ET and UNSAT_ETWC are specified in the OPTIONS block. The evapotranspiration rate from the unsaturated zone will be set to zero when the calculated water content is at or less than this value.  The value for EXTWC cannot be less than the residual water content, and if it is specified as being less than the residual water content it is set to the residual water content. If the Options block includes a TIMESERIESFILE entry (see the 'Time-Variable Input' section), values can be obtained from a time series by entering the time-series name in place of a numeric value.",
                 "tagged": false,
                 "time_series": true
               },
               "ha": {
-                "type": "string",
+                "type": "double",
                 "longname": "air entry potential",
                 "description": "real or character value that defines the air entry potential (head) of the UZF cell. HA is always specified, but is only used if SIMULATE_ET and UNSAT_ETAE are specified in the OPTIONS block. If the Options block includes a TIMESERIESFILE entry (see the 'Time-Variable Input' section), values can be obtained from a time series by entering the time-series name in place of a numeric value.",
                 "tagged": false,
                 "time_series": true
               },
               "hroot": {
-                "type": "string",
+                "type": "double",
                 "longname": "root potential",
                 "description": "real or character value that defines the root potential (head) of the UZF cell. HROOT is always specified, but is only used if SIMULATE_ET and UNSAT_ETAE are specified in the OPTIONS block. If the Options block includes a TIMESERIESFILE entry (see the 'Time-Variable Input' section), values can be obtained from a time series by entering the time-series name in place of a numeric value.",
                 "tagged": false,
                 "time_series": true
               },
               "rootact": {
-                "type": "string",
+                "type": "double",
                 "longname": "root activity function",
                 "description": "real or character value that defines the root activity function of the UZF cell. ROOTACT is the length of roots in a given volume of soil divided by that volume. Values range from 0 to about 3 $cm^{-2}$, depending on the plant community and its stage of development. ROOTACT is always specified, but is only used if SIMULATE_ET and UNSAT_ETAE are specified in the OPTIONS block. If the Options block includes a TIMESERIESFILE entry (see the 'Time-Variable Input' section), values can be obtained from a time series by entering the time-series name in place of a numeric value.",
                 "tagged": false,