diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-lak.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-lak.json index 02298f03..3c1f6fc1 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-lak.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-lak.json @@ -332,7 +332,6 @@ "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, "arms": { "none": { "type": "keyword" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-lak.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-lak.toml index d4d99003..bd12753f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-lak.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-lak.toml @@ -305,7 +305,6 @@ tagged = false 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" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-lak.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-lak.yaml index 5a4f54e9..5490df3a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-lak.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-lak.yaml @@ -349,7 +349,6 @@ blocks: 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 arms: none: type: keyword diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-maw.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-maw.json index 9d417800..df99a632 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-maw.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-maw.json @@ -425,7 +425,6 @@ "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" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-maw.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-maw.toml index aa45bf33..b0d5ddb9 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-maw.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-maw.toml @@ -387,7 +387,6 @@ type = "keyword" 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" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-maw.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-maw.yaml index df24b4ee..ab79c970 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-maw.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-maw.yaml @@ -488,7 +488,6 @@ blocks: 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 diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-obs.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-obs.json index 047e9617..78ce7e08 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-obs.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-obs.json @@ -48,7 +48,6 @@ "type": "union", "longname": "time", "description": "Text identifying cell where observation is located. For packages other than NPF, if boundary names are defined in the corresponding package input file, ID can be a boundary name. Otherwise ID is a cellid. If the model discretization is type DIS, cellid is three integers (layer, row, column). If the discretization is DISV, cellid is two integers (layer, cell number). If the discretization is DISU, cellid is one integer (node number).", - "tagged": false, "arms": { "cellid": { "type": "array", @@ -76,7 +75,6 @@ "longname": "time", "description": "Text identifying cell adjacent to cell identified by ID. The form of ID2 is as described for ID. ID2 is used for intercell-flow observations of a GWF model, for three observation types of the LAK Package, for two observation types of the MAW Package, and one observation type of the UZF Package.", "optional": true, - "tagged": false, "arms": { "cellid": { "type": "array", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-obs.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-obs.toml index 453f302c..8b1914ac 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-obs.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-obs.toml @@ -42,7 +42,6 @@ tagged = false type = "union" longname = "time" description = "Text identifying cell where observation is located. For packages other than NPF, if boundary names are defined in the corresponding package input file, ID can be a boundary name. Otherwise ID is a cellid. If the model discretization is type DIS, cellid is three integers (layer, row, column). If the discretization is DISV, cellid is two integers (layer, cell number). If the discretization is DISU, cellid is one integer (node number)." -tagged = false [blocks.continuous.fields.continuous.item.fields.id.arms.cellid] type = "array" @@ -68,7 +67,6 @@ type = "union" longname = "time" description = "Text identifying cell adjacent to cell identified by ID. The form of ID2 is as described for ID. ID2 is used for intercell-flow observations of a GWF model, for three observation types of the LAK Package, for two observation types of the MAW Package, and one observation type of the UZF Package." optional = true -tagged = false [blocks.continuous.fields.continuous.item.fields.id2.arms.cellid] type = "array" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-obs.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-obs.yaml index 7ce303f7..c79d1f37 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-obs.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-obs.yaml @@ -54,7 +54,6 @@ blocks: a boundary name. Otherwise ID is a cellid. If the model discretization is type DIS, cellid is three integers (layer, row, column). If the discretization is DISV, cellid is two integers (layer, cell number). If the discretization is DISU, cellid is one integer (node number). - tagged: false arms: cellid: type: array @@ -79,7 +78,6 @@ blocks: observation types of the LAK Package, for two observation types of the MAW Package, and one observation type of the UZF Package. optional: true - tagged: false arms: cellid: type: array diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-cdb.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-cdb.json index 077c031e..e4121b6a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-cdb.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-cdb.json @@ -294,7 +294,6 @@ "observations": { "cdb": { "type": "union", - "tagged": false, "arms": { "cellid": { "type": "array", @@ -314,7 +313,6 @@ }, "to-mvr": { "type": "union", - "tagged": false, "arms": { "cellid": { "type": "array", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-cdb.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-cdb.toml index 2a7491a7..46a6a561 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-cdb.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-cdb.toml @@ -269,7 +269,6 @@ shape = [ [observations.cdb] type = "union" -tagged = false [observations.cdb.arms.cellid] type = "array" @@ -287,7 +286,6 @@ tagged = false [observations.to-mvr] type = "union" -tagged = false [observations.to-mvr.arms.cellid] type = "array" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-cdb.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-cdb.yaml index 9cec2c66..2a9dac38 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-cdb.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-cdb.yaml @@ -269,7 +269,6 @@ memory: observations: cdb: type: union - tagged: false arms: cellid: type: array @@ -284,7 +283,6 @@ observations: tagged: false to-mvr: type: union - tagged: false arms: cellid: type: array diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-chd.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-chd.json index 22edf0a9..7343acf6 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-chd.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-chd.json @@ -303,7 +303,6 @@ "observations": { "chd": { "type": "union", - "tagged": false, "arms": { "cellid": { "type": "array", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-chd.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-chd.toml index 7f7d18fd..8b962107 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-chd.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-chd.toml @@ -276,7 +276,6 @@ shape = [ [observations.chd] type = "union" -tagged = false [observations.chd.arms.cellid] type = "array" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-chd.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-chd.yaml index e40940ae..fc945a79 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-chd.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-chd.yaml @@ -273,7 +273,6 @@ memory: observations: chd: type: union - tagged: false arms: cellid: type: array diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-evp.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-evp.json index 26dad44d..3d42f68a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-evp.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-evp.json @@ -313,7 +313,6 @@ "observations": { "evp": { "type": "union", - "tagged": false, "arms": { "cellid": { "type": "array", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-evp.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-evp.toml index 4f1ad9bd..38731d2c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-evp.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-evp.toml @@ -286,7 +286,6 @@ shape = [ [observations.evp] type = "union" -tagged = false [observations.evp.arms.cellid] type = "array" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-evp.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-evp.yaml index 95066243..6b725869 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-evp.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-evp.yaml @@ -283,7 +283,6 @@ memory: observations: evp: type: union - tagged: false arms: cellid: type: array diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-flw.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-flw.json index fb18dd23..1eef0ad9 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-flw.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-flw.json @@ -305,7 +305,6 @@ "observations": { "flw": { "type": "union", - "tagged": false, "arms": { "cellid": { "type": "array", @@ -325,7 +324,6 @@ }, "to-mvr": { "type": "union", - "tagged": false, "arms": { "cellid": { "type": "array", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-flw.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-flw.toml index 0042c8b3..f9f92fcf 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-flw.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-flw.toml @@ -278,7 +278,6 @@ shape = [ [observations.flw] type = "union" -tagged = false [observations.flw.arms.cellid] type = "array" @@ -296,7 +295,6 @@ tagged = false [observations.to-mvr] type = "union" -tagged = false [observations.to-mvr.arms.cellid] type = "array" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-flw.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-flw.yaml index b0324255..3d208516 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-flw.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-flw.yaml @@ -275,7 +275,6 @@ memory: observations: flw: type: union - tagged: false arms: cellid: type: array @@ -290,7 +289,6 @@ observations: tagged: false to-mvr: type: union - tagged: false arms: cellid: type: array diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-nam.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-nam.json index a4eded73..efb22e08 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-nam.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-nam.json @@ -181,7 +181,6 @@ }, "flow-ja-face": { "type": "record", - "tagged": false, "fields": { "cellid": { "type": "array", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-nam.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-nam.toml index c63cdaaf..73f5736a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-nam.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-nam.toml @@ -162,7 +162,6 @@ shape = [ [observations.flow-ja-face] type = "record" -tagged = false [observations.flow-ja-face.fields.cellid] type = "array" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-nam.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-nam.yaml index 511e9c0e..0b21608c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-nam.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-nam.yaml @@ -172,7 +172,6 @@ observations: - ncelldim flow-ja-face: type: record - tagged: false fields: cellid: type: array diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-pcp.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-pcp.json index 81b98301..9d7fc117 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-pcp.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-pcp.json @@ -313,7 +313,6 @@ "observations": { "pcp": { "type": "union", - "tagged": false, "arms": { "cellid": { "type": "array", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-pcp.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-pcp.toml index dec31f68..c21bb5b5 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-pcp.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-pcp.toml @@ -286,7 +286,6 @@ shape = [ [observations.pcp] type = "union" -tagged = false [observations.pcp.arms.cellid] type = "array" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-pcp.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-pcp.yaml index de2e2783..e8a9aa1e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-pcp.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-pcp.yaml @@ -283,7 +283,6 @@ memory: observations: pcp: type: union - tagged: false arms: cellid: type: array diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-zdg.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-zdg.json index 24ac554e..d1ea6a50 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-zdg.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-zdg.json @@ -331,7 +331,6 @@ "observations": { "zdg": { "type": "union", - "tagged": false, "arms": { "cellid": { "type": "array", @@ -351,7 +350,6 @@ }, "to-mvr": { "type": "union", - "tagged": false, "arms": { "cellid": { "type": "array", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-zdg.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-zdg.toml index 4da328d1..761782fc 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-zdg.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-zdg.toml @@ -304,7 +304,6 @@ shape = [ [observations.zdg] type = "union" -tagged = false [observations.zdg.arms.cellid] type = "array" @@ -322,7 +321,6 @@ tagged = false [observations.to-mvr] type = "union" -tagged = false [observations.to-mvr.arms.cellid] type = "array" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-zdg.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-zdg.yaml index 63b8020e..2a3d6fce 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-zdg.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-zdg.yaml @@ -310,7 +310,6 @@ memory: observations: zdg: type: union - tagged: false arms: cellid: type: array @@ -325,7 +324,6 @@ observations: tagged: false to-mvr: type: union - tagged: false arms: cellid: type: array 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 113129d5..b67f54e8 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwegwe.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwegwe.json @@ -340,7 +340,6 @@ "observations": { "flow-ja-face": { "type": "union", - "tagged": false, "arms": { "iexg": { "type": "integer", 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 41dff304..34d50342 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwegwe.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwegwe.toml @@ -315,7 +315,6 @@ shape = [ [observations.flow-ja-face] type = "union" -tagged = false [observations.flow-ja-face.arms.iexg] 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 c033de5c..6a1535d6 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwegwe.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwegwe.yaml @@ -316,7 +316,6 @@ memory: observations: flow-ja-face: type: union - tagged: false arms: iexg: type: integer 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 fcc65af2..6048c779 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwfgwf.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwfgwf.json @@ -368,7 +368,6 @@ "observations": { "flow-ja-face": { "type": "union", - "tagged": false, "arms": { "iexg": { "type": "integer", 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 d5486a67..751d6830 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwfgwf.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwfgwf.toml @@ -339,7 +339,6 @@ shape = [ [observations.flow-ja-face] type = "union" -tagged = false [observations.flow-ja-face.arms.iexg] 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 ab5e22c0..6bd80482 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwfgwf.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwfgwf.yaml @@ -362,7 +362,6 @@ memory: observations: flow-ja-face: type: union - tagged: false arms: iexg: type: integer 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 c4e7ac3b..c9f4687f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwtgwt.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwtgwt.json @@ -340,7 +340,6 @@ "observations": { "flow-ja-face": { "type": "union", - "tagged": false, "arms": { "iexg": { "type": "integer", 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 202b9197..4e6a469b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwtgwt.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwtgwt.toml @@ -315,7 +315,6 @@ shape = [ [observations.flow-ja-face] type = "union" -tagged = false [observations.flow-ja-face.arms.iexg] 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 249a2991..7eab601e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwtgwt.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwtgwt.yaml @@ -314,7 +314,6 @@ memory: observations: flow-ja-face: type: union - tagged: false arms: iexg: type: integer diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ctp.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ctp.json index 3b7ee4f5..af247c5f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ctp.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ctp.json @@ -318,7 +318,6 @@ "observations": { "ctp": { "type": "union", - "tagged": false, "arms": { "cellid": { "type": "array", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ctp.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ctp.toml index cc1b5d0d..a37382e3 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ctp.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ctp.toml @@ -291,7 +291,6 @@ shape = [ [observations.ctp] type = "union" -tagged = false [observations.ctp.arms.cellid] type = "array" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ctp.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ctp.yaml index 22ee770c..c2775660 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ctp.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ctp.yaml @@ -285,7 +285,6 @@ memory: observations: ctp: type: union - tagged: false arms: cellid: type: array diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-esl.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-esl.json index b8d27ade..f0bab797 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-esl.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-esl.json @@ -315,7 +315,6 @@ "observations": { "esl": { "type": "union", - "tagged": false, "arms": { "cellid": { "type": "array", @@ -335,7 +334,6 @@ }, "to-mvr": { "type": "union", - "tagged": false, "arms": { "cellid": { "type": "array", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-esl.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-esl.toml index 7d43abb6..636abb16 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-esl.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-esl.toml @@ -288,7 +288,6 @@ shape = [ [observations.esl] type = "union" -tagged = false [observations.esl.arms.cellid] type = "array" @@ -306,7 +305,6 @@ tagged = false [observations.to-mvr] type = "union" -tagged = false [observations.to-mvr.arms.cellid] type = "array" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-esl.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-esl.yaml index 64d2550e..eee13f38 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-esl.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-esl.yaml @@ -284,7 +284,6 @@ memory: observations: esl: type: union - tagged: false arms: cellid: type: array @@ -299,7 +298,6 @@ observations: tagged: false to-mvr: type: union - tagged: false arms: cellid: type: array diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-lke.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-lke.json index 8ba7f4f7..51a83616 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-lke.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-lke.json @@ -442,7 +442,6 @@ "observations": { "temperature": { "type": "union", - "tagged": false, "arms": { "lakeno": { "type": "integer", @@ -458,7 +457,6 @@ }, "storage": { "type": "union", - "tagged": false, "arms": { "lakeno": { "type": "integer", @@ -474,7 +472,6 @@ }, "constant": { "type": "union", - "tagged": false, "arms": { "lakeno": { "type": "integer", @@ -490,7 +487,6 @@ }, "from-mvr": { "type": "union", - "tagged": false, "arms": { "lakeno": { "type": "integer", @@ -506,7 +502,6 @@ }, "lke": { "type": "union", - "tagged": false, "arms": { "lakeno": { "type": "integer", @@ -522,7 +517,6 @@ }, "rainfall": { "type": "union", - "tagged": false, "arms": { "lakeno": { "type": "integer", @@ -538,7 +532,6 @@ }, "evaporation": { "type": "union", - "tagged": false, "arms": { "lakeno": { "type": "integer", @@ -554,7 +547,6 @@ }, "runoff": { "type": "union", - "tagged": false, "arms": { "lakeno": { "type": "integer", @@ -570,7 +562,6 @@ }, "ext-inflow": { "type": "union", - "tagged": false, "arms": { "lakeno": { "type": "integer", @@ -586,7 +577,6 @@ }, "withdrawal": { "type": "union", - "tagged": false, "arms": { "lakeno": { "type": "integer", @@ -602,7 +592,6 @@ }, "ext-outflow": { "type": "union", - "tagged": false, "arms": { "lakeno": { "type": "integer", @@ -618,11 +607,9 @@ }, "flow-ja-face": { "type": "union", - "tagged": false, "arms": { "lakeno_lakeno2": { "type": "record", - "tagged": false, "fields": { "lakeno": { "type": "integer", @@ -646,7 +633,6 @@ }, "to-mvr": { "type": "union", - "tagged": false, "arms": { "outletno": { "type": "integer", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-lke.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-lke.toml index 60719324..7f8a9e43 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-lke.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-lke.toml @@ -403,7 +403,6 @@ shape = [ [observations.temperature] type = "union" -tagged = false [observations.temperature.arms.lakeno] type = "integer" @@ -417,7 +416,6 @@ tagged = false [observations.storage] type = "union" -tagged = false [observations.storage.arms.lakeno] type = "integer" @@ -431,7 +429,6 @@ tagged = false [observations.constant] type = "union" -tagged = false [observations.constant.arms.lakeno] type = "integer" @@ -445,7 +442,6 @@ tagged = false [observations.from-mvr] type = "union" -tagged = false [observations.from-mvr.arms.lakeno] type = "integer" @@ -459,7 +455,6 @@ tagged = false [observations.lke] type = "union" -tagged = false [observations.lke.arms.lakeno] type = "integer" @@ -473,7 +468,6 @@ tagged = false [observations.rainfall] type = "union" -tagged = false [observations.rainfall.arms.lakeno] type = "integer" @@ -487,7 +481,6 @@ tagged = false [observations.evaporation] type = "union" -tagged = false [observations.evaporation.arms.lakeno] type = "integer" @@ -501,7 +494,6 @@ tagged = false [observations.runoff] type = "union" -tagged = false [observations.runoff.arms.lakeno] type = "integer" @@ -515,7 +507,6 @@ tagged = false [observations.ext-inflow] type = "union" -tagged = false [observations.ext-inflow.arms.lakeno] type = "integer" @@ -529,7 +520,6 @@ tagged = false [observations.withdrawal] type = "union" -tagged = false [observations.withdrawal.arms.lakeno] type = "integer" @@ -543,7 +533,6 @@ tagged = false [observations.ext-outflow] type = "union" -tagged = false [observations.ext-outflow.arms.lakeno] type = "integer" @@ -557,11 +546,9 @@ tagged = false [observations.flow-ja-face] type = "union" -tagged = false [observations.flow-ja-face.arms.lakeno_lakeno2] type = "record" -tagged = false [observations.flow-ja-face.arms.lakeno_lakeno2.fields.lakeno] type = "integer" @@ -581,7 +568,6 @@ tagged = false [observations.to-mvr] type = "union" -tagged = false [observations.to-mvr.arms.outletno] type = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-lke.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-lke.yaml index 87ec33a0..958e4ce1 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-lke.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-lke.yaml @@ -428,7 +428,6 @@ memory: observations: temperature: type: union - tagged: false arms: lakeno: type: integer @@ -440,7 +439,6 @@ observations: tagged: false storage: type: union - tagged: false arms: lakeno: type: integer @@ -452,7 +450,6 @@ observations: tagged: false constant: type: union - tagged: false arms: lakeno: type: integer @@ -464,7 +461,6 @@ observations: tagged: false from-mvr: type: union - tagged: false arms: lakeno: type: integer @@ -476,7 +472,6 @@ observations: tagged: false lke: type: union - tagged: false arms: lakeno: type: integer @@ -488,7 +483,6 @@ observations: tagged: false rainfall: type: union - tagged: false arms: lakeno: type: integer @@ -500,7 +494,6 @@ observations: tagged: false evaporation: type: union - tagged: false arms: lakeno: type: integer @@ -512,7 +505,6 @@ observations: tagged: false runoff: type: union - tagged: false arms: lakeno: type: integer @@ -524,7 +516,6 @@ observations: tagged: false ext-inflow: type: union - tagged: false arms: lakeno: type: integer @@ -536,7 +527,6 @@ observations: tagged: false withdrawal: type: union - tagged: false arms: lakeno: type: integer @@ -548,7 +538,6 @@ observations: tagged: false ext-outflow: type: union - tagged: false arms: lakeno: type: integer @@ -560,11 +549,9 @@ observations: tagged: false flow-ja-face: type: union - tagged: false arms: lakeno_lakeno2: type: record - tagged: false fields: lakeno: type: integer @@ -581,7 +568,6 @@ observations: tagged: false to-mvr: type: union - tagged: false arms: outletno: type: integer diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-mwe.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-mwe.json index fd94b6cc..7e43021f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-mwe.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-mwe.json @@ -397,7 +397,6 @@ "observations": { "temperature": { "type": "union", - "tagged": false, "arms": { "mawno": { "type": "integer", @@ -413,7 +412,6 @@ }, "storage": { "type": "union", - "tagged": false, "arms": { "mawno": { "type": "integer", @@ -429,7 +427,6 @@ }, "constant": { "type": "union", - "tagged": false, "arms": { "mawno": { "type": "integer", @@ -445,7 +442,6 @@ }, "from-mvr": { "type": "union", - "tagged": false, "arms": { "mawno": { "type": "integer", @@ -461,7 +457,6 @@ }, "rate": { "type": "union", - "tagged": false, "arms": { "mawno": { "type": "integer", @@ -477,7 +472,6 @@ }, "fw-rate": { "type": "union", - "tagged": false, "arms": { "mawno": { "type": "integer", @@ -493,7 +487,6 @@ }, "rate-to-mvr": { "type": "union", - "tagged": false, "arms": { "mawno": { "type": "integer", @@ -509,7 +502,6 @@ }, "fw-rate-to-mvr": { "type": "union", - "tagged": false, "arms": { "mawno": { "type": "integer", @@ -525,11 +517,9 @@ }, "mwe": { "type": "union", - "tagged": false, "arms": { "mawno_iconn": { "type": "record", - "tagged": false, "fields": { "mawno": { "type": "integer", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-mwe.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-mwe.toml index 362265fc..2340f680 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-mwe.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-mwe.toml @@ -358,7 +358,6 @@ shape = [ [observations.temperature] type = "union" -tagged = false [observations.temperature.arms.mawno] type = "integer" @@ -372,7 +371,6 @@ tagged = false [observations.storage] type = "union" -tagged = false [observations.storage.arms.mawno] type = "integer" @@ -386,7 +384,6 @@ tagged = false [observations.constant] type = "union" -tagged = false [observations.constant.arms.mawno] type = "integer" @@ -400,7 +397,6 @@ tagged = false [observations.from-mvr] type = "union" -tagged = false [observations.from-mvr.arms.mawno] type = "integer" @@ -414,7 +410,6 @@ tagged = false [observations.rate] type = "union" -tagged = false [observations.rate.arms.mawno] type = "integer" @@ -428,7 +423,6 @@ tagged = false [observations.fw-rate] type = "union" -tagged = false [observations.fw-rate.arms.mawno] type = "integer" @@ -442,7 +436,6 @@ tagged = false [observations.rate-to-mvr] type = "union" -tagged = false [observations.rate-to-mvr.arms.mawno] type = "integer" @@ -456,7 +449,6 @@ tagged = false [observations.fw-rate-to-mvr] type = "union" -tagged = false [observations.fw-rate-to-mvr.arms.mawno] type = "integer" @@ -470,11 +462,9 @@ tagged = false [observations.mwe] type = "union" -tagged = false [observations.mwe.arms.mawno_iconn] type = "record" -tagged = false [observations.mwe.arms.mawno_iconn.fields.mawno] type = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-mwe.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-mwe.yaml index e4312a36..d88b111e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-mwe.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-mwe.yaml @@ -381,7 +381,6 @@ memory: observations: temperature: type: union - tagged: false arms: mawno: type: integer @@ -393,7 +392,6 @@ observations: tagged: false storage: type: union - tagged: false arms: mawno: type: integer @@ -405,7 +403,6 @@ observations: tagged: false constant: type: union - tagged: false arms: mawno: type: integer @@ -417,7 +414,6 @@ observations: tagged: false from-mvr: type: union - tagged: false arms: mawno: type: integer @@ -429,7 +425,6 @@ observations: tagged: false rate: type: union - tagged: false arms: mawno: type: integer @@ -441,7 +436,6 @@ observations: tagged: false fw-rate: type: union - tagged: false arms: mawno: type: integer @@ -453,7 +447,6 @@ observations: tagged: false rate-to-mvr: type: union - tagged: false arms: mawno: type: integer @@ -465,7 +458,6 @@ observations: tagged: false fw-rate-to-mvr: type: union - tagged: false arms: mawno: type: integer @@ -477,11 +469,9 @@ observations: tagged: false mwe: type: union - tagged: false arms: mawno_iconn: type: record - tagged: false fields: mawno: type: integer diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-nam.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-nam.json index 6034bc1b..08a678de 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-nam.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-nam.json @@ -240,7 +240,6 @@ }, "flow-ja-face": { "type": "record", - "tagged": false, "fields": { "cellid": { "type": "array", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-nam.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-nam.toml index 1cf2ff0d..cb4d2275 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-nam.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-nam.toml @@ -217,7 +217,6 @@ shape = [ [observations.flow-ja-face] type = "record" -tagged = false [observations.flow-ja-face.fields.cellid] type = "array" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-nam.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-nam.yaml index 0ed6b10a..de2bc375 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-nam.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-nam.yaml @@ -215,7 +215,6 @@ observations: - ncelldim flow-ja-face: type: record - tagged: false fields: cellid: type: array diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-sfe.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-sfe.json index 302c98fe..7b440bbf 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-sfe.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-sfe.json @@ -462,7 +462,6 @@ "observations": { "temperature": { "type": "union", - "tagged": false, "arms": { "rno": { "type": "integer", @@ -478,7 +477,6 @@ }, "storage": { "type": "union", - "tagged": false, "arms": { "rno": { "type": "integer", @@ -494,7 +492,6 @@ }, "constant": { "type": "union", - "tagged": false, "arms": { "rno": { "type": "integer", @@ -510,7 +507,6 @@ }, "from-mvr": { "type": "union", - "tagged": false, "arms": { "rno": { "type": "integer", @@ -526,7 +522,6 @@ }, "sfe": { "type": "union", - "tagged": false, "arms": { "rno": { "type": "integer", @@ -542,7 +537,6 @@ }, "strmbd-cond": { "type": "union", - "tagged": false, "arms": { "rno": { "type": "integer", @@ -558,7 +552,6 @@ }, "to-mvr": { "type": "union", - "tagged": false, "arms": { "rno": { "type": "integer", @@ -574,7 +567,6 @@ }, "rainfall": { "type": "union", - "tagged": false, "arms": { "rno": { "type": "integer", @@ -590,7 +582,6 @@ }, "evaporation": { "type": "union", - "tagged": false, "arms": { "rno": { "type": "integer", @@ -606,7 +597,6 @@ }, "runoff": { "type": "union", - "tagged": false, "arms": { "rno": { "type": "integer", @@ -622,7 +612,6 @@ }, "ext-inflow": { "type": "union", - "tagged": false, "arms": { "rno": { "type": "integer", @@ -638,7 +627,6 @@ }, "ext-outflow": { "type": "union", - "tagged": false, "arms": { "rno": { "type": "integer", @@ -654,11 +642,9 @@ }, "flow-ja-face": { "type": "union", - "tagged": false, "arms": { "rno_rno2": { "type": "record", - "tagged": false, "fields": { "rno": { "type": "integer", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-sfe.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-sfe.toml index 1d33ce13..3d06b9f0 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-sfe.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-sfe.toml @@ -423,7 +423,6 @@ shape = [ [observations.temperature] type = "union" -tagged = false [observations.temperature.arms.rno] type = "integer" @@ -437,7 +436,6 @@ tagged = false [observations.storage] type = "union" -tagged = false [observations.storage.arms.rno] type = "integer" @@ -451,7 +449,6 @@ tagged = false [observations.constant] type = "union" -tagged = false [observations.constant.arms.rno] type = "integer" @@ -465,7 +462,6 @@ tagged = false [observations.from-mvr] type = "union" -tagged = false [observations.from-mvr.arms.rno] type = "integer" @@ -479,7 +475,6 @@ tagged = false [observations.sfe] type = "union" -tagged = false [observations.sfe.arms.rno] type = "integer" @@ -493,7 +488,6 @@ tagged = false [observations.strmbd-cond] type = "union" -tagged = false [observations.strmbd-cond.arms.rno] type = "integer" @@ -507,7 +501,6 @@ tagged = false [observations.to-mvr] type = "union" -tagged = false [observations.to-mvr.arms.rno] type = "integer" @@ -521,7 +514,6 @@ tagged = false [observations.rainfall] type = "union" -tagged = false [observations.rainfall.arms.rno] type = "integer" @@ -535,7 +527,6 @@ tagged = false [observations.evaporation] type = "union" -tagged = false [observations.evaporation.arms.rno] type = "integer" @@ -549,7 +540,6 @@ tagged = false [observations.runoff] type = "union" -tagged = false [observations.runoff.arms.rno] type = "integer" @@ -563,7 +553,6 @@ tagged = false [observations.ext-inflow] type = "union" -tagged = false [observations.ext-inflow.arms.rno] type = "integer" @@ -577,7 +566,6 @@ tagged = false [observations.ext-outflow] type = "union" -tagged = false [observations.ext-outflow.arms.rno] type = "integer" @@ -591,11 +579,9 @@ tagged = false [observations.flow-ja-face] type = "union" -tagged = false [observations.flow-ja-face.arms.rno_rno2] type = "record" -tagged = false [observations.flow-ja-face.arms.rno_rno2.fields.rno] type = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-sfe.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-sfe.yaml index bd9c533d..4045a574 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-sfe.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-sfe.yaml @@ -444,7 +444,6 @@ memory: observations: temperature: type: union - tagged: false arms: rno: type: integer @@ -456,7 +455,6 @@ observations: tagged: false storage: type: union - tagged: false arms: rno: type: integer @@ -468,7 +466,6 @@ observations: tagged: false constant: type: union - tagged: false arms: rno: type: integer @@ -480,7 +477,6 @@ observations: tagged: false from-mvr: type: union - tagged: false arms: rno: type: integer @@ -492,7 +488,6 @@ observations: tagged: false sfe: type: union - tagged: false arms: rno: type: integer @@ -504,7 +499,6 @@ observations: tagged: false strmbd-cond: type: union - tagged: false arms: rno: type: integer @@ -516,7 +510,6 @@ observations: tagged: false to-mvr: type: union - tagged: false arms: rno: type: integer @@ -528,7 +521,6 @@ observations: tagged: false rainfall: type: union - tagged: false arms: rno: type: integer @@ -540,7 +532,6 @@ observations: tagged: false evaporation: type: union - tagged: false arms: rno: type: integer @@ -552,7 +543,6 @@ observations: tagged: false runoff: type: union - tagged: false arms: rno: type: integer @@ -564,7 +554,6 @@ observations: tagged: false ext-inflow: type: union - tagged: false arms: rno: type: integer @@ -576,7 +565,6 @@ observations: tagged: false ext-outflow: type: union - tagged: false arms: rno: type: integer @@ -588,11 +576,9 @@ observations: tagged: false flow-ja-face: type: union - tagged: false arms: rno_rno2: type: record - tagged: false fields: rno: type: integer diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-uze.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-uze.json index 8b0b8e3d..76d78117 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-uze.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-uze.json @@ -380,7 +380,6 @@ "observations": { "temperature": { "type": "union", - "tagged": false, "arms": { "uzfno": { "type": "integer", @@ -396,7 +395,6 @@ }, "storage": { "type": "union", - "tagged": false, "arms": { "uzfno": { "type": "integer", @@ -412,7 +410,6 @@ }, "constant": { "type": "union", - "tagged": false, "arms": { "uzfno": { "type": "integer", @@ -428,7 +425,6 @@ }, "from-mvr": { "type": "union", - "tagged": false, "arms": { "uzfno": { "type": "integer", @@ -444,7 +440,6 @@ }, "uze": { "type": "union", - "tagged": false, "arms": { "uzfno": { "type": "integer", @@ -460,7 +455,6 @@ }, "thermal-equil": { "type": "union", - "tagged": false, "arms": { "uzfno": { "type": "integer", @@ -476,7 +470,6 @@ }, "infiltration": { "type": "union", - "tagged": false, "arms": { "uzfno": { "type": "integer", @@ -492,7 +485,6 @@ }, "rej-inf": { "type": "union", - "tagged": false, "arms": { "uzfno": { "type": "integer", @@ -508,7 +500,6 @@ }, "uzet": { "type": "union", - "tagged": false, "arms": { "uzfno": { "type": "integer", @@ -524,7 +515,6 @@ }, "rej-inf-to-mvr": { "type": "union", - "tagged": false, "arms": { "uzfno": { "type": "integer", @@ -540,11 +530,9 @@ }, "flow-ja-face": { "type": "union", - "tagged": false, "arms": { "uzfno_uzfno2": { "type": "record", - "tagged": false, "fields": { "uzfno": { "type": "integer", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-uze.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-uze.toml index f647fab2..975b4d40 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-uze.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-uze.toml @@ -341,7 +341,6 @@ shape = [ [observations.temperature] type = "union" -tagged = false [observations.temperature.arms.uzfno] type = "integer" @@ -355,7 +354,6 @@ tagged = false [observations.storage] type = "union" -tagged = false [observations.storage.arms.uzfno] type = "integer" @@ -369,7 +367,6 @@ tagged = false [observations.constant] type = "union" -tagged = false [observations.constant.arms.uzfno] type = "integer" @@ -383,7 +380,6 @@ tagged = false [observations.from-mvr] type = "union" -tagged = false [observations.from-mvr.arms.uzfno] type = "integer" @@ -397,7 +393,6 @@ tagged = false [observations.uze] type = "union" -tagged = false [observations.uze.arms.uzfno] type = "integer" @@ -411,7 +406,6 @@ tagged = false [observations.thermal-equil] type = "union" -tagged = false [observations.thermal-equil.arms.uzfno] type = "integer" @@ -425,7 +419,6 @@ tagged = false [observations.infiltration] type = "union" -tagged = false [observations.infiltration.arms.uzfno] type = "integer" @@ -439,7 +432,6 @@ tagged = false [observations.rej-inf] type = "union" -tagged = false [observations.rej-inf.arms.uzfno] type = "integer" @@ -453,7 +445,6 @@ tagged = false [observations.uzet] type = "union" -tagged = false [observations.uzet.arms.uzfno] type = "integer" @@ -467,7 +458,6 @@ tagged = false [observations.rej-inf-to-mvr] type = "union" -tagged = false [observations.rej-inf-to-mvr.arms.uzfno] type = "integer" @@ -481,11 +471,9 @@ tagged = false [observations.flow-ja-face] type = "union" -tagged = false [observations.flow-ja-face.arms.uzfno_uzfno2] type = "record" -tagged = false [observations.flow-ja-face.arms.uzfno_uzfno2.fields.uzfno] type = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-uze.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-uze.yaml index a3a9da8d..b5d0f857 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-uze.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-uze.yaml @@ -370,7 +370,6 @@ memory: observations: temperature: type: union - tagged: false arms: uzfno: type: integer @@ -382,7 +381,6 @@ observations: tagged: false storage: type: union - tagged: false arms: uzfno: type: integer @@ -394,7 +392,6 @@ observations: tagged: false constant: type: union - tagged: false arms: uzfno: type: integer @@ -406,7 +403,6 @@ observations: tagged: false from-mvr: type: union - tagged: false arms: uzfno: type: integer @@ -418,7 +414,6 @@ observations: tagged: false uze: type: union - tagged: false arms: uzfno: type: integer @@ -430,7 +425,6 @@ observations: tagged: false thermal-equil: type: union - tagged: false arms: uzfno: type: integer @@ -442,7 +436,6 @@ observations: tagged: false infiltration: type: union - tagged: false arms: uzfno: type: integer @@ -454,7 +447,6 @@ observations: tagged: false rej-inf: type: union - tagged: false arms: uzfno: type: integer @@ -466,7 +458,6 @@ observations: tagged: false uzet: type: union - tagged: false arms: uzfno: type: integer @@ -478,7 +469,6 @@ observations: tagged: false rej-inf-to-mvr: type: union - tagged: false arms: uzfno: type: integer @@ -490,11 +480,9 @@ observations: tagged: false flow-ja-face: type: union - tagged: false arms: uzfno_uzfno2: type: record - tagged: false fields: uzfno: type: integer diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-api.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-api.json index ad449532..383403b2 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-api.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-api.json @@ -97,7 +97,6 @@ "observations": { "api": { "type": "union", - "tagged": false, "arms": { "cellid": { "type": "array", @@ -117,7 +116,6 @@ }, "to-mvr": { "type": "union", - "tagged": false, "arms": { "cellid": { "type": "array", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-api.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-api.toml index 5e0ea8a7..ccc77eff 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-api.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-api.toml @@ -80,7 +80,6 @@ type = "integer" [observations.api] type = "union" -tagged = false [observations.api.arms.cellid] type = "array" @@ -98,7 +97,6 @@ tagged = false [observations.to-mvr] type = "union" -tagged = false [observations.to-mvr.arms.cellid] type = "array" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-api.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-api.yaml index b92d7ed8..be9c47ea 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-api.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-api.yaml @@ -85,7 +85,6 @@ memory: observations: api: type: union - tagged: false arms: cellid: type: array @@ -100,7 +99,6 @@ observations: tagged: false to-mvr: type: union - tagged: false arms: cellid: type: array 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 172b6e3e..4ca7f09c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chd.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chd.json @@ -325,7 +325,6 @@ "observations": { "chd": { "type": "union", - "tagged": false, "arms": { "cellid": { "type": "array", 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 fc394ed4..252860a0 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chd.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chd.toml @@ -298,7 +298,6 @@ shape = [ [observations.chd] type = "union" -tagged = false [observations.chd.arms.cellid] type = "array" 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 2135c0e1..7ee9b245 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chd.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chd.yaml @@ -291,7 +291,6 @@ memory: observations: chd: type: union - tagged: false arms: cellid: type: array 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 41d95a64..708a09e6 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chdg.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chdg.json @@ -310,7 +310,6 @@ "observations": { "chd": { "type": "union", - "tagged": false, "arms": { "cellid": { "type": "array", 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 17829504..ec14d787 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chdg.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chdg.toml @@ -285,7 +285,6 @@ shape = [ [observations.chd] type = "union" -tagged = false [observations.chd.arms.cellid] type = "array" 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 df31f22c..90b6626f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chdg.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chdg.yaml @@ -275,7 +275,6 @@ memory: observations: chd: type: union - tagged: false arms: cellid: type: array 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 5b3dcaba..c67d29e6 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-csub.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-csub.json @@ -707,7 +707,6 @@ "observations": { "csub": { "type": "union", - "tagged": false, "arms": { "icsubno": { "type": "integer", @@ -723,7 +722,6 @@ }, "inelastic-csub": { "type": "union", - "tagged": false, "arms": { "icsubno": { "type": "integer", @@ -739,7 +737,6 @@ }, "elastic-csub": { "type": "union", - "tagged": false, "arms": { "icsubno": { "type": "integer", @@ -755,7 +752,6 @@ }, "delay-flowtop": { "type": "union", - "tagged": false, "arms": { "icsubno": { "type": "integer", @@ -771,7 +767,6 @@ }, "delay-flowbot": { "type": "union", - "tagged": false, "arms": { "icsubno": { "type": "integer", @@ -835,7 +830,6 @@ }, "delay-head": { "type": "record", - "tagged": false, "fields": { "icsubno": { "type": "integer", @@ -852,7 +846,6 @@ }, "delay-gstress": { "type": "record", - "tagged": false, "fields": { "icsubno": { "type": "integer", @@ -869,7 +862,6 @@ }, "delay-estress": { "type": "record", - "tagged": false, "fields": { "icsubno": { "type": "integer", @@ -886,7 +878,6 @@ }, "delay-preconstress": { "type": "record", - "tagged": false, "fields": { "icsubno": { "type": "integer", @@ -903,7 +894,6 @@ }, "delay-compaction": { "type": "record", - "tagged": false, "fields": { "icsubno": { "type": "integer", @@ -920,7 +910,6 @@ }, "delay-thickness": { "type": "record", - "tagged": false, "fields": { "icsubno": { "type": "integer", @@ -937,7 +926,6 @@ }, "delay-theta": { "type": "record", - "tagged": false, "fields": { "icsubno": { "type": "integer", 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 1ddd1b21..ddcac1bf 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-csub.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-csub.toml @@ -652,7 +652,6 @@ shape = [ [observations.csub] type = "union" -tagged = false [observations.csub.arms.icsubno] type = "integer" @@ -666,7 +665,6 @@ tagged = false [observations.inelastic-csub] type = "union" -tagged = false [observations.inelastic-csub.arms.icsubno] type = "integer" @@ -680,7 +678,6 @@ tagged = false [observations.elastic-csub] type = "union" -tagged = false [observations.elastic-csub.arms.icsubno] type = "integer" @@ -694,7 +691,6 @@ tagged = false [observations.delay-flowtop] type = "union" -tagged = false [observations.delay-flowtop.arms.icsubno] type = "integer" @@ -708,7 +704,6 @@ tagged = false [observations.delay-flowbot] type = "union" -tagged = false [observations.delay-flowbot.arms.icsubno] type = "integer" @@ -770,7 +765,6 @@ fk = "packagedata.icsubno" [observations.delay-head] type = "record" -tagged = false [observations.delay-head.fields.icsubno] type = "integer" @@ -785,7 +779,6 @@ index = true [observations.delay-gstress] type = "record" -tagged = false [observations.delay-gstress.fields.icsubno] type = "integer" @@ -800,7 +793,6 @@ index = true [observations.delay-estress] type = "record" -tagged = false [observations.delay-estress.fields.icsubno] type = "integer" @@ -815,7 +807,6 @@ index = true [observations.delay-preconstress] type = "record" -tagged = false [observations.delay-preconstress.fields.icsubno] type = "integer" @@ -830,7 +821,6 @@ index = true [observations.delay-compaction] type = "record" -tagged = false [observations.delay-compaction.fields.icsubno] type = "integer" @@ -845,7 +835,6 @@ index = true [observations.delay-thickness] type = "record" -tagged = false [observations.delay-thickness.fields.icsubno] type = "integer" @@ -860,7 +849,6 @@ index = true [observations.delay-theta] type = "record" -tagged = false [observations.delay-theta.fields.icsubno] type = "integer" 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 ba8b2592..cb45317a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-csub.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-csub.yaml @@ -664,7 +664,6 @@ memory: observations: csub: type: union - tagged: false arms: icsubno: type: integer @@ -676,7 +675,6 @@ observations: tagged: false inelastic-csub: type: union - tagged: false arms: icsubno: type: integer @@ -688,7 +686,6 @@ observations: tagged: false elastic-csub: type: union - tagged: false arms: icsubno: type: integer @@ -700,7 +697,6 @@ observations: tagged: false delay-flowtop: type: union - tagged: false arms: icsubno: type: integer @@ -712,7 +708,6 @@ observations: tagged: false delay-flowbot: type: union - tagged: false arms: icsubno: type: integer @@ -764,7 +759,6 @@ observations: fk: packagedata.icsubno delay-head: type: record - tagged: false fields: icsubno: type: integer @@ -777,7 +771,6 @@ observations: index: true delay-gstress: type: record - tagged: false fields: icsubno: type: integer @@ -790,7 +783,6 @@ observations: index: true delay-estress: type: record - tagged: false fields: icsubno: type: integer @@ -803,7 +795,6 @@ observations: index: true delay-preconstress: type: record - tagged: false fields: icsubno: type: integer @@ -816,7 +807,6 @@ observations: index: true delay-compaction: type: record - tagged: false fields: icsubno: type: integer @@ -829,7 +819,6 @@ observations: index: true delay-thickness: type: record - tagged: false fields: icsubno: type: integer @@ -842,7 +831,6 @@ observations: index: true delay-theta: type: record - tagged: false fields: icsubno: type: integer 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 5b83ae78..1e96aab5 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drn.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drn.json @@ -345,7 +345,6 @@ "observations": { "drn": { "type": "union", - "tagged": false, "arms": { "cellid": { "type": "array", @@ -365,7 +364,6 @@ }, "to-mvr": { "type": "union", - "tagged": false, "arms": { "cellid": { "type": "array", 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 be41728a..c863ae22 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drn.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drn.toml @@ -318,7 +318,6 @@ shape = [ [observations.drn] type = "union" -tagged = false [observations.drn.arms.cellid] type = "array" @@ -336,7 +335,6 @@ tagged = false [observations.to-mvr] type = "union" -tagged = false [observations.to-mvr.arms.cellid] type = "array" 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 b78a0feb..4ed8decf 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drn.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drn.yaml @@ -320,7 +320,6 @@ memory: observations: drn: type: union - tagged: false arms: cellid: type: array @@ -335,7 +334,6 @@ observations: tagged: false to-mvr: type: union - tagged: false arms: cellid: type: array 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 05e28e3b..f7260b23 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drng.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drng.json @@ -335,7 +335,6 @@ "observations": { "drn": { "type": "union", - "tagged": false, "arms": { "cellid": { "type": "array", @@ -355,7 +354,6 @@ }, "to-mvr": { "type": "union", - "tagged": false, "arms": { "cellid": { "type": "array", 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 60bf538b..dbccc35a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drng.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drng.toml @@ -310,7 +310,6 @@ shape = [ [observations.drn] type = "union" -tagged = false [observations.drn.arms.cellid] type = "array" @@ -328,7 +327,6 @@ tagged = false [observations.to-mvr] type = "union" -tagged = false [observations.to-mvr.arms.cellid] type = "array" 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 37de8844..166b1987 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drng.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drng.yaml @@ -306,7 +306,6 @@ memory: observations: drn: type: union - tagged: false arms: cellid: type: array @@ -321,7 +320,6 @@ observations: tagged: false to-mvr: type: union - tagged: false arms: cellid: type: array diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evt.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evt.json index 629d1863..c9b0d69f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evt.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evt.json @@ -389,7 +389,6 @@ "observations": { "evt": { "type": "union", - "tagged": false, "arms": { "cellid": { "type": "array", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evt.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evt.toml index bf53bc5f..6013462f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evt.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evt.toml @@ -362,7 +362,6 @@ shape = [ [observations.evt] type = "union" -tagged = false [observations.evt.arms.cellid] type = "array" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evt.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evt.yaml index 79ef25d0..667b516d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evt.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evt.yaml @@ -366,7 +366,6 @@ memory: observations: evt: type: union - tagged: false arms: cellid: type: array diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evta.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evta.json index 621deccc..e8ddf3c5 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evta.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evta.json @@ -347,7 +347,6 @@ "observations": { "evt": { "type": "union", - "tagged": false, "arms": { "cellid": { "type": "array", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evta.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evta.toml index 8612a299..a1bc2ade 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evta.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evta.toml @@ -324,7 +324,6 @@ shape = [ [observations.evt] type = "union" -tagged = false [observations.evt.arms.cellid] type = "array" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evta.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evta.yaml index 7e379552..712f3e71 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evta.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evta.yaml @@ -312,7 +312,6 @@ memory: observations: evt: type: union - tagged: false arms: cellid: type: array diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghb.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghb.json index 37c4da90..91d8afff 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghb.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghb.json @@ -327,7 +327,6 @@ "observations": { "ghb": { "type": "union", - "tagged": false, "arms": { "cellid": { "type": "array", @@ -347,7 +346,6 @@ }, "to-mvr": { "type": "union", - "tagged": false, "arms": { "cellid": { "type": "array", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghb.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghb.toml index b1560a65..7c7cc4cc 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghb.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghb.toml @@ -300,7 +300,6 @@ shape = [ [observations.ghb] type = "union" -tagged = false [observations.ghb.arms.cellid] type = "array" @@ -318,7 +317,6 @@ tagged = false [observations.to-mvr] type = "union" -tagged = false [observations.to-mvr.arms.cellid] type = "array" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghb.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghb.yaml index 16a8b076..eecda8e8 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghb.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghb.yaml @@ -298,7 +298,6 @@ memory: observations: ghb: type: union - tagged: false arms: cellid: type: array @@ -313,7 +312,6 @@ observations: tagged: false to-mvr: type: union - tagged: false arms: cellid: type: array 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 b2970dfc..0f9e6ba8 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghbg.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghbg.json @@ -317,7 +317,6 @@ "observations": { "ghb": { "type": "union", - "tagged": false, "arms": { "cellid": { "type": "array", @@ -337,7 +336,6 @@ }, "to-mvr": { "type": "union", - "tagged": false, "arms": { "cellid": { "type": "array", 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 26da016c..42f1d0f4 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghbg.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghbg.toml @@ -292,7 +292,6 @@ shape = [ [observations.ghb] type = "union" -tagged = false [observations.ghb.arms.cellid] type = "array" @@ -310,7 +309,6 @@ tagged = false [observations.to-mvr] type = "union" -tagged = false [observations.to-mvr.arms.cellid] type = "array" 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 aff275af..574cf0cb 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghbg.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghbg.yaml @@ -284,7 +284,6 @@ memory: observations: ghb: type: union - tagged: false arms: cellid: type: array @@ -299,7 +298,6 @@ observations: tagged: false to-mvr: type: union - tagged: false arms: cellid: type: array diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-lak.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-lak.json index 5cc9f149..f1aa0920 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-lak.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-lak.json @@ -332,7 +332,6 @@ "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, "arms": { "none": { "type": "keyword" @@ -793,7 +792,6 @@ "observations": { "stage": { "type": "union", - "tagged": false, "arms": { "ifno": { "type": "integer", @@ -809,7 +807,6 @@ }, "ext-inflow": { "type": "union", - "tagged": false, "arms": { "ifno": { "type": "integer", @@ -825,7 +822,6 @@ }, "outlet-inflow": { "type": "union", - "tagged": false, "arms": { "ifno": { "type": "integer", @@ -841,7 +837,6 @@ }, "inflow": { "type": "union", - "tagged": false, "arms": { "ifno": { "type": "integer", @@ -857,7 +852,6 @@ }, "from-mvr": { "type": "union", - "tagged": false, "arms": { "ifno": { "type": "integer", @@ -873,7 +867,6 @@ }, "rainfall": { "type": "union", - "tagged": false, "arms": { "ifno": { "type": "integer", @@ -889,7 +882,6 @@ }, "runoff": { "type": "union", - "tagged": false, "arms": { "ifno": { "type": "integer", @@ -905,7 +897,6 @@ }, "withdrawal": { "type": "union", - "tagged": false, "arms": { "ifno": { "type": "integer", @@ -921,7 +912,6 @@ }, "evaporation": { "type": "union", - "tagged": false, "arms": { "ifno": { "type": "integer", @@ -937,7 +927,6 @@ }, "storage": { "type": "union", - "tagged": false, "arms": { "ifno": { "type": "integer", @@ -953,7 +942,6 @@ }, "constant": { "type": "union", - "tagged": false, "arms": { "ifno": { "type": "integer", @@ -969,7 +957,6 @@ }, "volume": { "type": "union", - "tagged": false, "arms": { "ifno": { "type": "integer", @@ -985,7 +972,6 @@ }, "surface-area": { "type": "union", - "tagged": false, "arms": { "ifno": { "type": "integer", @@ -1001,11 +987,9 @@ }, "lak": { "type": "union", - "tagged": false, "arms": { "ifno_iconn": { "type": "record", - "tagged": false, "fields": { "ifno": { "type": "integer", @@ -1022,7 +1006,6 @@ }, "ifno_boundname": { "type": "record", - "tagged": false, "fields": { "ifno": { "type": "integer", @@ -1044,11 +1027,9 @@ }, "wetted-area": { "type": "union", - "tagged": false, "arms": { "ifno_iconn": { "type": "record", - "tagged": false, "fields": { "ifno": { "type": "integer", @@ -1065,7 +1046,6 @@ }, "ifno_boundname": { "type": "record", - "tagged": false, "fields": { "ifno": { "type": "integer", @@ -1087,11 +1067,9 @@ }, "conductance": { "type": "union", - "tagged": false, "arms": { "ifno_iconn": { "type": "record", - "tagged": false, "fields": { "ifno": { "type": "integer", @@ -1108,7 +1086,6 @@ }, "ifno_boundname": { "type": "record", - "tagged": false, "fields": { "ifno": { "type": "integer", @@ -1130,7 +1107,6 @@ }, "ext-outflow": { "type": "union", - "tagged": false, "arms": { "outletno": { "type": "integer", @@ -1146,7 +1122,6 @@ }, "to-mvr": { "type": "union", - "tagged": false, "arms": { "outletno": { "type": "integer", @@ -1162,7 +1137,6 @@ }, "outlet": { "type": "union", - "tagged": false, "arms": { "outletno": { "type": "integer", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-lak.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-lak.toml index 023621a9..a6065d3a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-lak.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-lak.toml @@ -305,7 +305,6 @@ tagged = false 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" @@ -706,7 +705,6 @@ type = "integer" [observations.stage] type = "union" -tagged = false [observations.stage.arms.ifno] type = "integer" @@ -720,7 +718,6 @@ tagged = false [observations.ext-inflow] type = "union" -tagged = false [observations.ext-inflow.arms.ifno] type = "integer" @@ -734,7 +731,6 @@ tagged = false [observations.outlet-inflow] type = "union" -tagged = false [observations.outlet-inflow.arms.ifno] type = "integer" @@ -748,7 +744,6 @@ tagged = false [observations.inflow] type = "union" -tagged = false [observations.inflow.arms.ifno] type = "integer" @@ -762,7 +757,6 @@ tagged = false [observations.from-mvr] type = "union" -tagged = false [observations.from-mvr.arms.ifno] type = "integer" @@ -776,7 +770,6 @@ tagged = false [observations.rainfall] type = "union" -tagged = false [observations.rainfall.arms.ifno] type = "integer" @@ -790,7 +783,6 @@ tagged = false [observations.runoff] type = "union" -tagged = false [observations.runoff.arms.ifno] type = "integer" @@ -804,7 +796,6 @@ tagged = false [observations.withdrawal] type = "union" -tagged = false [observations.withdrawal.arms.ifno] type = "integer" @@ -818,7 +809,6 @@ tagged = false [observations.evaporation] type = "union" -tagged = false [observations.evaporation.arms.ifno] type = "integer" @@ -832,7 +822,6 @@ tagged = false [observations.storage] type = "union" -tagged = false [observations.storage.arms.ifno] type = "integer" @@ -846,7 +835,6 @@ tagged = false [observations.constant] type = "union" -tagged = false [observations.constant.arms.ifno] type = "integer" @@ -860,7 +848,6 @@ tagged = false [observations.volume] type = "union" -tagged = false [observations.volume.arms.ifno] type = "integer" @@ -874,7 +861,6 @@ tagged = false [observations.surface-area] type = "union" -tagged = false [observations.surface-area.arms.ifno] type = "integer" @@ -888,11 +874,9 @@ tagged = false [observations.lak] type = "union" -tagged = false [observations.lak.arms.ifno_iconn] type = "record" -tagged = false [observations.lak.arms.ifno_iconn.fields.ifno] type = "integer" @@ -907,7 +891,6 @@ index = true [observations.lak.arms.ifno_boundname] type = "record" -tagged = false [observations.lak.arms.ifno_boundname.fields.ifno] type = "integer" @@ -925,11 +908,9 @@ tagged = false [observations.wetted-area] type = "union" -tagged = false [observations.wetted-area.arms.ifno_iconn] type = "record" -tagged = false [observations.wetted-area.arms.ifno_iconn.fields.ifno] type = "integer" @@ -944,7 +925,6 @@ index = true [observations.wetted-area.arms.ifno_boundname] type = "record" -tagged = false [observations.wetted-area.arms.ifno_boundname.fields.ifno] type = "integer" @@ -962,11 +942,9 @@ tagged = false [observations.conductance] type = "union" -tagged = false [observations.conductance.arms.ifno_iconn] type = "record" -tagged = false [observations.conductance.arms.ifno_iconn.fields.ifno] type = "integer" @@ -981,7 +959,6 @@ index = true [observations.conductance.arms.ifno_boundname] type = "record" -tagged = false [observations.conductance.arms.ifno_boundname.fields.ifno] type = "integer" @@ -999,7 +976,6 @@ tagged = false [observations.ext-outflow] type = "union" -tagged = false [observations.ext-outflow.arms.outletno] type = "integer" @@ -1013,7 +989,6 @@ tagged = false [observations.to-mvr] type = "union" -tagged = false [observations.to-mvr.arms.outletno] type = "integer" @@ -1027,7 +1002,6 @@ tagged = false [observations.outlet] type = "union" -tagged = false [observations.outlet.arms.outletno] type = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-lak.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-lak.yaml index 681d98a9..86f1523c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-lak.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-lak.yaml @@ -349,7 +349,6 @@ blocks: 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 arms: none: type: keyword @@ -851,7 +850,6 @@ memory: observations: stage: type: union - tagged: false arms: ifno: type: integer @@ -863,7 +861,6 @@ observations: tagged: false ext-inflow: type: union - tagged: false arms: ifno: type: integer @@ -875,7 +872,6 @@ observations: tagged: false outlet-inflow: type: union - tagged: false arms: ifno: type: integer @@ -887,7 +883,6 @@ observations: tagged: false inflow: type: union - tagged: false arms: ifno: type: integer @@ -899,7 +894,6 @@ observations: tagged: false from-mvr: type: union - tagged: false arms: ifno: type: integer @@ -911,7 +905,6 @@ observations: tagged: false rainfall: type: union - tagged: false arms: ifno: type: integer @@ -923,7 +916,6 @@ observations: tagged: false runoff: type: union - tagged: false arms: ifno: type: integer @@ -935,7 +927,6 @@ observations: tagged: false withdrawal: type: union - tagged: false arms: ifno: type: integer @@ -947,7 +938,6 @@ observations: tagged: false evaporation: type: union - tagged: false arms: ifno: type: integer @@ -959,7 +949,6 @@ observations: tagged: false storage: type: union - tagged: false arms: ifno: type: integer @@ -971,7 +960,6 @@ observations: tagged: false constant: type: union - tagged: false arms: ifno: type: integer @@ -983,7 +971,6 @@ observations: tagged: false volume: type: union - tagged: false arms: ifno: type: integer @@ -995,7 +982,6 @@ observations: tagged: false surface-area: type: union - tagged: false arms: ifno: type: integer @@ -1007,11 +993,9 @@ observations: tagged: false lak: type: union - tagged: false arms: ifno_iconn: type: record - tagged: false fields: ifno: type: integer @@ -1024,7 +1008,6 @@ observations: index: true ifno_boundname: type: record - tagged: false fields: ifno: type: integer @@ -1039,11 +1022,9 @@ observations: tagged: false wetted-area: type: union - tagged: false arms: ifno_iconn: type: record - tagged: false fields: ifno: type: integer @@ -1056,7 +1037,6 @@ observations: index: true ifno_boundname: type: record - tagged: false fields: ifno: type: integer @@ -1071,11 +1051,9 @@ observations: tagged: false conductance: type: union - tagged: false arms: ifno_iconn: type: record - tagged: false fields: ifno: type: integer @@ -1088,7 +1066,6 @@ observations: index: true ifno_boundname: type: record - tagged: false fields: ifno: type: integer @@ -1103,7 +1080,6 @@ observations: tagged: false ext-outflow: type: union - tagged: false arms: outletno: type: integer @@ -1115,7 +1091,6 @@ observations: tagged: false to-mvr: type: union - tagged: false arms: outletno: type: integer @@ -1127,7 +1102,6 @@ observations: tagged: false outlet: type: union - tagged: false arms: outletno: type: integer diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-maw.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-maw.json index c2eda39c..9fddc48d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-maw.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-maw.json @@ -425,7 +425,6 @@ "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" @@ -530,7 +529,6 @@ "observations": { "head": { "type": "union", - "tagged": false, "arms": { "ifno": { "type": "integer", @@ -546,7 +544,6 @@ }, "from-mvr": { "type": "union", - "tagged": false, "arms": { "ifno": { "type": "integer", @@ -562,7 +559,6 @@ }, "rate": { "type": "union", - "tagged": false, "arms": { "ifno": { "type": "integer", @@ -578,7 +574,6 @@ }, "rate-to-mvr": { "type": "union", - "tagged": false, "arms": { "ifno": { "type": "integer", @@ -594,7 +589,6 @@ }, "fw-rate": { "type": "union", - "tagged": false, "arms": { "ifno": { "type": "integer", @@ -610,7 +604,6 @@ }, "fw-to-mvr": { "type": "union", - "tagged": false, "arms": { "ifno": { "type": "integer", @@ -626,7 +619,6 @@ }, "storage": { "type": "union", - "tagged": false, "arms": { "ifno": { "type": "integer", @@ -642,7 +634,6 @@ }, "constant": { "type": "union", - "tagged": false, "arms": { "ifno": { "type": "integer", @@ -658,7 +649,6 @@ }, "fw-conductance": { "type": "union", - "tagged": false, "arms": { "ifno": { "type": "integer", @@ -674,11 +664,9 @@ }, "maw": { "type": "union", - "tagged": false, "arms": { "ifno_icon": { "type": "record", - "tagged": false, "fields": { "ifno": { "type": "integer", @@ -695,7 +683,6 @@ }, "ifno_boundname": { "type": "record", - "tagged": false, "fields": { "ifno": { "type": "integer", @@ -717,11 +704,9 @@ }, "conductance": { "type": "union", - "tagged": false, "arms": { "ifno_icon": { "type": "record", - "tagged": false, "fields": { "ifno": { "type": "integer", @@ -738,7 +723,6 @@ }, "ifno_boundname": { "type": "record", - "tagged": false, "fields": { "ifno": { "type": "integer", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-maw.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-maw.toml index 9547458c..6f6df767 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-maw.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-maw.toml @@ -387,7 +387,6 @@ type = "keyword" 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" @@ -471,7 +470,6 @@ type = "integer" [observations.head] type = "union" -tagged = false [observations.head.arms.ifno] type = "integer" @@ -485,7 +483,6 @@ tagged = false [observations.from-mvr] type = "union" -tagged = false [observations.from-mvr.arms.ifno] type = "integer" @@ -499,7 +496,6 @@ tagged = false [observations.rate] type = "union" -tagged = false [observations.rate.arms.ifno] type = "integer" @@ -513,7 +509,6 @@ tagged = false [observations.rate-to-mvr] type = "union" -tagged = false [observations.rate-to-mvr.arms.ifno] type = "integer" @@ -527,7 +522,6 @@ tagged = false [observations.fw-rate] type = "union" -tagged = false [observations.fw-rate.arms.ifno] type = "integer" @@ -541,7 +535,6 @@ tagged = false [observations.fw-to-mvr] type = "union" -tagged = false [observations.fw-to-mvr.arms.ifno] type = "integer" @@ -555,7 +548,6 @@ tagged = false [observations.storage] type = "union" -tagged = false [observations.storage.arms.ifno] type = "integer" @@ -569,7 +561,6 @@ tagged = false [observations.constant] type = "union" -tagged = false [observations.constant.arms.ifno] type = "integer" @@ -583,7 +574,6 @@ tagged = false [observations.fw-conductance] type = "union" -tagged = false [observations.fw-conductance.arms.ifno] type = "integer" @@ -597,11 +587,9 @@ tagged = false [observations.maw] type = "union" -tagged = false [observations.maw.arms.ifno_icon] type = "record" -tagged = false [observations.maw.arms.ifno_icon.fields.ifno] type = "integer" @@ -616,7 +604,6 @@ index = true [observations.maw.arms.ifno_boundname] type = "record" -tagged = false [observations.maw.arms.ifno_boundname.fields.ifno] type = "integer" @@ -634,11 +621,9 @@ tagged = false [observations.conductance] type = "union" -tagged = false [observations.conductance.arms.ifno_icon] type = "record" -tagged = false [observations.conductance.arms.ifno_icon.fields.ifno] type = "integer" @@ -653,7 +638,6 @@ index = true [observations.conductance.arms.ifno_boundname] type = "record" -tagged = false [observations.conductance.arms.ifno_boundname.fields.ifno] type = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-maw.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-maw.yaml index a781c393..a5bbe082 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-maw.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-maw.yaml @@ -488,7 +488,6 @@ blocks: 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 @@ -599,7 +598,6 @@ memory: observations: head: type: union - tagged: false arms: ifno: type: integer @@ -611,7 +609,6 @@ observations: tagged: false from-mvr: type: union - tagged: false arms: ifno: type: integer @@ -623,7 +620,6 @@ observations: tagged: false rate: type: union - tagged: false arms: ifno: type: integer @@ -635,7 +631,6 @@ observations: tagged: false rate-to-mvr: type: union - tagged: false arms: ifno: type: integer @@ -647,7 +642,6 @@ observations: tagged: false fw-rate: type: union - tagged: false arms: ifno: type: integer @@ -659,7 +653,6 @@ observations: tagged: false fw-to-mvr: type: union - tagged: false arms: ifno: type: integer @@ -671,7 +664,6 @@ observations: tagged: false storage: type: union - tagged: false arms: ifno: type: integer @@ -683,7 +675,6 @@ observations: tagged: false constant: type: union - tagged: false arms: ifno: type: integer @@ -695,7 +686,6 @@ observations: tagged: false fw-conductance: type: union - tagged: false arms: ifno: type: integer @@ -707,11 +697,9 @@ observations: tagged: false maw: type: union - tagged: false arms: ifno_icon: type: record - tagged: false fields: ifno: type: integer @@ -724,7 +712,6 @@ observations: index: true ifno_boundname: type: record - tagged: false fields: ifno: type: integer @@ -739,11 +726,9 @@ observations: tagged: false conductance: type: union - tagged: false arms: ifno_icon: type: record - tagged: false fields: ifno: type: integer @@ -756,7 +741,6 @@ observations: index: true ifno_boundname: type: record - tagged: false fields: ifno: type: integer diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-nam.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-nam.json index 8b6b9192..269a11e9 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-nam.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-nam.json @@ -258,7 +258,6 @@ }, "flow-ja-face": { "type": "record", - "tagged": false, "fields": { "cellid": { "type": "array", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-nam.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-nam.toml index 71d3ac1b..2680c8f1 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-nam.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-nam.toml @@ -233,7 +233,6 @@ shape = [ [observations.flow-ja-face] type = "record" -tagged = false [observations.flow-ja-face.fields.cellid] type = "array" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-nam.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-nam.yaml index 24ad5c2a..d2962cf6 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-nam.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-nam.yaml @@ -233,7 +233,6 @@ observations: - ncelldim flow-ja-face: type: record - tagged: false fields: cellid: type: array diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rch.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rch.json index 0b01e2b9..9fe0aa99 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rch.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rch.json @@ -319,7 +319,6 @@ "observations": { "rch": { "type": "union", - "tagged": false, "arms": { "cellid": { "type": "array", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rch.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rch.toml index f0cfcd77..c3c77846 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rch.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rch.toml @@ -292,7 +292,6 @@ shape = [ [observations.rch] type = "union" -tagged = false [observations.rch.arms.cellid] type = "array" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rch.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rch.yaml index 5dc8691a..7b248214 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rch.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rch.yaml @@ -289,7 +289,6 @@ memory: observations: rch: type: union - tagged: false arms: cellid: type: array diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rcha.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rcha.json index 5dd5556e..75595d9a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rcha.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rcha.json @@ -325,7 +325,6 @@ "observations": { "rch": { "type": "union", - "tagged": false, "arms": { "cellid": { "type": "array", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rcha.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rcha.toml index 1cf5637f..5044f41d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rcha.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rcha.toml @@ -302,7 +302,6 @@ shape = [ [observations.rch] type = "union" -tagged = false [observations.rch.arms.cellid] type = "array" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rcha.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rcha.yaml index 3c326b39..98b79762 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rcha.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rcha.yaml @@ -296,7 +296,6 @@ memory: observations: rch: type: union - tagged: false arms: cellid: type: array diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-riv.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-riv.json index 8a1c77ff..7dbeda3d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-riv.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-riv.json @@ -334,7 +334,6 @@ "observations": { "riv": { "type": "union", - "tagged": false, "arms": { "cellid": { "type": "array", @@ -354,7 +353,6 @@ }, "to-mvr": { "type": "union", - "tagged": false, "arms": { "cellid": { "type": "array", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-riv.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-riv.toml index 50ba60c6..8e9bed1f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-riv.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-riv.toml @@ -307,7 +307,6 @@ shape = [ [observations.riv] type = "union" -tagged = false [observations.riv.arms.cellid] type = "array" @@ -325,7 +324,6 @@ tagged = false [observations.to-mvr] type = "union" -tagged = false [observations.to-mvr.arms.cellid] type = "array" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-riv.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-riv.yaml index 100bdbc8..e3fe7342 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-riv.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-riv.yaml @@ -305,7 +305,6 @@ memory: observations: riv: type: union - tagged: false arms: cellid: type: array @@ -320,7 +319,6 @@ observations: tagged: false to-mvr: type: union - tagged: false arms: cellid: type: array 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 73fd9afd..0098a039 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rivg.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rivg.json @@ -329,7 +329,6 @@ "observations": { "riv": { "type": "union", - "tagged": false, "arms": { "cellid": { "type": "array", @@ -349,7 +348,6 @@ }, "to-mvr": { "type": "union", - "tagged": false, "arms": { "cellid": { "type": "array", 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 866168bb..9acda005 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rivg.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rivg.toml @@ -304,7 +304,6 @@ shape = [ [observations.riv] type = "union" -tagged = false [observations.riv.arms.cellid] type = "array" @@ -322,7 +321,6 @@ tagged = false [observations.to-mvr] type = "union" -tagged = false [observations.to-mvr.arms.cellid] type = "array" 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 5365cfd3..1e67bcd4 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rivg.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rivg.yaml @@ -293,7 +293,6 @@ memory: observations: riv: type: union - tagged: false arms: cellid: type: array @@ -308,7 +307,6 @@ observations: tagged: false to-mvr: type: union - tagged: false arms: cellid: type: array 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 b0d87fbc..72236536 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sfr.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sfr.json @@ -766,7 +766,6 @@ "observations": { "stage": { "type": "union", - "tagged": false, "arms": { "ifno": { "type": "integer", @@ -782,7 +781,6 @@ }, "ext-inflow": { "type": "union", - "tagged": false, "arms": { "ifno": { "type": "integer", @@ -798,7 +796,6 @@ }, "inflow": { "type": "union", - "tagged": false, "arms": { "ifno": { "type": "integer", @@ -814,7 +811,6 @@ }, "from-mvr": { "type": "union", - "tagged": false, "arms": { "ifno": { "type": "integer", @@ -830,7 +826,6 @@ }, "rainfall": { "type": "union", - "tagged": false, "arms": { "ifno": { "type": "integer", @@ -846,7 +841,6 @@ }, "runoff": { "type": "union", - "tagged": false, "arms": { "ifno": { "type": "integer", @@ -862,7 +856,6 @@ }, "sfr": { "type": "union", - "tagged": false, "arms": { "ifno": { "type": "integer", @@ -878,7 +871,6 @@ }, "evaporation": { "type": "union", - "tagged": false, "arms": { "ifno": { "type": "integer", @@ -894,7 +886,6 @@ }, "outflow": { "type": "union", - "tagged": false, "arms": { "ifno": { "type": "integer", @@ -910,7 +901,6 @@ }, "ext-outflow": { "type": "union", - "tagged": false, "arms": { "ifno": { "type": "integer", @@ -926,7 +916,6 @@ }, "to-mvr": { "type": "union", - "tagged": false, "arms": { "ifno": { "type": "integer", @@ -942,7 +931,6 @@ }, "upstream-flow": { "type": "union", - "tagged": false, "arms": { "ifno": { "type": "integer", @@ -958,7 +946,6 @@ }, "downstream-flow": { "type": "union", - "tagged": false, "arms": { "ifno": { "type": "integer", @@ -974,7 +961,6 @@ }, "depth": { "type": "union", - "tagged": false, "arms": { "ifno": { "type": "integer", @@ -990,7 +976,6 @@ }, "wet-perimeter": { "type": "union", - "tagged": false, "arms": { "ifno": { "type": "integer", @@ -1006,7 +991,6 @@ }, "wet-area": { "type": "union", - "tagged": false, "arms": { "ifno": { "type": "integer", @@ -1022,7 +1006,6 @@ }, "wet-width": { "type": "union", - "tagged": false, "arms": { "ifno": { "type": "integer", 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 a4aa00aa..78d7c66b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sfr.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sfr.toml @@ -693,7 +693,6 @@ shape = [ [observations.stage] type = "union" -tagged = false [observations.stage.arms.ifno] type = "integer" @@ -707,7 +706,6 @@ tagged = false [observations.ext-inflow] type = "union" -tagged = false [observations.ext-inflow.arms.ifno] type = "integer" @@ -721,7 +719,6 @@ tagged = false [observations.inflow] type = "union" -tagged = false [observations.inflow.arms.ifno] type = "integer" @@ -735,7 +732,6 @@ tagged = false [observations.from-mvr] type = "union" -tagged = false [observations.from-mvr.arms.ifno] type = "integer" @@ -749,7 +745,6 @@ tagged = false [observations.rainfall] type = "union" -tagged = false [observations.rainfall.arms.ifno] type = "integer" @@ -763,7 +758,6 @@ tagged = false [observations.runoff] type = "union" -tagged = false [observations.runoff.arms.ifno] type = "integer" @@ -777,7 +771,6 @@ tagged = false [observations.sfr] type = "union" -tagged = false [observations.sfr.arms.ifno] type = "integer" @@ -791,7 +784,6 @@ tagged = false [observations.evaporation] type = "union" -tagged = false [observations.evaporation.arms.ifno] type = "integer" @@ -805,7 +797,6 @@ tagged = false [observations.outflow] type = "union" -tagged = false [observations.outflow.arms.ifno] type = "integer" @@ -819,7 +810,6 @@ tagged = false [observations.ext-outflow] type = "union" -tagged = false [observations.ext-outflow.arms.ifno] type = "integer" @@ -833,7 +823,6 @@ tagged = false [observations.to-mvr] type = "union" -tagged = false [observations.to-mvr.arms.ifno] type = "integer" @@ -847,7 +836,6 @@ tagged = false [observations.upstream-flow] type = "union" -tagged = false [observations.upstream-flow.arms.ifno] type = "integer" @@ -861,7 +849,6 @@ tagged = false [observations.downstream-flow] type = "union" -tagged = false [observations.downstream-flow.arms.ifno] type = "integer" @@ -875,7 +862,6 @@ tagged = false [observations.depth] type = "union" -tagged = false [observations.depth.arms.ifno] type = "integer" @@ -889,7 +875,6 @@ tagged = false [observations.wet-perimeter] type = "union" -tagged = false [observations.wet-perimeter.arms.ifno] type = "integer" @@ -903,7 +888,6 @@ tagged = false [observations.wet-area] type = "union" -tagged = false [observations.wet-area.arms.ifno] type = "integer" @@ -917,7 +901,6 @@ tagged = false [observations.wet-width] type = "union" -tagged = false [observations.wet-width.arms.ifno] 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 5f017d47..fa671baf 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sfr.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sfr.yaml @@ -811,7 +811,6 @@ memory: observations: stage: type: union - tagged: false arms: ifno: type: integer @@ -823,7 +822,6 @@ observations: tagged: false ext-inflow: type: union - tagged: false arms: ifno: type: integer @@ -835,7 +833,6 @@ observations: tagged: false inflow: type: union - tagged: false arms: ifno: type: integer @@ -847,7 +844,6 @@ observations: tagged: false from-mvr: type: union - tagged: false arms: ifno: type: integer @@ -859,7 +855,6 @@ observations: tagged: false rainfall: type: union - tagged: false arms: ifno: type: integer @@ -871,7 +866,6 @@ observations: tagged: false runoff: type: union - tagged: false arms: ifno: type: integer @@ -883,7 +877,6 @@ observations: tagged: false sfr: type: union - tagged: false arms: ifno: type: integer @@ -895,7 +888,6 @@ observations: tagged: false evaporation: type: union - tagged: false arms: ifno: type: integer @@ -907,7 +899,6 @@ observations: tagged: false outflow: type: union - tagged: false arms: ifno: type: integer @@ -919,7 +910,6 @@ observations: tagged: false ext-outflow: type: union - tagged: false arms: ifno: type: integer @@ -931,7 +921,6 @@ observations: tagged: false to-mvr: type: union - tagged: false arms: ifno: type: integer @@ -943,7 +932,6 @@ observations: tagged: false upstream-flow: type: union - tagged: false arms: ifno: type: integer @@ -955,7 +943,6 @@ observations: tagged: false downstream-flow: type: union - tagged: false arms: ifno: type: integer @@ -967,7 +954,6 @@ observations: tagged: false depth: type: union - tagged: false arms: ifno: type: integer @@ -979,7 +965,6 @@ observations: tagged: false wet-perimeter: type: union - tagged: false arms: ifno: type: integer @@ -991,7 +976,6 @@ observations: tagged: false wet-area: type: union - tagged: false arms: ifno: type: integer @@ -1003,7 +987,6 @@ observations: tagged: false wet-width: type: union - tagged: false arms: ifno: type: integer 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 32c0b5fd..484cbf59 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-uzf.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-uzf.json @@ -443,7 +443,6 @@ "observations": { "uzf-gwrch": { "type": "union", - "tagged": false, "arms": { "ifno": { "type": "integer", @@ -459,7 +458,6 @@ }, "uzf-gwd": { "type": "union", - "tagged": false, "arms": { "ifno": { "type": "integer", @@ -475,7 +473,6 @@ }, "uzf-gwd-to-mvr": { "type": "union", - "tagged": false, "arms": { "ifno": { "type": "integer", @@ -491,7 +488,6 @@ }, "uzf-gwet": { "type": "union", - "tagged": false, "arms": { "ifno": { "type": "integer", @@ -507,7 +503,6 @@ }, "infiltration": { "type": "union", - "tagged": false, "arms": { "ifno": { "type": "integer", @@ -523,7 +518,6 @@ }, "from-mvr": { "type": "union", - "tagged": false, "arms": { "ifno": { "type": "integer", @@ -539,7 +533,6 @@ }, "rej-inf": { "type": "union", - "tagged": false, "arms": { "ifno": { "type": "integer", @@ -555,7 +548,6 @@ }, "rej-inf-to-mvr": { "type": "union", - "tagged": false, "arms": { "ifno": { "type": "integer", @@ -571,7 +563,6 @@ }, "uzet": { "type": "union", - "tagged": false, "arms": { "ifno": { "type": "integer", @@ -587,7 +578,6 @@ }, "storage": { "type": "union", - "tagged": false, "arms": { "ifno": { "type": "integer", @@ -603,7 +593,6 @@ }, "net-infiltration": { "type": "union", - "tagged": false, "arms": { "ifno": { "type": "integer", @@ -619,11 +608,9 @@ }, "water-content": { "type": "record", - "tagged": false, "fields": { "ifno": { "type": "union", - "tagged": false, "arms": { "ifno": { "type": "integer", 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 02c6ec26..102fd04e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-uzf.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-uzf.toml @@ -404,7 +404,6 @@ type = "integer" [observations.uzf-gwrch] type = "union" -tagged = false [observations.uzf-gwrch.arms.ifno] type = "integer" @@ -418,7 +417,6 @@ tagged = false [observations.uzf-gwd] type = "union" -tagged = false [observations.uzf-gwd.arms.ifno] type = "integer" @@ -432,7 +430,6 @@ tagged = false [observations.uzf-gwd-to-mvr] type = "union" -tagged = false [observations.uzf-gwd-to-mvr.arms.ifno] type = "integer" @@ -446,7 +443,6 @@ tagged = false [observations.uzf-gwet] type = "union" -tagged = false [observations.uzf-gwet.arms.ifno] type = "integer" @@ -460,7 +456,6 @@ tagged = false [observations.infiltration] type = "union" -tagged = false [observations.infiltration.arms.ifno] type = "integer" @@ -474,7 +469,6 @@ tagged = false [observations.from-mvr] type = "union" -tagged = false [observations.from-mvr.arms.ifno] type = "integer" @@ -488,7 +482,6 @@ tagged = false [observations.rej-inf] type = "union" -tagged = false [observations.rej-inf.arms.ifno] type = "integer" @@ -502,7 +495,6 @@ tagged = false [observations.rej-inf-to-mvr] type = "union" -tagged = false [observations.rej-inf-to-mvr.arms.ifno] type = "integer" @@ -516,7 +508,6 @@ tagged = false [observations.uzet] type = "union" -tagged = false [observations.uzet.arms.ifno] type = "integer" @@ -530,7 +521,6 @@ tagged = false [observations.storage] type = "union" -tagged = false [observations.storage.arms.ifno] type = "integer" @@ -544,7 +534,6 @@ tagged = false [observations.net-infiltration] type = "union" -tagged = false [observations.net-infiltration.arms.ifno] type = "integer" @@ -558,11 +547,9 @@ tagged = false [observations.water-content] type = "record" -tagged = false [observations.water-content.fields.ifno] type = "union" -tagged = false [observations.water-content.fields.ifno.arms.ifno] type = "integer" 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 9206e9b7..d399cfb1 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-uzf.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-uzf.yaml @@ -466,7 +466,6 @@ memory: observations: uzf-gwrch: type: union - tagged: false arms: ifno: type: integer @@ -478,7 +477,6 @@ observations: tagged: false uzf-gwd: type: union - tagged: false arms: ifno: type: integer @@ -490,7 +488,6 @@ observations: tagged: false uzf-gwd-to-mvr: type: union - tagged: false arms: ifno: type: integer @@ -502,7 +499,6 @@ observations: tagged: false uzf-gwet: type: union - tagged: false arms: ifno: type: integer @@ -514,7 +510,6 @@ observations: tagged: false infiltration: type: union - tagged: false arms: ifno: type: integer @@ -526,7 +521,6 @@ observations: tagged: false from-mvr: type: union - tagged: false arms: ifno: type: integer @@ -538,7 +532,6 @@ observations: tagged: false rej-inf: type: union - tagged: false arms: ifno: type: integer @@ -550,7 +543,6 @@ observations: tagged: false rej-inf-to-mvr: type: union - tagged: false arms: ifno: type: integer @@ -562,7 +554,6 @@ observations: tagged: false uzet: type: union - tagged: false arms: ifno: type: integer @@ -574,7 +565,6 @@ observations: tagged: false storage: type: union - tagged: false arms: ifno: type: integer @@ -586,7 +576,6 @@ observations: tagged: false net-infiltration: type: union - tagged: false arms: ifno: type: integer @@ -598,11 +587,9 @@ observations: tagged: false water-content: type: record - tagged: false fields: ifno: type: union - tagged: false arms: ifno: type: integer diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-wel.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-wel.json index 28d72a8b..8ddecf19 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-wel.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-wel.json @@ -365,7 +365,6 @@ "observations": { "wel": { "type": "union", - "tagged": false, "arms": { "cellid": { "type": "array", @@ -385,7 +384,6 @@ }, "to-mvr": { "type": "union", - "tagged": false, "arms": { "cellid": { "type": "array", @@ -405,7 +403,6 @@ }, "wel-reduction": { "type": "union", - "tagged": false, "arms": { "cellid": { "type": "array", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-wel.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-wel.toml index 7162e2aa..d6652db2 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-wel.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-wel.toml @@ -336,7 +336,6 @@ shape = [ [observations.wel] type = "union" -tagged = false [observations.wel.arms.cellid] type = "array" @@ -354,7 +353,6 @@ tagged = false [observations.to-mvr] type = "union" -tagged = false [observations.to-mvr.arms.cellid] type = "array" @@ -372,7 +370,6 @@ tagged = false [observations.wel-reduction] type = "union" -tagged = false [observations.wel-reduction.arms.cellid] type = "array" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-wel.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-wel.yaml index a3e2e187..d7628a0b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-wel.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-wel.yaml @@ -341,7 +341,6 @@ memory: observations: wel: type: union - tagged: false arms: cellid: type: array @@ -356,7 +355,6 @@ observations: tagged: false to-mvr: type: union - tagged: false arms: cellid: type: array @@ -371,7 +369,6 @@ observations: tagged: false wel-reduction: type: union - tagged: false arms: cellid: type: array 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 62e02189..d3e6fcfc 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-welg.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-welg.json @@ -350,7 +350,6 @@ "observations": { "wel": { "type": "union", - "tagged": false, "arms": { "cellid": { "type": "array", @@ -370,7 +369,6 @@ }, "to-mvr": { "type": "union", - "tagged": false, "arms": { "cellid": { "type": "array", @@ -390,7 +388,6 @@ }, "wel-reduction": { "type": "union", - "tagged": false, "arms": { "cellid": { "type": "array", 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 56e345a9..307b27e7 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-welg.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-welg.toml @@ -323,7 +323,6 @@ shape = [ [observations.wel] type = "union" -tagged = false [observations.wel.arms.cellid] type = "array" @@ -341,7 +340,6 @@ tagged = false [observations.to-mvr] type = "union" -tagged = false [observations.to-mvr.arms.cellid] type = "array" @@ -359,7 +357,6 @@ tagged = false [observations.wel-reduction] type = "union" -tagged = false [observations.wel-reduction.arms.cellid] type = "array" 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 c514a8f0..ffdd1f37 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-welg.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-welg.yaml @@ -326,7 +326,6 @@ memory: observations: wel: type: union - tagged: false arms: cellid: type: array @@ -341,7 +340,6 @@ observations: tagged: false to-mvr: type: union - tagged: false arms: cellid: type: array @@ -356,7 +354,6 @@ observations: tagged: false wel-reduction: type: union - tagged: false arms: cellid: type: array diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-api.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-api.json index 69093ab8..9088e038 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-api.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-api.json @@ -97,7 +97,6 @@ "observations": { "api": { "type": "union", - "tagged": false, "arms": { "cellid": { "type": "array", @@ -117,7 +116,6 @@ }, "to-mvr": { "type": "union", - "tagged": false, "arms": { "cellid": { "type": "array", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-api.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-api.toml index f2d37934..5a679272 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-api.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-api.toml @@ -80,7 +80,6 @@ type = "integer" [observations.api] type = "union" -tagged = false [observations.api.arms.cellid] type = "array" @@ -98,7 +97,6 @@ tagged = false [observations.to-mvr] type = "union" -tagged = false [observations.to-mvr.arms.cellid] type = "array" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-api.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-api.yaml index 42c55c46..c82fa05d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-api.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-api.yaml @@ -85,7 +85,6 @@ memory: observations: api: type: union - tagged: false arms: cellid: type: array @@ -100,7 +99,6 @@ observations: tagged: false to-mvr: type: union - tagged: false arms: cellid: type: array diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-cnc.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-cnc.json index 93e718df..110af6d3 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-cnc.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-cnc.json @@ -318,7 +318,6 @@ "observations": { "cnc": { "type": "union", - "tagged": false, "arms": { "cellid": { "type": "array", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-cnc.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-cnc.toml index 0085f6e7..10d6b35c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-cnc.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-cnc.toml @@ -291,7 +291,6 @@ shape = [ [observations.cnc] type = "union" -tagged = false [observations.cnc.arms.cellid] type = "array" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-cnc.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-cnc.yaml index 8bb753c7..f7f1bb69 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-cnc.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-cnc.yaml @@ -285,7 +285,6 @@ memory: observations: cnc: type: union - tagged: false arms: cellid: type: array diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-lkt.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-lkt.json index 4f1d288a..795edf89 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-lkt.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-lkt.json @@ -410,7 +410,6 @@ "observations": { "concentration": { "type": "union", - "tagged": false, "arms": { "ifno": { "type": "integer", @@ -426,7 +425,6 @@ }, "storage": { "type": "union", - "tagged": false, "arms": { "ifno": { "type": "integer", @@ -442,7 +440,6 @@ }, "constant": { "type": "union", - "tagged": false, "arms": { "ifno": { "type": "integer", @@ -458,7 +455,6 @@ }, "from-mvr": { "type": "union", - "tagged": false, "arms": { "ifno": { "type": "integer", @@ -474,7 +470,6 @@ }, "rainfall": { "type": "union", - "tagged": false, "arms": { "ifno": { "type": "integer", @@ -490,7 +485,6 @@ }, "evaporation": { "type": "union", - "tagged": false, "arms": { "ifno": { "type": "integer", @@ -506,7 +500,6 @@ }, "runoff": { "type": "union", - "tagged": false, "arms": { "ifno": { "type": "integer", @@ -522,7 +515,6 @@ }, "ext-inflow": { "type": "union", - "tagged": false, "arms": { "ifno": { "type": "integer", @@ -538,7 +530,6 @@ }, "withdrawal": { "type": "union", - "tagged": false, "arms": { "ifno": { "type": "integer", @@ -554,7 +545,6 @@ }, "ext-outflow": { "type": "union", - "tagged": false, "arms": { "ifno": { "type": "integer", @@ -570,11 +560,9 @@ }, "flow-ja-face": { "type": "union", - "tagged": false, "arms": { "ifno_ifno2": { "type": "record", - "tagged": false, "fields": { "ifno": { "type": "integer", @@ -598,7 +586,6 @@ }, "to-mvr": { "type": "union", - "tagged": false, "arms": { "outletno": { "type": "integer", @@ -613,11 +600,9 @@ }, "lkt": { "type": "union", - "tagged": false, "arms": { "ifno_iconn": { "type": "record", - "tagged": false, "fields": { "ifno": { "type": "integer", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-lkt.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-lkt.toml index 40a0d74b..ed40a338 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-lkt.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-lkt.toml @@ -371,7 +371,6 @@ shape = [ [observations.concentration] type = "union" -tagged = false [observations.concentration.arms.ifno] type = "integer" @@ -385,7 +384,6 @@ tagged = false [observations.storage] type = "union" -tagged = false [observations.storage.arms.ifno] type = "integer" @@ -399,7 +397,6 @@ tagged = false [observations.constant] type = "union" -tagged = false [observations.constant.arms.ifno] type = "integer" @@ -413,7 +410,6 @@ tagged = false [observations.from-mvr] type = "union" -tagged = false [observations.from-mvr.arms.ifno] type = "integer" @@ -427,7 +423,6 @@ tagged = false [observations.rainfall] type = "union" -tagged = false [observations.rainfall.arms.ifno] type = "integer" @@ -441,7 +436,6 @@ tagged = false [observations.evaporation] type = "union" -tagged = false [observations.evaporation.arms.ifno] type = "integer" @@ -455,7 +449,6 @@ tagged = false [observations.runoff] type = "union" -tagged = false [observations.runoff.arms.ifno] type = "integer" @@ -469,7 +462,6 @@ tagged = false [observations.ext-inflow] type = "union" -tagged = false [observations.ext-inflow.arms.ifno] type = "integer" @@ -483,7 +475,6 @@ tagged = false [observations.withdrawal] type = "union" -tagged = false [observations.withdrawal.arms.ifno] type = "integer" @@ -497,7 +488,6 @@ tagged = false [observations.ext-outflow] type = "union" -tagged = false [observations.ext-outflow.arms.ifno] type = "integer" @@ -511,11 +501,9 @@ tagged = false [observations.flow-ja-face] type = "union" -tagged = false [observations.flow-ja-face.arms.ifno_ifno2] type = "record" -tagged = false [observations.flow-ja-face.arms.ifno_ifno2.fields.ifno] type = "integer" @@ -535,7 +523,6 @@ tagged = false [observations.to-mvr] type = "union" -tagged = false [observations.to-mvr.arms.outletno] type = "integer" @@ -548,11 +535,9 @@ tagged = false [observations.lkt] type = "union" -tagged = false [observations.lkt.arms.ifno_iconn] type = "record" -tagged = false [observations.lkt.arms.ifno_iconn.fields.ifno] type = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-lkt.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-lkt.yaml index 641d19df..b0f4a82e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-lkt.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-lkt.yaml @@ -401,7 +401,6 @@ memory: observations: concentration: type: union - tagged: false arms: ifno: type: integer @@ -413,7 +412,6 @@ observations: tagged: false storage: type: union - tagged: false arms: ifno: type: integer @@ -425,7 +423,6 @@ observations: tagged: false constant: type: union - tagged: false arms: ifno: type: integer @@ -437,7 +434,6 @@ observations: tagged: false from-mvr: type: union - tagged: false arms: ifno: type: integer @@ -449,7 +445,6 @@ observations: tagged: false rainfall: type: union - tagged: false arms: ifno: type: integer @@ -461,7 +456,6 @@ observations: tagged: false evaporation: type: union - tagged: false arms: ifno: type: integer @@ -473,7 +467,6 @@ observations: tagged: false runoff: type: union - tagged: false arms: ifno: type: integer @@ -485,7 +478,6 @@ observations: tagged: false ext-inflow: type: union - tagged: false arms: ifno: type: integer @@ -497,7 +489,6 @@ observations: tagged: false withdrawal: type: union - tagged: false arms: ifno: type: integer @@ -509,7 +500,6 @@ observations: tagged: false ext-outflow: type: union - tagged: false arms: ifno: type: integer @@ -521,11 +511,9 @@ observations: tagged: false flow-ja-face: type: union - tagged: false arms: ifno_ifno2: type: record - tagged: false fields: ifno: type: integer @@ -542,7 +530,6 @@ observations: tagged: false to-mvr: type: union - tagged: false arms: outletno: type: integer @@ -553,11 +540,9 @@ observations: tagged: false lkt: type: union - tagged: false arms: ifno_iconn: type: record - tagged: false fields: ifno: type: integer diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-mwt.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-mwt.json index 11811daa..c21fc155 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-mwt.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-mwt.json @@ -365,7 +365,6 @@ "observations": { "concentration": { "type": "union", - "tagged": false, "arms": { "ifno": { "type": "integer", @@ -381,7 +380,6 @@ }, "storage": { "type": "union", - "tagged": false, "arms": { "ifno": { "type": "integer", @@ -397,7 +395,6 @@ }, "constant": { "type": "union", - "tagged": false, "arms": { "ifno": { "type": "integer", @@ -413,7 +410,6 @@ }, "from-mvr": { "type": "union", - "tagged": false, "arms": { "ifno": { "type": "integer", @@ -429,7 +425,6 @@ }, "rate": { "type": "union", - "tagged": false, "arms": { "ifno": { "type": "integer", @@ -445,7 +440,6 @@ }, "fw-rate": { "type": "union", - "tagged": false, "arms": { "ifno": { "type": "integer", @@ -461,7 +455,6 @@ }, "rate-to-mvr": { "type": "union", - "tagged": false, "arms": { "ifno": { "type": "integer", @@ -477,7 +470,6 @@ }, "fw-rate-to-mvr": { "type": "union", - "tagged": false, "arms": { "ifno": { "type": "integer", @@ -493,11 +485,9 @@ }, "mwt": { "type": "union", - "tagged": false, "arms": { "ifno_iconn": { "type": "record", - "tagged": false, "fields": { "ifno": { "type": "integer", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-mwt.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-mwt.toml index 06374533..65c9d064 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-mwt.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-mwt.toml @@ -326,7 +326,6 @@ shape = [ [observations.concentration] type = "union" -tagged = false [observations.concentration.arms.ifno] type = "integer" @@ -340,7 +339,6 @@ tagged = false [observations.storage] type = "union" -tagged = false [observations.storage.arms.ifno] type = "integer" @@ -354,7 +352,6 @@ tagged = false [observations.constant] type = "union" -tagged = false [observations.constant.arms.ifno] type = "integer" @@ -368,7 +365,6 @@ tagged = false [observations.from-mvr] type = "union" -tagged = false [observations.from-mvr.arms.ifno] type = "integer" @@ -382,7 +378,6 @@ tagged = false [observations.rate] type = "union" -tagged = false [observations.rate.arms.ifno] type = "integer" @@ -396,7 +391,6 @@ tagged = false [observations.fw-rate] type = "union" -tagged = false [observations.fw-rate.arms.ifno] type = "integer" @@ -410,7 +404,6 @@ tagged = false [observations.rate-to-mvr] type = "union" -tagged = false [observations.rate-to-mvr.arms.ifno] type = "integer" @@ -424,7 +417,6 @@ tagged = false [observations.fw-rate-to-mvr] type = "union" -tagged = false [observations.fw-rate-to-mvr.arms.ifno] type = "integer" @@ -438,11 +430,9 @@ tagged = false [observations.mwt] type = "union" -tagged = false [observations.mwt.arms.ifno_iconn] type = "record" -tagged = false [observations.mwt.arms.ifno_iconn.fields.ifno] type = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-mwt.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-mwt.yaml index 7f8e6a5f..f221c6e5 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-mwt.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-mwt.yaml @@ -353,7 +353,6 @@ memory: observations: concentration: type: union - tagged: false arms: ifno: type: integer @@ -365,7 +364,6 @@ observations: tagged: false storage: type: union - tagged: false arms: ifno: type: integer @@ -377,7 +375,6 @@ observations: tagged: false constant: type: union - tagged: false arms: ifno: type: integer @@ -389,7 +386,6 @@ observations: tagged: false from-mvr: type: union - tagged: false arms: ifno: type: integer @@ -401,7 +397,6 @@ observations: tagged: false rate: type: union - tagged: false arms: ifno: type: integer @@ -413,7 +408,6 @@ observations: tagged: false fw-rate: type: union - tagged: false arms: ifno: type: integer @@ -425,7 +419,6 @@ observations: tagged: false rate-to-mvr: type: union - tagged: false arms: ifno: type: integer @@ -437,7 +430,6 @@ observations: tagged: false fw-rate-to-mvr: type: union - tagged: false arms: ifno: type: integer @@ -449,11 +441,9 @@ observations: tagged: false mwt: type: union - tagged: false arms: ifno_iconn: type: record - tagged: false fields: ifno: type: integer diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-nam.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-nam.json index 19a4f1de..f31a3646 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-nam.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-nam.json @@ -240,7 +240,6 @@ }, "flow-ja-face": { "type": "record", - "tagged": false, "fields": { "cellid": { "type": "array", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-nam.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-nam.toml index 427d89a9..6d1043d2 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-nam.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-nam.toml @@ -217,7 +217,6 @@ shape = [ [observations.flow-ja-face] type = "record" -tagged = false [observations.flow-ja-face.fields.cellid] type = "array" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-nam.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-nam.yaml index d123a121..af3ed726 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-nam.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-nam.yaml @@ -215,7 +215,6 @@ observations: - ncelldim flow-ja-face: type: record - tagged: false fields: cellid: type: array diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-sft.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-sft.json index 831d497b..0c5f5ee4 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-sft.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-sft.json @@ -430,7 +430,6 @@ "observations": { "concentration": { "type": "union", - "tagged": false, "arms": { "ifno": { "type": "integer", @@ -446,7 +445,6 @@ }, "storage": { "type": "union", - "tagged": false, "arms": { "ifno": { "type": "integer", @@ -462,7 +460,6 @@ }, "constant": { "type": "union", - "tagged": false, "arms": { "ifno": { "type": "integer", @@ -478,7 +475,6 @@ }, "from-mvr": { "type": "union", - "tagged": false, "arms": { "ifno": { "type": "integer", @@ -494,7 +490,6 @@ }, "sft": { "type": "union", - "tagged": false, "arms": { "ifno": { "type": "integer", @@ -510,7 +505,6 @@ }, "to-mvr": { "type": "union", - "tagged": false, "arms": { "ifno": { "type": "integer", @@ -526,7 +520,6 @@ }, "rainfall": { "type": "union", - "tagged": false, "arms": { "ifno": { "type": "integer", @@ -542,7 +535,6 @@ }, "evaporation": { "type": "union", - "tagged": false, "arms": { "ifno": { "type": "integer", @@ -558,7 +550,6 @@ }, "runoff": { "type": "union", - "tagged": false, "arms": { "ifno": { "type": "integer", @@ -574,7 +565,6 @@ }, "ext-inflow": { "type": "union", - "tagged": false, "arms": { "ifno": { "type": "integer", @@ -590,7 +580,6 @@ }, "ext-outflow": { "type": "union", - "tagged": false, "arms": { "ifno": { "type": "integer", @@ -606,11 +595,9 @@ }, "flow-ja-face": { "type": "union", - "tagged": false, "arms": { "ifno_ifno2": { "type": "record", - "tagged": false, "fields": { "ifno": { "type": "integer", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-sft.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-sft.toml index 43b8b90e..93a670d5 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-sft.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-sft.toml @@ -391,7 +391,6 @@ shape = [ [observations.concentration] type = "union" -tagged = false [observations.concentration.arms.ifno] type = "integer" @@ -405,7 +404,6 @@ tagged = false [observations.storage] type = "union" -tagged = false [observations.storage.arms.ifno] type = "integer" @@ -419,7 +417,6 @@ tagged = false [observations.constant] type = "union" -tagged = false [observations.constant.arms.ifno] type = "integer" @@ -433,7 +430,6 @@ tagged = false [observations.from-mvr] type = "union" -tagged = false [observations.from-mvr.arms.ifno] type = "integer" @@ -447,7 +443,6 @@ tagged = false [observations.sft] type = "union" -tagged = false [observations.sft.arms.ifno] type = "integer" @@ -461,7 +456,6 @@ tagged = false [observations.to-mvr] type = "union" -tagged = false [observations.to-mvr.arms.ifno] type = "integer" @@ -475,7 +469,6 @@ tagged = false [observations.rainfall] type = "union" -tagged = false [observations.rainfall.arms.ifno] type = "integer" @@ -489,7 +482,6 @@ tagged = false [observations.evaporation] type = "union" -tagged = false [observations.evaporation.arms.ifno] type = "integer" @@ -503,7 +495,6 @@ tagged = false [observations.runoff] type = "union" -tagged = false [observations.runoff.arms.ifno] type = "integer" @@ -517,7 +508,6 @@ tagged = false [observations.ext-inflow] type = "union" -tagged = false [observations.ext-inflow.arms.ifno] type = "integer" @@ -531,7 +521,6 @@ tagged = false [observations.ext-outflow] type = "union" -tagged = false [observations.ext-outflow.arms.ifno] type = "integer" @@ -545,11 +534,9 @@ tagged = false [observations.flow-ja-face] type = "union" -tagged = false [observations.flow-ja-face.arms.ifno_ifno2] type = "record" -tagged = false [observations.flow-ja-face.arms.ifno_ifno2.fields.ifno] type = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-sft.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-sft.yaml index 8867bf50..1c2d7845 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-sft.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-sft.yaml @@ -415,7 +415,6 @@ memory: observations: concentration: type: union - tagged: false arms: ifno: type: integer @@ -427,7 +426,6 @@ observations: tagged: false storage: type: union - tagged: false arms: ifno: type: integer @@ -439,7 +437,6 @@ observations: tagged: false constant: type: union - tagged: false arms: ifno: type: integer @@ -451,7 +448,6 @@ observations: tagged: false from-mvr: type: union - tagged: false arms: ifno: type: integer @@ -463,7 +459,6 @@ observations: tagged: false sft: type: union - tagged: false arms: ifno: type: integer @@ -475,7 +470,6 @@ observations: tagged: false to-mvr: type: union - tagged: false arms: ifno: type: integer @@ -487,7 +481,6 @@ observations: tagged: false rainfall: type: union - tagged: false arms: ifno: type: integer @@ -499,7 +492,6 @@ observations: tagged: false evaporation: type: union - tagged: false arms: ifno: type: integer @@ -511,7 +503,6 @@ observations: tagged: false runoff: type: union - tagged: false arms: ifno: type: integer @@ -523,7 +514,6 @@ observations: tagged: false ext-inflow: type: union - tagged: false arms: ifno: type: integer @@ -535,7 +525,6 @@ observations: tagged: false ext-outflow: type: union - tagged: false arms: ifno: type: integer @@ -547,11 +536,9 @@ observations: tagged: false flow-ja-face: type: union - tagged: false arms: ifno_ifno2: type: record - tagged: false fields: ifno: type: integer diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-src.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-src.json index 1dcd25d8..6b7a9be3 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-src.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-src.json @@ -326,7 +326,6 @@ "observations": { "src": { "type": "union", - "tagged": false, "arms": { "cellid": { "type": "array", @@ -346,7 +345,6 @@ }, "to-mvr": { "type": "union", - "tagged": false, "arms": { "cellid": { "type": "array", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-src.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-src.toml index 021edcf6..c8eec50b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-src.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-src.toml @@ -299,7 +299,6 @@ shape = [ [observations.src] type = "union" -tagged = false [observations.src.arms.cellid] type = "array" @@ -317,7 +316,6 @@ tagged = false [observations.to-mvr] type = "union" -tagged = false [observations.to-mvr.arms.cellid] type = "array" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-src.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-src.yaml index 9fe9cbe5..ae4104f5 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-src.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-src.yaml @@ -303,7 +303,6 @@ memory: observations: src: type: union - tagged: false arms: cellid: type: array @@ -318,7 +317,6 @@ observations: tagged: false to-mvr: type: union - tagged: false arms: cellid: type: array diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-uzt.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-uzt.json index 10cb5a7f..f74a6a80 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-uzt.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-uzt.json @@ -380,7 +380,6 @@ "observations": { "concentration": { "type": "union", - "tagged": false, "arms": { "ifno": { "type": "integer", @@ -396,7 +395,6 @@ }, "storage": { "type": "union", - "tagged": false, "arms": { "ifno": { "type": "integer", @@ -412,7 +410,6 @@ }, "constant": { "type": "union", - "tagged": false, "arms": { "ifno": { "type": "integer", @@ -428,7 +425,6 @@ }, "from-mvr": { "type": "union", - "tagged": false, "arms": { "ifno": { "type": "integer", @@ -444,7 +440,6 @@ }, "uzt": { "type": "union", - "tagged": false, "arms": { "ifno": { "type": "integer", @@ -460,7 +455,6 @@ }, "infiltration": { "type": "union", - "tagged": false, "arms": { "ifno": { "type": "integer", @@ -476,7 +470,6 @@ }, "rej-inf": { "type": "union", - "tagged": false, "arms": { "ifno": { "type": "integer", @@ -492,7 +485,6 @@ }, "uzet": { "type": "union", - "tagged": false, "arms": { "ifno": { "type": "integer", @@ -508,7 +500,6 @@ }, "rej-inf-to-mvr": { "type": "union", - "tagged": false, "arms": { "ifno": { "type": "integer", @@ -524,11 +515,9 @@ }, "flow-ja-face": { "type": "union", - "tagged": false, "arms": { "ifno_ifno2": { "type": "record", - "tagged": false, "fields": { "ifno": { "type": "integer", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-uzt.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-uzt.toml index c5aafe4d..d047fd8d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-uzt.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-uzt.toml @@ -341,7 +341,6 @@ shape = [ [observations.concentration] type = "union" -tagged = false [observations.concentration.arms.ifno] type = "integer" @@ -355,7 +354,6 @@ tagged = false [observations.storage] type = "union" -tagged = false [observations.storage.arms.ifno] type = "integer" @@ -369,7 +367,6 @@ tagged = false [observations.constant] type = "union" -tagged = false [observations.constant.arms.ifno] type = "integer" @@ -383,7 +380,6 @@ tagged = false [observations.from-mvr] type = "union" -tagged = false [observations.from-mvr.arms.ifno] type = "integer" @@ -397,7 +393,6 @@ tagged = false [observations.uzt] type = "union" -tagged = false [observations.uzt.arms.ifno] type = "integer" @@ -411,7 +406,6 @@ tagged = false [observations.infiltration] type = "union" -tagged = false [observations.infiltration.arms.ifno] type = "integer" @@ -425,7 +419,6 @@ tagged = false [observations.rej-inf] type = "union" -tagged = false [observations.rej-inf.arms.ifno] type = "integer" @@ -439,7 +432,6 @@ tagged = false [observations.uzet] type = "union" -tagged = false [observations.uzet.arms.ifno] type = "integer" @@ -453,7 +445,6 @@ tagged = false [observations.rej-inf-to-mvr] type = "union" -tagged = false [observations.rej-inf-to-mvr.arms.ifno] type = "integer" @@ -467,11 +458,9 @@ tagged = false [observations.flow-ja-face] type = "union" -tagged = false [observations.flow-ja-face.arms.ifno_ifno2] type = "record" -tagged = false [observations.flow-ja-face.arms.ifno_ifno2.fields.ifno] type = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-uzt.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-uzt.yaml index 2810ed8f..c6b0a1c7 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-uzt.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-uzt.yaml @@ -371,7 +371,6 @@ memory: observations: concentration: type: union - tagged: false arms: ifno: type: integer @@ -383,7 +382,6 @@ observations: tagged: false storage: type: union - tagged: false arms: ifno: type: integer @@ -395,7 +393,6 @@ observations: tagged: false constant: type: union - tagged: false arms: ifno: type: integer @@ -407,7 +404,6 @@ observations: tagged: false from-mvr: type: union - tagged: false arms: ifno: type: integer @@ -419,7 +415,6 @@ observations: tagged: false uzt: type: union - tagged: false arms: ifno: type: integer @@ -431,7 +426,6 @@ observations: tagged: false infiltration: type: union - tagged: false arms: ifno: type: integer @@ -443,7 +437,6 @@ observations: tagged: false rej-inf: type: union - tagged: false arms: ifno: type: integer @@ -455,7 +448,6 @@ observations: tagged: false uzet: type: union - tagged: false arms: ifno: type: integer @@ -467,7 +459,6 @@ observations: tagged: false rej-inf-to-mvr: type: union - tagged: false arms: ifno: type: integer @@ -479,11 +470,9 @@ observations: tagged: false flow-ja-face: type: union - tagged: false arms: ifno_ifno2: type: record - tagged: false fields: ifno: type: integer diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-cdb.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-cdb.json index 5472328b..b209753b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-cdb.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-cdb.json @@ -293,7 +293,6 @@ "observations": { "cdb": { "type": "union", - "tagged": false, "arms": { "cellid": { "type": "array", @@ -313,7 +312,6 @@ }, "to-mvr": { "type": "union", - "tagged": false, "arms": { "cellid": { "type": "array", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-cdb.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-cdb.toml index 1ccc2842..fa93598c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-cdb.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-cdb.toml @@ -268,7 +268,6 @@ shape = [ [observations.cdb] type = "union" -tagged = false [observations.cdb.arms.cellid] type = "array" @@ -286,7 +285,6 @@ tagged = false [observations.to-mvr] type = "union" -tagged = false [observations.to-mvr.arms.cellid] type = "array" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-cdb.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-cdb.yaml index d52eaa48..b7e493b6 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-cdb.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-cdb.yaml @@ -268,7 +268,6 @@ memory: observations: cdb: type: union - tagged: false arms: cellid: type: array @@ -283,7 +282,6 @@ observations: tagged: false to-mvr: type: union - tagged: false arms: cellid: type: array diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-chd.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-chd.json index 24319839..8c4334dd 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-chd.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-chd.json @@ -303,7 +303,6 @@ "observations": { "chd": { "type": "union", - "tagged": false, "arms": { "cellid": { "type": "array", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-chd.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-chd.toml index 19c9a69b..b41458b1 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-chd.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-chd.toml @@ -276,7 +276,6 @@ shape = [ [observations.chd] type = "union" -tagged = false [observations.chd.arms.cellid] type = "array" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-chd.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-chd.yaml index f954e377..323d967a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-chd.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-chd.yaml @@ -273,7 +273,6 @@ memory: observations: chd: type: union - tagged: false arms: cellid: type: array diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-evp.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-evp.json index 51102725..0b753635 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-evp.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-evp.json @@ -313,7 +313,6 @@ "observations": { "evp": { "type": "union", - "tagged": false, "arms": { "cellid": { "type": "array", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-evp.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-evp.toml index c9c7ab15..754063cb 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-evp.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-evp.toml @@ -286,7 +286,6 @@ shape = [ [observations.evp] type = "union" -tagged = false [observations.evp.arms.cellid] type = "array" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-evp.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-evp.yaml index 059d2bc7..c890abe4 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-evp.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-evp.yaml @@ -283,7 +283,6 @@ memory: observations: evp: type: union - tagged: false arms: cellid: type: array diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-flw.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-flw.json index c2f8f90b..8cb4d7c0 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-flw.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-flw.json @@ -305,7 +305,6 @@ "observations": { "flw": { "type": "union", - "tagged": false, "arms": { "cellid": { "type": "array", @@ -325,7 +324,6 @@ }, "to-mvr": { "type": "union", - "tagged": false, "arms": { "cellid": { "type": "array", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-flw.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-flw.toml index b3a6ccd9..79ef55b3 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-flw.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-flw.toml @@ -278,7 +278,6 @@ shape = [ [observations.flw] type = "union" -tagged = false [observations.flw.arms.cellid] type = "array" @@ -296,7 +295,6 @@ tagged = false [observations.to-mvr] type = "union" -tagged = false [observations.to-mvr.arms.cellid] type = "array" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-flw.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-flw.yaml index 69065b02..3984a60e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-flw.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-flw.yaml @@ -275,7 +275,6 @@ memory: observations: flw: type: union - tagged: false arms: cellid: type: array @@ -290,7 +289,6 @@ observations: tagged: false to-mvr: type: union - tagged: false arms: cellid: type: array diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-nam.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-nam.json index 0b65a1e1..039e0773 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-nam.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-nam.json @@ -181,7 +181,6 @@ }, "flow-ja-face": { "type": "record", - "tagged": false, "fields": { "cellid": { "type": "array", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-nam.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-nam.toml index 31808aea..d18131f5 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-nam.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-nam.toml @@ -162,7 +162,6 @@ shape = [ [observations.flow-ja-face] type = "record" -tagged = false [observations.flow-ja-face.fields.cellid] type = "array" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-nam.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-nam.yaml index 683e9c9a..bc06b21b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-nam.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-nam.yaml @@ -172,7 +172,6 @@ observations: - ncelldim flow-ja-face: type: record - tagged: false fields: cellid: type: array diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-pcp.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-pcp.json index ab03b468..462528a1 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-pcp.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-pcp.json @@ -313,7 +313,6 @@ "observations": { "pcp": { "type": "union", - "tagged": false, "arms": { "cellid": { "type": "array", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-pcp.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-pcp.toml index 7f24df64..1706311e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-pcp.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-pcp.toml @@ -286,7 +286,6 @@ shape = [ [observations.pcp] type = "union" -tagged = false [observations.pcp.arms.cellid] type = "array" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-pcp.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-pcp.yaml index bca7905e..e40d1815 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-pcp.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-pcp.yaml @@ -283,7 +283,6 @@ memory: observations: pcp: type: union - tagged: false arms: cellid: type: array diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-zdg.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-zdg.json index dbc83d3a..74b74ca7 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-zdg.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-zdg.json @@ -331,7 +331,6 @@ "observations": { "zdg": { "type": "union", - "tagged": false, "arms": { "cellid": { "type": "array", @@ -351,7 +350,6 @@ }, "to-mvr": { "type": "union", - "tagged": false, "arms": { "cellid": { "type": "array", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-zdg.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-zdg.toml index c74b65db..a61039de 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-zdg.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-zdg.toml @@ -304,7 +304,6 @@ shape = [ [observations.zdg] type = "union" -tagged = false [observations.zdg.arms.cellid] type = "array" @@ -322,7 +321,6 @@ tagged = false [observations.to-mvr] type = "union" -tagged = false [observations.to-mvr.arms.cellid] type = "array" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-zdg.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-zdg.yaml index 30692d9e..306f715d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-zdg.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-zdg.yaml @@ -310,7 +310,6 @@ memory: observations: zdg: type: union - tagged: false arms: cellid: type: array @@ -325,7 +324,6 @@ observations: tagged: false to-mvr: type: union - tagged: false arms: cellid: type: array diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-cdb.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-cdb.json index 8999d8d0..64685a6d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-cdb.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-cdb.json @@ -293,7 +293,6 @@ "observations": { "cdb": { "type": "union", - "tagged": false, "arms": { "cellid": { "type": "array", @@ -313,7 +312,6 @@ }, "to-mvr": { "type": "union", - "tagged": false, "arms": { "cellid": { "type": "array", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-cdb.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-cdb.toml index 33110de7..bc97444b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-cdb.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-cdb.toml @@ -268,7 +268,6 @@ shape = [ [observations.cdb] type = "union" -tagged = false [observations.cdb.arms.cellid] type = "array" @@ -286,7 +285,6 @@ tagged = false [observations.to-mvr] type = "union" -tagged = false [observations.to-mvr.arms.cellid] type = "array" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-cdb.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-cdb.yaml index 7945d9dd..286ab77f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-cdb.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-cdb.yaml @@ -269,7 +269,6 @@ memory: observations: cdb: type: union - tagged: false arms: cellid: type: array @@ -284,7 +283,6 @@ observations: tagged: false to-mvr: type: union - tagged: false arms: cellid: type: array diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-chd.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-chd.json index 98dd97ec..580e3f8f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-chd.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-chd.json @@ -303,7 +303,6 @@ "observations": { "chd": { "type": "union", - "tagged": false, "arms": { "cellid": { "type": "array", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-chd.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-chd.toml index 937a44d8..d02a0821 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-chd.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-chd.toml @@ -276,7 +276,6 @@ shape = [ [observations.chd] type = "union" -tagged = false [observations.chd.arms.cellid] type = "array" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-chd.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-chd.yaml index f2b64e13..c4fc7ce1 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-chd.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-chd.yaml @@ -273,7 +273,6 @@ memory: observations: chd: type: union - tagged: false arms: cellid: type: array diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-evp.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-evp.json index d4660931..d59e3fa2 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-evp.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-evp.json @@ -313,7 +313,6 @@ "observations": { "evp": { "type": "union", - "tagged": false, "arms": { "cellid": { "type": "array", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-evp.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-evp.toml index b28fa942..36b750ce 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-evp.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-evp.toml @@ -286,7 +286,6 @@ shape = [ [observations.evp] type = "union" -tagged = false [observations.evp.arms.cellid] type = "array" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-evp.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-evp.yaml index 762b01b0..fae7528a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-evp.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-evp.yaml @@ -283,7 +283,6 @@ memory: observations: evp: type: union - tagged: false arms: cellid: type: array diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-flw.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-flw.json index 476274f4..b424f1a3 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-flw.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-flw.json @@ -305,7 +305,6 @@ "observations": { "flw": { "type": "union", - "tagged": false, "arms": { "cellid": { "type": "array", @@ -325,7 +324,6 @@ }, "to-mvr": { "type": "union", - "tagged": false, "arms": { "cellid": { "type": "array", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-flw.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-flw.toml index 3ea41b4c..8062f16e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-flw.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-flw.toml @@ -278,7 +278,6 @@ shape = [ [observations.flw] type = "union" -tagged = false [observations.flw.arms.cellid] type = "array" @@ -296,7 +295,6 @@ tagged = false [observations.to-mvr] type = "union" -tagged = false [observations.to-mvr.arms.cellid] type = "array" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-flw.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-flw.yaml index 6d32f276..d1a2ebb7 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-flw.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-flw.yaml @@ -275,7 +275,6 @@ memory: observations: flw: type: union - tagged: false arms: cellid: type: array @@ -290,7 +289,6 @@ observations: tagged: false to-mvr: type: union - tagged: false arms: cellid: type: array diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-nam.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-nam.json index eb9aa391..d164085c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-nam.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-nam.json @@ -181,7 +181,6 @@ }, "flow-ja-face": { "type": "record", - "tagged": false, "fields": { "cellid": { "type": "array", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-nam.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-nam.toml index 43c3d12f..a23f26cd 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-nam.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-nam.toml @@ -162,7 +162,6 @@ shape = [ [observations.flow-ja-face] type = "record" -tagged = false [observations.flow-ja-face.fields.cellid] type = "array" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-nam.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-nam.yaml index 97553f30..4e25ad62 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-nam.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-nam.yaml @@ -172,7 +172,6 @@ observations: - ncelldim flow-ja-face: type: record - tagged: false fields: cellid: type: array diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-pcp.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-pcp.json index fdb8cf0f..a9e9a89d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-pcp.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-pcp.json @@ -313,7 +313,6 @@ "observations": { "pcp": { "type": "union", - "tagged": false, "arms": { "cellid": { "type": "array", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-pcp.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-pcp.toml index 18031760..66f8abdc 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-pcp.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-pcp.toml @@ -286,7 +286,6 @@ shape = [ [observations.pcp] type = "union" -tagged = false [observations.pcp.arms.cellid] type = "array" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-pcp.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-pcp.yaml index 90cd62cf..d01c5eda 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-pcp.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-pcp.yaml @@ -283,7 +283,6 @@ memory: observations: pcp: type: union - tagged: false arms: cellid: type: array diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-zdg.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-zdg.json index f4bf69ee..ee6962a4 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-zdg.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-zdg.json @@ -330,7 +330,6 @@ "observations": { "zdg": { "type": "union", - "tagged": false, "arms": { "cellid": { "type": "array", @@ -350,7 +349,6 @@ }, "to-mvr": { "type": "union", - "tagged": false, "arms": { "cellid": { "type": "array", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-zdg.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-zdg.toml index d366c95d..411a3636 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-zdg.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-zdg.toml @@ -303,7 +303,6 @@ shape = [ [observations.zdg] type = "union" -tagged = false [observations.zdg.arms.cellid] type = "array" @@ -321,7 +320,6 @@ tagged = false [observations.to-mvr] type = "union" -tagged = false [observations.to-mvr.arms.cellid] type = "array" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-zdg.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-zdg.yaml index 11094a7d..fda58770 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-zdg.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-zdg.yaml @@ -310,7 +310,6 @@ memory: observations: zdg: type: union - tagged: false arms: cellid: type: array @@ -325,7 +324,6 @@ observations: tagged: false to-mvr: type: union - tagged: false arms: cellid: type: array diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-obs.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-obs.json index 557fd3c8..c703527e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-obs.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-obs.json @@ -48,7 +48,6 @@ "type": "union", "longname": "time", "description": "Text identifying cell where observation is located. For packages other than NPF, if boundary names are defined in the corresponding package input file, ID can be a boundary name. Otherwise ID is a cellid. If the model discretization is type DIS, cellid is three integers (layer, row, column). If the discretization is DISV, cellid is two integers (layer, cell number). If the discretization is DISU, cellid is one integer (node number).", - "tagged": false, "arms": { "cellid": { "type": "array", @@ -76,7 +75,6 @@ "longname": "time", "description": "Text identifying cell adjacent to cell identified by ID. The form of ID2 is as described for ID. ID2 is used for intercell-flow observations of a GWF model, for three observation types of the LAK Package, for two observation types of the MAW Package, and one observation type of the UZF Package.", "optional": true, - "tagged": false, "arms": { "cellid": { "type": "array", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-obs.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-obs.toml index ac78ccaf..3fa041e8 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-obs.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-obs.toml @@ -42,7 +42,6 @@ tagged = false type = "union" longname = "time" description = "Text identifying cell where observation is located. For packages other than NPF, if boundary names are defined in the corresponding package input file, ID can be a boundary name. Otherwise ID is a cellid. If the model discretization is type DIS, cellid is three integers (layer, row, column). If the discretization is DISV, cellid is two integers (layer, cell number). If the discretization is DISU, cellid is one integer (node number)." -tagged = false [blocks.continuous.fields.continuous.item.fields.id.arms.cellid] type = "array" @@ -68,7 +67,6 @@ type = "union" longname = "time" description = "Text identifying cell adjacent to cell identified by ID. The form of ID2 is as described for ID. ID2 is used for intercell-flow observations of a GWF model, for three observation types of the LAK Package, for two observation types of the MAW Package, and one observation type of the UZF Package." optional = true -tagged = false [blocks.continuous.fields.continuous.item.fields.id2.arms.cellid] type = "array" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-obs.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-obs.yaml index 791024b3..d7465644 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-obs.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-obs.yaml @@ -54,7 +54,6 @@ blocks: a boundary name. Otherwise ID is a cellid. If the model discretization is type DIS, cellid is three integers (layer, row, column). If the discretization is DISV, cellid is two integers (layer, cell number). If the discretization is DISU, cellid is one integer (node number). - tagged: false arms: cellid: type: array @@ -79,7 +78,6 @@ blocks: observation types of the LAK Package, for two observation types of the MAW Package, and one observation type of the UZF Package. optional: true - tagged: false arms: cellid: type: array diff --git a/autotest/dfns/test_schema.py b/autotest/dfns/test_schema.py index ab62e52d..c5d6df1e 100644 --- a/autotest/dfns/test_schema.py +++ b/autotest/dfns/test_schema.py @@ -448,6 +448,47 @@ def test_list_tagged_not_serialized_or_settable(): lst.model_copy(update={"tagged": False}) +def test_composite_tagged_derived(): + """A record is tagged iff its first field is, a union iff every arm is.""" + assert _ts_list().item.tagged is True + assert _table_list().item.tagged is False + led = Record(name="r", fields={"head_limit": Keyword(name="head_limit"), "v": Double(name="v")}) + assert led.tagged is True + assert Record(name="r", fields={"v": Double(name="v", tagged=False)}).tagged is False + assert Record(name="r", fields={"v": Double(name="v")}).tagged is True # `V ` + assert Record(name="r").tagged is False + discriminated = Union(name="u", arms={"r": led, "all": Keyword(name="all")}) + assert discriminated.tagged is True + number_or_word = Union( + name="u", arms={"off": Keyword(name="off"), "value": Double(name="value", tagged=False)} + ) + assert number_or_word.tagged is False + assert Keyword(name="all").tagged is True + + +@pytest.mark.parametrize("cls", [Record, Union, Keyword]) +def test_composite_tagged_not_serialized_or_settable(cls): + kwargs: dict = {"name": "x"} + if cls is Record: + kwargs["fields"] = {"v": Double(name="v", tagged=False)} + if cls is Union: + kwargs["arms"] = {"v": Double(name="v", tagged=False)} + field = cls(**kwargs) + assert "tagged" not in field.model_dump() + assert cls.model_validate(field.model_dump()).tagged is field.tagged + with pytest.raises(ValueError, match="contradicts"): + cls(**kwargs, tagged=not field.tagged) + with pytest.raises(ValueError, match="derived"): + field.model_copy(update={"tagged": not field.tagged}) + + +def test_composite_tagged_rederived_on_model_copy(): + record = Record(name="r", fields={"v": Double(name="v", tagged=False)}) + assert record.model_copy(update={"fields": {"k": Keyword(name="k")}}).tagged is True + union = Union(name="u", arms={"k": Keyword(name="k")}) + assert union.model_copy(update={"arms": {"v": Double(name="v", tagged=False)}}).tagged is False + + def test_list_tagged_rederived_on_model_copy(): """model_copy skips validation, so List re-derives `tagged` itself.""" lst = _ts_list() diff --git a/autotest/dfns/test_schema_relations.py b/autotest/dfns/test_schema_relations.py index 02896174..f6a7bfeb 100644 --- a/autotest/dfns/test_schema_relations.py +++ b/autotest/dfns/test_schema_relations.py @@ -299,7 +299,6 @@ def test_dfns_validate_cellid_union_arms_are_alternatives(): # is checked against the row's other cellid columns. union = Union( name="id", - tagged=False, arms={"x": _cellid_col("x", "1"), "y": _cellid_col("y", "2")}, ) item = Record(name="item", fields={"a": _cellid_col("a", "1"), "id": union}) diff --git a/docs/md/dfnspec.md b/docs/md/dfnspec.md index 4d464968..bf232ff2 100644 --- a/docs/md/dfnspec.md +++ b/docs/md/dfnspec.md @@ -278,9 +278,9 @@ A block has no explicit `optional` attribute. Its optionality is derived from it Field order within a block can be significant. -Tagged fields must precede untagged fields. Fields whose values are not preceded by their name (i.e., `tagged: false`) must come after all tagged fields. Among tagged fields, relative order is unconstrained. Untagged fields must appear in the same order of appearance as in the definition. +Tagged fields must precede untagged fields. Fields that don't begin with a keyword (i.e., `tagged: false`) must come after all tagged fields. Among tagged fields, relative order is unconstrained. Untagged fields must appear in the same order of appearance as in the definition. -**Note:** a list's `tagged` is derived from its `item`, never declared (see [List](#list)). An **untagged** list's item type begins with a value, so its items have no keyword delimiter; once a parser reaches an untagged list, it must continue to read lines as list items until the block's end tag. Therefore an untagged list must be the last field in its block and a block may have at most one untagged list. A **tagged** list's item type begins with a keyword, so a parser can recognize its items anywhere in the block, like any other tagged field: it may appear anywhere among the block's tagged fields, and a block may have any number of them. No other field in the block may begin with one of a tagged list's item keywords. For a list whose item begins with a dynamic keyword (see [List](#list)), this can only be checked at runtime: no value of the key's `fk` target may be the keyword of another field in the block. +**Note:** a list's `tagged` is derived from its `item`, never declared (see [`tagged`](#tagged) and [List](#list)). An **untagged** list's item type begins with a value, so its items have no keyword delimiter; once a parser reaches an untagged list, it must continue to read lines as list items until the block's end tag. Therefore an untagged list must be the last field in its block and a block may have at most one untagged list. A **tagged** list's item type begins with a keyword, so a parser can recognize its items anywhere in the block, like any other tagged field: it may appear anywhere among the block's tagged fields, and a block may have any number of them. No other field in the block may begin with one of a tagged list's item keywords. For a list whose item begins with a dynamic keyword (see [List](#list)), this can only be checked at runtime: no value of the key's `fk` target may be the keyword of another field in the block. ## Fields @@ -353,7 +353,14 @@ A list's default value is interpreted as a single element. This allows consumers #### `tagged` -`boolean (default: true)`. Indicates that the field value should be preceded by the field name. Not declared on lists, where it's derived instead; see [List](#list). +`boolean (default: true)`. Whether the field begins with a keyword in input files. On a scalar or an array, it says whether the field's own name precedes its value, e.g. `MAXBOUND `. Other types derive it, so it is never declared on them: + +- A keyword always begins with itself, so it is always tagged. +- A record is tagged if its first field is, or is a dynamic keyword (see [List](#list)). +- A union is tagged if every arm is, so that the keyword picks the arm. This is a tagged union in the type-theory sense. An untagged union has an arm that begins with a value instead. +- A list is tagged if its item is (see [List](#list)). + +A composite never begins with its own name. A keyword before a composite is a field of an enclosing record, e.g. `gwf-oc`'s `SAVE `, where `ocsetting` is a union. ### Scalars @@ -519,7 +526,7 @@ The leading `ncelldim` is not resolved as a dim in the component's own scope: it #### Record -Type `record`. Product type. In MF6 input files, records appear on a single line, except for a record that consists of a dynamic keyword (see [List](#list)) followed by an array: it is read like a tagged array whose tag is the key's value, i.e. the key on its own line, then the array in READARRAY format on the following lines. Record subfields may or may not be `tagged`. While blocks can be considered product types also, in the DFN specification only records are considered fields; blocks are considered named collections of related fields. +Type `record`. Product type. In MF6 input files, records appear on a single line, except for a record that consists of a dynamic keyword (see [List](#list)) followed by an array: it is read like a tagged array whose tag is the key's value, i.e. the key on its own line, then the array in READARRAY format on the following lines. Record subfields may or may not be `tagged`, and the first decides whether the record is. While blocks can be considered product types also, in the DFN specification only records are considered fields; blocks are considered named collections of related fields. ##### Type-specific attributes @@ -541,15 +548,15 @@ Type `union`. Sum type. `{string: Scalar | Array | Record}`. Subfields, required. -A union is usually keyword-led: each arm begins with its own keyword, which picks the arm. An untagged union's arms begin with a value instead, and the value alone may not pick the arm. `utl-obs`'s `id` is a cellid, a 1-based index (e.g. a lake number), or a boundname, depending on the parent package and the observation type. The parent's [`observations`](#observations) say which. +A union is usually tagged: each arm begins with its own keyword, which picks the arm. An untagged union has an arm that begins with a value instead, and the value alone may not pick the arm. A union can't be another union's arm: a tagged one's arms could be the outer union's own, and an untagged one has no keyword to pick it. `utl-obs`'s `id` is a cellid, a 1-based index (e.g. a lake number), or a boundname, depending on the parent package and the observation type. The parent's [`observations`](#observations) say which. -A reader tries an untagged union's arms in order. A `keyword` arm is its own name as a literal token, matched case-insensitively, so a keyword arm before a number arm expresses "a number, or this word". For example, `gwf-lak`'s `bedleak` has arms `none` (a keyword) and `value` (a double), and `gwf-maw`'s `HEAD_LIMIT` takes `OFF` or a number. A union can't be another union's arm, so `HEAD_LIMIT`'s arm of `mawsetting` is a record of the `head_limit` keyword and such a union, `head_limit_value`: `HEAD_LIMIT `. +A reader tries an untagged union's arms in order. A `keyword` arm is its own name as a literal token, matched case-insensitively, so a keyword arm before a number arm expresses "a number, or this word". For example, `gwf-lak`'s `bedleak` has arms `none` (a keyword) and `value` (a double), and `gwf-maw`'s `HEAD_LIMIT` takes `OFF` or a number. Since unions don't nest, `HEAD_LIMIT`'s arm of `mawsetting` is a tagged record of the `head_limit` keyword and such a union, `head_limit_value`: `HEAD_LIMIT `. #### List Type `list`. Collection type. Unlimited but for one rule: a list may not contain another list. Lists are distinct from arrays in two ways: a list element may be a composite type and a list admits sparse representations. -A list is **tagged** if and only if its `item` type is keyword-led. This is a property of the definition, not of any particular input file. A type is keyword-led if it is a `keyword`, a tagged scalar or array (which begins with its own name), or a record whose first field is keyword-led or is a **dynamic keyword**: an untagged `string` whose `fk` is a hierarchical path to a string array, so that its value is one of that array's entries. A dynamic keyword's possible values are known keywords once the array has been read, though not when the definition is written. A `union` item type is keyword-led if every arm is, since each arm is a distinct line form the item may take. For example, a record item `TS6 FILEIN `, or a union item whose arms are `ALL` and `FREQUENCY `. Otherwise it is **untagged**. This is derived from `item` rather than declared (like a block's optionality), and determines where the list may appear in its block (see [Field ordering](#field-ordering)). +A list is **tagged** if and only if its `item` type is keyword-led, i.e. tagged. This is a property of the definition, not of any particular input file. A type is keyword-led if it is a `keyword`, a tagged scalar or array (which begins with its own name), or a record whose first field is keyword-led or is a **dynamic keyword**: an untagged `string` whose `fk` is a hierarchical path to a string array, so that its value is one of that array's entries. A dynamic keyword's possible values are known keywords once the array has been read, though not when the definition is written. A `union` item type is keyword-led if every arm is, since each arm is a distinct line form the item may take. For example, a record item `TS6 FILEIN `, or a union item whose arms are `ALL` and `FREQUENCY `. Otherwise it is **untagged**. This is derived from `item` rather than declared (like a block's optionality), and determines where the list may appear in its block (see [Field ordering](#field-ordering)). Untagged lists are tables: a block body of items, one per line, e.g. a stress package's period data. Tagged lists also express a line that may be repeated among a block's other fields, e.g. `TS6 FILEIN `, which MODFLOW 6 accepts any number of times in a package's options block (one per time-series file). A tagged list whose item begins with a dynamic keyword expresses a field whose name is chosen by the user. For example, an array-based stress package (e.g. `gwf-rcha`) reads one grid array per auxiliary variable, each introduced by that variable's name: 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 5223aca0..d8ad0de1 100644 --- a/modflow_devtools/dfns/migrate_to_v2_0_0_dev2.py +++ b/modflow_devtools/dfns/migrate_to_v2_0_0_dev2.py @@ -708,15 +708,16 @@ def _replace(field: Any, in_union: bool, word: str = word) -> Any: f"{name}: {field.name!r} is {'' if field.tagged else 'un'}tagged, " f"expected {'a union arm' if field.tagged else 'a record column'}" ) - data = {k: getattr(field, k) for k in v2.InputFieldBase.model_fields} + # `tagged` is derived from the arms + data = {k: getattr(field, k) for k in v2.InputFieldBase.model_fields if k != "tagged"} arms: dict[str, v2.Scalar | v2.Array | v2.Record] = { word: v2.Keyword(name=word), "value": v2.Double(name="value", tagged=False), } if not in_union: - return v2.Union(**{**data, "tagged": False}, arms=arms) + return v2.Union(**data, arms=arms) value = v2.Union( - **{**data, "name": f"{field.name}_value", "tagged": False, "optional": False}, + **{**data, "name": f"{field.name}_value", "optional": False}, arms=arms, ) return v2.Record( @@ -1840,7 +1841,6 @@ def _to_id_union() -> v2.Union: developmode=developmode, removed=removed, deprecated=deprecated, - tagged=False, arms={ "cellid": v2.Array( name="cellid", diff --git a/modflow_devtools/dfns/observations.py b/modflow_devtools/dfns/observations.py index c490d98e..ed9dd032 100644 --- a/modflow_devtools/dfns/observations.py +++ b/modflow_devtools/dfns/observations.py @@ -30,13 +30,13 @@ def _record( """ID and ID2, named after both (e.g. ``ifno_iconn``) so records that are arms of the same union get distinct names.""" name = "_".join(f.name for f in fields) - return v2.Record(name=name, tagged=False, fields={f.name: f for f in fields}) + return v2.Record(name=name, fields={f.name: f for f in fields}) def _or_boundname(form: "v2.Integer | v2.Array | v2.Record") -> v2.Union: """``form``, or a boundname instead, after which MF6 reads no ID2.""" boundname = v2.String(name="boundname", tagged=False) - return v2.Union(name=form.name, tagged=False, arms={form.name: form, "boundname": boundname}) + return v2.Union(name=form.name, arms={form.name: form, "boundname": boundname}) def _all(field: _Field, *obstypes: str) -> dict[str, _Field]: @@ -66,7 +66,7 @@ def _connection_or_name(pk: str, iconn: str = "iconn") -> v2.Union: feature = _index(pk, fk=f"packagedata.{pk}") boundname = v2.String(name="boundname", tagged=False) arms = (_record(feature, _index(iconn)), _record(feature, boundname), boundname) - return v2.Union(name=pk, tagged=False, arms={arm.name: arm for arm in arms}) + return v2.Union(name=pk, arms={arm.name: arm for arm in arms}) # Stress packages diff --git a/modflow_devtools/dfns/schema.json b/modflow_devtools/dfns/schema.json index fabbf5b2..5f43434c 100644 --- a/modflow_devtools/dfns/schema.json +++ b/modflow_devtools/dfns/schema.json @@ -792,11 +792,6 @@ "title": "Netcdf", "type": "boolean" }, - "tagged": { - "default": true, - "title": "Tagged", - "type": "boolean" - }, "removed": { "anyOf": [ { @@ -1697,11 +1692,6 @@ "title": "Netcdf", "type": "boolean" }, - "tagged": { - "default": true, - "title": "Tagged", - "type": "boolean" - }, "removed": { "anyOf": [ { @@ -2207,11 +2197,6 @@ "title": "Netcdf", "type": "boolean" }, - "tagged": { - "default": true, - "title": "Tagged", - "type": "boolean" - }, "removed": { "anyOf": [ { diff --git a/modflow_devtools/dfns/schema.py b/modflow_devtools/dfns/schema.py index 51e9e1ab..384a0eee 100644 --- a/modflow_devtools/dfns/schema.py +++ b/modflow_devtools/dfns/schema.py @@ -90,10 +90,48 @@ def render(self, *, inline: bool = False) -> str: return _render_field(cast("InputField", self), inline=inline) -class Keyword(InputFieldBase): +class _DerivedTagged(InputFieldBase): + """A field whose `tagged` follows from its type, not declared. A field is + tagged iff it begins with a keyword: a scalar or array declares whether + its own name precedes it, but a keyword always begins with itself, and a + composite begins with whatever its parts begin with (see `_item_tags`). + Never serialized. A hidden field rather than a property because pydantic + can't override an inherited field with one, so it's re-derived wherever + pydantic skips validation (see `model_copy`).""" + + tagged: SkipJsonSchema[bool] = PydanticField(default=False, exclude=True) + + def _derive_tagged(self) -> bool: + raise NotImplementedError + + @model_validator(mode="after") + def _set_tagged(self) -> "_DerivedTagged": + tagged = self._derive_tagged() + if "tagged" in self.model_fields_set and self.tagged != tagged: + raise ValueError( + f"{type(self).__name__} {self.name!r}: tagged={self.tagged!r} contradicts " + f"its type, which {'begins' if tagged else 'does not begin'} with a keyword" + ) + object.__setattr__(self, "tagged", tagged) + return self + + def model_copy(self, *, update: Mapping[str, Any] | None = None, deep: bool = False): + if update and "tagged" in update: + raise ValueError( + f"{type(self).__name__} {self.name!r}: tagged is derived, not settable" + ) + copy = super().model_copy(update=update, deep=deep) + object.__setattr__(copy, "tagged", copy._derive_tagged()) + return copy + + +class Keyword(_DerivedTagged): type: Literal["keyword"] = PydanticField(default="keyword", frozen=True) aliases: list[str] = [] + def _derive_tagged(self) -> bool: + return True + class String(InputFieldBase): type: Literal["string"] = PydanticField(default="string", frozen=True) @@ -193,19 +231,27 @@ def _check_index_dtype(self) -> "Array": return self -class Record(InputFieldBase): +class Record(_DerivedTagged): type: Literal["record"] = PydanticField(default="record", frozen=True) fields: "dict[str, Scalar | Array | Record | Union]" = PydanticField(default_factory=dict) + def _derive_tagged(self) -> bool: + # Its first field begins with a keyword, or is a dynamic keyword. + return _item_tags(self) is not None + @property def children(self) -> "dict[str, InputField]": return self.fields # type: ignore[return-value] -class Union(InputFieldBase): +class Union(_DerivedTagged): type: Literal["union"] = PydanticField(default="union", frozen=True) arms: "dict[str, Scalar | Array | Record]" = PydanticField(default_factory=dict) + def _derive_tagged(self) -> bool: + # Every arm begins with a keyword, which picks the arm. + return _item_tags(self) is not None + @property def children(self) -> "dict[str, InputField]": return self.arms # type: ignore[return-value] @@ -269,36 +315,16 @@ def _leading_tags(field: "InputField", *, every_line: bool = False) -> list[str] return field.item_tags -class List(InputFieldBase): +class List(_DerivedTagged): type: Literal["list"] = PydanticField(default="list", frozen=True) - # Derived from `item`, like `Block.optional`: a list is tagged iff its item - # type is keyword-led (see `_item_tags`). A tagged list's items can be told - # apart from the block's other fields, so unlike an untagged list it needn't - # be the last or only list in its block. Never serialized. A hidden field - # rather than a property because pydantic can't override an inherited field - # with one, so it's re-derived wherever pydantic skips validation (see - # `model_copy`). - tagged: SkipJsonSchema[bool] = PydanticField(default=False, exclude=True) item: "Record | Union" shape: list[str] = [] - @model_validator(mode="after") - def _derive_tagged(self) -> "List": - tagged = _item_tags(self.item) is not None - if "tagged" in self.model_fields_set and self.tagged != tagged: - raise ValueError( - f"List {self.name!r}: tagged={self.tagged!r} contradicts its item, " - f"whose type {'is' if tagged else 'is not'} keyword-led" - ) - object.__setattr__(self, "tagged", tagged) - return self - - def model_copy(self, *, update: Mapping[str, Any] | None = None, deep: bool = False) -> "List": - if update and "tagged" in update: - raise ValueError(f"List {self.name!r}: tagged is derived from item, not settable") - copy = super().model_copy(update=update, deep=deep) - object.__setattr__(copy, "tagged", _item_tags(copy.item) is not None) - return copy + def _derive_tagged(self) -> bool: + # Its item begins with a keyword. A tagged list's items can be told + # apart from the block's other fields, so unlike an untagged list it + # needn't be the last or only list in its block. + return self.item.tagged @property def item_tags(self) -> list[str]: