diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-cdb.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-cdb.json index ce8794a8..7563a453 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-cdb.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-cdb.json @@ -86,16 +86,10 @@ "type": "record", "fields": { "cellid": { - "type": "array", + "type": "cellid", "longname": "cell identifier", "description": "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell.", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "tagged": false }, "idcxs": { "type": "integer", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-cdb.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-cdb.toml index 8d052c49..24b7a6fc 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-cdb.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-cdb.toml @@ -75,16 +75,10 @@ name = "stress_period_data" type = "record" [blocks.period.fields.stress_period_data.item.fields.cellid] -type = "array" +type = "cellid" longname = "cell identifier" description = "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell." tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [blocks.period.fields.stress_period_data.item.fields.idcxs] type = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-cdb.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-cdb.yaml index ee82f122..465c5bab 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-cdb.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-cdb.yaml @@ -84,7 +84,7 @@ blocks: type: record fields: cellid: - type: array + type: cellid longname: cell identifier description: is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, @@ -92,11 +92,6 @@ blocks: number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell. tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim idcxs: type: integer longname: cross section identifier diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-chd.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-chd.json index 12f664b2..1a2d84e8 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-chd.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-chd.json @@ -115,16 +115,10 @@ "type": "record", "fields": { "cellid": { - "type": "array", + "type": "cellid", "longname": "cell identifier", "description": "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell.", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "tagged": false }, "head": { "type": "double", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-chd.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-chd.toml index 9d22fee7..d53a0510 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-chd.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-chd.toml @@ -102,16 +102,10 @@ name = "stress_period_data" type = "record" [blocks.period.fields.stress_period_data.item.fields.cellid] -type = "array" +type = "cellid" longname = "cell identifier" description = "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell." tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [blocks.period.fields.stress_period_data.item.fields.head] type = "double" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-chd.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-chd.yaml index d1b08a7c..cd4eab53 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-chd.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-chd.yaml @@ -109,7 +109,7 @@ blocks: type: record fields: cellid: - type: array + type: cellid longname: cell identifier description: is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, @@ -117,11 +117,6 @@ blocks: number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell. tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim head: type: double longname: head value assigned to constant head diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-evp.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-evp.json index 8106634d..d397531a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-evp.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-evp.json @@ -115,16 +115,10 @@ "type": "record", "fields": { "cellid": { - "type": "array", + "type": "cellid", "longname": "cell identifier", "description": "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell.", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "tagged": false }, "evaporation": { "type": "double", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-evp.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-evp.toml index 0393a56b..db48b7e2 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-evp.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-evp.toml @@ -102,16 +102,10 @@ name = "stress_period_data" type = "record" [blocks.period.fields.stress_period_data.item.fields.cellid] -type = "array" +type = "cellid" longname = "cell identifier" description = "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell." tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [blocks.period.fields.stress_period_data.item.fields.evaporation] type = "double" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-evp.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-evp.yaml index bb96e62b..fd81d233 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-evp.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-evp.yaml @@ -109,7 +109,7 @@ blocks: type: record fields: cellid: - type: array + type: cellid longname: cell identifier description: is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, @@ -117,11 +117,6 @@ blocks: number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell. tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim evaporation: type: double longname: evaporation rate diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-flw.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-flw.json index 03d51de3..41445b1b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-flw.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-flw.json @@ -115,16 +115,10 @@ "type": "record", "fields": { "cellid": { - "type": "array", + "type": "cellid", "longname": "cell identifier", "description": "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell.", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "tagged": false }, "q": { "type": "double", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-flw.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-flw.toml index ab30faca..84a36739 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-flw.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-flw.toml @@ -102,16 +102,10 @@ name = "stress_period_data" type = "record" [blocks.period.fields.stress_period_data.item.fields.cellid] -type = "array" +type = "cellid" longname = "cell identifier" description = "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell." tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [blocks.period.fields.stress_period_data.item.fields.q] type = "double" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-flw.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-flw.yaml index 2ca119a2..df8cb0bb 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-flw.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-flw.yaml @@ -108,7 +108,7 @@ blocks: type: record fields: cellid: - type: array + type: cellid longname: cell identifier description: is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, @@ -116,11 +116,6 @@ blocks: number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell. tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim q: type: double longname: well rate diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-pcp.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-pcp.json index 7f632fd6..51e7406f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-pcp.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-pcp.json @@ -115,16 +115,10 @@ "type": "record", "fields": { "cellid": { - "type": "array", + "type": "cellid", "longname": "cell identifier", "description": "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell.", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "tagged": false }, "precipitation": { "type": "double", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-pcp.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-pcp.toml index 14734bd4..36c4d3ef 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-pcp.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-pcp.toml @@ -102,16 +102,10 @@ name = "stress_period_data" type = "record" [blocks.period.fields.stress_period_data.item.fields.cellid] -type = "array" +type = "cellid" longname = "cell identifier" description = "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell." tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [blocks.period.fields.stress_period_data.item.fields.precipitation] type = "double" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-pcp.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-pcp.yaml index 757c622d..d0ae8cbe 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-pcp.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-pcp.yaml @@ -109,7 +109,7 @@ blocks: type: record fields: cellid: - type: array + type: cellid longname: cell identifier description: is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, @@ -117,11 +117,6 @@ blocks: number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell. tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim precipitation: type: double longname: precipitation rate diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-zdg.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-zdg.json index ecac6383..ecabd675 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-zdg.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-zdg.json @@ -109,16 +109,10 @@ "type": "record", "fields": { "cellid": { - "type": "array", + "type": "cellid", "longname": "cell identifier", "description": "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell.", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "tagged": false }, "idcxs": { "type": "integer", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-zdg.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-zdg.toml index 16e7a69c..a9f79ebc 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-zdg.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-zdg.toml @@ -96,16 +96,10 @@ name = "stress_period_data" type = "record" [blocks.period.fields.stress_period_data.item.fields.cellid] -type = "array" +type = "cellid" longname = "cell identifier" description = "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell." tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [blocks.period.fields.stress_period_data.item.fields.idcxs] type = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-zdg.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-zdg.yaml index bc1907e4..017ac150 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-zdg.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-zdg.yaml @@ -104,7 +104,7 @@ blocks: type: record fields: cellid: - type: array + type: cellid longname: cell identifier description: is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, @@ -112,11 +112,6 @@ blocks: number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell. tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim idcxs: type: integer longname: cross section identifier diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-chfgwf.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-chfgwf.json index b0841f17..26d8a078 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-chfgwf.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-chfgwf.json @@ -72,28 +72,18 @@ "type": "record", "fields": { "cellidm1": { - "type": "array", + "type": "cellid", "longname": "cellid of cell in surface water model", "description": "is the cellid of the cell in model 1, which must be the surface water model. For a structured grid that uses the DIS input file, CELLIDM1 is the layer, row, and column numbers of the cell. For a grid that uses the DISV input file, CELLIDM1 is the layer number and CELL2D number for the two cells. If the model uses the unstructured discretization (DISU) input file, then CELLIDM1 is the node number for the cell.", "tagged": false, - "dtype": "integer", - "index": true, - "cellid": "1", - "shape": [ - "ncelldim" - ] + "model": "1" }, "cellidm2": { - "type": "array", + "type": "cellid", "longname": "cellid of cell in groundwater model", "description": "is the cellid of the cell in model 2, which must be the groundwater model. For a structured grid that uses the DIS input file, CELLIDM2 is the layer, row, and column numbers of the cell. For a grid that uses the DISV input file, CELLIDM2 is the layer number and CELL2D number for the two cells. If the model uses the unstructured discretization (DISU) input file, then CELLIDM2 is the node number for the cell.", "tagged": false, - "dtype": "integer", - "index": true, - "cellid": "2", - "shape": [ - "ncelldim" - ] + "model": "2" }, "bedleak": { "type": "double", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-chfgwf.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-chfgwf.toml index 7c236e32..2240fce2 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-chfgwf.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-chfgwf.toml @@ -61,28 +61,18 @@ name = "exchangedata" type = "record" [blocks.exchangedata.fields.exchangedata.item.fields.cellidm1] -type = "array" +type = "cellid" longname = "cellid of cell in surface water model" description = "is the cellid of the cell in model 1, which must be the surface water model. For a structured grid that uses the DIS input file, CELLIDM1 is the layer, row, and column numbers of the cell. For a grid that uses the DISV input file, CELLIDM1 is the layer number and CELL2D number for the two cells. If the model uses the unstructured discretization (DISU) input file, then CELLIDM1 is the node number for the cell." tagged = false -dtype = "integer" -index = true -cellid = "1" -shape = [ - "ncelldim", -] +model = "1" [blocks.exchangedata.fields.exchangedata.item.fields.cellidm2] -type = "array" +type = "cellid" longname = "cellid of cell in groundwater model" description = "is the cellid of the cell in model 2, which must be the groundwater model. For a structured grid that uses the DIS input file, CELLIDM2 is the layer, row, and column numbers of the cell. For a grid that uses the DISV input file, CELLIDM2 is the layer number and CELL2D number for the two cells. If the model uses the unstructured discretization (DISU) input file, then CELLIDM2 is the node number for the cell." tagged = false -dtype = "integer" -index = true -cellid = "2" -shape = [ - "ncelldim", -] +model = "2" [blocks.exchangedata.fields.exchangedata.item.fields.bedleak] type = "double" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-chfgwf.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-chfgwf.yaml index 20540f66..9981c4da 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-chfgwf.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-chfgwf.yaml @@ -63,7 +63,7 @@ blocks: type: record fields: cellidm1: - type: array + type: cellid longname: cellid of cell in surface water model description: is the cellid of the cell in model 1, which must be the surface water model. For a structured grid that uses the DIS input file, CELLIDM1 is the layer, row, and column @@ -71,13 +71,9 @@ blocks: number and CELL2D number for the two cells. If the model uses the unstructured discretization (DISU) input file, then CELLIDM1 is the node number for the cell. tagged: false - dtype: integer - index: true - cellid: '1' - shape: - - ncelldim + model: '1' cellidm2: - type: array + type: cellid longname: cellid of cell in groundwater model description: is the cellid of the cell in model 2, which must be the groundwater model. For a structured grid that uses the DIS input file, CELLIDM2 is the layer, row, and column @@ -85,11 +81,7 @@ blocks: number and CELL2D number for the two cells. If the model uses the unstructured discretization (DISU) input file, then CELLIDM2 is the node number for the cell. tagged: false - dtype: integer - index: true - cellid: '2' - shape: - - ncelldim + model: '2' bedleak: type: double longname: bed leakance diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwegwe.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwegwe.json index 70c59943..41590f24 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwegwe.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwegwe.json @@ -146,28 +146,18 @@ "type": "record", "fields": { "cellidm1": { - "type": "array", + "type": "cellid", "longname": "cellid of first cell", "description": "is the cellid of the cell in model 1 as specified in the simulation name file. For a structured grid that uses the DIS input file, CELLIDM1 is the layer, row, and column numbers of the cell. For a grid that uses the DISV input file, CELLIDM1 is the layer number and CELL2D number for the two cells. If the model uses the unstructured discretization (DISU) input file, then CELLIDM1 is the node number for the cell.", "tagged": false, - "dtype": "integer", - "index": true, - "cellid": "1", - "shape": [ - "ncelldim" - ] + "model": "1" }, "cellidm2": { - "type": "array", + "type": "cellid", "longname": "cellid of second cell", "description": "is the cellid of the cell in model 2 as specified in the simulation name file. For a structured grid that uses the DIS input file, CELLIDM2 is the layer, row, and column numbers of the cell. For a grid that uses the DISV input file, CELLIDM2 is the layer number and CELL2D number for the two cells. If the model uses the unstructured discretization (DISU) input file, then CELLIDM2 is the node number for the cell.", "tagged": false, - "dtype": "integer", - "index": true, - "cellid": "2", - "shape": [ - "ncelldim" - ] + "model": "2" }, "ihc": { "type": "integer", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwegwe.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwegwe.toml index 682dedeb..87ae5501 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwegwe.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwegwe.toml @@ -133,28 +133,18 @@ name = "exchangedata" type = "record" [blocks.exchangedata.fields.exchangedata.item.fields.cellidm1] -type = "array" +type = "cellid" longname = "cellid of first cell" description = "is the cellid of the cell in model 1 as specified in the simulation name file. For a structured grid that uses the DIS input file, CELLIDM1 is the layer, row, and column numbers of the cell. For a grid that uses the DISV input file, CELLIDM1 is the layer number and CELL2D number for the two cells. If the model uses the unstructured discretization (DISU) input file, then CELLIDM1 is the node number for the cell." tagged = false -dtype = "integer" -index = true -cellid = "1" -shape = [ - "ncelldim", -] +model = "1" [blocks.exchangedata.fields.exchangedata.item.fields.cellidm2] -type = "array" +type = "cellid" longname = "cellid of second cell" description = "is the cellid of the cell in model 2 as specified in the simulation name file. For a structured grid that uses the DIS input file, CELLIDM2 is the layer, row, and column numbers of the cell. For a grid that uses the DISV input file, CELLIDM2 is the layer number and CELL2D number for the two cells. If the model uses the unstructured discretization (DISU) input file, then CELLIDM2 is the node number for the cell." tagged = false -dtype = "integer" -index = true -cellid = "2" -shape = [ - "ncelldim", -] +model = "2" [blocks.exchangedata.fields.exchangedata.item.fields.ihc] type = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwegwe.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwegwe.yaml index 4a86032c..cd966df4 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwegwe.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwegwe.yaml @@ -143,7 +143,7 @@ blocks: type: record fields: cellidm1: - type: array + type: cellid longname: cellid of first cell description: is the cellid of the cell in model 1 as specified in the simulation name file. For a structured grid that uses the DIS input file, CELLIDM1 is the layer, row, and column @@ -151,13 +151,9 @@ blocks: number and CELL2D number for the two cells. If the model uses the unstructured discretization (DISU) input file, then CELLIDM1 is the node number for the cell. tagged: false - dtype: integer - index: true - cellid: '1' - shape: - - ncelldim + model: '1' cellidm2: - type: array + type: cellid longname: cellid of second cell description: is the cellid of the cell in model 2 as specified in the simulation name file. For a structured grid that uses the DIS input file, CELLIDM2 is the layer, row, and column @@ -165,11 +161,7 @@ blocks: number and CELL2D number for the two cells. If the model uses the unstructured discretization (DISU) input file, then CELLIDM2 is the node number for the cell. tagged: false - dtype: integer - index: true - cellid: '2' - shape: - - ncelldim + model: '2' ihc: type: integer longname: integer flag for connection type diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwfgwf.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwfgwf.json index c433efc8..233f96ca 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwfgwf.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwfgwf.json @@ -174,28 +174,18 @@ "type": "record", "fields": { "cellidm1": { - "type": "array", + "type": "cellid", "longname": "cellid of first cell", "description": "is the cellid of the cell in model 1 as specified in the simulation name file. For a structured grid that uses the DIS input file, CELLIDM1 is the layer, row, and column numbers of the cell. For a grid that uses the DISV input file, CELLIDM1 is the layer number and CELL2D number for the two cells. If the model uses the unstructured discretization (DISU) input file, then CELLIDM1 is the node number for the cell.", "tagged": false, - "dtype": "integer", - "index": true, - "cellid": "1", - "shape": [ - "ncelldim" - ] + "model": "1" }, "cellidm2": { - "type": "array", + "type": "cellid", "longname": "cellid of second cell", "description": "is the cellid of the cell in model 2 as specified in the simulation name file. For a structured grid that uses the DIS input file, CELLIDM2 is the layer, row, and column numbers of the cell. For a grid that uses the DISV input file, CELLIDM2 is the layer number and CELL2D number for the two cells. If the model uses the unstructured discretization (DISU) input file, then CELLIDM2 is the node number for the cell.", "tagged": false, - "dtype": "integer", - "index": true, - "cellid": "2", - "shape": [ - "ncelldim" - ] + "model": "2" }, "ihc": { "type": "integer", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwfgwf.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwfgwf.toml index 79098670..f9037bf9 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwfgwf.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwfgwf.toml @@ -157,28 +157,18 @@ name = "exchangedata" type = "record" [blocks.exchangedata.fields.exchangedata.item.fields.cellidm1] -type = "array" +type = "cellid" longname = "cellid of first cell" description = "is the cellid of the cell in model 1 as specified in the simulation name file. For a structured grid that uses the DIS input file, CELLIDM1 is the layer, row, and column numbers of the cell. For a grid that uses the DISV input file, CELLIDM1 is the layer number and CELL2D number for the two cells. If the model uses the unstructured discretization (DISU) input file, then CELLIDM1 is the node number for the cell." tagged = false -dtype = "integer" -index = true -cellid = "1" -shape = [ - "ncelldim", -] +model = "1" [blocks.exchangedata.fields.exchangedata.item.fields.cellidm2] -type = "array" +type = "cellid" longname = "cellid of second cell" description = "is the cellid of the cell in model 2 as specified in the simulation name file. For a structured grid that uses the DIS input file, CELLIDM2 is the layer, row, and column numbers of the cell. For a grid that uses the DISV input file, CELLIDM2 is the layer number and CELL2D number for the two cells. If the model uses the unstructured discretization (DISU) input file, then CELLIDM2 is the node number for the cell." tagged = false -dtype = "integer" -index = true -cellid = "2" -shape = [ - "ncelldim", -] +model = "2" [blocks.exchangedata.fields.exchangedata.item.fields.ihc] type = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwfgwf.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwfgwf.yaml index dbc2e0c4..b8f50726 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwfgwf.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwfgwf.yaml @@ -189,7 +189,7 @@ blocks: type: record fields: cellidm1: - type: array + type: cellid longname: cellid of first cell description: is the cellid of the cell in model 1 as specified in the simulation name file. For a structured grid that uses the DIS input file, CELLIDM1 is the layer, row, and column @@ -197,13 +197,9 @@ blocks: number and CELL2D number for the two cells. If the model uses the unstructured discretization (DISU) input file, then CELLIDM1 is the node number for the cell. tagged: false - dtype: integer - index: true - cellid: '1' - shape: - - ncelldim + model: '1' cellidm2: - type: array + type: cellid longname: cellid of second cell description: is the cellid of the cell in model 2 as specified in the simulation name file. For a structured grid that uses the DIS input file, CELLIDM2 is the layer, row, and column @@ -211,11 +207,7 @@ blocks: number and CELL2D number for the two cells. If the model uses the unstructured discretization (DISU) input file, then CELLIDM2 is the node number for the cell. tagged: false - dtype: integer - index: true - cellid: '2' - shape: - - ncelldim + model: '2' ihc: type: integer longname: integer flag for connection type diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwtgwt.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwtgwt.json index ba1e9d74..23868a9d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwtgwt.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwtgwt.json @@ -146,28 +146,18 @@ "type": "record", "fields": { "cellidm1": { - "type": "array", + "type": "cellid", "longname": "cellid of first cell", "description": "is the cellid of the cell in model 1 as specified in the simulation name file. For a structured grid that uses the DIS input file, CELLIDM1 is the layer, row, and column numbers of the cell. For a grid that uses the DISV input file, CELLIDM1 is the layer number and CELL2D number for the two cells. If the model uses the unstructured discretization (DISU) input file, then CELLIDM1 is the node number for the cell.", "tagged": false, - "dtype": "integer", - "index": true, - "cellid": "1", - "shape": [ - "ncelldim" - ] + "model": "1" }, "cellidm2": { - "type": "array", + "type": "cellid", "longname": "cellid of second cell", "description": "is the cellid of the cell in model 2 as specified in the simulation name file. For a structured grid that uses the DIS input file, CELLIDM2 is the layer, row, and column numbers of the cell. For a grid that uses the DISV input file, CELLIDM2 is the layer number and CELL2D number for the two cells. If the model uses the unstructured discretization (DISU) input file, then CELLIDM2 is the node number for the cell.", "tagged": false, - "dtype": "integer", - "index": true, - "cellid": "2", - "shape": [ - "ncelldim" - ] + "model": "2" }, "ihc": { "type": "integer", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwtgwt.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwtgwt.toml index 92fb46af..3fa3d9a0 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwtgwt.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwtgwt.toml @@ -133,28 +133,18 @@ name = "exchangedata" type = "record" [blocks.exchangedata.fields.exchangedata.item.fields.cellidm1] -type = "array" +type = "cellid" longname = "cellid of first cell" description = "is the cellid of the cell in model 1 as specified in the simulation name file. For a structured grid that uses the DIS input file, CELLIDM1 is the layer, row, and column numbers of the cell. For a grid that uses the DISV input file, CELLIDM1 is the layer number and CELL2D number for the two cells. If the model uses the unstructured discretization (DISU) input file, then CELLIDM1 is the node number for the cell." tagged = false -dtype = "integer" -index = true -cellid = "1" -shape = [ - "ncelldim", -] +model = "1" [blocks.exchangedata.fields.exchangedata.item.fields.cellidm2] -type = "array" +type = "cellid" longname = "cellid of second cell" description = "is the cellid of the cell in model 2 as specified in the simulation name file. For a structured grid that uses the DIS input file, CELLIDM2 is the layer, row, and column numbers of the cell. For a grid that uses the DISV input file, CELLIDM2 is the layer number and CELL2D number for the two cells. If the model uses the unstructured discretization (DISU) input file, then CELLIDM2 is the node number for the cell." tagged = false -dtype = "integer" -index = true -cellid = "2" -shape = [ - "ncelldim", -] +model = "2" [blocks.exchangedata.fields.exchangedata.item.fields.ihc] type = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwtgwt.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwtgwt.yaml index 0ddca562..9e355f36 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwtgwt.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwtgwt.yaml @@ -141,7 +141,7 @@ blocks: type: record fields: cellidm1: - type: array + type: cellid longname: cellid of first cell description: is the cellid of the cell in model 1 as specified in the simulation name file. For a structured grid that uses the DIS input file, CELLIDM1 is the layer, row, and column @@ -149,13 +149,9 @@ blocks: number and CELL2D number for the two cells. If the model uses the unstructured discretization (DISU) input file, then CELLIDM1 is the node number for the cell. tagged: false - dtype: integer - index: true - cellid: '1' - shape: - - ncelldim + model: '1' cellidm2: - type: array + type: cellid longname: cellid of second cell description: is the cellid of the cell in model 2 as specified in the simulation name file. For a structured grid that uses the DIS input file, CELLIDM2 is the layer, row, and column @@ -163,11 +159,7 @@ blocks: number and CELL2D number for the two cells. If the model uses the unstructured discretization (DISU) input file, then CELLIDM2 is the node number for the cell. tagged: false - dtype: integer - index: true - cellid: '2' - shape: - - ncelldim + model: '2' ihc: type: integer longname: integer flag for connection type diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-olfgwf.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-olfgwf.json index 3f685dd7..08e186fa 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-olfgwf.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-olfgwf.json @@ -72,28 +72,18 @@ "type": "record", "fields": { "cellidm1": { - "type": "array", + "type": "cellid", "longname": "cellid of cell in surface water model", "description": "is the cellid of the cell in model 1, which must be the surface water model. For a structured grid that uses the DIS input file, CELLIDM1 is the layer, row, and column numbers of the cell. For a grid that uses the DISV input file, CELLIDM1 is the layer number and CELL2D number for the two cells. If the model uses the unstructured discretization (DISU) input file, then CELLIDM1 is the node number for the cell.", "tagged": false, - "dtype": "integer", - "index": true, - "cellid": "1", - "shape": [ - "ncelldim" - ] + "model": "1" }, "cellidm2": { - "type": "array", + "type": "cellid", "longname": "cellid of cell in groundwater model", "description": "is the cellid of the cell in model 2, which must be the groundwater model. For a structured grid that uses the DIS input file, CELLIDM2 is the layer, row, and column numbers of the cell. For a grid that uses the DISV input file, CELLIDM2 is the layer number and CELL2D number for the two cells. If the model uses the unstructured discretization (DISU) input file, then CELLIDM2 is the node number for the cell.", "tagged": false, - "dtype": "integer", - "index": true, - "cellid": "2", - "shape": [ - "ncelldim" - ] + "model": "2" }, "bedleak": { "type": "double", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-olfgwf.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-olfgwf.toml index 321cd82e..f047cff7 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-olfgwf.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-olfgwf.toml @@ -61,28 +61,18 @@ name = "exchangedata" type = "record" [blocks.exchangedata.fields.exchangedata.item.fields.cellidm1] -type = "array" +type = "cellid" longname = "cellid of cell in surface water model" description = "is the cellid of the cell in model 1, which must be the surface water model. For a structured grid that uses the DIS input file, CELLIDM1 is the layer, row, and column numbers of the cell. For a grid that uses the DISV input file, CELLIDM1 is the layer number and CELL2D number for the two cells. If the model uses the unstructured discretization (DISU) input file, then CELLIDM1 is the node number for the cell." tagged = false -dtype = "integer" -index = true -cellid = "1" -shape = [ - "ncelldim", -] +model = "1" [blocks.exchangedata.fields.exchangedata.item.fields.cellidm2] -type = "array" +type = "cellid" longname = "cellid of cell in groundwater model" description = "is the cellid of the cell in model 2, which must be the groundwater model. For a structured grid that uses the DIS input file, CELLIDM2 is the layer, row, and column numbers of the cell. For a grid that uses the DISV input file, CELLIDM2 is the layer number and CELL2D number for the two cells. If the model uses the unstructured discretization (DISU) input file, then CELLIDM2 is the node number for the cell." tagged = false -dtype = "integer" -index = true -cellid = "2" -shape = [ - "ncelldim", -] +model = "2" [blocks.exchangedata.fields.exchangedata.item.fields.bedleak] type = "double" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-olfgwf.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-olfgwf.yaml index 329c1670..a7366ea7 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-olfgwf.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-olfgwf.yaml @@ -63,7 +63,7 @@ blocks: type: record fields: cellidm1: - type: array + type: cellid longname: cellid of cell in surface water model description: is the cellid of the cell in model 1, which must be the surface water model. For a structured grid that uses the DIS input file, CELLIDM1 is the layer, row, and column @@ -71,13 +71,9 @@ blocks: number and CELL2D number for the two cells. If the model uses the unstructured discretization (DISU) input file, then CELLIDM1 is the node number for the cell. tagged: false - dtype: integer - index: true - cellid: '1' - shape: - - ncelldim + model: '1' cellidm2: - type: array + type: cellid longname: cellid of cell in groundwater model description: is the cellid of the cell in model 2, which must be the groundwater model. For a structured grid that uses the DIS input file, CELLIDM2 is the layer, row, and column @@ -85,11 +81,7 @@ blocks: number and CELL2D number for the two cells. If the model uses the unstructured discretization (DISU) input file, then CELLIDM2 is the node number for the cell. tagged: false - dtype: integer - index: true - cellid: '2' - shape: - - ncelldim + model: '2' bedleak: type: double longname: bed leakance diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-ctp.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-ctp.json index a4e9ad4f..1a5a4c4d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-ctp.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-ctp.json @@ -115,16 +115,10 @@ "type": "record", "fields": { "cellid": { - "type": "array", + "type": "cellid", "longname": "cell identifier", "description": "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell.", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "tagged": false }, "temp": { "type": "double", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-ctp.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-ctp.toml index a982f8df..c5f3538d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-ctp.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-ctp.toml @@ -102,16 +102,10 @@ name = "stress_period_data" type = "record" [blocks.period.fields.stress_period_data.item.fields.cellid] -type = "array" +type = "cellid" longname = "cell identifier" description = "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell." tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [blocks.period.fields.stress_period_data.item.fields.temp] type = "double" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-ctp.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-ctp.yaml index 1129f47f..d30fd7c5 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-ctp.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-ctp.yaml @@ -109,7 +109,7 @@ blocks: type: record fields: cellid: - type: array + type: cellid longname: cell identifier description: is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, @@ -117,11 +117,6 @@ blocks: number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell. tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim temp: type: double longname: constant temperature value diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-esl.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-esl.json index 384f2245..2a9b3b49 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-esl.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-esl.json @@ -115,16 +115,10 @@ "type": "record", "fields": { "cellid": { - "type": "array", + "type": "cellid", "longname": "cell identifier", "description": "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell.", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "tagged": false }, "senerrate": { "type": "double", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-esl.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-esl.toml index 689e9e15..baa11e2e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-esl.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-esl.toml @@ -102,16 +102,10 @@ name = "stress_period_data" type = "record" [blocks.period.fields.stress_period_data.item.fields.cellid] -type = "array" +type = "cellid" longname = "cell identifier" description = "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell." tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [blocks.period.fields.stress_period_data.item.fields.senerrate] type = "double" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-esl.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-esl.yaml index 82c595c9..24534990 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-esl.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-esl.yaml @@ -109,7 +109,7 @@ blocks: type: record fields: cellid: - type: array + type: cellid longname: cell identifier description: is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, @@ -117,11 +117,6 @@ blocks: number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell. tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim senerrate: type: double longname: energy source loading rate diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chd.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chd.json index dbd776ae..90058c4e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chd.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chd.json @@ -122,16 +122,10 @@ "type": "record", "fields": { "cellid": { - "type": "array", + "type": "cellid", "longname": "cell identifier", "description": "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell.", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "tagged": false }, "head": { "type": "double", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chd.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chd.toml index 9e3701b0..7f6d5503 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chd.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chd.toml @@ -109,16 +109,10 @@ name = "stress_period_data" type = "record" [blocks.period.fields.stress_period_data.item.fields.cellid] -type = "array" +type = "cellid" longname = "cell identifier" description = "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell." tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [blocks.period.fields.stress_period_data.item.fields.head] type = "double" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chd.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chd.yaml index 0d4f8189..147ba96f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chd.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chd.yaml @@ -115,7 +115,7 @@ blocks: type: record fields: cellid: - type: array + type: cellid longname: cell identifier description: is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, @@ -123,11 +123,6 @@ blocks: number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell. tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim head: type: double longname: head value assigned to constant head diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-csub.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-csub.json index b4f06558..02d7d1f0 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-csub.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-csub.json @@ -397,16 +397,10 @@ "pk": true }, "cellid": { - "type": "array", + "type": "cellid", "longname": "cell identifier", "description": "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell.", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "tagged": false }, "cdelay": { "type": "string", @@ -487,16 +481,10 @@ "type": "record", "fields": { "cellid": { - "type": "array", + "type": "cellid", "longname": "cell identifier", "description": "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell.", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "tagged": false }, "sig0": { "type": "double", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-csub.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-csub.toml index b9964ca1..a9746b2c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-csub.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-csub.toml @@ -362,16 +362,10 @@ index = true pk = true [blocks.packagedata.fields.packagedata.item.fields.cellid] -type = "array" +type = "cellid" longname = "cell identifier" description = "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell." tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [blocks.packagedata.fields.packagedata.item.fields.cdelay] type = "string" @@ -446,16 +440,10 @@ name = "stress_period_data" type = "record" [blocks.period.fields.stress_period_data.item.fields.cellid] -type = "array" +type = "cellid" longname = "cell identifier" description = "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell." tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [blocks.period.fields.stress_period_data.item.fields.sig0] type = "double" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-csub.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-csub.yaml index bcf1fed4..504bf33b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-csub.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-csub.yaml @@ -380,7 +380,7 @@ blocks: index: true pk: true cellid: - type: array + type: cellid longname: cell identifier description: is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, @@ -388,11 +388,6 @@ blocks: number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell. tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim cdelay: type: string longname: delay type @@ -482,7 +477,7 @@ blocks: type: record fields: cellid: - type: array + type: cellid longname: cell identifier description: is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, @@ -490,11 +485,6 @@ blocks: number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell. tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim sig0: type: double longname: well stress offset diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drn.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drn.json index 32d64348..4853a849 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drn.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drn.json @@ -133,16 +133,10 @@ "type": "record", "fields": { "cellid": { - "type": "array", + "type": "cellid", "longname": "cell identifier", "description": "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell.", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "tagged": false }, "elev": { "type": "double", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drn.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drn.toml index 3bb1feb4..291f842b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drn.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drn.toml @@ -120,16 +120,10 @@ name = "stress_period_data" type = "record" [blocks.period.fields.stress_period_data.item.fields.cellid] -type = "array" +type = "cellid" longname = "cell identifier" description = "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell." tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [blocks.period.fields.stress_period_data.item.fields.elev] type = "double" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drn.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drn.yaml index 3ec99a51..79fb0a89 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drn.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drn.yaml @@ -133,7 +133,7 @@ blocks: type: record fields: cellid: - type: array + type: cellid longname: cell identifier description: is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, @@ -141,11 +141,6 @@ blocks: number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell. tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim elev: type: double longname: drain elevation diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-evt.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-evt.json index b615564b..3f557dbb 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-evt.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-evt.json @@ -135,16 +135,10 @@ "type": "record", "fields": { "cellid": { - "type": "array", + "type": "cellid", "longname": "cell identifier", "description": "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell.", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "tagged": false }, "surface": { "type": "double", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-evt.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-evt.toml index 5211e869..321476d3 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-evt.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-evt.toml @@ -122,16 +122,10 @@ name = "stress_period_data" type = "record" [blocks.period.fields.stress_period_data.item.fields.cellid] -type = "array" +type = "cellid" longname = "cell identifier" description = "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell." tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [blocks.period.fields.stress_period_data.item.fields.surface] type = "double" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-evt.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-evt.yaml index ddc67ad8..076f10e1 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-evt.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-evt.yaml @@ -131,7 +131,7 @@ blocks: type: record fields: cellid: - type: array + type: cellid longname: cell identifier description: is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, @@ -139,11 +139,6 @@ blocks: number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell. tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim surface: type: double longname: ET surface diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghb.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghb.json index a28b2256..6dbfe2e1 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghb.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghb.json @@ -120,16 +120,10 @@ "type": "record", "fields": { "cellid": { - "type": "array", + "type": "cellid", "longname": "cell identifier", "description": "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell.", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "tagged": false }, "bhead": { "type": "double", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghb.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghb.toml index 914b1aff..182bc5fc 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghb.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghb.toml @@ -107,16 +107,10 @@ name = "stress_period_data" type = "record" [blocks.period.fields.stress_period_data.item.fields.cellid] -type = "array" +type = "cellid" longname = "cell identifier" description = "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell." tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [blocks.period.fields.stress_period_data.item.fields.bhead] type = "double" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghb.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghb.yaml index 7b067fbf..f85c2b34 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghb.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghb.yaml @@ -115,7 +115,7 @@ blocks: type: record fields: cellid: - type: array + type: cellid longname: cell identifier description: is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, @@ -123,11 +123,6 @@ blocks: number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell. tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim bhead: type: double longname: boundary head diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-gnc.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-gnc.json index c4ede87f..8bff6db7 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-gnc.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-gnc.json @@ -61,39 +61,28 @@ "type": "record", "fields": { "cellidn": { - "type": "array", + "type": "cellid", "longname": "GNC cellid n", "description": "is the cellid of the cell, $n$, in which the ghost node is located. For a structured grid that uses the DIS input file, CELLIDN is the layer, row, and column numbers of the cell. For a grid that uses the DISV input file, CELLIDN is the layer number and CELL2D number for the two cells. If the model uses the unstructured discretization (DISU) input file, then CELLIDN is the node number for the cell.", "tagged": false, - "dtype": "integer", - "index": true, - "cellid": "1", - "shape": [ - "ncelldim" - ] + "model": "1" }, "cellidm": { - "type": "array", + "type": "cellid", "longname": "GNC cellid n", "description": "is the cellid of the connecting cell, $m$, to which flow occurs from the ghost node. For a structured grid that uses the DIS input file, CELLIDM is the layer, row, and column numbers of the cell. For a grid that uses the DISV input file, CELLIDM is the layer number and CELL2D number for the two cells. If the model uses the unstructured discretization (DISU) input file, then CELLIDM is the node number for the cell.", "tagged": false, - "dtype": "integer", - "index": true, - "cellid": "2", - "shape": [ - "ncelldim" - ] + "model": "2" }, "cellidsj": { "type": "array", "longname": "GNC contributing cells", "description": "is the array of CELLIDS for the contributing j cells, which contribute to the interpolated head value at the ghost node. This item contains one CELLID for each of the contributing cells of the ghost node. Note that if the number of actual contributing cells needed by the user is less than NUMALPHAJ for any ghost node, then a dummy CELLID of zero(s) should be inserted with an associated contributing factor of zero. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column numbers of the cell. For a grid that uses the DISV input file, CELLID is the layer number and cell2d number for the two cells. If the model uses the unstructured discretization (DISU) input file, then CELLID is the node number for the cell.", "tagged": false, - "dtype": "integer", - "index": true, - "cellid": "1", + "dtype": "cellid", + "model": "1", + "allow_zero": true, "shape": [ - "ncelldim", "numalphaj" ] }, diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-gnc.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-gnc.toml index 0480e02c..3d942779 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-gnc.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-gnc.toml @@ -52,39 +52,28 @@ name = "gncdata" type = "record" [blocks.gncdata.fields.gncdata.item.fields.cellidn] -type = "array" +type = "cellid" longname = "GNC cellid n" description = "is the cellid of the cell, $n$, in which the ghost node is located. For a structured grid that uses the DIS input file, CELLIDN is the layer, row, and column numbers of the cell. For a grid that uses the DISV input file, CELLIDN is the layer number and CELL2D number for the two cells. If the model uses the unstructured discretization (DISU) input file, then CELLIDN is the node number for the cell." tagged = false -dtype = "integer" -index = true -cellid = "1" -shape = [ - "ncelldim", -] +model = "1" [blocks.gncdata.fields.gncdata.item.fields.cellidm] -type = "array" +type = "cellid" longname = "GNC cellid n" description = "is the cellid of the connecting cell, $m$, to which flow occurs from the ghost node. For a structured grid that uses the DIS input file, CELLIDM is the layer, row, and column numbers of the cell. For a grid that uses the DISV input file, CELLIDM is the layer number and CELL2D number for the two cells. If the model uses the unstructured discretization (DISU) input file, then CELLIDM is the node number for the cell." tagged = false -dtype = "integer" -index = true -cellid = "2" -shape = [ - "ncelldim", -] +model = "2" [blocks.gncdata.fields.gncdata.item.fields.cellidsj] type = "array" longname = "GNC contributing cells" description = "is the array of CELLIDS for the contributing j cells, which contribute to the interpolated head value at the ghost node. This item contains one CELLID for each of the contributing cells of the ghost node. Note that if the number of actual contributing cells needed by the user is less than NUMALPHAJ for any ghost node, then a dummy CELLID of zero(s) should be inserted with an associated contributing factor of zero. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column numbers of the cell. For a grid that uses the DISV input file, CELLID is the layer number and cell2d number for the two cells. If the model uses the unstructured discretization (DISU) input file, then CELLID is the node number for the cell." tagged = false -dtype = "integer" -index = true -cellid = "1" +dtype = "cellid" +model = "1" +allow_zero = true shape = [ - "ncelldim", "numalphaj", ] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-gnc.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-gnc.yaml index 404e110f..ecf14697 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-gnc.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-gnc.yaml @@ -57,7 +57,7 @@ blocks: type: record fields: cellidn: - type: array + type: cellid longname: GNC cellid n description: is the cellid of the cell, $n$, in which the ghost node is located. For a structured grid that uses the DIS input file, CELLIDN is the layer, row, and column numbers of the @@ -65,13 +65,9 @@ blocks: number for the two cells. If the model uses the unstructured discretization (DISU) input file, then CELLIDN is the node number for the cell. tagged: false - dtype: integer - index: true - cellid: '1' - shape: - - ncelldim + model: '1' cellidm: - type: array + type: cellid longname: GNC cellid n description: is the cellid of the connecting cell, $m$, to which flow occurs from the ghost node. For a structured grid that uses the DIS input file, CELLIDM is the layer, row, and @@ -79,11 +75,7 @@ blocks: layer number and CELL2D number for the two cells. If the model uses the unstructured discretization (DISU) input file, then CELLIDM is the node number for the cell. tagged: false - dtype: integer - index: true - cellid: '2' - shape: - - ncelldim + model: '2' cellidsj: type: array longname: GNC contributing cells @@ -97,11 +89,10 @@ blocks: the two cells. If the model uses the unstructured discretization (DISU) input file, then CELLID is the node number for the cell. tagged: false - dtype: integer - index: true - cellid: '1' + dtype: cellid + model: '1' + allow_zero: true shape: - - ncelldim - numalphaj alphasj: type: array diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-hfb.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-hfb.json index 324ef03d..1d5d0d4f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-hfb.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-hfb.json @@ -38,28 +38,16 @@ "type": "record", "fields": { "cellid1": { - "type": "array", + "type": "cellid", "longname": "first cell adjacent to barrier", "description": "identifier for the first cell. For a structured grid that uses the DIS input file, CELLID1 is the layer, row, and column numbers of the cell. For a grid that uses the DISV input file, CELLID1 is the layer number and CELL2D number for the two cells. If the model uses the unstructured discretization (DISU) input file, then CELLID1 is the node numbers for the cell. The barrier is located between cells designated as CELLID1 and CELLID2. For models that use the DIS and DISV grid types, the layer number for CELLID1 and CELLID2 must be the same. For all grid types, cells must be horizontally or vertically adjacent.", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "tagged": false }, "cellid2": { - "type": "array", + "type": "cellid", "longname": "second cell adjacent to barrier", "description": "identifier for the second cell. See CELLID1 for description of how to specify.", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "tagged": false }, "hydchr": { "type": "double", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-hfb.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-hfb.toml index 174fc353..263d4662 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-hfb.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-hfb.toml @@ -29,28 +29,16 @@ name = "stress_period_data" type = "record" [blocks.period.fields.stress_period_data.item.fields.cellid1] -type = "array" +type = "cellid" longname = "first cell adjacent to barrier" description = "identifier for the first cell. For a structured grid that uses the DIS input file, CELLID1 is the layer, row, and column numbers of the cell. For a grid that uses the DISV input file, CELLID1 is the layer number and CELL2D number for the two cells. If the model uses the unstructured discretization (DISU) input file, then CELLID1 is the node numbers for the cell. The barrier is located between cells designated as CELLID1 and CELLID2. For models that use the DIS and DISV grid types, the layer number for CELLID1 and CELLID2 must be the same. For all grid types, cells must be horizontally or vertically adjacent." tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [blocks.period.fields.stress_period_data.item.fields.cellid2] -type = "array" +type = "cellid" longname = "second cell adjacent to barrier" description = "identifier for the second cell. See CELLID1 for description of how to specify." tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [blocks.period.fields.stress_period_data.item.fields.hydchr] type = "double" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-hfb.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-hfb.yaml index eceb5435..89cb3ed8 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-hfb.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-hfb.yaml @@ -32,7 +32,7 @@ blocks: type: record fields: cellid1: - type: array + type: cellid longname: first cell adjacent to barrier description: identifier for the first cell. For a structured grid that uses the DIS input file, CELLID1 is the layer, row, and column numbers of the cell. For a grid that uses @@ -43,21 +43,11 @@ blocks: and CELLID2 must be the same. For all grid types, cells must be horizontally or vertically adjacent. tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim cellid2: - type: array + type: cellid longname: second cell adjacent to barrier description: identifier for the second cell. See CELLID1 for description of how to specify. tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim hydchr: type: double longname: barrier hydraulic characteristic 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 0a242277..488fe6fe 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-lak.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-lak.json @@ -311,16 +311,10 @@ "index": true }, "cellid": { - "type": "array", + "type": "cellid", "longname": "cell identifier", "description": "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell.", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "tagged": false }, "claktype": { "type": "string", 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 058eb5d5..485bb0bd 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-lak.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-lak.toml @@ -284,16 +284,10 @@ tagged = false index = true [blocks.connectiondata.fields.connectiondata.item.fields.cellid] -type = "array" +type = "cellid" longname = "cell identifier" description = "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell." tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [blocks.connectiondata.fields.connectiondata.item.fields.claktype] type = "string" 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 235ffe91..9b14f05d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-lak.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-lak.yaml @@ -308,7 +308,7 @@ blocks: tagged: false index: true cellid: - type: array + type: cellid longname: cell identifier description: is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, @@ -316,11 +316,6 @@ blocks: number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell. tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim claktype: type: string longname: lake connection type 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 df99a632..d7baad5f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-maw.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-maw.json @@ -310,16 +310,10 @@ "index": true }, "cellid": { - "type": "array", + "type": "cellid", "longname": "cell identifier", "description": "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell. One or more screened intervals can be connected to the same CELLID if CONDEQN for a well is MEAN. The program will terminate with an error if MAW wells using SPECIFIED, THIEM, SKIN, or CUMULATIVE conductance equations have more than one connection to the same CELLID.", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "tagged": false }, "scrn_top": { "type": "double", 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 b0d5ddb9..27d4a4fe 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-maw.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-maw.toml @@ -280,16 +280,10 @@ tagged = false index = true [blocks.connectiondata.fields.connectiondata.item.fields.cellid] -type = "array" +type = "cellid" longname = "cell identifier" description = "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell. One or more screened intervals can be connected to the same CELLID if CONDEQN for a well is MEAN. The program will terminate with an error if MAW wells using SPECIFIED, THIEM, SKIN, or CUMULATIVE conductance equations have more than one connection to the same CELLID." tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [blocks.connectiondata.fields.connectiondata.item.fields.scrn_top] type = "double" 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 ab79c970..f4fb4d66 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-maw.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-maw.yaml @@ -338,7 +338,7 @@ blocks: tagged: false index: true cellid: - type: array + type: cellid longname: cell identifier description: is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, @@ -349,11 +349,6 @@ blocks: wells using SPECIFIED, THIEM, SKIN, or CUMULATIVE conductance equations have more than one connection to the same CELLID. tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim scrn_top: type: double longname: screen top diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rch.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rch.json index e20f114a..a3c87db7 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rch.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rch.json @@ -121,16 +121,10 @@ "type": "record", "fields": { "cellid": { - "type": "array", + "type": "cellid", "longname": "cell identifier", "description": "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell.", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "tagged": false }, "recharge": { "type": "double", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rch.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rch.toml index 50af495c..0e2753ca 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rch.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rch.toml @@ -108,16 +108,10 @@ name = "stress_period_data" type = "record" [blocks.period.fields.stress_period_data.item.fields.cellid] -type = "array" +type = "cellid" longname = "cell identifier" description = "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell." tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [blocks.period.fields.stress_period_data.item.fields.recharge] type = "double" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rch.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rch.yaml index 700fc980..cab270f2 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rch.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rch.yaml @@ -115,7 +115,7 @@ blocks: type: record fields: cellid: - type: array + type: cellid longname: cell identifier description: is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, @@ -123,11 +123,6 @@ blocks: number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell. tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim recharge: type: double longname: recharge rate diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-riv.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-riv.json index 22d4d067..b95197a5 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-riv.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-riv.json @@ -120,16 +120,10 @@ "type": "record", "fields": { "cellid": { - "type": "array", + "type": "cellid", "longname": "cell identifier", "description": "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell.", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "tagged": false }, "stage": { "type": "double", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-riv.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-riv.toml index 048c3ff2..52237bec 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-riv.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-riv.toml @@ -107,16 +107,10 @@ name = "stress_period_data" type = "record" [blocks.period.fields.stress_period_data.item.fields.cellid] -type = "array" +type = "cellid" longname = "cell identifier" description = "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell." tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [blocks.period.fields.stress_period_data.item.fields.stage] type = "double" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-riv.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-riv.yaml index 9742091b..2b1e96a0 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-riv.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-riv.yaml @@ -114,7 +114,7 @@ blocks: type: record fields: cellid: - type: array + type: cellid longname: cell identifier description: is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, @@ -122,11 +122,6 @@ blocks: number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell. tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim stage: type: double longname: river stage diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sfr.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sfr.json index e09e561a..35e95edc 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sfr.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sfr.json @@ -250,16 +250,11 @@ "pk": true }, "cellid": { - "type": "array", + "type": "cellid", "longname": "cell identifier", "description": "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell. For reaches that are not connected to an underlying GWF cell, a zero should be specified for each grid dimension. For example, for a DIS grid a CELLID of 0 0 0 should be specified. Reach-aquifer flow is not calculated for unconnected reaches. The keyword NONE can be still be specified to identify unconnected reaches for backward compatibility with previous versions of MODFLOW 6 but eventually NONE will be deprecated and will cause MODFLOW 6 to terminate with an error.", "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "allow_zero": true }, "rlen": { "type": "double", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sfr.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sfr.toml index 15fd6e0d..d042794b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sfr.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sfr.toml @@ -229,16 +229,11 @@ index = true pk = true [blocks.packagedata.fields.packagedata.item.fields.cellid] -type = "array" +type = "cellid" longname = "cell identifier" description = "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell. For reaches that are not connected to an underlying GWF cell, a zero should be specified for each grid dimension. For example, for a DIS grid a CELLID of 0 0 0 should be specified. Reach-aquifer flow is not calculated for unconnected reaches. The keyword NONE can be still be specified to identify unconnected reaches for backward compatibility with previous versions of MODFLOW 6 but eventually NONE will be deprecated and will cause MODFLOW 6 to terminate with an error." tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] +allow_zero = true [blocks.packagedata.fields.packagedata.item.fields.rlen] type = "double" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sfr.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sfr.yaml index c123d4db..8e2b5f32 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sfr.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sfr.yaml @@ -253,7 +253,7 @@ blocks: index: true pk: true cellid: - type: array + type: cellid longname: cell identifier description: is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, @@ -266,11 +266,7 @@ blocks: compatibility with previous versions of MODFLOW 6 but eventually NONE will be deprecated and will cause MODFLOW 6 to terminate with an error. tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim + allow_zero: true rlen: type: double longname: reach length diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-uzf.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-uzf.json index 5c26f26d..21935b04 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-uzf.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-uzf.json @@ -254,16 +254,10 @@ "pk": true }, "cellid": { - "type": "array", + "type": "cellid", "longname": "cell identifier", "description": "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell.", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "tagged": false }, "landflag": { "type": "integer", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-uzf.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-uzf.toml index 32cd8d89..e42ebbb5 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-uzf.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-uzf.toml @@ -233,16 +233,10 @@ index = true pk = true [blocks.packagedata.fields.packagedata.item.fields.cellid] -type = "array" +type = "cellid" longname = "cell identifier" description = "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell." tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [blocks.packagedata.fields.packagedata.item.fields.landflag] type = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-uzf.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-uzf.yaml index 64894741..a4b545a8 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-uzf.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-uzf.yaml @@ -247,7 +247,7 @@ blocks: index: true pk: true cellid: - type: array + type: cellid longname: cell identifier description: is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, @@ -255,11 +255,6 @@ blocks: number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell. tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim landflag: type: integer longname: land flag diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-wel.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-wel.json index bcc5701d..b253b155 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-wel.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-wel.json @@ -150,16 +150,10 @@ "type": "record", "fields": { "cellid": { - "type": "array", + "type": "cellid", "longname": "cell identifier", "description": "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell.", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "tagged": false }, "q": { "type": "double", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-wel.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-wel.toml index 48aa966e..592e1e26 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-wel.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-wel.toml @@ -135,16 +135,10 @@ name = "stress_period_data" type = "record" [blocks.period.fields.stress_period_data.item.fields.cellid] -type = "array" +type = "cellid" longname = "cell identifier" description = "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell." tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [blocks.period.fields.stress_period_data.item.fields.q] type = "double" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-wel.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-wel.yaml index d0e51e51..f3ef12c1 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-wel.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-wel.yaml @@ -154,7 +154,7 @@ blocks: type: record fields: cellid: - type: array + type: cellid longname: cell identifier description: is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, @@ -162,11 +162,6 @@ blocks: number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell. tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim q: type: double longname: well rate diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-cnc.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-cnc.json index d72e0bc8..64d2d678 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-cnc.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-cnc.json @@ -115,16 +115,10 @@ "type": "record", "fields": { "cellid": { - "type": "array", + "type": "cellid", "longname": "cell identifier", "description": "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell.", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "tagged": false }, "conc": { "type": "double", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-cnc.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-cnc.toml index f41ae708..fbef2ee9 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-cnc.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-cnc.toml @@ -102,16 +102,10 @@ name = "stress_period_data" type = "record" [blocks.period.fields.stress_period_data.item.fields.cellid] -type = "array" +type = "cellid" longname = "cell identifier" description = "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell." tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [blocks.period.fields.stress_period_data.item.fields.conc] type = "double" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-cnc.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-cnc.yaml index 4034a699..b9cd8ae6 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-cnc.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-cnc.yaml @@ -109,7 +109,7 @@ blocks: type: record fields: cellid: - type: array + type: cellid longname: cell identifier description: is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, @@ -117,11 +117,6 @@ blocks: number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell. tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim conc: type: double longname: constant concentration value diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-src.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-src.json index f6340e2a..e2bf474e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-src.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-src.json @@ -121,16 +121,10 @@ "type": "record", "fields": { "cellid": { - "type": "array", + "type": "cellid", "longname": "cell identifier", "description": "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell.", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "tagged": false }, "smassrate": { "type": "double", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-src.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-src.toml index 1602aeb1..0c00315d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-src.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-src.toml @@ -108,16 +108,10 @@ name = "stress_period_data" type = "record" [blocks.period.fields.stress_period_data.item.fields.cellid] -type = "array" +type = "cellid" longname = "cell identifier" description = "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell." tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [blocks.period.fields.stress_period_data.item.fields.smassrate] type = "double" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-src.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-src.yaml index 55e8711e..c6fe8d67 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-src.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-src.yaml @@ -124,7 +124,7 @@ blocks: type: record fields: cellid: - type: array + type: cellid longname: cell identifier description: is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, @@ -132,11 +132,6 @@ blocks: number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell. tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim smassrate: type: double longname: mass source loading rate diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-cdb.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-cdb.json index 1aa00afb..a601ccb3 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-cdb.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-cdb.json @@ -86,16 +86,10 @@ "type": "record", "fields": { "cellid": { - "type": "array", + "type": "cellid", "longname": "cell identifier", "description": "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell.", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "tagged": false }, "idcxs": { "type": "integer", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-cdb.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-cdb.toml index 033db17a..4dfb3a30 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-cdb.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-cdb.toml @@ -75,16 +75,10 @@ name = "stress_period_data" type = "record" [blocks.period.fields.stress_period_data.item.fields.cellid] -type = "array" +type = "cellid" longname = "cell identifier" description = "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell." tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [blocks.period.fields.stress_period_data.item.fields.idcxs] type = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-cdb.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-cdb.yaml index 1c081b11..8903b118 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-cdb.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-cdb.yaml @@ -84,7 +84,7 @@ blocks: type: record fields: cellid: - type: array + type: cellid longname: cell identifier description: is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, @@ -92,11 +92,6 @@ blocks: number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell. tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim idcxs: type: integer longname: cross section identifier diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-chd.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-chd.json index fba16d40..ad00380e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-chd.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-chd.json @@ -115,16 +115,10 @@ "type": "record", "fields": { "cellid": { - "type": "array", + "type": "cellid", "longname": "cell identifier", "description": "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell.", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "tagged": false }, "head": { "type": "double", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-chd.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-chd.toml index d7d337b3..54cc3969 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-chd.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-chd.toml @@ -102,16 +102,10 @@ name = "stress_period_data" type = "record" [blocks.period.fields.stress_period_data.item.fields.cellid] -type = "array" +type = "cellid" longname = "cell identifier" description = "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell." tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [blocks.period.fields.stress_period_data.item.fields.head] type = "double" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-chd.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-chd.yaml index 21f78524..82109d24 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-chd.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-chd.yaml @@ -109,7 +109,7 @@ blocks: type: record fields: cellid: - type: array + type: cellid longname: cell identifier description: is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, @@ -117,11 +117,6 @@ blocks: number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell. tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim head: type: double longname: head value assigned to constant head diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-evp.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-evp.json index e4171301..5c4051f6 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-evp.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-evp.json @@ -115,16 +115,10 @@ "type": "record", "fields": { "cellid": { - "type": "array", + "type": "cellid", "longname": "cell identifier", "description": "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell.", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "tagged": false }, "evaporation": { "type": "double", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-evp.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-evp.toml index 56bc3e61..98767a17 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-evp.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-evp.toml @@ -102,16 +102,10 @@ name = "stress_period_data" type = "record" [blocks.period.fields.stress_period_data.item.fields.cellid] -type = "array" +type = "cellid" longname = "cell identifier" description = "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell." tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [blocks.period.fields.stress_period_data.item.fields.evaporation] type = "double" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-evp.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-evp.yaml index 9372825e..91974989 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-evp.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-evp.yaml @@ -109,7 +109,7 @@ blocks: type: record fields: cellid: - type: array + type: cellid longname: cell identifier description: is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, @@ -117,11 +117,6 @@ blocks: number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell. tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim evaporation: type: double longname: evaporation rate diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-flw.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-flw.json index 1f3c108a..5de5fce6 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-flw.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-flw.json @@ -115,16 +115,10 @@ "type": "record", "fields": { "cellid": { - "type": "array", + "type": "cellid", "longname": "cell identifier", "description": "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell.", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "tagged": false }, "q": { "type": "double", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-flw.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-flw.toml index ae4d2709..c59426e3 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-flw.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-flw.toml @@ -102,16 +102,10 @@ name = "stress_period_data" type = "record" [blocks.period.fields.stress_period_data.item.fields.cellid] -type = "array" +type = "cellid" longname = "cell identifier" description = "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell." tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [blocks.period.fields.stress_period_data.item.fields.q] type = "double" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-flw.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-flw.yaml index e09aedef..aa2d8628 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-flw.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-flw.yaml @@ -108,7 +108,7 @@ blocks: type: record fields: cellid: - type: array + type: cellid longname: cell identifier description: is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, @@ -116,11 +116,6 @@ blocks: number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell. tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim q: type: double longname: flow rate diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-pcp.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-pcp.json index 5437aa4e..00a3e2f0 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-pcp.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-pcp.json @@ -115,16 +115,10 @@ "type": "record", "fields": { "cellid": { - "type": "array", + "type": "cellid", "longname": "cell identifier", "description": "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell.", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "tagged": false }, "precipitation": { "type": "double", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-pcp.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-pcp.toml index 9db50471..3e159bdf 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-pcp.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-pcp.toml @@ -102,16 +102,10 @@ name = "stress_period_data" type = "record" [blocks.period.fields.stress_period_data.item.fields.cellid] -type = "array" +type = "cellid" longname = "cell identifier" description = "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell." tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [blocks.period.fields.stress_period_data.item.fields.precipitation] type = "double" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-pcp.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-pcp.yaml index 0d31eb30..80a63e89 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-pcp.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-pcp.yaml @@ -109,7 +109,7 @@ blocks: type: record fields: cellid: - type: array + type: cellid longname: cell identifier description: is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, @@ -117,11 +117,6 @@ blocks: number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell. tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim precipitation: type: double longname: precipitation rate diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-zdg.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-zdg.json index d8ee7622..d5c008fd 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-zdg.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-zdg.json @@ -109,16 +109,10 @@ "type": "record", "fields": { "cellid": { - "type": "array", + "type": "cellid", "longname": "cell identifier", "description": "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell.", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "tagged": false }, "idcxs": { "type": "integer", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-zdg.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-zdg.toml index efd7fe92..7cbd2526 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-zdg.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-zdg.toml @@ -96,16 +96,10 @@ name = "stress_period_data" type = "record" [blocks.period.fields.stress_period_data.item.fields.cellid] -type = "array" +type = "cellid" longname = "cell identifier" description = "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell." tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [blocks.period.fields.stress_period_data.item.fields.idcxs] type = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-zdg.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-zdg.yaml index 696aa3fd..0ec54d32 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-zdg.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-zdg.yaml @@ -104,7 +104,7 @@ blocks: type: record fields: cellid: - type: array + type: cellid longname: cell identifier description: is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, @@ -112,11 +112,6 @@ blocks: number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell. tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim idcxs: type: integer longname: cross section identifier diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-prp.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-prp.json index ee417a35..1be7604f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-prp.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-prp.json @@ -240,16 +240,10 @@ "pk": true }, "cellid": { - "type": "array", + "type": "cellid", "longname": "cell identifier", "description": "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell.", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "tagged": false }, "xrpt": { "type": "double", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-prp.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-prp.toml index 836e6ee4..32edabd1 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-prp.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-prp.toml @@ -223,16 +223,10 @@ index = true pk = true [blocks.packagedata.fields.packagedata.item.fields.cellid] -type = "array" +type = "cellid" longname = "cell identifier" description = "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell." tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [blocks.packagedata.fields.packagedata.item.fields.xrpt] type = "double" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-prp.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-prp.yaml index a5a9e44e..83f4d970 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-prp.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-prp.yaml @@ -256,7 +256,7 @@ blocks: index: true pk: true cellid: - type: array + type: cellid longname: cell identifier description: is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, @@ -264,11 +264,6 @@ blocks: number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell. tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim xrpt: type: double longname: x coordinate of release point diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-cdb.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-cdb.json index 08718943..5fa4b344 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-cdb.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-cdb.json @@ -86,16 +86,10 @@ "type": "record", "fields": { "cellid": { - "type": "array", + "type": "cellid", "longname": "cell identifier", "description": "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell.", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "tagged": false }, "idcxs": { "type": "integer", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-cdb.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-cdb.toml index 4574ad5a..a6203e6f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-cdb.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-cdb.toml @@ -75,16 +75,10 @@ name = "stress_period_data" type = "record" [blocks.period.fields.stress_period_data.item.fields.cellid] -type = "array" +type = "cellid" longname = "cell identifier" description = "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell." tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [blocks.period.fields.stress_period_data.item.fields.idcxs] type = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-cdb.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-cdb.yaml index 4c83f465..5a12d8d5 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-cdb.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-cdb.yaml @@ -85,7 +85,7 @@ blocks: type: record fields: cellid: - type: array + type: cellid longname: cell identifier description: is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, @@ -93,11 +93,6 @@ blocks: number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell. tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim idcxs: type: integer longname: cross section identifier diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-chd.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-chd.json index e0f699a7..a1505dd5 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-chd.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-chd.json @@ -115,16 +115,10 @@ "type": "record", "fields": { "cellid": { - "type": "array", + "type": "cellid", "longname": "cell identifier", "description": "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell.", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "tagged": false }, "head": { "type": "double", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-chd.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-chd.toml index 7974b358..009fd939 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-chd.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-chd.toml @@ -102,16 +102,10 @@ name = "stress_period_data" type = "record" [blocks.period.fields.stress_period_data.item.fields.cellid] -type = "array" +type = "cellid" longname = "cell identifier" description = "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell." tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [blocks.period.fields.stress_period_data.item.fields.head] type = "double" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-chd.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-chd.yaml index 8ebfc0eb..866bedd5 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-chd.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-chd.yaml @@ -109,7 +109,7 @@ blocks: type: record fields: cellid: - type: array + type: cellid longname: cell identifier description: is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, @@ -117,11 +117,6 @@ blocks: number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell. tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim head: type: double longname: head value assigned to constant head diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-evp.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-evp.json index c7783ae6..9c8e9175 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-evp.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-evp.json @@ -115,16 +115,10 @@ "type": "record", "fields": { "cellid": { - "type": "array", + "type": "cellid", "longname": "cell identifier", "description": "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell.", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "tagged": false }, "evaporation": { "type": "double", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-evp.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-evp.toml index 2c61ffda..d6048fbd 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-evp.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-evp.toml @@ -102,16 +102,10 @@ name = "stress_period_data" type = "record" [blocks.period.fields.stress_period_data.item.fields.cellid] -type = "array" +type = "cellid" longname = "cell identifier" description = "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell." tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [blocks.period.fields.stress_period_data.item.fields.evaporation] type = "double" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-evp.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-evp.yaml index 91ac249e..3b8a45a9 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-evp.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-evp.yaml @@ -109,7 +109,7 @@ blocks: type: record fields: cellid: - type: array + type: cellid longname: cell identifier description: is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, @@ -117,11 +117,6 @@ blocks: number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell. tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim evaporation: type: double longname: evaporation rate diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-flw.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-flw.json index 53c6734c..cd7c58aa 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-flw.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-flw.json @@ -115,16 +115,10 @@ "type": "record", "fields": { "cellid": { - "type": "array", + "type": "cellid", "longname": "cell identifier", "description": "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell.", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "tagged": false }, "q": { "type": "double", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-flw.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-flw.toml index c1a95866..0cf782a1 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-flw.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-flw.toml @@ -102,16 +102,10 @@ name = "stress_period_data" type = "record" [blocks.period.fields.stress_period_data.item.fields.cellid] -type = "array" +type = "cellid" longname = "cell identifier" description = "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell." tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [blocks.period.fields.stress_period_data.item.fields.q] type = "double" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-flw.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-flw.yaml index ebb45fa3..7f0fcefa 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-flw.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-flw.yaml @@ -108,7 +108,7 @@ blocks: type: record fields: cellid: - type: array + type: cellid longname: cell identifier description: is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, @@ -116,11 +116,6 @@ blocks: number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell. tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim q: type: double longname: well rate diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-pcp.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-pcp.json index 65a24324..71c57f25 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-pcp.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-pcp.json @@ -115,16 +115,10 @@ "type": "record", "fields": { "cellid": { - "type": "array", + "type": "cellid", "longname": "cell identifier", "description": "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell.", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "tagged": false }, "precipitation": { "type": "double", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-pcp.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-pcp.toml index 8c783903..e76d5a3f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-pcp.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-pcp.toml @@ -102,16 +102,10 @@ name = "stress_period_data" type = "record" [blocks.period.fields.stress_period_data.item.fields.cellid] -type = "array" +type = "cellid" longname = "cell identifier" description = "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell." tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [blocks.period.fields.stress_period_data.item.fields.precipitation] type = "double" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-pcp.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-pcp.yaml index 2bf200a8..513c9737 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-pcp.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-pcp.yaml @@ -109,7 +109,7 @@ blocks: type: record fields: cellid: - type: array + type: cellid longname: cell identifier description: is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, @@ -117,11 +117,6 @@ blocks: number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell. tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim precipitation: type: double longname: precipitation rate diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-zdg.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-zdg.json index 90d4a399..4c9a767f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-zdg.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-zdg.json @@ -109,16 +109,10 @@ "type": "record", "fields": { "cellid": { - "type": "array", + "type": "cellid", "longname": "cell identifier", "description": "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell.", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "tagged": false }, "idcxs": { "type": "integer", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-zdg.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-zdg.toml index 8a5a5a30..785b8090 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-zdg.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-zdg.toml @@ -96,16 +96,10 @@ name = "stress_period_data" type = "record" [blocks.period.fields.stress_period_data.item.fields.cellid] -type = "array" +type = "cellid" longname = "cell identifier" description = "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell." tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [blocks.period.fields.stress_period_data.item.fields.idcxs] type = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-zdg.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-zdg.yaml index 89150b9a..b93ac5d7 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-zdg.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-zdg.yaml @@ -105,7 +105,7 @@ blocks: type: record fields: cellid: - type: array + type: cellid longname: cell identifier description: is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, @@ -113,11 +113,6 @@ blocks: number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell. tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim idcxs: type: integer longname: cross section identifier 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 78ce7e08..98328002 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-obs.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-obs.json @@ -50,14 +50,8 @@ "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).", "arms": { "cellid": { - "type": "array", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "type": "cellid", + "tagged": false }, "index": { "type": "integer", @@ -77,14 +71,8 @@ "optional": true, "arms": { "cellid": { - "type": "array", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "type": "cellid", + "tagged": false }, "index": { "type": "integer", 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 8b1914ac..1e68cb00 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-obs.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-obs.toml @@ -44,14 +44,8 @@ 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)." [blocks.continuous.fields.continuous.item.fields.id.arms.cellid] -type = "array" +type = "cellid" tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [blocks.continuous.fields.continuous.item.fields.id.arms.index] type = "integer" @@ -69,14 +63,8 @@ description = "Text identifying cell adjacent to cell identified by ID. The form optional = true [blocks.continuous.fields.continuous.item.fields.id2.arms.cellid] -type = "array" +type = "cellid" tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [blocks.continuous.fields.continuous.item.fields.id2.arms.index] type = "integer" 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 c79d1f37..eabdc90c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-obs.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-obs.yaml @@ -56,13 +56,8 @@ blocks: (layer, cell number). If the discretization is DISU, cellid is one integer (node number). arms: cellid: - type: array + type: cellid tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim index: type: integer tagged: false @@ -80,13 +75,8 @@ blocks: optional: true arms: cellid: - type: array + type: cellid tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim index: type: integer tagged: false diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tvk.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tvk.json index ff856ac6..cbc85d3c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tvk.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tvk.json @@ -48,16 +48,10 @@ "type": "record", "fields": { "cellid": { - "type": "array", + "type": "cellid", "longname": "cell identifier", "description": "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell.", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "tagged": false }, "tvksetting": { "type": "union", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tvk.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tvk.toml index b8336904..de162141 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tvk.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tvk.toml @@ -40,16 +40,10 @@ name = "perioddata" type = "record" [blocks.period.fields.perioddata.item.fields.cellid] -type = "array" +type = "cellid" longname = "cell identifier" description = "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell." tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [blocks.period.fields.perioddata.item.fields.tvksetting] type = "union" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tvk.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tvk.yaml index a993f4aa..1b10588f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tvk.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tvk.yaml @@ -42,7 +42,7 @@ blocks: type: record fields: cellid: - type: array + type: cellid longname: cell identifier description: is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, @@ -50,11 +50,6 @@ blocks: number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell. tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim tvksetting: type: union description: 'line of information that is parsed into a property name keyword and values. Property diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tvs.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tvs.json index 055b1067..e25c0b81 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tvs.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tvs.json @@ -54,16 +54,10 @@ "type": "record", "fields": { "cellid": { - "type": "array", + "type": "cellid", "longname": "cell identifier", "description": "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell.", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "tagged": false }, "tvssetting": { "type": "union", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tvs.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tvs.toml index 9b3b1f60..396ab896 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tvs.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tvs.toml @@ -46,16 +46,10 @@ name = "perioddata" type = "record" [blocks.period.fields.perioddata.item.fields.cellid] -type = "array" +type = "cellid" longname = "cell identifier" description = "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell." tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [blocks.period.fields.perioddata.item.fields.tvssetting] type = "union" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tvs.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tvs.yaml index a1187637..782c4ca5 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tvs.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tvs.yaml @@ -50,7 +50,7 @@ blocks: type: record fields: cellid: - type: array + type: cellid longname: cell identifier description: is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, @@ -58,11 +58,6 @@ blocks: number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell. tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim tvssetting: type: union description: 'line of information that is parsed into a property name keyword and values. Property 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 e4121b6a..10e37b5d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-cdb.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-cdb.json @@ -97,16 +97,10 @@ "type": "record", "fields": { "cellid": { - "type": "array", + "type": "cellid", "longname": "cell identifier", "description": "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell.", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "tagged": false }, "idcxs": { "type": "integer", @@ -296,14 +290,8 @@ "type": "union", "arms": { "cellid": { - "type": "array", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "type": "cellid", + "tagged": false }, "boundname": { "type": "string", @@ -315,14 +303,8 @@ "type": "union", "arms": { "cellid": { - "type": "array", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "type": "cellid", + "tagged": false }, "boundname": { "type": "string", 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 46a6a561..111ad79a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-cdb.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-cdb.toml @@ -84,16 +84,10 @@ name = "stress_period_data" type = "record" [blocks.period.fields.stress_period_data.item.fields.cellid] -type = "array" +type = "cellid" longname = "cell identifier" description = "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell." tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [blocks.period.fields.stress_period_data.item.fields.idcxs] type = "integer" @@ -271,14 +265,8 @@ shape = [ type = "union" [observations.cdb.arms.cellid] -type = "array" +type = "cellid" tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [observations.cdb.arms.boundname] type = "string" @@ -288,14 +276,8 @@ tagged = false type = "union" [observations.to-mvr.arms.cellid] -type = "array" +type = "cellid" tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [observations.to-mvr.arms.boundname] type = "string" 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 2a9dac38..27ba7e6f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-cdb.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-cdb.yaml @@ -91,7 +91,7 @@ blocks: type: record fields: cellid: - type: array + type: cellid longname: cell identifier description: is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, @@ -99,11 +99,6 @@ blocks: number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell. tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim idcxs: type: integer longname: cross section identifier @@ -271,13 +266,8 @@ observations: type: union arms: cellid: - type: array + type: cellid tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim boundname: type: string tagged: false @@ -285,13 +275,8 @@ observations: type: union arms: cellid: - type: array + type: cellid tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim boundname: type: string tagged: false 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 7343acf6..f40935de 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-chd.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-chd.json @@ -126,16 +126,10 @@ "type": "record", "fields": { "cellid": { - "type": "array", + "type": "cellid", "longname": "cell identifier", "description": "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell.", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "tagged": false }, "head": { "type": "double", @@ -305,14 +299,8 @@ "type": "union", "arms": { "cellid": { - "type": "array", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "type": "cellid", + "tagged": false }, "boundname": { "type": "string", 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 8b962107..070757e3 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-chd.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-chd.toml @@ -111,16 +111,10 @@ name = "stress_period_data" type = "record" [blocks.period.fields.stress_period_data.item.fields.cellid] -type = "array" +type = "cellid" longname = "cell identifier" description = "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell." tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [blocks.period.fields.stress_period_data.item.fields.head] type = "double" @@ -278,14 +272,8 @@ shape = [ type = "union" [observations.chd.arms.cellid] -type = "array" +type = "cellid" tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [observations.chd.arms.boundname] type = "string" 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 fc945a79..7e0483c4 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-chd.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-chd.yaml @@ -116,7 +116,7 @@ blocks: type: record fields: cellid: - type: array + type: cellid longname: cell identifier description: is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, @@ -124,11 +124,6 @@ blocks: number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell. tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim head: type: double longname: head value assigned to constant head @@ -275,13 +270,8 @@ observations: type: union arms: cellid: - type: array + type: cellid tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim boundname: type: string tagged: false 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 3d42f68a..a00f385a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-evp.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-evp.json @@ -126,16 +126,10 @@ "type": "record", "fields": { "cellid": { - "type": "array", + "type": "cellid", "longname": "cell identifier", "description": "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell.", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "tagged": false }, "evaporation": { "type": "double", @@ -315,14 +309,8 @@ "type": "union", "arms": { "cellid": { - "type": "array", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "type": "cellid", + "tagged": false }, "boundname": { "type": "string", 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 38731d2c..3d3395c9 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-evp.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-evp.toml @@ -111,16 +111,10 @@ name = "stress_period_data" type = "record" [blocks.period.fields.stress_period_data.item.fields.cellid] -type = "array" +type = "cellid" longname = "cell identifier" description = "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell." tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [blocks.period.fields.stress_period_data.item.fields.evaporation] type = "double" @@ -288,14 +282,8 @@ shape = [ type = "union" [observations.evp.arms.cellid] -type = "array" +type = "cellid" tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [observations.evp.arms.boundname] type = "string" 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 6b725869..3123869a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-evp.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-evp.yaml @@ -116,7 +116,7 @@ blocks: type: record fields: cellid: - type: array + type: cellid longname: cell identifier description: is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, @@ -124,11 +124,6 @@ blocks: number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell. tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim evaporation: type: double longname: evaporation rate @@ -285,13 +280,8 @@ observations: type: union arms: cellid: - type: array + type: cellid tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim boundname: type: string tagged: false 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 1eef0ad9..86f5bb64 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-flw.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-flw.json @@ -126,16 +126,10 @@ "type": "record", "fields": { "cellid": { - "type": "array", + "type": "cellid", "longname": "cell identifier", "description": "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell.", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "tagged": false }, "q": { "type": "double", @@ -307,14 +301,8 @@ "type": "union", "arms": { "cellid": { - "type": "array", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "type": "cellid", + "tagged": false }, "boundname": { "type": "string", @@ -326,14 +314,8 @@ "type": "union", "arms": { "cellid": { - "type": "array", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "type": "cellid", + "tagged": false }, "boundname": { "type": "string", 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 f9f92fcf..9e218793 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-flw.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-flw.toml @@ -111,16 +111,10 @@ name = "stress_period_data" type = "record" [blocks.period.fields.stress_period_data.item.fields.cellid] -type = "array" +type = "cellid" longname = "cell identifier" description = "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell." tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [blocks.period.fields.stress_period_data.item.fields.q] type = "double" @@ -280,14 +274,8 @@ shape = [ type = "union" [observations.flw.arms.cellid] -type = "array" +type = "cellid" tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [observations.flw.arms.boundname] type = "string" @@ -297,14 +285,8 @@ tagged = false type = "union" [observations.to-mvr.arms.cellid] -type = "array" +type = "cellid" tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [observations.to-mvr.arms.boundname] type = "string" 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 3d208516..913e9598 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-flw.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-flw.yaml @@ -115,7 +115,7 @@ blocks: type: record fields: cellid: - type: array + type: cellid longname: cell identifier description: is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, @@ -123,11 +123,6 @@ blocks: number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell. tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim q: type: double longname: well rate @@ -277,13 +272,8 @@ observations: type: union arms: cellid: - type: array + type: cellid tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim boundname: type: string tagged: false @@ -291,13 +281,8 @@ observations: type: union arms: cellid: - type: array + type: cellid tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim boundname: type: string tagged: false 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 efb22e08..b0656308 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-nam.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-nam.json @@ -170,37 +170,19 @@ }, "observations": { "stage": { - "type": "array", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "type": "cellid", + "tagged": false }, "flow-ja-face": { "type": "record", "fields": { "cellid": { - "type": "array", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "type": "cellid", + "tagged": false }, "cellid2": { - "type": "array", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "type": "cellid", + "tagged": false } } } 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 73f5736a..3d7ac1d8 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-nam.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-nam.toml @@ -151,34 +151,16 @@ shape = [ ] [observations.stage] -type = "array" +type = "cellid" tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [observations.flow-ja-face] type = "record" [observations.flow-ja-face.fields.cellid] -type = "array" +type = "cellid" tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [observations.flow-ja-face.fields.cellid2] -type = "array" +type = "cellid" tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] 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 0b21608c..c5a1d3e1 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-nam.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-nam.yaml @@ -163,29 +163,14 @@ memory: - nja observations: stage: - type: array + type: cellid tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim flow-ja-face: type: record fields: cellid: - type: array + type: cellid tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim cellid2: - type: array + type: cellid tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim 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 9d7fc117..caa2a017 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-pcp.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-pcp.json @@ -126,16 +126,10 @@ "type": "record", "fields": { "cellid": { - "type": "array", + "type": "cellid", "longname": "cell identifier", "description": "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell.", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "tagged": false }, "precipitation": { "type": "double", @@ -315,14 +309,8 @@ "type": "union", "arms": { "cellid": { - "type": "array", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "type": "cellid", + "tagged": false }, "boundname": { "type": "string", 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 c21bb5b5..8f25a999 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-pcp.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-pcp.toml @@ -111,16 +111,10 @@ name = "stress_period_data" type = "record" [blocks.period.fields.stress_period_data.item.fields.cellid] -type = "array" +type = "cellid" longname = "cell identifier" description = "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell." tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [blocks.period.fields.stress_period_data.item.fields.precipitation] type = "double" @@ -288,14 +282,8 @@ shape = [ type = "union" [observations.pcp.arms.cellid] -type = "array" +type = "cellid" tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [observations.pcp.arms.boundname] type = "string" 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 e8a9aa1e..8482fbbd 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-pcp.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-pcp.yaml @@ -116,7 +116,7 @@ blocks: type: record fields: cellid: - type: array + type: cellid longname: cell identifier description: is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, @@ -124,11 +124,6 @@ blocks: number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell. tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim precipitation: type: double longname: precipitation rate @@ -285,13 +280,8 @@ observations: type: union arms: cellid: - type: array + type: cellid tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim boundname: type: string tagged: false 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 d1ea6a50..5f6ac554 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-zdg.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-zdg.json @@ -120,16 +120,10 @@ "type": "record", "fields": { "cellid": { - "type": "array", + "type": "cellid", "longname": "cell identifier", "description": "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell.", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "tagged": false }, "idcxs": { "type": "integer", @@ -333,14 +327,8 @@ "type": "union", "arms": { "cellid": { - "type": "array", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "type": "cellid", + "tagged": false }, "boundname": { "type": "string", @@ -352,14 +340,8 @@ "type": "union", "arms": { "cellid": { - "type": "array", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "type": "cellid", + "tagged": false }, "boundname": { "type": "string", 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 761782fc..687c29f0 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-zdg.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-zdg.toml @@ -105,16 +105,10 @@ name = "stress_period_data" type = "record" [blocks.period.fields.stress_period_data.item.fields.cellid] -type = "array" +type = "cellid" longname = "cell identifier" description = "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell." tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [blocks.period.fields.stress_period_data.item.fields.idcxs] type = "integer" @@ -306,14 +300,8 @@ shape = [ type = "union" [observations.zdg.arms.cellid] -type = "array" +type = "cellid" tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [observations.zdg.arms.boundname] type = "string" @@ -323,14 +311,8 @@ tagged = false type = "union" [observations.to-mvr.arms.cellid] -type = "array" +type = "cellid" tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [observations.to-mvr.arms.boundname] type = "string" 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 2a3d6fce..2af941c9 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-zdg.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-zdg.yaml @@ -111,7 +111,7 @@ blocks: type: record fields: cellid: - type: array + type: cellid longname: cell identifier description: is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, @@ -119,11 +119,6 @@ blocks: number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell. tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim idcxs: type: integer longname: cross section identifier @@ -312,13 +307,8 @@ observations: type: union arms: cellid: - type: array + type: cellid tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim boundname: type: string tagged: false @@ -326,13 +316,8 @@ observations: type: union arms: cellid: - type: array + type: cellid tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim boundname: type: string tagged: false diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-chfgwf.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-chfgwf.json index 8dbdecca..443459ad 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-chfgwf.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-chfgwf.json @@ -72,28 +72,18 @@ "type": "record", "fields": { "cellidm1": { - "type": "array", + "type": "cellid", "longname": "cellid of cell in surface water model", "description": "is the cellid of the cell in model 1, which must be the surface water model. For a structured grid that uses the DIS input file, CELLIDM1 is the layer, row, and column numbers of the cell. For a grid that uses the DISV input file, CELLIDM1 is the layer number and CELL2D number for the two cells. If the model uses the unstructured discretization (DISU) input file, then CELLIDM1 is the node number for the cell.", "tagged": false, - "dtype": "integer", - "index": true, - "cellid": "1", - "shape": [ - "ncelldim" - ] + "model": "1" }, "cellidm2": { - "type": "array", + "type": "cellid", "longname": "cellid of cell in groundwater model", "description": "is the cellid of the cell in model 2, which must be the groundwater model. For a structured grid that uses the DIS input file, CELLIDM2 is the layer, row, and column numbers of the cell. For a grid that uses the DISV input file, CELLIDM2 is the layer number and CELL2D number for the two cells. If the model uses the unstructured discretization (DISU) input file, then CELLIDM2 is the node number for the cell.", "tagged": false, - "dtype": "integer", - "index": true, - "cellid": "2", - "shape": [ - "ncelldim" - ] + "model": "2" }, "bedleak": { "type": "double", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-chfgwf.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-chfgwf.toml index 5aabf2d5..de1fa892 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-chfgwf.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-chfgwf.toml @@ -61,28 +61,18 @@ name = "exchangedata" type = "record" [blocks.exchangedata.fields.exchangedata.item.fields.cellidm1] -type = "array" +type = "cellid" longname = "cellid of cell in surface water model" description = "is the cellid of the cell in model 1, which must be the surface water model. For a structured grid that uses the DIS input file, CELLIDM1 is the layer, row, and column numbers of the cell. For a grid that uses the DISV input file, CELLIDM1 is the layer number and CELL2D number for the two cells. If the model uses the unstructured discretization (DISU) input file, then CELLIDM1 is the node number for the cell." tagged = false -dtype = "integer" -index = true -cellid = "1" -shape = [ - "ncelldim", -] +model = "1" [blocks.exchangedata.fields.exchangedata.item.fields.cellidm2] -type = "array" +type = "cellid" longname = "cellid of cell in groundwater model" description = "is the cellid of the cell in model 2, which must be the groundwater model. For a structured grid that uses the DIS input file, CELLIDM2 is the layer, row, and column numbers of the cell. For a grid that uses the DISV input file, CELLIDM2 is the layer number and CELL2D number for the two cells. If the model uses the unstructured discretization (DISU) input file, then CELLIDM2 is the node number for the cell." tagged = false -dtype = "integer" -index = true -cellid = "2" -shape = [ - "ncelldim", -] +model = "2" [blocks.exchangedata.fields.exchangedata.item.fields.bedleak] type = "double" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-chfgwf.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-chfgwf.yaml index 243a29a7..7223260f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-chfgwf.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-chfgwf.yaml @@ -63,7 +63,7 @@ blocks: type: record fields: cellidm1: - type: array + type: cellid longname: cellid of cell in surface water model description: is the cellid of the cell in model 1, which must be the surface water model. For a structured grid that uses the DIS input file, CELLIDM1 is the layer, row, and column @@ -71,13 +71,9 @@ blocks: number and CELL2D number for the two cells. If the model uses the unstructured discretization (DISU) input file, then CELLIDM1 is the node number for the cell. tagged: false - dtype: integer - index: true - cellid: '1' - shape: - - ncelldim + model: '1' cellidm2: - type: array + type: cellid longname: cellid of cell in groundwater model description: is the cellid of the cell in model 2, which must be the groundwater model. For a structured grid that uses the DIS input file, CELLIDM2 is the layer, row, and column @@ -85,11 +81,7 @@ blocks: number and CELL2D number for the two cells. If the model uses the unstructured discretization (DISU) input file, then CELLIDM2 is the node number for the cell. tagged: false - dtype: integer - index: true - cellid: '2' - shape: - - ncelldim + model: '2' bedleak: type: double longname: bed leakance 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 b67f54e8..88bebb74 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwegwe.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwegwe.json @@ -149,28 +149,18 @@ "type": "record", "fields": { "cellidm1": { - "type": "array", + "type": "cellid", "longname": "cellid of first cell", "description": "is the cellid of the cell in model 1 as specified in the simulation name file. For a structured grid that uses the DIS input file, CELLIDM1 is the layer, row, and column numbers of the cell. For a grid that uses the DISV input file, CELLIDM1 is the layer number and CELL2D number for the two cells. If the model uses the unstructured discretization (DISU) input file, then CELLIDM1 is the node number for the cell.", "tagged": false, - "dtype": "integer", - "index": true, - "cellid": "1", - "shape": [ - "ncelldim" - ] + "model": "1" }, "cellidm2": { - "type": "array", + "type": "cellid", "longname": "cellid of second cell", "description": "is the cellid of the cell in model 2 as specified in the simulation name file. For a structured grid that uses the DIS input file, CELLIDM2 is the layer, row, and column numbers of the cell. For a grid that uses the DISV input file, CELLIDM2 is the layer number and CELL2D number for the two cells. If the model uses the unstructured discretization (DISU) input file, then CELLIDM2 is the node number for the cell.", "tagged": false, - "dtype": "integer", - "index": true, - "cellid": "2", - "shape": [ - "ncelldim" - ] + "model": "2" }, "ihc": { "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 34d50342..ac6303e2 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwegwe.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwegwe.toml @@ -136,28 +136,18 @@ name = "exchangedata" type = "record" [blocks.exchangedata.fields.exchangedata.item.fields.cellidm1] -type = "array" +type = "cellid" longname = "cellid of first cell" description = "is the cellid of the cell in model 1 as specified in the simulation name file. For a structured grid that uses the DIS input file, CELLIDM1 is the layer, row, and column numbers of the cell. For a grid that uses the DISV input file, CELLIDM1 is the layer number and CELL2D number for the two cells. If the model uses the unstructured discretization (DISU) input file, then CELLIDM1 is the node number for the cell." tagged = false -dtype = "integer" -index = true -cellid = "1" -shape = [ - "ncelldim", -] +model = "1" [blocks.exchangedata.fields.exchangedata.item.fields.cellidm2] -type = "array" +type = "cellid" longname = "cellid of second cell" description = "is the cellid of the cell in model 2 as specified in the simulation name file. For a structured grid that uses the DIS input file, CELLIDM2 is the layer, row, and column numbers of the cell. For a grid that uses the DISV input file, CELLIDM2 is the layer number and CELL2D number for the two cells. If the model uses the unstructured discretization (DISU) input file, then CELLIDM2 is the node number for the cell." tagged = false -dtype = "integer" -index = true -cellid = "2" -shape = [ - "ncelldim", -] +model = "2" [blocks.exchangedata.fields.exchangedata.item.fields.ihc] 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 6a1535d6..b7b28688 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwegwe.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwegwe.yaml @@ -145,7 +145,7 @@ blocks: type: record fields: cellidm1: - type: array + type: cellid longname: cellid of first cell description: is the cellid of the cell in model 1 as specified in the simulation name file. For a structured grid that uses the DIS input file, CELLIDM1 is the layer, row, and column @@ -153,13 +153,9 @@ blocks: number and CELL2D number for the two cells. If the model uses the unstructured discretization (DISU) input file, then CELLIDM1 is the node number for the cell. tagged: false - dtype: integer - index: true - cellid: '1' - shape: - - ncelldim + model: '1' cellidm2: - type: array + type: cellid longname: cellid of second cell description: is the cellid of the cell in model 2 as specified in the simulation name file. For a structured grid that uses the DIS input file, CELLIDM2 is the layer, row, and column @@ -167,11 +163,7 @@ blocks: number and CELL2D number for the two cells. If the model uses the unstructured discretization (DISU) input file, then CELLIDM2 is the node number for the cell. tagged: false - dtype: integer - index: true - cellid: '2' - shape: - - ncelldim + model: '2' ihc: type: integer longname: integer flag for connection type 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 6048c779..2a0667ce 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwfgwf.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwfgwf.json @@ -177,28 +177,18 @@ "type": "record", "fields": { "cellidm1": { - "type": "array", + "type": "cellid", "longname": "cellid of first cell", "description": "is the cellid of the cell in model 1 as specified in the simulation name file. For a structured grid that uses the DIS input file, CELLIDM1 is the layer, row, and column numbers of the cell. For a grid that uses the DISV input file, CELLIDM1 is the layer number and CELL2D number for the two cells. If the model uses the unstructured discretization (DISU) input file, then CELLIDM1 is the node number for the cell.", "tagged": false, - "dtype": "integer", - "index": true, - "cellid": "1", - "shape": [ - "ncelldim" - ] + "model": "1" }, "cellidm2": { - "type": "array", + "type": "cellid", "longname": "cellid of second cell", "description": "is the cellid of the cell in model 2 as specified in the simulation name file. For a structured grid that uses the DIS input file, CELLIDM2 is the layer, row, and column numbers of the cell. For a grid that uses the DISV input file, CELLIDM2 is the layer number and CELL2D number for the two cells. If the model uses the unstructured discretization (DISU) input file, then CELLIDM2 is the node number for the cell.", "tagged": false, - "dtype": "integer", - "index": true, - "cellid": "2", - "shape": [ - "ncelldim" - ] + "model": "2" }, "ihc": { "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 751d6830..e7fdfe7a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwfgwf.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwfgwf.toml @@ -160,28 +160,18 @@ name = "exchangedata" type = "record" [blocks.exchangedata.fields.exchangedata.item.fields.cellidm1] -type = "array" +type = "cellid" longname = "cellid of first cell" description = "is the cellid of the cell in model 1 as specified in the simulation name file. For a structured grid that uses the DIS input file, CELLIDM1 is the layer, row, and column numbers of the cell. For a grid that uses the DISV input file, CELLIDM1 is the layer number and CELL2D number for the two cells. If the model uses the unstructured discretization (DISU) input file, then CELLIDM1 is the node number for the cell." tagged = false -dtype = "integer" -index = true -cellid = "1" -shape = [ - "ncelldim", -] +model = "1" [blocks.exchangedata.fields.exchangedata.item.fields.cellidm2] -type = "array" +type = "cellid" longname = "cellid of second cell" description = "is the cellid of the cell in model 2 as specified in the simulation name file. For a structured grid that uses the DIS input file, CELLIDM2 is the layer, row, and column numbers of the cell. For a grid that uses the DISV input file, CELLIDM2 is the layer number and CELL2D number for the two cells. If the model uses the unstructured discretization (DISU) input file, then CELLIDM2 is the node number for the cell." tagged = false -dtype = "integer" -index = true -cellid = "2" -shape = [ - "ncelldim", -] +model = "2" [blocks.exchangedata.fields.exchangedata.item.fields.ihc] 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 6bd80482..51e2d02e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwfgwf.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwfgwf.yaml @@ -191,7 +191,7 @@ blocks: type: record fields: cellidm1: - type: array + type: cellid longname: cellid of first cell description: is the cellid of the cell in model 1 as specified in the simulation name file. For a structured grid that uses the DIS input file, CELLIDM1 is the layer, row, and column @@ -199,13 +199,9 @@ blocks: number and CELL2D number for the two cells. If the model uses the unstructured discretization (DISU) input file, then CELLIDM1 is the node number for the cell. tagged: false - dtype: integer - index: true - cellid: '1' - shape: - - ncelldim + model: '1' cellidm2: - type: array + type: cellid longname: cellid of second cell description: is the cellid of the cell in model 2 as specified in the simulation name file. For a structured grid that uses the DIS input file, CELLIDM2 is the layer, row, and column @@ -213,11 +209,7 @@ blocks: number and CELL2D number for the two cells. If the model uses the unstructured discretization (DISU) input file, then CELLIDM2 is the node number for the cell. tagged: false - dtype: integer - index: true - cellid: '2' - shape: - - ncelldim + model: '2' ihc: type: integer longname: integer flag for connection type 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 c9f4687f..23ddf11b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwtgwt.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwtgwt.json @@ -149,28 +149,18 @@ "type": "record", "fields": { "cellidm1": { - "type": "array", + "type": "cellid", "longname": "cellid of first cell", "description": "is the cellid of the cell in model 1 as specified in the simulation name file. For a structured grid that uses the DIS input file, CELLIDM1 is the layer, row, and column numbers of the cell. For a grid that uses the DISV input file, CELLIDM1 is the layer number and CELL2D number for the two cells. If the model uses the unstructured discretization (DISU) input file, then CELLIDM1 is the node number for the cell.", "tagged": false, - "dtype": "integer", - "index": true, - "cellid": "1", - "shape": [ - "ncelldim" - ] + "model": "1" }, "cellidm2": { - "type": "array", + "type": "cellid", "longname": "cellid of second cell", "description": "is the cellid of the cell in model 2 as specified in the simulation name file. For a structured grid that uses the DIS input file, CELLIDM2 is the layer, row, and column numbers of the cell. For a grid that uses the DISV input file, CELLIDM2 is the layer number and CELL2D number for the two cells. If the model uses the unstructured discretization (DISU) input file, then CELLIDM2 is the node number for the cell.", "tagged": false, - "dtype": "integer", - "index": true, - "cellid": "2", - "shape": [ - "ncelldim" - ] + "model": "2" }, "ihc": { "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 4e6a469b..e093c8a2 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwtgwt.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwtgwt.toml @@ -136,28 +136,18 @@ name = "exchangedata" type = "record" [blocks.exchangedata.fields.exchangedata.item.fields.cellidm1] -type = "array" +type = "cellid" longname = "cellid of first cell" description = "is the cellid of the cell in model 1 as specified in the simulation name file. For a structured grid that uses the DIS input file, CELLIDM1 is the layer, row, and column numbers of the cell. For a grid that uses the DISV input file, CELLIDM1 is the layer number and CELL2D number for the two cells. If the model uses the unstructured discretization (DISU) input file, then CELLIDM1 is the node number for the cell." tagged = false -dtype = "integer" -index = true -cellid = "1" -shape = [ - "ncelldim", -] +model = "1" [blocks.exchangedata.fields.exchangedata.item.fields.cellidm2] -type = "array" +type = "cellid" longname = "cellid of second cell" description = "is the cellid of the cell in model 2 as specified in the simulation name file. For a structured grid that uses the DIS input file, CELLIDM2 is the layer, row, and column numbers of the cell. For a grid that uses the DISV input file, CELLIDM2 is the layer number and CELL2D number for the two cells. If the model uses the unstructured discretization (DISU) input file, then CELLIDM2 is the node number for the cell." tagged = false -dtype = "integer" -index = true -cellid = "2" -shape = [ - "ncelldim", -] +model = "2" [blocks.exchangedata.fields.exchangedata.item.fields.ihc] 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 7eab601e..49ad6107 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwtgwt.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwtgwt.yaml @@ -143,7 +143,7 @@ blocks: type: record fields: cellidm1: - type: array + type: cellid longname: cellid of first cell description: is the cellid of the cell in model 1 as specified in the simulation name file. For a structured grid that uses the DIS input file, CELLIDM1 is the layer, row, and column @@ -151,13 +151,9 @@ blocks: number and CELL2D number for the two cells. If the model uses the unstructured discretization (DISU) input file, then CELLIDM1 is the node number for the cell. tagged: false - dtype: integer - index: true - cellid: '1' - shape: - - ncelldim + model: '1' cellidm2: - type: array + type: cellid longname: cellid of second cell description: is the cellid of the cell in model 2 as specified in the simulation name file. For a structured grid that uses the DIS input file, CELLIDM2 is the layer, row, and column @@ -165,11 +161,7 @@ blocks: number and CELL2D number for the two cells. If the model uses the unstructured discretization (DISU) input file, then CELLIDM2 is the node number for the cell. tagged: false - dtype: integer - index: true - cellid: '2' - shape: - - ncelldim + model: '2' ihc: type: integer longname: integer flag for connection type diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-olfgwf.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-olfgwf.json index 8717685f..df904839 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-olfgwf.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-olfgwf.json @@ -72,28 +72,18 @@ "type": "record", "fields": { "cellidm1": { - "type": "array", + "type": "cellid", "longname": "cellid of cell in surface water model", "description": "is the cellid of the cell in model 1, which must be the surface water model. For a structured grid that uses the DIS input file, CELLIDM1 is the layer, row, and column numbers of the cell. For a grid that uses the DISV input file, CELLIDM1 is the layer number and CELL2D number for the two cells. If the model uses the unstructured discretization (DISU) input file, then CELLIDM1 is the node number for the cell.", "tagged": false, - "dtype": "integer", - "index": true, - "cellid": "1", - "shape": [ - "ncelldim" - ] + "model": "1" }, "cellidm2": { - "type": "array", + "type": "cellid", "longname": "cellid of cell in groundwater model", "description": "is the cellid of the cell in model 2, which must be the groundwater model. For a structured grid that uses the DIS input file, CELLIDM2 is the layer, row, and column numbers of the cell. For a grid that uses the DISV input file, CELLIDM2 is the layer number and CELL2D number for the two cells. If the model uses the unstructured discretization (DISU) input file, then CELLIDM2 is the node number for the cell.", "tagged": false, - "dtype": "integer", - "index": true, - "cellid": "2", - "shape": [ - "ncelldim" - ] + "model": "2" }, "bedleak": { "type": "double", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-olfgwf.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-olfgwf.toml index 09d3a9e2..c07fa562 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-olfgwf.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-olfgwf.toml @@ -61,28 +61,18 @@ name = "exchangedata" type = "record" [blocks.exchangedata.fields.exchangedata.item.fields.cellidm1] -type = "array" +type = "cellid" longname = "cellid of cell in surface water model" description = "is the cellid of the cell in model 1, which must be the surface water model. For a structured grid that uses the DIS input file, CELLIDM1 is the layer, row, and column numbers of the cell. For a grid that uses the DISV input file, CELLIDM1 is the layer number and CELL2D number for the two cells. If the model uses the unstructured discretization (DISU) input file, then CELLIDM1 is the node number for the cell." tagged = false -dtype = "integer" -index = true -cellid = "1" -shape = [ - "ncelldim", -] +model = "1" [blocks.exchangedata.fields.exchangedata.item.fields.cellidm2] -type = "array" +type = "cellid" longname = "cellid of cell in groundwater model" description = "is the cellid of the cell in model 2, which must be the groundwater model. For a structured grid that uses the DIS input file, CELLIDM2 is the layer, row, and column numbers of the cell. For a grid that uses the DISV input file, CELLIDM2 is the layer number and CELL2D number for the two cells. If the model uses the unstructured discretization (DISU) input file, then CELLIDM2 is the node number for the cell." tagged = false -dtype = "integer" -index = true -cellid = "2" -shape = [ - "ncelldim", -] +model = "2" [blocks.exchangedata.fields.exchangedata.item.fields.bedleak] type = "double" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-olfgwf.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-olfgwf.yaml index 38bd8c33..8f632722 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-olfgwf.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-olfgwf.yaml @@ -63,7 +63,7 @@ blocks: type: record fields: cellidm1: - type: array + type: cellid longname: cellid of cell in surface water model description: is the cellid of the cell in model 1, which must be the surface water model. For a structured grid that uses the DIS input file, CELLIDM1 is the layer, row, and column @@ -71,13 +71,9 @@ blocks: number and CELL2D number for the two cells. If the model uses the unstructured discretization (DISU) input file, then CELLIDM1 is the node number for the cell. tagged: false - dtype: integer - index: true - cellid: '1' - shape: - - ncelldim + model: '1' cellidm2: - type: array + type: cellid longname: cellid of cell in groundwater model description: is the cellid of the cell in model 2, which must be the groundwater model. For a structured grid that uses the DIS input file, CELLIDM2 is the layer, row, and column @@ -85,11 +81,7 @@ blocks: number and CELL2D number for the two cells. If the model uses the unstructured discretization (DISU) input file, then CELLIDM2 is the node number for the cell. tagged: false - dtype: integer - index: true - cellid: '2' - shape: - - ncelldim + model: '2' bedleak: type: double longname: bed leakance 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 af247c5f..9b3313b3 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ctp.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ctp.json @@ -126,16 +126,10 @@ "type": "record", "fields": { "cellid": { - "type": "array", + "type": "cellid", "longname": "cell identifier", "description": "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell.", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "tagged": false }, "temp": { "type": "double", @@ -320,14 +314,8 @@ "type": "union", "arms": { "cellid": { - "type": "array", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "type": "cellid", + "tagged": false }, "boundname": { "type": "string", 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 a37382e3..2e24c311 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ctp.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ctp.toml @@ -111,16 +111,10 @@ name = "stress_period_data" type = "record" [blocks.period.fields.stress_period_data.item.fields.cellid] -type = "array" +type = "cellid" longname = "cell identifier" description = "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell." tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [blocks.period.fields.stress_period_data.item.fields.temp] type = "double" @@ -293,14 +287,8 @@ shape = [ type = "union" [observations.ctp.arms.cellid] -type = "array" +type = "cellid" tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [observations.ctp.arms.boundname] type = "string" 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 c2775660..2aa535a0 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ctp.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ctp.yaml @@ -116,7 +116,7 @@ blocks: type: record fields: cellid: - type: array + type: cellid longname: cell identifier description: is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, @@ -124,11 +124,6 @@ blocks: number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell. tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim temp: type: double longname: constant temperature value @@ -287,13 +282,8 @@ observations: type: union arms: cellid: - type: array + type: cellid tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim boundname: type: string tagged: false 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 f0bab797..ce00ecdf 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-esl.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-esl.json @@ -126,16 +126,10 @@ "type": "record", "fields": { "cellid": { - "type": "array", + "type": "cellid", "longname": "cell identifier", "description": "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell.", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "tagged": false }, "senerrate": { "type": "double", @@ -317,14 +311,8 @@ "type": "union", "arms": { "cellid": { - "type": "array", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "type": "cellid", + "tagged": false }, "boundname": { "type": "string", @@ -336,14 +324,8 @@ "type": "union", "arms": { "cellid": { - "type": "array", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "type": "cellid", + "tagged": false }, "boundname": { "type": "string", 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 636abb16..441cb365 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-esl.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-esl.toml @@ -111,16 +111,10 @@ name = "stress_period_data" type = "record" [blocks.period.fields.stress_period_data.item.fields.cellid] -type = "array" +type = "cellid" longname = "cell identifier" description = "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell." tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [blocks.period.fields.stress_period_data.item.fields.senerrate] type = "double" @@ -290,14 +284,8 @@ shape = [ type = "union" [observations.esl.arms.cellid] -type = "array" +type = "cellid" tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [observations.esl.arms.boundname] type = "string" @@ -307,14 +295,8 @@ tagged = false type = "union" [observations.to-mvr.arms.cellid] -type = "array" +type = "cellid" tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [observations.to-mvr.arms.boundname] type = "string" 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 eee13f38..5304b93e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-esl.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-esl.yaml @@ -116,7 +116,7 @@ blocks: type: record fields: cellid: - type: array + type: cellid longname: cell identifier description: is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, @@ -124,11 +124,6 @@ blocks: number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell. tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim senerrate: type: double longname: energy source loading rate @@ -286,13 +281,8 @@ observations: type: union arms: cellid: - type: array + type: cellid tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim boundname: type: string tagged: false @@ -300,13 +290,8 @@ observations: type: union arms: cellid: - type: array + type: cellid tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim boundname: type: string tagged: false 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 08a678de..4149b46a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-nam.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-nam.json @@ -229,37 +229,19 @@ }, "observations": { "temperature": { - "type": "array", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "type": "cellid", + "tagged": false }, "flow-ja-face": { "type": "record", "fields": { "cellid": { - "type": "array", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "type": "cellid", + "tagged": false }, "cellid2": { - "type": "array", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "type": "cellid", + "tagged": false } } } 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 cb4d2275..b4573607 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-nam.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-nam.toml @@ -206,34 +206,16 @@ shape = [ ] [observations.temperature] -type = "array" +type = "cellid" tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [observations.flow-ja-face] type = "record" [observations.flow-ja-face.fields.cellid] -type = "array" +type = "cellid" tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [observations.flow-ja-face.fields.cellid2] -type = "array" +type = "cellid" tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] 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 de2bc375..b0c284e2 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-nam.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-nam.yaml @@ -206,29 +206,14 @@ memory: - nja observations: temperature: - type: array + type: cellid tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim flow-ja-face: type: record fields: cellid: - type: array + type: cellid tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim cellid2: - type: array + type: cellid tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim 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 383403b2..20f34981 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-api.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-api.json @@ -99,14 +99,8 @@ "type": "union", "arms": { "cellid": { - "type": "array", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "type": "cellid", + "tagged": false }, "boundname": { "type": "string", @@ -118,14 +112,8 @@ "type": "union", "arms": { "cellid": { - "type": "array", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "type": "cellid", + "tagged": false }, "boundname": { "type": "string", 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 ccc77eff..1d90f7c0 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-api.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-api.toml @@ -82,14 +82,8 @@ type = "integer" type = "union" [observations.api.arms.cellid] -type = "array" +type = "cellid" tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [observations.api.arms.boundname] type = "string" @@ -99,14 +93,8 @@ tagged = false type = "union" [observations.to-mvr.arms.cellid] -type = "array" +type = "cellid" tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [observations.to-mvr.arms.boundname] type = "string" 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 be9c47ea..a447c281 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-api.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-api.yaml @@ -87,13 +87,8 @@ observations: type: union arms: cellid: - type: array + type: cellid tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim boundname: type: string tagged: false @@ -101,13 +96,8 @@ observations: type: union arms: cellid: - type: array + type: cellid tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim boundname: type: string tagged: false 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 4ca7f09c..0afe0ff5 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chd.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chd.json @@ -133,16 +133,10 @@ "type": "record", "fields": { "cellid": { - "type": "array", + "type": "cellid", "longname": "cell identifier", "description": "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell.", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "tagged": false }, "head": { "type": "double", @@ -327,14 +321,8 @@ "type": "union", "arms": { "cellid": { - "type": "array", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "type": "cellid", + "tagged": false }, "boundname": { "type": "string", 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 252860a0..339f9526 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chd.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chd.toml @@ -118,16 +118,10 @@ name = "stress_period_data" type = "record" [blocks.period.fields.stress_period_data.item.fields.cellid] -type = "array" +type = "cellid" longname = "cell identifier" description = "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell." tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [blocks.period.fields.stress_period_data.item.fields.head] type = "double" @@ -300,14 +294,8 @@ shape = [ type = "union" [observations.chd.arms.cellid] -type = "array" +type = "cellid" tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [observations.chd.arms.boundname] type = "string" 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 7ee9b245..43711621 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chd.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chd.yaml @@ -122,7 +122,7 @@ blocks: type: record fields: cellid: - type: array + type: cellid longname: cell identifier description: is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, @@ -130,11 +130,6 @@ blocks: number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell. tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim head: type: double longname: head value assigned to constant head @@ -293,13 +288,8 @@ observations: type: union arms: cellid: - type: array + type: cellid tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim boundname: type: string tagged: false 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 708a09e6..c4dfe5cd 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chdg.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chdg.json @@ -312,14 +312,8 @@ "type": "union", "arms": { "cellid": { - "type": "array", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "type": "cellid", + "tagged": false }, "boundname": { "type": "string", 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 ec14d787..cab92efe 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chdg.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chdg.toml @@ -287,14 +287,8 @@ shape = [ type = "union" [observations.chd.arms.cellid] -type = "array" +type = "cellid" tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [observations.chd.arms.boundname] type = "string" 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 90b6626f..ba333452 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chdg.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chdg.yaml @@ -277,13 +277,8 @@ observations: type: union arms: cellid: - type: array + type: cellid tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim boundname: type: string tagged: false 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 c67d29e6..05525bb6 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-csub.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-csub.json @@ -405,16 +405,10 @@ "pk": true }, "cellid": { - "type": "array", + "type": "cellid", "longname": "cell identifier", "description": "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell.", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "tagged": false }, "cdelay": { "type": "string", @@ -495,16 +489,10 @@ "type": "record", "fields": { "cellid": { - "type": "array", + "type": "cellid", "longname": "cell identifier", "description": "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell.", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "tagged": false }, "sig0": { "type": "double", @@ -941,164 +929,68 @@ } }, "coarse-csub": { - "type": "array", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "type": "cellid", + "tagged": false }, "csub-cell": { - "type": "array", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "type": "cellid", + "tagged": false }, "wcomp-csub-cell": { - "type": "array", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "type": "cellid", + "tagged": false }, "sk-cell": { - "type": "array", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "type": "cellid", + "tagged": false }, "ske-cell": { - "type": "array", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "type": "cellid", + "tagged": false }, "estress-cell": { - "type": "array", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "type": "cellid", + "tagged": false }, "gstress-cell": { - "type": "array", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "type": "cellid", + "tagged": false }, "preconstress-cell": { - "type": "array", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "type": "cellid", + "tagged": false }, "coarse-compaction": { - "type": "array", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "type": "cellid", + "tagged": false }, "compaction-cell": { - "type": "array", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "type": "cellid", + "tagged": false }, "inelastic-compaction-cell": { - "type": "array", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "type": "cellid", + "tagged": false }, "elastic-compaction-cell": { - "type": "array", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "type": "cellid", + "tagged": false }, "coarse-thickness": { - "type": "array", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "type": "cellid", + "tagged": false }, "thickness-cell": { - "type": "array", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "type": "cellid", + "tagged": false }, "coarse-theta": { - "type": "array", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "type": "cellid", + "tagged": false }, "theta-cell": { - "type": "array", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "type": "cellid", + "tagged": false } } } \ No newline at end of file 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 ddcac1bf..37486725 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-csub.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-csub.toml @@ -368,16 +368,10 @@ index = true pk = true [blocks.packagedata.fields.packagedata.item.fields.cellid] -type = "array" +type = "cellid" longname = "cell identifier" description = "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell." tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [blocks.packagedata.fields.packagedata.item.fields.cdelay] type = "string" @@ -452,16 +446,10 @@ name = "stress_period_data" type = "record" [blocks.period.fields.stress_period_data.item.fields.cellid] -type = "array" +type = "cellid" longname = "cell identifier" description = "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell." tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [blocks.period.fields.stress_period_data.item.fields.sig0] type = "double" @@ -862,161 +850,65 @@ tagged = false index = true [observations.coarse-csub] -type = "array" +type = "cellid" tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [observations.csub-cell] -type = "array" +type = "cellid" tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [observations.wcomp-csub-cell] -type = "array" +type = "cellid" tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [observations.sk-cell] -type = "array" +type = "cellid" tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [observations.ske-cell] -type = "array" +type = "cellid" tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [observations.estress-cell] -type = "array" +type = "cellid" tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [observations.gstress-cell] -type = "array" +type = "cellid" tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [observations.preconstress-cell] -type = "array" +type = "cellid" tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [observations.coarse-compaction] -type = "array" +type = "cellid" tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [observations.compaction-cell] -type = "array" +type = "cellid" tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [observations.inelastic-compaction-cell] -type = "array" +type = "cellid" tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [observations.elastic-compaction-cell] -type = "array" +type = "cellid" tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [observations.coarse-thickness] -type = "array" +type = "cellid" tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [observations.thickness-cell] -type = "array" +type = "cellid" tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [observations.coarse-theta] -type = "array" +type = "cellid" tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [observations.theta-cell] -type = "array" +type = "cellid" tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] 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 cb45317a..a32ffdb9 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-csub.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-csub.yaml @@ -385,7 +385,7 @@ blocks: index: true pk: true cellid: - type: array + type: cellid longname: cell identifier description: is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, @@ -393,11 +393,6 @@ blocks: number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell. tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim cdelay: type: string longname: delay type @@ -487,7 +482,7 @@ blocks: type: record fields: cellid: - type: array + type: cellid longname: cell identifier description: is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, @@ -495,11 +490,6 @@ blocks: number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell. tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim sig0: type: double longname: well stress offset @@ -842,130 +832,50 @@ observations: tagged: false index: true coarse-csub: - type: array + type: cellid tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim csub-cell: - type: array + type: cellid tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim wcomp-csub-cell: - type: array + type: cellid tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim sk-cell: - type: array + type: cellid tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim ske-cell: - type: array + type: cellid tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim estress-cell: - type: array + type: cellid tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim gstress-cell: - type: array + type: cellid tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim preconstress-cell: - type: array + type: cellid tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim coarse-compaction: - type: array + type: cellid tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim compaction-cell: - type: array + type: cellid tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim inelastic-compaction-cell: - type: array + type: cellid tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim elastic-compaction-cell: - type: array + type: cellid tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim coarse-thickness: - type: array + type: cellid tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim thickness-cell: - type: array + type: cellid tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim coarse-theta: - type: array + type: cellid tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim theta-cell: - type: array + type: cellid tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim 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 1e96aab5..e8ac7698 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drn.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drn.json @@ -144,16 +144,10 @@ "type": "record", "fields": { "cellid": { - "type": "array", + "type": "cellid", "longname": "cell identifier", "description": "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell.", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "tagged": false }, "elev": { "type": "double", @@ -347,14 +341,8 @@ "type": "union", "arms": { "cellid": { - "type": "array", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "type": "cellid", + "tagged": false }, "boundname": { "type": "string", @@ -366,14 +354,8 @@ "type": "union", "arms": { "cellid": { - "type": "array", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "type": "cellid", + "tagged": false }, "boundname": { "type": "string", 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 c863ae22..d193975f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drn.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drn.toml @@ -129,16 +129,10 @@ name = "stress_period_data" type = "record" [blocks.period.fields.stress_period_data.item.fields.cellid] -type = "array" +type = "cellid" longname = "cell identifier" description = "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell." tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [blocks.period.fields.stress_period_data.item.fields.elev] type = "double" @@ -320,14 +314,8 @@ shape = [ type = "union" [observations.drn.arms.cellid] -type = "array" +type = "cellid" tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [observations.drn.arms.boundname] type = "string" @@ -337,14 +325,8 @@ tagged = false type = "union" [observations.to-mvr.arms.cellid] -type = "array" +type = "cellid" tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [observations.to-mvr.arms.boundname] type = "string" 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 4ed8decf..6a535f76 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drn.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drn.yaml @@ -140,7 +140,7 @@ blocks: type: record fields: cellid: - type: array + type: cellid longname: cell identifier description: is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, @@ -148,11 +148,6 @@ blocks: number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell. tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim elev: type: double longname: drain elevation @@ -322,13 +317,8 @@ observations: type: union arms: cellid: - type: array + type: cellid tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim boundname: type: string tagged: false @@ -336,13 +326,8 @@ observations: type: union arms: cellid: - type: array + type: cellid tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim boundname: type: string tagged: false 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 f7260b23..5e129fad 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drng.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drng.json @@ -337,14 +337,8 @@ "type": "union", "arms": { "cellid": { - "type": "array", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "type": "cellid", + "tagged": false }, "boundname": { "type": "string", @@ -356,14 +350,8 @@ "type": "union", "arms": { "cellid": { - "type": "array", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "type": "cellid", + "tagged": false }, "boundname": { "type": "string", 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 dbccc35a..e15bcb6c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drng.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drng.toml @@ -312,14 +312,8 @@ shape = [ type = "union" [observations.drn.arms.cellid] -type = "array" +type = "cellid" tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [observations.drn.arms.boundname] type = "string" @@ -329,14 +323,8 @@ tagged = false type = "union" [observations.to-mvr.arms.cellid] -type = "array" +type = "cellid" tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [observations.to-mvr.arms.boundname] type = "string" 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 166b1987..077ffb5c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drng.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drng.yaml @@ -308,13 +308,8 @@ observations: type: union arms: cellid: - type: array + type: cellid tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim boundname: type: string tagged: false @@ -322,13 +317,8 @@ observations: type: union arms: cellid: - type: array + type: cellid tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim boundname: type: string tagged: false 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 c9b0d69f..4e879e84 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evt.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evt.json @@ -146,16 +146,10 @@ "type": "record", "fields": { "cellid": { - "type": "array", + "type": "cellid", "longname": "cell identifier", "description": "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell.", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "tagged": false }, "surface": { "type": "double", @@ -391,14 +385,8 @@ "type": "union", "arms": { "cellid": { - "type": "array", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "type": "cellid", + "tagged": false }, "boundname": { "type": "string", 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 6013462f..e8661fb4 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evt.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evt.toml @@ -131,16 +131,10 @@ name = "stress_period_data" type = "record" [blocks.period.fields.stress_period_data.item.fields.cellid] -type = "array" +type = "cellid" longname = "cell identifier" description = "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell." tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [blocks.period.fields.stress_period_data.item.fields.surface] type = "double" @@ -364,14 +358,8 @@ shape = [ type = "union" [observations.evt.arms.cellid] -type = "array" +type = "cellid" tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [observations.evt.arms.boundname] type = "string" 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 667b516d..d3546af8 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evt.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evt.yaml @@ -138,7 +138,7 @@ blocks: type: record fields: cellid: - type: array + type: cellid longname: cell identifier description: is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, @@ -146,11 +146,6 @@ blocks: number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell. tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim surface: type: double longname: ET surface @@ -368,13 +363,8 @@ observations: type: union arms: cellid: - type: array + type: cellid tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim boundname: type: string tagged: false 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 e8ddf3c5..68e06346 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evta.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evta.json @@ -349,14 +349,8 @@ "type": "union", "arms": { "cellid": { - "type": "array", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "type": "cellid", + "tagged": false }, "boundname": { "type": "string", 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 a1bc2ade..81464bc5 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evta.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evta.toml @@ -326,14 +326,8 @@ shape = [ type = "union" [observations.evt.arms.cellid] -type = "array" +type = "cellid" tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [observations.evt.arms.boundname] type = "string" 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 712f3e71..e1c14720 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evta.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evta.yaml @@ -314,13 +314,8 @@ observations: type: union arms: cellid: - type: array + type: cellid tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim boundname: type: string tagged: false 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 91d8afff..747365fc 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghb.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghb.json @@ -131,16 +131,10 @@ "type": "record", "fields": { "cellid": { - "type": "array", + "type": "cellid", "longname": "cell identifier", "description": "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell.", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "tagged": false }, "bhead": { "type": "double", @@ -329,14 +323,8 @@ "type": "union", "arms": { "cellid": { - "type": "array", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "type": "cellid", + "tagged": false }, "boundname": { "type": "string", @@ -348,14 +336,8 @@ "type": "union", "arms": { "cellid": { - "type": "array", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "type": "cellid", + "tagged": false }, "boundname": { "type": "string", 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 7c7cc4cc..91e10f91 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghb.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghb.toml @@ -116,16 +116,10 @@ name = "stress_period_data" type = "record" [blocks.period.fields.stress_period_data.item.fields.cellid] -type = "array" +type = "cellid" longname = "cell identifier" description = "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell." tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [blocks.period.fields.stress_period_data.item.fields.bhead] type = "double" @@ -302,14 +296,8 @@ shape = [ type = "union" [observations.ghb.arms.cellid] -type = "array" +type = "cellid" tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [observations.ghb.arms.boundname] type = "string" @@ -319,14 +307,8 @@ tagged = false type = "union" [observations.to-mvr.arms.cellid] -type = "array" +type = "cellid" tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [observations.to-mvr.arms.boundname] type = "string" 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 eecda8e8..7a5f4f73 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghb.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghb.yaml @@ -122,7 +122,7 @@ blocks: type: record fields: cellid: - type: array + type: cellid longname: cell identifier description: is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, @@ -130,11 +130,6 @@ blocks: number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell. tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim bhead: type: double longname: boundary head @@ -300,13 +295,8 @@ observations: type: union arms: cellid: - type: array + type: cellid tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim boundname: type: string tagged: false @@ -314,13 +304,8 @@ observations: type: union arms: cellid: - type: array + type: cellid tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim boundname: type: string tagged: false 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 0f9e6ba8..edd5bde7 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghbg.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghbg.json @@ -319,14 +319,8 @@ "type": "union", "arms": { "cellid": { - "type": "array", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "type": "cellid", + "tagged": false }, "boundname": { "type": "string", @@ -338,14 +332,8 @@ "type": "union", "arms": { "cellid": { - "type": "array", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "type": "cellid", + "tagged": false }, "boundname": { "type": "string", 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 42f1d0f4..24a2fa4e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghbg.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghbg.toml @@ -294,14 +294,8 @@ shape = [ type = "union" [observations.ghb.arms.cellid] -type = "array" +type = "cellid" tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [observations.ghb.arms.boundname] type = "string" @@ -311,14 +305,8 @@ tagged = false type = "union" [observations.to-mvr.arms.cellid] -type = "array" +type = "cellid" tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [observations.to-mvr.arms.boundname] type = "string" 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 574cf0cb..6277a581 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghbg.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghbg.yaml @@ -286,13 +286,8 @@ observations: type: union arms: cellid: - type: array + type: cellid tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim boundname: type: string tagged: false @@ -300,13 +295,8 @@ observations: type: union arms: cellid: - type: array + type: cellid tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim boundname: type: string tagged: false diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-gnc.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-gnc.json index e59eeac5..e611512e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-gnc.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-gnc.json @@ -61,39 +61,28 @@ "type": "record", "fields": { "cellidn": { - "type": "array", + "type": "cellid", "longname": "GNC cellid n", "description": "is the cellid of the cell, $n$, in which the ghost node is located. For a structured grid that uses the DIS input file, CELLIDN is the layer, row, and column numbers of the cell. For a grid that uses the DISV input file, CELLIDN is the layer number and CELL2D number for the two cells. If the model uses the unstructured discretization (DISU) input file, then CELLIDN is the node number for the cell.", "tagged": false, - "dtype": "integer", - "index": true, - "cellid": "1", - "shape": [ - "ncelldim" - ] + "model": "1" }, "cellidm": { - "type": "array", + "type": "cellid", "longname": "GNC cellid n", "description": "is the cellid of the connecting cell, $m$, to which flow occurs from the ghost node. For a structured grid that uses the DIS input file, CELLIDM is the layer, row, and column numbers of the cell. For a grid that uses the DISV input file, CELLIDM is the layer number and CELL2D number for the two cells. If the model uses the unstructured discretization (DISU) input file, then CELLIDM is the node number for the cell.", "tagged": false, - "dtype": "integer", - "index": true, - "cellid": "2", - "shape": [ - "ncelldim" - ] + "model": "2" }, "cellidsj": { "type": "array", "longname": "GNC contributing cells", "description": "is the array of CELLIDS for the contributing j cells, which contribute to the interpolated head value at the ghost node. This item contains one CELLID for each of the contributing cells of the ghost node. Note that if the number of actual contributing cells needed by the user is less than NUMALPHAJ for any ghost node, then a dummy CELLID of zero(s) should be inserted with an associated contributing factor of zero. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column numbers of the cell. For a grid that uses the DISV input file, CELLID is the layer number and cell2d number for the two cells. If the model uses the unstructured discretization (DISU) input file, then CELLID is the node number for the cell.", "tagged": false, - "dtype": "integer", - "index": true, - "cellid": "1", + "dtype": "cellid", + "model": "1", + "allow_zero": true, "shape": [ - "ncelldim", "numalphaj" ] }, diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-gnc.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-gnc.toml index bb1c5fd9..09c72084 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-gnc.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-gnc.toml @@ -52,39 +52,28 @@ name = "gncdata" type = "record" [blocks.gncdata.fields.gncdata.item.fields.cellidn] -type = "array" +type = "cellid" longname = "GNC cellid n" description = "is the cellid of the cell, $n$, in which the ghost node is located. For a structured grid that uses the DIS input file, CELLIDN is the layer, row, and column numbers of the cell. For a grid that uses the DISV input file, CELLIDN is the layer number and CELL2D number for the two cells. If the model uses the unstructured discretization (DISU) input file, then CELLIDN is the node number for the cell." tagged = false -dtype = "integer" -index = true -cellid = "1" -shape = [ - "ncelldim", -] +model = "1" [blocks.gncdata.fields.gncdata.item.fields.cellidm] -type = "array" +type = "cellid" longname = "GNC cellid n" description = "is the cellid of the connecting cell, $m$, to which flow occurs from the ghost node. For a structured grid that uses the DIS input file, CELLIDM is the layer, row, and column numbers of the cell. For a grid that uses the DISV input file, CELLIDM is the layer number and CELL2D number for the two cells. If the model uses the unstructured discretization (DISU) input file, then CELLIDM is the node number for the cell." tagged = false -dtype = "integer" -index = true -cellid = "2" -shape = [ - "ncelldim", -] +model = "2" [blocks.gncdata.fields.gncdata.item.fields.cellidsj] type = "array" longname = "GNC contributing cells" description = "is the array of CELLIDS for the contributing j cells, which contribute to the interpolated head value at the ghost node. This item contains one CELLID for each of the contributing cells of the ghost node. Note that if the number of actual contributing cells needed by the user is less than NUMALPHAJ for any ghost node, then a dummy CELLID of zero(s) should be inserted with an associated contributing factor of zero. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column numbers of the cell. For a grid that uses the DISV input file, CELLID is the layer number and cell2d number for the two cells. If the model uses the unstructured discretization (DISU) input file, then CELLID is the node number for the cell." tagged = false -dtype = "integer" -index = true -cellid = "1" +dtype = "cellid" +model = "1" +allow_zero = true shape = [ - "ncelldim", "numalphaj", ] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-gnc.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-gnc.yaml index baf1fe41..bf7c0878 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-gnc.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-gnc.yaml @@ -57,7 +57,7 @@ blocks: type: record fields: cellidn: - type: array + type: cellid longname: GNC cellid n description: is the cellid of the cell, $n$, in which the ghost node is located. For a structured grid that uses the DIS input file, CELLIDN is the layer, row, and column numbers of the @@ -65,13 +65,9 @@ blocks: number for the two cells. If the model uses the unstructured discretization (DISU) input file, then CELLIDN is the node number for the cell. tagged: false - dtype: integer - index: true - cellid: '1' - shape: - - ncelldim + model: '1' cellidm: - type: array + type: cellid longname: GNC cellid n description: is the cellid of the connecting cell, $m$, to which flow occurs from the ghost node. For a structured grid that uses the DIS input file, CELLIDM is the layer, row, and @@ -79,11 +75,7 @@ blocks: layer number and CELL2D number for the two cells. If the model uses the unstructured discretization (DISU) input file, then CELLIDM is the node number for the cell. tagged: false - dtype: integer - index: true - cellid: '2' - shape: - - ncelldim + model: '2' cellidsj: type: array longname: GNC contributing cells @@ -97,11 +89,10 @@ blocks: the two cells. If the model uses the unstructured discretization (DISU) input file, then CELLID is the node number for the cell. tagged: false - dtype: integer - index: true - cellid: '1' + dtype: cellid + model: '1' + allow_zero: true shape: - - ncelldim - numalphaj alphasj: type: array diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-hfb.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-hfb.json index e8d19913..7911d9d6 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-hfb.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-hfb.json @@ -38,28 +38,16 @@ "type": "record", "fields": { "cellid1": { - "type": "array", + "type": "cellid", "longname": "first cell adjacent to barrier", "description": "identifier for the first cell. For a structured grid that uses the DIS input file, CELLID1 is the layer, row, and column numbers of the cell. For a grid that uses the DISV input file, CELLID1 is the layer number and CELL2D number for the two cells. If the model uses the unstructured discretization (DISU) input file, then CELLID1 is the node numbers for the cell. The barrier is located between cells designated as CELLID1 and CELLID2. For models that use the DIS and DISV grid types, the layer number for CELLID1 and CELLID2 must be the same. For all grid types, cells must be horizontally or vertically adjacent.", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "tagged": false }, "cellid2": { - "type": "array", + "type": "cellid", "longname": "second cell adjacent to barrier", "description": "identifier for the second cell. See CELLID1 for description of how to specify.", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "tagged": false }, "hydchr": { "type": "double", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-hfb.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-hfb.toml index 146d2f19..515062f5 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-hfb.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-hfb.toml @@ -29,28 +29,16 @@ name = "stress_period_data" type = "record" [blocks.period.fields.stress_period_data.item.fields.cellid1] -type = "array" +type = "cellid" longname = "first cell adjacent to barrier" description = "identifier for the first cell. For a structured grid that uses the DIS input file, CELLID1 is the layer, row, and column numbers of the cell. For a grid that uses the DISV input file, CELLID1 is the layer number and CELL2D number for the two cells. If the model uses the unstructured discretization (DISU) input file, then CELLID1 is the node numbers for the cell. The barrier is located between cells designated as CELLID1 and CELLID2. For models that use the DIS and DISV grid types, the layer number for CELLID1 and CELLID2 must be the same. For all grid types, cells must be horizontally or vertically adjacent." tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [blocks.period.fields.stress_period_data.item.fields.cellid2] -type = "array" +type = "cellid" longname = "second cell adjacent to barrier" description = "identifier for the second cell. See CELLID1 for description of how to specify." tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [blocks.period.fields.stress_period_data.item.fields.hydchr] type = "double" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-hfb.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-hfb.yaml index 2b74815b..ebb88ae0 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-hfb.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-hfb.yaml @@ -32,7 +32,7 @@ blocks: type: record fields: cellid1: - type: array + type: cellid longname: first cell adjacent to barrier description: identifier for the first cell. For a structured grid that uses the DIS input file, CELLID1 is the layer, row, and column numbers of the cell. For a grid that uses @@ -43,21 +43,11 @@ blocks: and CELLID2 must be the same. For all grid types, cells must be horizontally or vertically adjacent. tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim cellid2: - type: array + type: cellid longname: second cell adjacent to barrier description: identifier for the second cell. See CELLID1 for description of how to specify. tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim hydchr: type: double longname: barrier hydraulic characteristic 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 92e2427c..71d7c32a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-lak.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-lak.json @@ -311,16 +311,10 @@ "index": true }, "cellid": { - "type": "array", + "type": "cellid", "longname": "cell identifier", "description": "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell.", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "tagged": false }, "claktype": { "type": "string", 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 724daad7..75dc688c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-lak.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-lak.toml @@ -284,16 +284,10 @@ tagged = false index = true [blocks.connectiondata.fields.connectiondata.item.fields.cellid] -type = "array" +type = "cellid" longname = "cell identifier" description = "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell." tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [blocks.connectiondata.fields.connectiondata.item.fields.claktype] type = "string" 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 54942d16..8ef02f57 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-lak.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-lak.yaml @@ -308,7 +308,7 @@ blocks: tagged: false index: true cellid: - type: array + type: cellid longname: cell identifier description: is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, @@ -316,11 +316,6 @@ blocks: number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell. tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim claktype: type: string longname: lake connection type 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 9fddc48d..a51f0f38 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-maw.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-maw.json @@ -310,16 +310,10 @@ "index": true }, "cellid": { - "type": "array", + "type": "cellid", "longname": "cell identifier", "description": "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell. One or more screened intervals can be connected to the same CELLID if CONDEQN for a well is MEAN. The program will terminate with an error if MAW wells using SPECIFIED, THIEM, SKIN, or CUMULATIVE conductance equations have more than one connection to the same CELLID.", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "tagged": false }, "scrn_top": { "type": "double", 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 6f6df767..460f2dc7 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-maw.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-maw.toml @@ -280,16 +280,10 @@ tagged = false index = true [blocks.connectiondata.fields.connectiondata.item.fields.cellid] -type = "array" +type = "cellid" longname = "cell identifier" description = "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell. One or more screened intervals can be connected to the same CELLID if CONDEQN for a well is MEAN. The program will terminate with an error if MAW wells using SPECIFIED, THIEM, SKIN, or CUMULATIVE conductance equations have more than one connection to the same CELLID." tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [blocks.connectiondata.fields.connectiondata.item.fields.scrn_top] type = "double" 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 a5bbe082..028e7c6b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-maw.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-maw.yaml @@ -338,7 +338,7 @@ blocks: tagged: false index: true cellid: - type: array + type: cellid longname: cell identifier description: is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, @@ -349,11 +349,6 @@ blocks: wells using SPECIFIED, THIEM, SKIN, or CUMULATIVE conductance equations have more than one connection to the same CELLID. tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim scrn_top: type: double longname: screen top 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 269a11e9..f0f4eaf9 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-nam.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-nam.json @@ -237,47 +237,23 @@ }, "observations": { "head": { - "type": "array", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "type": "cellid", + "tagged": false }, "drawdown": { - "type": "array", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "type": "cellid", + "tagged": false }, "flow-ja-face": { "type": "record", "fields": { "cellid": { - "type": "array", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "type": "cellid", + "tagged": false }, "cellid2": { - "type": "array", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "type": "cellid", + "tagged": false } } } 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 2680c8f1..d4330966 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-nam.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-nam.toml @@ -212,44 +212,20 @@ shape = [ ] [observations.head] -type = "array" +type = "cellid" tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [observations.drawdown] -type = "array" +type = "cellid" tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [observations.flow-ja-face] type = "record" [observations.flow-ja-face.fields.cellid] -type = "array" +type = "cellid" tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [observations.flow-ja-face.fields.cellid2] -type = "array" +type = "cellid" tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] 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 d2962cf6..75b2ef5d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-nam.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-nam.yaml @@ -216,37 +216,17 @@ memory: - nja observations: head: - type: array + type: cellid tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim drawdown: - type: array + type: cellid tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim flow-ja-face: type: record fields: cellid: - type: array + type: cellid tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim cellid2: - type: array + type: cellid tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim 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 9fe0aa99..7c32ee71 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rch.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rch.json @@ -132,16 +132,10 @@ "type": "record", "fields": { "cellid": { - "type": "array", + "type": "cellid", "longname": "cell identifier", "description": "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell.", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "tagged": false }, "recharge": { "type": "double", @@ -321,14 +315,8 @@ "type": "union", "arms": { "cellid": { - "type": "array", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "type": "cellid", + "tagged": false }, "boundname": { "type": "string", 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 c3c77846..102152a9 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rch.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rch.toml @@ -117,16 +117,10 @@ name = "stress_period_data" type = "record" [blocks.period.fields.stress_period_data.item.fields.cellid] -type = "array" +type = "cellid" longname = "cell identifier" description = "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell." tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [blocks.period.fields.stress_period_data.item.fields.recharge] type = "double" @@ -294,14 +288,8 @@ shape = [ type = "union" [observations.rch.arms.cellid] -type = "array" +type = "cellid" tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [observations.rch.arms.boundname] type = "string" 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 7b248214..091dbd44 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rch.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rch.yaml @@ -122,7 +122,7 @@ blocks: type: record fields: cellid: - type: array + type: cellid longname: cell identifier description: is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, @@ -130,11 +130,6 @@ blocks: number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell. tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim recharge: type: double longname: recharge rate @@ -291,13 +286,8 @@ observations: type: union arms: cellid: - type: array + type: cellid tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim boundname: type: string tagged: false 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 75595d9a..a11a9955 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rcha.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rcha.json @@ -327,14 +327,8 @@ "type": "union", "arms": { "cellid": { - "type": "array", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "type": "cellid", + "tagged": false }, "boundname": { "type": "string", 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 5044f41d..27deab51 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rcha.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rcha.toml @@ -304,14 +304,8 @@ shape = [ type = "union" [observations.rch.arms.cellid] -type = "array" +type = "cellid" tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [observations.rch.arms.boundname] type = "string" 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 98b79762..ece09c52 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rcha.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rcha.yaml @@ -298,13 +298,8 @@ observations: type: union arms: cellid: - type: array + type: cellid tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim boundname: type: string tagged: false 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 7dbeda3d..4d8a1aca 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-riv.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-riv.json @@ -131,16 +131,10 @@ "type": "record", "fields": { "cellid": { - "type": "array", + "type": "cellid", "longname": "cell identifier", "description": "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell.", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "tagged": false }, "stage": { "type": "double", @@ -336,14 +330,8 @@ "type": "union", "arms": { "cellid": { - "type": "array", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "type": "cellid", + "tagged": false }, "boundname": { "type": "string", @@ -355,14 +343,8 @@ "type": "union", "arms": { "cellid": { - "type": "array", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "type": "cellid", + "tagged": false }, "boundname": { "type": "string", 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 8e9bed1f..53eea7d0 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-riv.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-riv.toml @@ -116,16 +116,10 @@ name = "stress_period_data" type = "record" [blocks.period.fields.stress_period_data.item.fields.cellid] -type = "array" +type = "cellid" longname = "cell identifier" description = "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell." tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [blocks.period.fields.stress_period_data.item.fields.stage] type = "double" @@ -309,14 +303,8 @@ shape = [ type = "union" [observations.riv.arms.cellid] -type = "array" +type = "cellid" tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [observations.riv.arms.boundname] type = "string" @@ -326,14 +314,8 @@ tagged = false type = "union" [observations.to-mvr.arms.cellid] -type = "array" +type = "cellid" tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [observations.to-mvr.arms.boundname] type = "string" 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 e3fe7342..63860f19 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-riv.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-riv.yaml @@ -121,7 +121,7 @@ blocks: type: record fields: cellid: - type: array + type: cellid longname: cell identifier description: is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, @@ -129,11 +129,6 @@ blocks: number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell. tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim stage: type: double longname: river stage @@ -307,13 +302,8 @@ observations: type: union arms: cellid: - type: array + type: cellid tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim boundname: type: string tagged: false @@ -321,13 +311,8 @@ observations: type: union arms: cellid: - type: array + type: cellid tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim boundname: type: string tagged: false 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 0098a039..556e4ce8 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rivg.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rivg.json @@ -331,14 +331,8 @@ "type": "union", "arms": { "cellid": { - "type": "array", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "type": "cellid", + "tagged": false }, "boundname": { "type": "string", @@ -350,14 +344,8 @@ "type": "union", "arms": { "cellid": { - "type": "array", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "type": "cellid", + "tagged": false }, "boundname": { "type": "string", 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 9acda005..31883dbe 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rivg.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rivg.toml @@ -306,14 +306,8 @@ shape = [ type = "union" [observations.riv.arms.cellid] -type = "array" +type = "cellid" tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [observations.riv.arms.boundname] type = "string" @@ -323,14 +317,8 @@ tagged = false type = "union" [observations.to-mvr.arms.cellid] -type = "array" +type = "cellid" tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [observations.to-mvr.arms.boundname] type = "string" 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 1e67bcd4..b076f925 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rivg.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rivg.yaml @@ -295,13 +295,8 @@ observations: type: union arms: cellid: - type: array + type: cellid tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim boundname: type: string tagged: false @@ -309,13 +304,8 @@ observations: type: union arms: cellid: - type: array + type: cellid tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim boundname: type: string tagged: false 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 72236536..5f6d62af 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sfr.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sfr.json @@ -255,16 +255,11 @@ "pk": true }, "cellid": { - "type": "array", + "type": "cellid", "longname": "cell identifier", "description": "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell. For reaches that are not connected to an underlying GWF cell, a zero should be specified for each grid dimension. For example, for a DIS grid a CELLID of 0 0 0 should be specified. Reach-aquifer flow is not calculated for unconnected reaches. The keyword NONE can be still be specified to identify unconnected reaches for backward compatibility with previous versions of MODFLOW 6 but eventually NONE will be deprecated and will cause MODFLOW 6 to terminate with an error.", "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "allow_zero": true }, "rlen": { "type": "double", 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 78d7c66b..99258a8b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sfr.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sfr.toml @@ -232,16 +232,11 @@ index = true pk = true [blocks.packagedata.fields.packagedata.item.fields.cellid] -type = "array" +type = "cellid" longname = "cell identifier" description = "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell. For reaches that are not connected to an underlying GWF cell, a zero should be specified for each grid dimension. For example, for a DIS grid a CELLID of 0 0 0 should be specified. Reach-aquifer flow is not calculated for unconnected reaches. The keyword NONE can be still be specified to identify unconnected reaches for backward compatibility with previous versions of MODFLOW 6 but eventually NONE will be deprecated and will cause MODFLOW 6 to terminate with an error." tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] +allow_zero = true [blocks.packagedata.fields.packagedata.item.fields.rlen] type = "double" 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 fa671baf..0d13159d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sfr.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sfr.yaml @@ -256,7 +256,7 @@ blocks: index: true pk: true cellid: - type: array + type: cellid longname: cell identifier description: is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, @@ -269,11 +269,7 @@ blocks: compatibility with previous versions of MODFLOW 6 but eventually NONE will be deprecated and will cause MODFLOW 6 to terminate with an error. tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim + allow_zero: true rlen: type: double longname: reach length 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 484cbf59..3628558e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-uzf.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-uzf.json @@ -254,16 +254,10 @@ "pk": true }, "cellid": { - "type": "array", + "type": "cellid", "longname": "cell identifier", "description": "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell.", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "tagged": false }, "landflag": { "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 102fd04e..5ff39ab6 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-uzf.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-uzf.toml @@ -233,16 +233,10 @@ index = true pk = true [blocks.packagedata.fields.packagedata.item.fields.cellid] -type = "array" +type = "cellid" longname = "cell identifier" description = "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell." tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [blocks.packagedata.fields.packagedata.item.fields.landflag] 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 d399cfb1..17ce417b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-uzf.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-uzf.yaml @@ -247,7 +247,7 @@ blocks: index: true pk: true cellid: - type: array + type: cellid longname: cell identifier description: is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, @@ -255,11 +255,6 @@ blocks: number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell. tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim landflag: type: integer longname: land flag 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 8ddecf19..16d04ef6 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-wel.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-wel.json @@ -161,16 +161,10 @@ "type": "record", "fields": { "cellid": { - "type": "array", + "type": "cellid", "longname": "cell identifier", "description": "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell.", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "tagged": false }, "q": { "type": "double", @@ -367,14 +361,8 @@ "type": "union", "arms": { "cellid": { - "type": "array", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "type": "cellid", + "tagged": false }, "boundname": { "type": "string", @@ -386,14 +374,8 @@ "type": "union", "arms": { "cellid": { - "type": "array", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "type": "cellid", + "tagged": false }, "boundname": { "type": "string", @@ -405,14 +387,8 @@ "type": "union", "arms": { "cellid": { - "type": "array", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "type": "cellid", + "tagged": false }, "boundname": { "type": "string", 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 d6652db2..301e583e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-wel.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-wel.toml @@ -144,16 +144,10 @@ name = "stress_period_data" type = "record" [blocks.period.fields.stress_period_data.item.fields.cellid] -type = "array" +type = "cellid" longname = "cell identifier" description = "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell." tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [blocks.period.fields.stress_period_data.item.fields.q] type = "double" @@ -338,14 +332,8 @@ shape = [ type = "union" [observations.wel.arms.cellid] -type = "array" +type = "cellid" tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [observations.wel.arms.boundname] type = "string" @@ -355,14 +343,8 @@ tagged = false type = "union" [observations.to-mvr.arms.cellid] -type = "array" +type = "cellid" tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [observations.to-mvr.arms.boundname] type = "string" @@ -372,14 +354,8 @@ tagged = false type = "union" [observations.wel-reduction.arms.cellid] -type = "array" +type = "cellid" tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [observations.wel-reduction.arms.boundname] type = "string" 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 d7628a0b..4a7d4edc 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-wel.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-wel.yaml @@ -161,7 +161,7 @@ blocks: type: record fields: cellid: - type: array + type: cellid longname: cell identifier description: is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, @@ -169,11 +169,6 @@ blocks: number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell. tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim q: type: double longname: well rate @@ -343,13 +338,8 @@ observations: type: union arms: cellid: - type: array + type: cellid tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim boundname: type: string tagged: false @@ -357,13 +347,8 @@ observations: type: union arms: cellid: - type: array + type: cellid tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim boundname: type: string tagged: false @@ -371,13 +356,8 @@ observations: type: union arms: cellid: - type: array + type: cellid tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim boundname: type: string tagged: false 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 d3e6fcfc..70dcb875 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-welg.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-welg.json @@ -352,14 +352,8 @@ "type": "union", "arms": { "cellid": { - "type": "array", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "type": "cellid", + "tagged": false }, "boundname": { "type": "string", @@ -371,14 +365,8 @@ "type": "union", "arms": { "cellid": { - "type": "array", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "type": "cellid", + "tagged": false }, "boundname": { "type": "string", @@ -390,14 +378,8 @@ "type": "union", "arms": { "cellid": { - "type": "array", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "type": "cellid", + "tagged": false }, "boundname": { "type": "string", 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 307b27e7..6d31f066 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-welg.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-welg.toml @@ -325,14 +325,8 @@ shape = [ type = "union" [observations.wel.arms.cellid] -type = "array" +type = "cellid" tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [observations.wel.arms.boundname] type = "string" @@ -342,14 +336,8 @@ tagged = false type = "union" [observations.to-mvr.arms.cellid] -type = "array" +type = "cellid" tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [observations.to-mvr.arms.boundname] type = "string" @@ -359,14 +347,8 @@ tagged = false type = "union" [observations.wel-reduction.arms.cellid] -type = "array" +type = "cellid" tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [observations.wel-reduction.arms.boundname] type = "string" 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 ffdd1f37..b70d8c65 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-welg.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-welg.yaml @@ -328,13 +328,8 @@ observations: type: union arms: cellid: - type: array + type: cellid tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim boundname: type: string tagged: false @@ -342,13 +337,8 @@ observations: type: union arms: cellid: - type: array + type: cellid tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim boundname: type: string tagged: false @@ -356,13 +346,8 @@ observations: type: union arms: cellid: - type: array + type: cellid tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim boundname: type: string tagged: false 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 9088e038..2b732cba 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-api.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-api.json @@ -99,14 +99,8 @@ "type": "union", "arms": { "cellid": { - "type": "array", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "type": "cellid", + "tagged": false }, "boundname": { "type": "string", @@ -118,14 +112,8 @@ "type": "union", "arms": { "cellid": { - "type": "array", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "type": "cellid", + "tagged": false }, "boundname": { "type": "string", 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 5a679272..628fa276 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-api.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-api.toml @@ -82,14 +82,8 @@ type = "integer" type = "union" [observations.api.arms.cellid] -type = "array" +type = "cellid" tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [observations.api.arms.boundname] type = "string" @@ -99,14 +93,8 @@ tagged = false type = "union" [observations.to-mvr.arms.cellid] -type = "array" +type = "cellid" tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [observations.to-mvr.arms.boundname] type = "string" 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 c82fa05d..1174816e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-api.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-api.yaml @@ -87,13 +87,8 @@ observations: type: union arms: cellid: - type: array + type: cellid tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim boundname: type: string tagged: false @@ -101,13 +96,8 @@ observations: type: union arms: cellid: - type: array + type: cellid tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim boundname: type: string tagged: false 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 110af6d3..de851b11 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-cnc.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-cnc.json @@ -126,16 +126,10 @@ "type": "record", "fields": { "cellid": { - "type": "array", + "type": "cellid", "longname": "cell identifier", "description": "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell.", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "tagged": false }, "conc": { "type": "double", @@ -320,14 +314,8 @@ "type": "union", "arms": { "cellid": { - "type": "array", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "type": "cellid", + "tagged": false }, "boundname": { "type": "string", 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 10d6b35c..73be0d09 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-cnc.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-cnc.toml @@ -111,16 +111,10 @@ name = "stress_period_data" type = "record" [blocks.period.fields.stress_period_data.item.fields.cellid] -type = "array" +type = "cellid" longname = "cell identifier" description = "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell." tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [blocks.period.fields.stress_period_data.item.fields.conc] type = "double" @@ -293,14 +287,8 @@ shape = [ type = "union" [observations.cnc.arms.cellid] -type = "array" +type = "cellid" tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [observations.cnc.arms.boundname] type = "string" 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 f7f1bb69..ac2cd553 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-cnc.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-cnc.yaml @@ -116,7 +116,7 @@ blocks: type: record fields: cellid: - type: array + type: cellid longname: cell identifier description: is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, @@ -124,11 +124,6 @@ blocks: number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell. tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim conc: type: double longname: constant concentration value @@ -287,13 +282,8 @@ observations: type: union arms: cellid: - type: array + type: cellid tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim boundname: type: string tagged: false 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 f31a3646..3754d566 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-nam.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-nam.json @@ -229,37 +229,19 @@ }, "observations": { "concentration": { - "type": "array", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "type": "cellid", + "tagged": false }, "flow-ja-face": { "type": "record", "fields": { "cellid": { - "type": "array", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "type": "cellid", + "tagged": false }, "cellid2": { - "type": "array", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "type": "cellid", + "tagged": false } } } 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 6d1043d2..8181b7e2 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-nam.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-nam.toml @@ -206,34 +206,16 @@ shape = [ ] [observations.concentration] -type = "array" +type = "cellid" tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [observations.flow-ja-face] type = "record" [observations.flow-ja-face.fields.cellid] -type = "array" +type = "cellid" tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [observations.flow-ja-face.fields.cellid2] -type = "array" +type = "cellid" tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] 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 af3ed726..d1b158c9 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-nam.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-nam.yaml @@ -206,29 +206,14 @@ memory: - nja observations: concentration: - type: array + type: cellid tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim flow-ja-face: type: record fields: cellid: - type: array + type: cellid tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim cellid2: - type: array + type: cellid tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim 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 6b7a9be3..7ef853cf 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-src.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-src.json @@ -132,16 +132,10 @@ "type": "record", "fields": { "cellid": { - "type": "array", + "type": "cellid", "longname": "cell identifier", "description": "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell.", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "tagged": false }, "smassrate": { "type": "double", @@ -328,14 +322,8 @@ "type": "union", "arms": { "cellid": { - "type": "array", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "type": "cellid", + "tagged": false }, "boundname": { "type": "string", @@ -347,14 +335,8 @@ "type": "union", "arms": { "cellid": { - "type": "array", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "type": "cellid", + "tagged": false }, "boundname": { "type": "string", 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 c8eec50b..2a80ca0b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-src.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-src.toml @@ -117,16 +117,10 @@ name = "stress_period_data" type = "record" [blocks.period.fields.stress_period_data.item.fields.cellid] -type = "array" +type = "cellid" longname = "cell identifier" description = "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell." tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [blocks.period.fields.stress_period_data.item.fields.smassrate] type = "double" @@ -301,14 +295,8 @@ shape = [ type = "union" [observations.src.arms.cellid] -type = "array" +type = "cellid" tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [observations.src.arms.boundname] type = "string" @@ -318,14 +306,8 @@ tagged = false type = "union" [observations.to-mvr.arms.cellid] -type = "array" +type = "cellid" tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [observations.to-mvr.arms.boundname] type = "string" 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 ae4104f5..d4c71cef 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-src.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-src.yaml @@ -131,7 +131,7 @@ blocks: type: record fields: cellid: - type: array + type: cellid longname: cell identifier description: is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, @@ -139,11 +139,6 @@ blocks: number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell. tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim smassrate: type: double longname: mass source loading rate @@ -305,13 +300,8 @@ observations: type: union arms: cellid: - type: array + type: cellid tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim boundname: type: string tagged: false @@ -319,13 +309,8 @@ observations: type: union arms: cellid: - type: array + type: cellid tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim boundname: type: string tagged: false 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 b209753b..44bc627a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-cdb.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-cdb.json @@ -97,16 +97,10 @@ "type": "record", "fields": { "cellid": { - "type": "array", + "type": "cellid", "longname": "cell identifier", "description": "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell.", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "tagged": false }, "idcxs": { "type": "integer", @@ -295,14 +289,8 @@ "type": "union", "arms": { "cellid": { - "type": "array", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "type": "cellid", + "tagged": false }, "boundname": { "type": "string", @@ -314,14 +302,8 @@ "type": "union", "arms": { "cellid": { - "type": "array", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "type": "cellid", + "tagged": false }, "boundname": { "type": "string", 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 fa93598c..056ad588 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-cdb.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-cdb.toml @@ -84,16 +84,10 @@ name = "stress_period_data" type = "record" [blocks.period.fields.stress_period_data.item.fields.cellid] -type = "array" +type = "cellid" longname = "cell identifier" description = "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell." tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [blocks.period.fields.stress_period_data.item.fields.idcxs] type = "integer" @@ -270,14 +264,8 @@ shape = [ type = "union" [observations.cdb.arms.cellid] -type = "array" +type = "cellid" tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [observations.cdb.arms.boundname] type = "string" @@ -287,14 +275,8 @@ tagged = false type = "union" [observations.to-mvr.arms.cellid] -type = "array" +type = "cellid" tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [observations.to-mvr.arms.boundname] type = "string" 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 b7e493b6..533f8754 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-cdb.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-cdb.yaml @@ -91,7 +91,7 @@ blocks: type: record fields: cellid: - type: array + type: cellid longname: cell identifier description: is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, @@ -99,11 +99,6 @@ blocks: number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell. tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim idcxs: type: integer longname: cross section identifier @@ -270,13 +265,8 @@ observations: type: union arms: cellid: - type: array + type: cellid tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim boundname: type: string tagged: false @@ -284,13 +274,8 @@ observations: type: union arms: cellid: - type: array + type: cellid tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim boundname: type: string tagged: false 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 8c4334dd..b492f725 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-chd.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-chd.json @@ -126,16 +126,10 @@ "type": "record", "fields": { "cellid": { - "type": "array", + "type": "cellid", "longname": "cell identifier", "description": "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell.", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "tagged": false }, "head": { "type": "double", @@ -305,14 +299,8 @@ "type": "union", "arms": { "cellid": { - "type": "array", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "type": "cellid", + "tagged": false }, "boundname": { "type": "string", 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 b41458b1..cee35d45 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-chd.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-chd.toml @@ -111,16 +111,10 @@ name = "stress_period_data" type = "record" [blocks.period.fields.stress_period_data.item.fields.cellid] -type = "array" +type = "cellid" longname = "cell identifier" description = "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell." tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [blocks.period.fields.stress_period_data.item.fields.head] type = "double" @@ -278,14 +272,8 @@ shape = [ type = "union" [observations.chd.arms.cellid] -type = "array" +type = "cellid" tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [observations.chd.arms.boundname] type = "string" 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 323d967a..de028465 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-chd.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-chd.yaml @@ -116,7 +116,7 @@ blocks: type: record fields: cellid: - type: array + type: cellid longname: cell identifier description: is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, @@ -124,11 +124,6 @@ blocks: number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell. tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim head: type: double longname: head value assigned to constant head @@ -275,13 +270,8 @@ observations: type: union arms: cellid: - type: array + type: cellid tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim boundname: type: string tagged: false 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 0b753635..09e50828 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-evp.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-evp.json @@ -126,16 +126,10 @@ "type": "record", "fields": { "cellid": { - "type": "array", + "type": "cellid", "longname": "cell identifier", "description": "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell.", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "tagged": false }, "evaporation": { "type": "double", @@ -315,14 +309,8 @@ "type": "union", "arms": { "cellid": { - "type": "array", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "type": "cellid", + "tagged": false }, "boundname": { "type": "string", 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 754063cb..d41fb66f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-evp.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-evp.toml @@ -111,16 +111,10 @@ name = "stress_period_data" type = "record" [blocks.period.fields.stress_period_data.item.fields.cellid] -type = "array" +type = "cellid" longname = "cell identifier" description = "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell." tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [blocks.period.fields.stress_period_data.item.fields.evaporation] type = "double" @@ -288,14 +282,8 @@ shape = [ type = "union" [observations.evp.arms.cellid] -type = "array" +type = "cellid" tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [observations.evp.arms.boundname] type = "string" 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 c890abe4..fa9c8519 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-evp.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-evp.yaml @@ -116,7 +116,7 @@ blocks: type: record fields: cellid: - type: array + type: cellid longname: cell identifier description: is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, @@ -124,11 +124,6 @@ blocks: number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell. tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim evaporation: type: double longname: evaporation rate @@ -285,13 +280,8 @@ observations: type: union arms: cellid: - type: array + type: cellid tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim boundname: type: string tagged: false 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 8cb4d7c0..16d74dcb 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-flw.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-flw.json @@ -126,16 +126,10 @@ "type": "record", "fields": { "cellid": { - "type": "array", + "type": "cellid", "longname": "cell identifier", "description": "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell.", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "tagged": false }, "q": { "type": "double", @@ -307,14 +301,8 @@ "type": "union", "arms": { "cellid": { - "type": "array", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "type": "cellid", + "tagged": false }, "boundname": { "type": "string", @@ -326,14 +314,8 @@ "type": "union", "arms": { "cellid": { - "type": "array", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "type": "cellid", + "tagged": false }, "boundname": { "type": "string", 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 79ef55b3..27351f22 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-flw.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-flw.toml @@ -111,16 +111,10 @@ name = "stress_period_data" type = "record" [blocks.period.fields.stress_period_data.item.fields.cellid] -type = "array" +type = "cellid" longname = "cell identifier" description = "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell." tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [blocks.period.fields.stress_period_data.item.fields.q] type = "double" @@ -280,14 +274,8 @@ shape = [ type = "union" [observations.flw.arms.cellid] -type = "array" +type = "cellid" tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [observations.flw.arms.boundname] type = "string" @@ -297,14 +285,8 @@ tagged = false type = "union" [observations.to-mvr.arms.cellid] -type = "array" +type = "cellid" tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [observations.to-mvr.arms.boundname] type = "string" 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 3984a60e..3f7d53a3 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-flw.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-flw.yaml @@ -115,7 +115,7 @@ blocks: type: record fields: cellid: - type: array + type: cellid longname: cell identifier description: is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, @@ -123,11 +123,6 @@ blocks: number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell. tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim q: type: double longname: flow rate @@ -277,13 +272,8 @@ observations: type: union arms: cellid: - type: array + type: cellid tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim boundname: type: string tagged: false @@ -291,13 +281,8 @@ observations: type: union arms: cellid: - type: array + type: cellid tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim boundname: type: string tagged: false 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 039e0773..930935f3 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-nam.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-nam.json @@ -170,37 +170,19 @@ }, "observations": { "stage": { - "type": "array", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "type": "cellid", + "tagged": false }, "flow-ja-face": { "type": "record", "fields": { "cellid": { - "type": "array", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "type": "cellid", + "tagged": false }, "cellid2": { - "type": "array", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "type": "cellid", + "tagged": false } } } 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 d18131f5..ce599377 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-nam.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-nam.toml @@ -151,34 +151,16 @@ shape = [ ] [observations.stage] -type = "array" +type = "cellid" tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [observations.flow-ja-face] type = "record" [observations.flow-ja-face.fields.cellid] -type = "array" +type = "cellid" tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [observations.flow-ja-face.fields.cellid2] -type = "array" +type = "cellid" tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] 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 bc06b21b..fd502051 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-nam.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-nam.yaml @@ -163,29 +163,14 @@ memory: - nja observations: stage: - type: array + type: cellid tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim flow-ja-face: type: record fields: cellid: - type: array + type: cellid tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim cellid2: - type: array + type: cellid tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim 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 462528a1..419743c6 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-pcp.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-pcp.json @@ -126,16 +126,10 @@ "type": "record", "fields": { "cellid": { - "type": "array", + "type": "cellid", "longname": "cell identifier", "description": "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell.", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "tagged": false }, "precipitation": { "type": "double", @@ -315,14 +309,8 @@ "type": "union", "arms": { "cellid": { - "type": "array", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "type": "cellid", + "tagged": false }, "boundname": { "type": "string", 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 1706311e..9a0e64b8 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-pcp.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-pcp.toml @@ -111,16 +111,10 @@ name = "stress_period_data" type = "record" [blocks.period.fields.stress_period_data.item.fields.cellid] -type = "array" +type = "cellid" longname = "cell identifier" description = "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell." tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [blocks.period.fields.stress_period_data.item.fields.precipitation] type = "double" @@ -288,14 +282,8 @@ shape = [ type = "union" [observations.pcp.arms.cellid] -type = "array" +type = "cellid" tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [observations.pcp.arms.boundname] type = "string" 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 e40d1815..7896814b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-pcp.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-pcp.yaml @@ -116,7 +116,7 @@ blocks: type: record fields: cellid: - type: array + type: cellid longname: cell identifier description: is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, @@ -124,11 +124,6 @@ blocks: number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell. tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim precipitation: type: double longname: precipitation rate @@ -285,13 +280,8 @@ observations: type: union arms: cellid: - type: array + type: cellid tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim boundname: type: string tagged: false 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 74b74ca7..c64cddd7 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-zdg.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-zdg.json @@ -120,16 +120,10 @@ "type": "record", "fields": { "cellid": { - "type": "array", + "type": "cellid", "longname": "cell identifier", "description": "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell.", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "tagged": false }, "idcxs": { "type": "integer", @@ -333,14 +327,8 @@ "type": "union", "arms": { "cellid": { - "type": "array", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "type": "cellid", + "tagged": false }, "boundname": { "type": "string", @@ -352,14 +340,8 @@ "type": "union", "arms": { "cellid": { - "type": "array", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "type": "cellid", + "tagged": false }, "boundname": { "type": "string", 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 a61039de..c323b8e1 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-zdg.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-zdg.toml @@ -105,16 +105,10 @@ name = "stress_period_data" type = "record" [blocks.period.fields.stress_period_data.item.fields.cellid] -type = "array" +type = "cellid" longname = "cell identifier" description = "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell." tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [blocks.period.fields.stress_period_data.item.fields.idcxs] type = "integer" @@ -306,14 +300,8 @@ shape = [ type = "union" [observations.zdg.arms.cellid] -type = "array" +type = "cellid" tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [observations.zdg.arms.boundname] type = "string" @@ -323,14 +311,8 @@ tagged = false type = "union" [observations.to-mvr.arms.cellid] -type = "array" +type = "cellid" tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [observations.to-mvr.arms.boundname] type = "string" 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 306f715d..79852b71 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-zdg.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-zdg.yaml @@ -111,7 +111,7 @@ blocks: type: record fields: cellid: - type: array + type: cellid longname: cell identifier description: is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, @@ -119,11 +119,6 @@ blocks: number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell. tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim idcxs: type: integer longname: cross section identifier @@ -312,13 +307,8 @@ observations: type: union arms: cellid: - type: array + type: cellid tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim boundname: type: string tagged: false @@ -326,13 +316,8 @@ observations: type: union arms: cellid: - type: array + type: cellid tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim boundname: type: string tagged: false diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-prp.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-prp.json index 39cbaba9..02f5ac97 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-prp.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-prp.json @@ -251,16 +251,10 @@ "pk": true }, "cellid": { - "type": "array", + "type": "cellid", "longname": "cell identifier", "description": "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell.", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "tagged": false }, "xrpt": { "type": "double", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-prp.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-prp.toml index 548841e1..118b0504 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-prp.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-prp.toml @@ -232,16 +232,10 @@ index = true pk = true [blocks.packagedata.fields.packagedata.item.fields.cellid] -type = "array" +type = "cellid" longname = "cell identifier" description = "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell." tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [blocks.packagedata.fields.packagedata.item.fields.xrpt] type = "double" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-prp.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-prp.yaml index 06d6b90d..da67d041 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-prp.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-prp.yaml @@ -263,7 +263,7 @@ blocks: index: true pk: true cellid: - type: array + type: cellid longname: cell identifier description: is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, @@ -271,11 +271,6 @@ blocks: number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell. tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim xrpt: type: double longname: x coordinate of release point 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 64685a6d..0fae1fd7 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-cdb.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-cdb.json @@ -97,16 +97,10 @@ "type": "record", "fields": { "cellid": { - "type": "array", + "type": "cellid", "longname": "cell identifier", "description": "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell.", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "tagged": false }, "idcxs": { "type": "integer", @@ -295,14 +289,8 @@ "type": "union", "arms": { "cellid": { - "type": "array", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "type": "cellid", + "tagged": false }, "boundname": { "type": "string", @@ -314,14 +302,8 @@ "type": "union", "arms": { "cellid": { - "type": "array", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "type": "cellid", + "tagged": false }, "boundname": { "type": "string", 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 bc97444b..673ccdbe 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-cdb.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-cdb.toml @@ -84,16 +84,10 @@ name = "stress_period_data" type = "record" [blocks.period.fields.stress_period_data.item.fields.cellid] -type = "array" +type = "cellid" longname = "cell identifier" description = "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell." tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [blocks.period.fields.stress_period_data.item.fields.idcxs] type = "integer" @@ -270,14 +264,8 @@ shape = [ type = "union" [observations.cdb.arms.cellid] -type = "array" +type = "cellid" tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [observations.cdb.arms.boundname] type = "string" @@ -287,14 +275,8 @@ tagged = false type = "union" [observations.to-mvr.arms.cellid] -type = "array" +type = "cellid" tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [observations.to-mvr.arms.boundname] type = "string" 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 286ab77f..29c68f80 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-cdb.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-cdb.yaml @@ -92,7 +92,7 @@ blocks: type: record fields: cellid: - type: array + type: cellid longname: cell identifier description: is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, @@ -100,11 +100,6 @@ blocks: number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell. tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim idcxs: type: integer longname: cross section identifier @@ -271,13 +266,8 @@ observations: type: union arms: cellid: - type: array + type: cellid tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim boundname: type: string tagged: false @@ -285,13 +275,8 @@ observations: type: union arms: cellid: - type: array + type: cellid tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim boundname: type: string tagged: false 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 580e3f8f..90c3f018 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-chd.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-chd.json @@ -126,16 +126,10 @@ "type": "record", "fields": { "cellid": { - "type": "array", + "type": "cellid", "longname": "cell identifier", "description": "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell.", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "tagged": false }, "head": { "type": "double", @@ -305,14 +299,8 @@ "type": "union", "arms": { "cellid": { - "type": "array", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "type": "cellid", + "tagged": false }, "boundname": { "type": "string", 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 d02a0821..a7880c3d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-chd.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-chd.toml @@ -111,16 +111,10 @@ name = "stress_period_data" type = "record" [blocks.period.fields.stress_period_data.item.fields.cellid] -type = "array" +type = "cellid" longname = "cell identifier" description = "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell." tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [blocks.period.fields.stress_period_data.item.fields.head] type = "double" @@ -278,14 +272,8 @@ shape = [ type = "union" [observations.chd.arms.cellid] -type = "array" +type = "cellid" tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [observations.chd.arms.boundname] type = "string" 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 c4fc7ce1..c13df2a3 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-chd.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-chd.yaml @@ -116,7 +116,7 @@ blocks: type: record fields: cellid: - type: array + type: cellid longname: cell identifier description: is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, @@ -124,11 +124,6 @@ blocks: number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell. tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim head: type: double longname: head value assigned to constant head @@ -275,13 +270,8 @@ observations: type: union arms: cellid: - type: array + type: cellid tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim boundname: type: string tagged: false 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 d59e3fa2..f6a8140c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-evp.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-evp.json @@ -126,16 +126,10 @@ "type": "record", "fields": { "cellid": { - "type": "array", + "type": "cellid", "longname": "cell identifier", "description": "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell.", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "tagged": false }, "evaporation": { "type": "double", @@ -315,14 +309,8 @@ "type": "union", "arms": { "cellid": { - "type": "array", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "type": "cellid", + "tagged": false }, "boundname": { "type": "string", 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 36b750ce..210c0007 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-evp.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-evp.toml @@ -111,16 +111,10 @@ name = "stress_period_data" type = "record" [blocks.period.fields.stress_period_data.item.fields.cellid] -type = "array" +type = "cellid" longname = "cell identifier" description = "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell." tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [blocks.period.fields.stress_period_data.item.fields.evaporation] type = "double" @@ -288,14 +282,8 @@ shape = [ type = "union" [observations.evp.arms.cellid] -type = "array" +type = "cellid" tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [observations.evp.arms.boundname] type = "string" 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 fae7528a..343e7721 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-evp.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-evp.yaml @@ -116,7 +116,7 @@ blocks: type: record fields: cellid: - type: array + type: cellid longname: cell identifier description: is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, @@ -124,11 +124,6 @@ blocks: number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell. tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim evaporation: type: double longname: evaporation rate @@ -285,13 +280,8 @@ observations: type: union arms: cellid: - type: array + type: cellid tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim boundname: type: string tagged: false 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 b424f1a3..9691adbc 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-flw.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-flw.json @@ -126,16 +126,10 @@ "type": "record", "fields": { "cellid": { - "type": "array", + "type": "cellid", "longname": "cell identifier", "description": "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell.", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "tagged": false }, "q": { "type": "double", @@ -307,14 +301,8 @@ "type": "union", "arms": { "cellid": { - "type": "array", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "type": "cellid", + "tagged": false }, "boundname": { "type": "string", @@ -326,14 +314,8 @@ "type": "union", "arms": { "cellid": { - "type": "array", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "type": "cellid", + "tagged": false }, "boundname": { "type": "string", 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 8062f16e..ca47f235 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-flw.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-flw.toml @@ -111,16 +111,10 @@ name = "stress_period_data" type = "record" [blocks.period.fields.stress_period_data.item.fields.cellid] -type = "array" +type = "cellid" longname = "cell identifier" description = "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell." tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [blocks.period.fields.stress_period_data.item.fields.q] type = "double" @@ -280,14 +274,8 @@ shape = [ type = "union" [observations.flw.arms.cellid] -type = "array" +type = "cellid" tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [observations.flw.arms.boundname] type = "string" @@ -297,14 +285,8 @@ tagged = false type = "union" [observations.to-mvr.arms.cellid] -type = "array" +type = "cellid" tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [observations.to-mvr.arms.boundname] type = "string" 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 d1a2ebb7..1b956b38 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-flw.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-flw.yaml @@ -115,7 +115,7 @@ blocks: type: record fields: cellid: - type: array + type: cellid longname: cell identifier description: is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, @@ -123,11 +123,6 @@ blocks: number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell. tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim q: type: double longname: well rate @@ -277,13 +272,8 @@ observations: type: union arms: cellid: - type: array + type: cellid tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim boundname: type: string tagged: false @@ -291,13 +281,8 @@ observations: type: union arms: cellid: - type: array + type: cellid tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim boundname: type: string tagged: false 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 d164085c..59990bac 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-nam.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-nam.json @@ -170,37 +170,19 @@ }, "observations": { "stage": { - "type": "array", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "type": "cellid", + "tagged": false }, "flow-ja-face": { "type": "record", "fields": { "cellid": { - "type": "array", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "type": "cellid", + "tagged": false }, "cellid2": { - "type": "array", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "type": "cellid", + "tagged": false } } } 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 a23f26cd..bde59912 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-nam.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-nam.toml @@ -151,34 +151,16 @@ shape = [ ] [observations.stage] -type = "array" +type = "cellid" tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [observations.flow-ja-face] type = "record" [observations.flow-ja-face.fields.cellid] -type = "array" +type = "cellid" tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [observations.flow-ja-face.fields.cellid2] -type = "array" +type = "cellid" tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] 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 4e25ad62..3e5bb128 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-nam.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-nam.yaml @@ -163,29 +163,14 @@ memory: - nja observations: stage: - type: array + type: cellid tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim flow-ja-face: type: record fields: cellid: - type: array + type: cellid tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim cellid2: - type: array + type: cellid tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim 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 a9e9a89d..a7ce0d4d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-pcp.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-pcp.json @@ -126,16 +126,10 @@ "type": "record", "fields": { "cellid": { - "type": "array", + "type": "cellid", "longname": "cell identifier", "description": "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell.", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "tagged": false }, "precipitation": { "type": "double", @@ -315,14 +309,8 @@ "type": "union", "arms": { "cellid": { - "type": "array", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "type": "cellid", + "tagged": false }, "boundname": { "type": "string", 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 66f8abdc..cf389583 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-pcp.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-pcp.toml @@ -111,16 +111,10 @@ name = "stress_period_data" type = "record" [blocks.period.fields.stress_period_data.item.fields.cellid] -type = "array" +type = "cellid" longname = "cell identifier" description = "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell." tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [blocks.period.fields.stress_period_data.item.fields.precipitation] type = "double" @@ -288,14 +282,8 @@ shape = [ type = "union" [observations.pcp.arms.cellid] -type = "array" +type = "cellid" tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [observations.pcp.arms.boundname] type = "string" 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 d01c5eda..055a31ab 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-pcp.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-pcp.yaml @@ -116,7 +116,7 @@ blocks: type: record fields: cellid: - type: array + type: cellid longname: cell identifier description: is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, @@ -124,11 +124,6 @@ blocks: number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell. tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim precipitation: type: double longname: precipitation rate @@ -285,13 +280,8 @@ observations: type: union arms: cellid: - type: array + type: cellid tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim boundname: type: string tagged: false 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 ee6962a4..4e49d969 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-zdg.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-zdg.json @@ -120,16 +120,10 @@ "type": "record", "fields": { "cellid": { - "type": "array", + "type": "cellid", "longname": "cell identifier", "description": "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell.", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "tagged": false }, "idcxs": { "type": "integer", @@ -332,14 +326,8 @@ "type": "union", "arms": { "cellid": { - "type": "array", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "type": "cellid", + "tagged": false }, "boundname": { "type": "string", @@ -351,14 +339,8 @@ "type": "union", "arms": { "cellid": { - "type": "array", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "type": "cellid", + "tagged": false }, "boundname": { "type": "string", 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 411a3636..12668bf0 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-zdg.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-zdg.toml @@ -105,16 +105,10 @@ name = "stress_period_data" type = "record" [blocks.period.fields.stress_period_data.item.fields.cellid] -type = "array" +type = "cellid" longname = "cell identifier" description = "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell." tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [blocks.period.fields.stress_period_data.item.fields.idcxs] type = "integer" @@ -305,14 +299,8 @@ shape = [ type = "union" [observations.zdg.arms.cellid] -type = "array" +type = "cellid" tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [observations.zdg.arms.boundname] type = "string" @@ -322,14 +310,8 @@ tagged = false type = "union" [observations.to-mvr.arms.cellid] -type = "array" +type = "cellid" tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [observations.to-mvr.arms.boundname] type = "string" 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 fda58770..e77ab7bb 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-zdg.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-zdg.yaml @@ -112,7 +112,7 @@ blocks: type: record fields: cellid: - type: array + type: cellid longname: cell identifier description: is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, @@ -120,11 +120,6 @@ blocks: number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell. tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim idcxs: type: integer longname: cross section identifier @@ -312,13 +307,8 @@ observations: type: union arms: cellid: - type: array + type: cellid tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim boundname: type: string tagged: false @@ -326,13 +316,8 @@ observations: type: union arms: cellid: - type: array + type: cellid tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim boundname: type: string tagged: false 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 c703527e..dd61d70a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-obs.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-obs.json @@ -50,14 +50,8 @@ "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).", "arms": { "cellid": { - "type": "array", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "type": "cellid", + "tagged": false }, "index": { "type": "integer", @@ -77,14 +71,8 @@ "optional": true, "arms": { "cellid": { - "type": "array", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "type": "cellid", + "tagged": false }, "index": { "type": "integer", 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 3fa041e8..b4f307bd 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-obs.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-obs.toml @@ -44,14 +44,8 @@ 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)." [blocks.continuous.fields.continuous.item.fields.id.arms.cellid] -type = "array" +type = "cellid" tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [blocks.continuous.fields.continuous.item.fields.id.arms.index] type = "integer" @@ -69,14 +63,8 @@ description = "Text identifying cell adjacent to cell identified by ID. The form optional = true [blocks.continuous.fields.continuous.item.fields.id2.arms.cellid] -type = "array" +type = "cellid" tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [blocks.continuous.fields.continuous.item.fields.id2.arms.index] type = "integer" 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 d7465644..051b1b8b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-obs.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-obs.yaml @@ -56,13 +56,8 @@ blocks: (layer, cell number). If the discretization is DISU, cellid is one integer (node number). arms: cellid: - type: array + type: cellid tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim index: type: integer tagged: false @@ -80,13 +75,8 @@ blocks: optional: true arms: cellid: - type: array + type: cellid tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim index: type: integer tagged: false diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tvk.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tvk.json index ac37f149..ef7f68b1 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tvk.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tvk.json @@ -48,16 +48,10 @@ "type": "record", "fields": { "cellid": { - "type": "array", + "type": "cellid", "longname": "cell identifier", "description": "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell.", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "tagged": false }, "tvksetting": { "type": "union", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tvk.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tvk.toml index 0fe9f787..5d86452a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tvk.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tvk.toml @@ -40,16 +40,10 @@ name = "perioddata" type = "record" [blocks.period.fields.perioddata.item.fields.cellid] -type = "array" +type = "cellid" longname = "cell identifier" description = "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell." tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [blocks.period.fields.perioddata.item.fields.tvksetting] type = "union" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tvk.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tvk.yaml index 916b710a..cbcdfd61 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tvk.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tvk.yaml @@ -42,7 +42,7 @@ blocks: type: record fields: cellid: - type: array + type: cellid longname: cell identifier description: is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, @@ -50,11 +50,6 @@ blocks: number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell. tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim tvksetting: type: union description: 'line of information that is parsed into a property name keyword and values. Property diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tvs.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tvs.json index 52c8ecec..f1a55f27 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tvs.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tvs.json @@ -54,16 +54,10 @@ "type": "record", "fields": { "cellid": { - "type": "array", + "type": "cellid", "longname": "cell identifier", "description": "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell.", - "tagged": false, - "dtype": "integer", - "index": true, - "cellid": true, - "shape": [ - "ncelldim" - ] + "tagged": false }, "tvssetting": { "type": "union", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tvs.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tvs.toml index 619c0e37..d450078c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tvs.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tvs.toml @@ -46,16 +46,10 @@ name = "perioddata" type = "record" [blocks.period.fields.perioddata.item.fields.cellid] -type = "array" +type = "cellid" longname = "cell identifier" description = "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell." tagged = false -dtype = "integer" -index = true -cellid = true -shape = [ - "ncelldim", -] [blocks.period.fields.perioddata.item.fields.tvssetting] type = "union" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tvs.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tvs.yaml index e93de869..4f2a53d6 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tvs.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tvs.yaml @@ -50,7 +50,7 @@ blocks: type: record fields: cellid: - type: array + type: cellid longname: cell identifier description: is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, @@ -58,11 +58,6 @@ blocks: number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell. tagged: false - dtype: integer - index: true - cellid: true - shape: - - ncelldim tvssetting: type: union description: 'line of information that is parsed into a property name keyword and values. Property diff --git a/autotest/dfns/test_migrate.py b/autotest/dfns/test_migrate.py index 26d63495..716b8e0f 100644 --- a/autotest/dfns/test_migrate.py +++ b/autotest/dfns/test_migrate.py @@ -343,20 +343,42 @@ def test_migrate_gnc_cellids(dfn_dir): item = component.blocks["gncdata"].fields["gncdata"].item # Under an exchange, `cellidn` and `cellidsj` are in model 1's grid and # `cellidm` in model 2's (MF6's GhostNode.f90). - for name, shape, model in [ - ("cellidn", ["ncelldim"], "1"), - ("cellidm", ["ncelldim"], "2"), - ("cellidsj", ["ncelldim", "numalphaj"], "1"), - ]: + for name, model in [("cellidn", "1"), ("cellidm", "2")]: field = item.fields[name] - assert isinstance(field, v2.Array) - assert (field.dtype, field.shape, field.index, field.cellid) == ( - "integer", - shape, - True, - model, - ) - assert not item.fields["alphasj"].cellid + assert isinstance(field, v2.CellID) + assert (field.model, field.allow_zero) == (model, False) + # `numalphaj` cellids, each of which may be a dummy cell of zeros. + cellidsj = item.fields["cellidsj"] + assert isinstance(cellidsj, v2.Array) + assert (cellidsj.dtype, cellidsj.shape, cellidsj.model, cellidsj.allow_zero) == ( + "cellid", + ["numalphaj"], + "1", + True, + ) + assert cellidsj.render(inline=True) == "" + alphasj = item.fields["alphasj"] + assert isinstance(alphasj, v2.Array) and alphasj.dtype == "double" + + +def test_migrate_sfr_cellid_allow_zero(dfn_dir): + # An unconnected reach gives zeros for its cellid (gwf-sfr.f90). + component = _migrate_dev3(dfn_dir, "gwf-sfr") + cellid = component.blocks["packagedata"].fields["packagedata"].item.fields["cellid"] + assert isinstance(cellid, v2.CellID) + assert (cellid.model, cellid.allow_zero, cellid.optional) == (None, True, False) + assert cellid.render(inline=True) == "" + + +def test_migrate_cellid_allow_zero_fails_when_stale(dfn_dir, monkeypatch): + from modflow_devtools.dfns import migrate_to_v2_0_0_dev2 as dev2 + + monkeypatch.setitem(dev2._CELLID_ALLOW_ZERO, "gwf-sfr", ("packagedata", {"nope"})) + with pytest.raises(ValueError, match="nope"): + _migrate_dev3(dfn_dir, "gwf-sfr") + monkeypatch.setitem(dev2._CELLID_ALLOW_ZERO, "gwf-sfr", ("packagedata", {"rlen"})) + with pytest.raises(ValueError, match="'rlen' is not a cellid"): + _migrate_dev3(dfn_dir, "gwf-sfr") @pytest.mark.parametrize( @@ -368,8 +390,8 @@ def test_migrate_exchange_cellids(dfn_dir, name): item = component.blocks["exchangedata"].fields["exchangedata"].item for col, model in (("cellidm1", "1"), ("cellidm2", "2")): field = item.fields[col] - assert isinstance(field, v2.Array) - assert (field.shape, field.index, field.cellid) == (["ncelldim"], True, model) + assert isinstance(field, v2.CellID) + assert (field.model, field.allow_zero) == (model, False) def _number_or_word(field, word: str) -> None: @@ -451,18 +473,20 @@ def test_migrate_cellid_models_round_trip(dev3): out, fmt = dev3 raw = _load(out / f"exg-gwfgwf.{fmt}", fmt) cols = raw["blocks"]["exchangedata"]["fields"]["exchangedata"]["item"]["fields"] - assert (cols["cellidm1"]["cellid"], cols["cellidm2"]["cellid"]) == ("1", "2") + assert (cols["cellidm1"]["model"], cols["cellidm2"]["model"]) == ("1", "2") dfns = v2.Dfns.load(out) gnc = dfns.components["gwf-gnc"].blocks["gncdata"].fields["gncdata"].item.fields - assert [gnc[c].cellid for c in ("cellidn", "cellidm", "cellidsj")] == ["1", "2", "1"] + assert [gnc[c].model for c in ("cellidn", "cellidm", "cellidsj")] == ["1", "2", "1"] + assert [type(gnc[c]) for c in ("cellidn", "cellidsj")] == [v2.CellID, v2.Array] + assert gnc["cellidsj"].allow_zero @pytest.mark.parametrize("name", ["gwf-chd", "gwf-wel", "gwf-hfb", "gwt-cnc"]) -def test_migrate_own_grid_cellids_stay_true(dfn_dir, name): +def test_migrate_own_grid_cellids_name_no_model(dfn_dir, name): # Only the `_CELLID_FIELDS` columns name a model; every other cellid is in # the component's own model's grid. def _cellids(field): - if isinstance(field, v2.Array) and field.cellid: + if isinstance(field, v2.CellID): yield field elif isinstance(field, v2.List): yield from _cellids(field.item) @@ -476,7 +500,7 @@ def _cellids(field): component = _migrate_dev3(dfn_dir, name) cellids = [c for b in component.blocks.values() for f in b.fields.values() for c in _cellids(f)] assert cellids - assert all(c.cellid is True for c in cellids) + assert all(c.model is None for c in cellids) @pytest.mark.parametrize( @@ -492,7 +516,9 @@ def test_migrate_marks_cellids(dfn_dir, name, block, cols): lst = next(f for f in component.blocks[block].fields.values() if isinstance(f, v2.List)) for col in cols: field = lst.item.fields[col] - assert (field.shape, field.index, field.cellid) == (["ncelldim"], True, True) + assert isinstance(field, v2.CellID) + assert (field.model, field.allow_zero) == (None, False) + assert field.render(inline=True) == f"<{col}(ncelldim)>" @pytest.mark.parametrize("col, optional", [("id", False), ("id2", True)]) @@ -505,8 +531,8 @@ def test_migrate_obs_id_union(dfn_dir, col, optional): assert isinstance(field, v2.Union) assert (field.tagged, field.optional) == (False, optional) cellid, index, boundname = field.arms.values() - assert isinstance(cellid, v2.Array) - assert (cellid.shape, cellid.index, cellid.cellid) == (["ncelldim"], True, True) + assert isinstance(cellid, v2.CellID) + assert cellid.model is None assert isinstance(index, v2.Integer) and index.index assert isinstance(boundname, v2.String) assert not any(arm.tagged for arm in field.arms.values()) @@ -522,7 +548,7 @@ def _obs_forms(field) -> list[tuple]: for col in field.fields.values(): forms = [f + g for f in forms for g in _obs_forms(col)] return forms - if isinstance(field, v2.Array) and field.cellid: + if isinstance(field, v2.CellID): return [(("cellid",),)] if isinstance(field, v2.String): return [(("boundname",),)] diff --git a/autotest/dfns/test_schema_relations.py b/autotest/dfns/test_schema_relations.py index f6a7bfeb..8517e2c5 100644 --- a/autotest/dfns/test_schema_relations.py +++ b/autotest/dfns/test_schema_relations.py @@ -5,6 +5,7 @@ from modflow_devtools.dfns.schema import ( Array, Block, + CellID, Dfns, Double, File, @@ -107,7 +108,7 @@ def test_dfns_validate_fk_fields_fk_ref_with_hierarchical_fk_rejected(): def test_dfns_validate_fk_fields_fk_ref_with_node_not_special_cased(): # "node" was formerly a reserved fk sentinel for grid-cell references (now - # replaced by the dedicated `Array.cellid` attribute); as a bare fk value + # replaced by the dedicated `CellID` type); as a bare fk value # it's just an ordinary (if oddly named) block name like any other, so # combining it with fk_ref is unremarkable and must not raise. mvr, gwf = _mvr_id_ctx(fk_val="node") @@ -205,18 +206,25 @@ def _cellid_ctx(field, name="gwf-gnc", parent="gwf-nam", dims=None): @pytest.mark.parametrize( "field", [ - Array(name="cellid", dtype="integer", shape=["ncelldim"], index=True, cellid=True), - Array(name="cellidsj", dtype="integer", shape=["ncelldim", "n"], index=True, cellid=True), + CellID(name="cellid"), + Array(name="cellidsj", dtype="cellid", shape=["n"]), ], ) def test_dfns_validate_cellid_in_list_item(field): # No component declares `ncelldim`: a cellid's width comes from the grid - # it refers to, so it isn't resolved as a dim. Later axes still are. + # it refers to, so it isn't in any shape. An array's shape counts its + # cellids, and is resolved as usual. dims = {"n": InputDim(value="2", scope="model")} spec = Dfns(components=_cellid_ctx(field, dims=dims)) assert "gwf-gnc" in spec.components +def test_dfns_validate_cellid_array_shape_resolves(): + field = Array(name="cellidsj", dtype="cellid", shape=["n"]) + with pytest.raises(ValueError, match="'n' does not resolve"): + Dfns(components=_cellid_ctx(field)) + + def _exchange_ctx(*fields): item = Record(name="item", fields={f.name: f for f in fields}) block = Block(name="data", fields={"data": List(name="data", item=item)}) @@ -224,19 +232,22 @@ def _exchange_ctx(*fields): return {"exg-gwfgwf": exg} -def _cellid_col(name, cellid, shape=("ncelldim",)): - return Array(name=name, dtype="integer", shape=list(shape), index=True, cellid=cellid) +def _cellid_col(name, model=None, shape=None): + if shape is None: + return CellID(name=name, model=model) + return Array(name=name, dtype="cellid", shape=list(shape), model=model) def test_dfns_validate_cellid_in_exchange(): fields = (_cellid_col("cellidm1", "1"), _cellid_col("cellidm2", "2")) spec = Dfns(components=_exchange_ctx(*fields)) item = spec.components["exg-gwfgwf"].blocks["data"].fields["data"].item - assert {n: f.cellid for n, f in item.fields.items()} == {"cellidm1": "1", "cellidm2": "2"} + assert {n: f.model for n, f in item.fields.items()} == {"cellidm1": "1", "cellidm2": "2"} -def test_dfns_validate_exchange_cellid_must_name_model(): - fields = (_cellid_col("cellidm1", True), _cellid_col("cellidm2", True)) +@pytest.mark.parametrize("shape", [None, ["n"]]) +def test_dfns_validate_exchange_cellid_must_name_model(shape): + fields = (_cellid_col("cellidm1", shape=shape), _cellid_col("cellidm2", shape=shape)) with pytest.raises(ValueError, match="exchange's cellid must say which model"): Dfns(components=_exchange_ctx(*fields)) @@ -246,7 +257,7 @@ def test_dfns_validate_cellid_models_under_a_model(): fields = ( _cellid_col("cellidn", "1"), _cellid_col("cellidm", "2"), - _cellid_col("cellidsj", "1", shape=("ncelldim", "n")), + _cellid_col("cellidsj", "1", shape=("n",)), ) item = Record(name="item", fields={f.name: f for f in fields}) block = Block(name="data", fields={"data": List(name="data", item=item)}) @@ -261,23 +272,23 @@ def test_dfns_validate_cellid_models_under_a_model(): def test_dfns_validate_cellid_no_mixing(): - item = Record(name="item", fields={"a": _cellid_col("a", "1"), "b": _cellid_col("b", True)}) + item = Record(name="item", fields={"a": _cellid_col("a", "1"), "b": _cellid_col("b")}) block = Block(name="data", fields={"data": List(name="data", item=item)}) pkg = Package(name="gwf-gnc", parent="gwf-nam", blocks={"data": block}) - with pytest.raises(ValueError, match="mix cellid=True with '1'/'2'"): + with pytest.raises(ValueError, match="mix model=None with '1'/'2'"): Dfns(components={"gwf-nam": Model(name="gwf-nam", blocks=None), "gwf-gnc": pkg}) -def _union_cellid_pkg(arm_cellid, sibling_cellid): +def _union_cellid_pkg(arm_model, sibling_model): union = Union( name="id", tagged=False, arms={ - "cellid": _cellid_col("cellid", arm_cellid), + "cellid": _cellid_col("cellid", arm_model), "boundname": String(name="boundname", tagged=False), }, ) - item = Record(name="item", fields={"a": _cellid_col("a", sibling_cellid), "id": union}) + item = Record(name="item", fields={"a": _cellid_col("a", sibling_model), "id": union}) block = Block(name="data", fields={"data": List(name="data", item=item)}) pkg = Package(name="gwf-gnc", parent="gwf-nam", blocks={"data": block}) return {"gwf-nam": Model(name="gwf-nam", blocks=None), "gwf-gnc": pkg} @@ -285,13 +296,13 @@ def _union_cellid_pkg(arm_cellid, sibling_cellid): def test_dfns_validate_cellid_no_mixing_across_union_arm(): # A union arm's cellid is read in the same row as its sibling columns. - with pytest.raises(ValueError, match="mix cellid=True with '1'/'2'"): - Dfns(components=_union_cellid_pkg(True, "1")) + with pytest.raises(ValueError, match="mix model=None with '1'/'2'"): + Dfns(components=_union_cellid_pkg(None, "1")) -@pytest.mark.parametrize("cellid", [True, "1"]) -def test_dfns_validate_cellid_union_arm_consistent(cellid): - assert "gwf-gnc" in Dfns(components=_union_cellid_pkg(cellid, cellid)).components +@pytest.mark.parametrize("model", [None, "1"]) +def test_dfns_validate_cellid_union_arm_consistent(model): + assert "gwf-gnc" in Dfns(components=_union_cellid_pkg(model, model)).components def test_dfns_validate_cellid_union_arms_are_alternatives(): @@ -307,35 +318,54 @@ def test_dfns_validate_cellid_union_arms_are_alternatives(): Dfns(components={"gwf-nam": Model(name="gwf-nam", blocks=None), "gwf-gnc": pkg}) -@pytest.mark.parametrize("value", [1, 2, 0, "true", "3", "a"]) -def test_array_cellid_rejects_non_model_values(value): - # `True == 1`: an int must never be read as (or coerced to) a model or `True`. - with pytest.raises(ValueError, match="cellid"): - _cellid_col("cellid", value) +@pytest.mark.parametrize("value", [True, 1, 2, 0, "true", "3", "a"]) +@pytest.mark.parametrize("shape", [None, ["n"]]) +def test_cellid_rejects_non_model_values(value, shape): + # `True == 1`: an int or bool must never be read as (or coerced to) a model. + with pytest.raises(ValueError, match="model"): + _cellid_col("cellid", value, shape=shape) + + +def test_cellid_render(): + assert CellID(name="cellid", tagged=False).render(inline=True) == "" + assert CellID(name="cellid", optional=True).render(inline=True) == "[CELLID ]" + arr = Array(name="cellidsj", dtype="cellid", shape=["numalphaj"], tagged=False) + assert arr.render(inline=True) == "" -def test_array_cellid_requires_integer_dtype(): - with pytest.raises(ValueError, match="cellid=True requires dtype='integer'"): - Array(name="alphasj", dtype="double", shape=["ncelldim"], cellid=True) +@pytest.mark.parametrize("attr", ["model", "allow_zero"]) +def test_array_cellid_attrs_require_cellid_dtype(attr): + value = "1" if attr == "model" else True + with pytest.raises(ValueError, match=f"{attr} requires dtype='cellid'"): + Array(name="alphasj", dtype="integer", shape=["n"], **{attr: value}) -@pytest.mark.parametrize("shape", [[], ["n"], ["n", "ncelldim"]]) -def test_array_cellid_requires_leading_ncelldim(shape): - with pytest.raises(ValueError, match="cellid=True requires shape to start with 'ncelldim'"): - Array(name="cellid", dtype="integer", shape=shape, index=True, cellid=True) +@pytest.mark.parametrize( + "attr, value, match", + [ + ("index", True, "index=True requires dtype='integer'"), + ("fk", "packagedata.ifno", "fk requires dtype='integer'"), + ("time_series", True, "time_series is not valid with dtype='cellid'"), + ("layered", True, "layered is not valid with dtype='cellid'"), + ("netcdf", True, "netcdf is not valid with dtype='cellid'"), + ], +) +def test_array_cellid_rejects_attrs(attr, value, match): + with pytest.raises(ValueError, match=match): + Array(name="cellidsj", dtype="cellid", shape=["n"], **{attr: value}) -def test_array_cellid_requires_index(): - with pytest.raises(ValueError, match="cellid=True requires index=True"): - Array(name="cellid", dtype="integer", shape=["ncelldim"], cellid=True) +@pytest.mark.parametrize("attr", ["index", "time_series", "fk", "shape", "dtype"]) +def test_cellid_has_no_array_attrs(attr): + # Pydantic ignores unknown keys, so check the class simply doesn't have them. + assert attr not in CellID.model_fields def test_dfns_validate_cellid_outside_list_item(): - field = Array(name="cellid", dtype="integer", shape=["ncelldim"], index=True, cellid=True) - block = Block(name="options", fields={"cellid": field}) + block = Block(name="options", fields={"cellid": CellID(name="cellid")}) pkg = Package(name="gwf-gnc", parent="gwf-nam", blocks={"options": block}) gwf = Model(name="gwf-nam", blocks=None) - with pytest.raises(ValueError, match="only valid on a column in a list item"): + with pytest.raises(ValueError, match="only valid as a column in a list item"): Dfns(components={"gwf-nam": gwf, "gwf-gnc": pkg}) diff --git a/docs/md/dfns.md b/docs/md/dfns.md index df3e737e..1a1bf9ff 100644 --- a/docs/md/dfns.md +++ b/docs/md/dfns.md @@ -172,7 +172,7 @@ assert gwf_chd.subtype == "stress" Each component has `blocks`, a dict mapping block names to `Block` objects. Each `Block` has a `fields` dict of typed field objects. ```python -from modflow_devtools.dfns import Block, Keyword, Double, List, Record +from modflow_devtools.dfns import CellID, List, Record period = gwf_chd.blocks["period"] assert period.repeats is True @@ -184,7 +184,8 @@ assert isinstance(spd, List) assert isinstance(spd.item, Record) cellid = spd.item.fields["cellid"] -assert isinstance(cellid, Array) +assert isinstance(cellid, CellID) +assert cellid.model is None # the CHD's own model's grid ``` Available field types: @@ -195,6 +196,7 @@ Available field types: | `String` | `"string"` | String value | | `Integer` | `"integer"` | Integer value | | `Double` | `"double"` | Floating-point value | +| `CellID` | `"cellid"` | Grid cell reference | | `File` | `"file"` | File path | | `Array` | `"array"` | Fixed or dynamic array | | `Record` | `"record"` | Single-line product type | diff --git a/docs/md/dfnspec.md b/docs/md/dfnspec.md index 1e1ee49b..2dd0c8b1 100644 --- a/docs/md/dfnspec.md +++ b/docs/md/dfnspec.md @@ -62,26 +62,30 @@ This document describes the MODFLOW 6 component definition (DFN) system. This sy - [Double](#double) - [Type-specific attributes](#type-specific-attributes-4) - [`time_series`](#time_series-2) - - [File](#file) + - [CellID](#cellid) - [Type-specific attributes](#type-specific-attributes-5) + - [`model`](#model) + - [`allow_zero`](#allow_zero) + - [File](#file) + - [Type-specific attributes](#type-specific-attributes-6) - [`direction`](#direction) - [Composites](#composites) - [Array](#array) - - [Type-specific attributes](#type-specific-attributes-6) + - [Type-specific attributes](#type-specific-attributes-7) - [`dtype`](#dtype) - [`shape`](#shape) - [`time_series`](#time_series-3) - [`index`](#index-1) - [`fk`](#fk-2) - - [`cellid`](#cellid) + - [`model`, `allow_zero`](#model-allow_zero) - [Record](#record) - - [Type-specific attributes](#type-specific-attributes-7) + - [Type-specific attributes](#type-specific-attributes-8) - [`fields`](#fields-2) - [Union](#union) - - [Type-specific attributes](#type-specific-attributes-8) + - [Type-specific attributes](#type-specific-attributes-9) - [`arms`](#arms) - [List](#list) - - [Type-specific attributes](#type-specific-attributes-9) + - [Type-specific attributes](#type-specific-attributes-10) - [`item`](#item) - [`shape`](#shape-1) - [Dimensions](#dimensions) @@ -318,6 +322,7 @@ Required. One of: - `keyword` - `integer` - `double` +- `cellid` - `array` - `string` - `file` @@ -448,6 +453,24 @@ Type `double`. `boolean (default: false)`. Marks fields where the parser accepts either a numeric literal or a time-series name (referencing a `utl-ts` object). Not inferable from structural type. Also appears on array fields (where it references a `utl-tas` object instead). Note that `utl-tas` currently only works with layered arrays, not full-grid arrays, though generalizing has been considered. +#### CellID + +Type `cellid`. A grid cell reference, resolved against the grid (DIS/DISV/DISU) it refers to: `ncelldim` integers, the cell's components (layer, row, column for DIS; layer, cell2d for DISV; node for DISU). Its width is a property of the type, the `ncelldim` of that grid, so it has no shape; `ncelldim` is never resolved as a dim in the component's own scope. A cellid is always 1-based in the file, so it has no `index` attribute. Several cellids are an [array](#array) with `dtype` `"cellid"`. + +A cellid is only valid as a column in a list item, where each row names its cell(s), or in an [observation](#observations) field, which reads like one. It renders as ``. + +##### Type-specific attributes + +###### `model` + +`"1" | "2" | null (default: null)`. Which model's grid the cellid refers to: `null` for the grid of the component's own model; `"1"` or `"2"` for the grid of the first or second model of the enclosing context, i.e. `EXGMNAMEA` or `EXGMNAMEB` under an exchange. Under a single model, both are that model, so a component read in either context (e.g. `gwf-gnc`) gives the value unconditionally. A cellid in an exchange ([`subtype`](#subtype) `"exchange"`) must give `"1"` or `"2"`, since an exchange has no grid of its own, and a list item giving `"1"` or `"2"` on one cellid column must give one on every cellid column. For example, in an exchange `cellidm1` is `"1"` and `cellidm2` is `"2"`; in `gwf-gnc`, `cellidn` and `cellidsj` are `"1"` and `cellidm` is `"2"`. The position of a column says nothing about its model: GNC's columns, in order, refer to models 1, 2 and 1. + +**Note:** The values are strings, not integers, as `true == 1` in many languages (e.g. Python). A reader rejects an integer or boolean `model`. + +###### `allow_zero` + +`boolean (default: false)`. Whether the cellid may refer to no cell, given as zero for every component (e.g. `0 0 0` for DIS). MF6 allows this in two places: `gwf-sfr`'s packagedata `cellid`, for a reach not connected to the groundwater model, and `gwf-gnc`'s `cellidsj`, for a dummy contributing cell with a zero factor. This is not [`optional`](#optional): the zeros are still written. + #### File Type `file`. A path to another file. @@ -494,13 +517,13 @@ An array appearing as a subfield of a record is called an **inline array**. Inli ###### `dtype` -`string`. The array's data type. Must be one of the scalar types. +`string`. The array's data type. Must be one of the scalar types: `"keyword"`, `"integer"`, `"double"`, `"string"` or `"cellid"`. An array of cellids is shaped only by what counts them: `gwf-gnc`'s `cellidsj` has shape `["numalphaj"]`, `numalphaj` cellids written one after another, each `ncelldim` integers. ###### `shape` `[string] (default: [])`. The array's shape, as a list of shape expressions, one per dimension. An empty list means the array is 1-dimensional and **self-sizing** (see above). Each length is exact unless its expression is prefixed with an inequality operator (e.g. `"<=n"`); see [Bounds](#bounds). -Dimensions are listed fastest-varying first, i.e. in the order elements are read from (or written to) the input file. A 3D grid array is `["ncol", "nrow", "nlay"]`, and a cellid array's `ncelldim` axis comes first (see [`cellid`](#cellid)). +Dimensions are listed fastest-varying first, i.e. in the order elements are read from (or written to) the input file. A 3D grid array is `["ncol", "nrow", "nlay"]`. A cellid's own components vary fastest of all, so an array of cellids renders with `ncelldim` first, e.g. ``, though `ncelldim` isn't in its shape (see [CellID](#cellid)). ###### `time_series` @@ -514,15 +537,9 @@ Dimensions are listed fastest-varying first, i.e. in the order elements are read `string | null (default: null)`. Marks the array's (nonzero) elements as a foreign key, each a reference to a row (by `pk`) in another list. On a grid array that's a per-grid-cell reference, rather than the per-list-row reference a scalar `fk` expresses (e.g. a grid-wide array giving each cell's cross-section id, referencing the cross-section package's `packagedata`). On an array column in a list item record, each row references several rows (e.g. SFR's `ic`, the reaches connected to a reach). Only valid when `dtype` is `"integer"`. Hierarchical path form only (`"[component.]block.field"`) — an array has no `fk_ref` counterpart, since it has no sibling record to carry a runtime component-selector field, and no `pk` counterpart, since it has no rows of its own to be a key of. See "Primary/foreign keys". -###### `cellid` - -`boolean | "1" | "2" (default: false)`. Marks the array as a **cellid**, or several: a grid cell reference, resolved against the grid (DIS/DISV/DISU) the column refers to. The first axis must be `ncelldim`, the cell's components (layer, row, column for DIS; layer, cell2d for DISV; node for DISU). Any further axes count cellids. A single cellid has shape `["ncelldim"]`; `gwf-gnc`'s `cellidsj` has shape `["ncelldim", "numalphaj"]`, `numalphaj` cellids written one after another. Only valid when `dtype` is `"integer"`, `index` is set (cellids are 1-based), and the array is a column in a list item. - -The value says which grid: `true` for the grid of the component's own model; `"1"` or `"2"` for the grid of the first or second model of the enclosing context, i.e. `EXGMNAMEA` or `EXGMNAMEB` under an exchange. Under a single model, both are that model, so a component read in either context (e.g. `gwf-gnc`) gives the value unconditionally. A cellid column in an exchange ([`subtype`](#subtype) `"exchange"`) must be `"1"` or `"2"`, since an exchange has no grid of its own, and a list item giving `"1"` or `"2"` on one cellid column must give one on every cellid column. For example, in an exchange `cellidm1` is `"1"` and `cellidm2` is `"2"`; in `gwf-gnc`, `cellidn` and `cellidsj` are `"1"` and `cellidm` is `"2"`. The position of a column says nothing about its model: GNC's columns, in order, refer to models 1, 2 and 1. - -The leading `ncelldim` is not resolved as a dim in the component's own scope: its value is the `ncelldim` of the grid the column refers to, by the above. +###### `model`, `allow_zero` -**Note:** The model values are strings, not integers, as `true == 1` in many languages (e.g. Python). A consumer should test for the strings (`cellid in ("1", "2")`), never compare `cellid` to an integer; and a reader rejects an integer `cellid`. +As for a [CellID](#cellid), applying to each element. Only valid when `dtype` is `"cellid"`. An array of cellids may not set `index` (cellids are always 1-based), `fk`, `time_series`, `layered` or `netcdf`. #### Record @@ -642,7 +659,7 @@ The `value` attribute defines the dimension as a Python expression over the comp - **`sum(list.column)`** — the sum of an integer column over a list's rows (`sum(packagedata.nlakeconn)`). - **Arithmetic expression** `nlay * nrow * ncol` — integer literals and other dims, combined with `+`, `-`, `*`, `/` (exact) and `//`. May not use bare field names; all operands must be declared dimensions. -A dimension whose value is its own name is an **input dimension**: it *is* the field, so a consumer may set the field from data the dimension sizes (e.g. `numalphaj` from the width of `cellidsj`). Every other dimension is **derived**: a function of the input, which a consumer can evaluate and check data against, but not set. More generally, a consumer may set an unset input from data whenever a length determines it uniquely: `nseg` from the width of an array with shape `["nseg-1"]`, or a row's `ncvert` from the length of its `icvert`. `modflow_devtools.dfns` evaluates any dimension or shape expression with `dim_value`, and finds the input a length determines with `dim_input`; see [Evaluating dimensions and shapes](dfns.md#evaluating-dimensions-and-shapes). +A dimension whose value is its own name is an **input dimension**: it *is* the field, so a consumer may set the field from data the dimension sizes (e.g. `numalphaj` from the number of cellids in `cellidsj`). Every other dimension is **derived**: a function of the input, which a consumer can evaluate and check data against, but not set. More generally, a consumer may set an unset input from data whenever a length determines it uniquely: `nseg` from the width of an array with shape `["nseg-1"]`, or a row's `ncvert` from the length of its `icvert`. `modflow_devtools.dfns` evaluates any dimension or shape expression with `dim_value`, and finds the input a length determines with `dim_input`; see [Evaluating dimensions and shapes](dfns.md#evaluating-dimensions-and-shapes). #### `runtime_dims` (RuntimeDim) @@ -796,7 +813,7 @@ Only a dimension that every component in the model (or simulation) shares should ### Primary and foreign keys -Sometimes a column in one list identifies a row in another list. This can be conceptualized as a primary key (PK) / foreign key (FK) relation. Integers and strings may encode PK/FK semantics with attributes `pk`, `fk`, and `fk_ref`. A column referencing a grid cell instead of another list's row is a distinct concern, handled by the array [`cellid`](#cellid) attribute rather than `pk`/`fk` — grid cells are resolved against the grid (DIS/DISV/DISU) the column refers to at runtime, not looked up via a `pk` column. +Sometimes a column in one list identifies a row in another list. This can be conceptualized as a primary key (PK) / foreign key (FK) relation. Integers and strings may encode PK/FK semantics with attributes `pk`, `fk`, and `fk_ref`. A column referencing a grid cell instead of another list's row is a distinct concern, handled by the [`cellid`](#cellid) type rather than `pk`/`fk` — grid cells are resolved against the grid (DIS/DISV/DISU) the column refers to at runtime, not looked up via a `pk` column. **Note**: `pk`/`fk_ref` are only valid on integer and string fields appearing as columns in a tabular (i.e. regular) list's record item type. `fk` is valid there too, and additionally on integer-`dtype` `Array` fields (see [Array](#array)) — there it references another list's row per grid cell rather than per list row, and only the hierarchical-path form applies (no `fk_ref` counterpart, since an array has no sibling record to carry a runtime component selector). diff --git a/modflow_devtools/dfns/__init__.py b/modflow_devtools/dfns/__init__.py index 1c6ee547..9d8750a4 100644 --- a/modflow_devtools/dfns/__init__.py +++ b/modflow_devtools/dfns/__init__.py @@ -10,6 +10,7 @@ Array, Block, Blocks, + CellID, Component, Dfns, Double, @@ -53,6 +54,7 @@ "Array", "Block", "Blocks", + "CellID", "Component", "DfnRegistry", "Dfns", 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 22b7deb6..db059edb 100644 --- a/modflow_devtools/dfns/migrate_to_v2_0_0_dev2.py +++ b/modflow_devtools/dfns/migrate_to_v2_0_0_dev2.py @@ -585,12 +585,12 @@ def _mark_lonely_pk(blocks: dict[str, v2.Block]) -> dict[str, v2.Block]: # width: either declared as a plain integer (one cellid), or as an integer array # shaped only by the number of cellids (GNC's `cellidsj`). Everywhere else v1 # writes a cellid as `shape (ncelldim)`, which `_mark_cellids` recognizes -# mechanically; these are rewritten into that form by an explicit, audited -# per-field allowlist, since v1 has no attribute that signals a cellid -# (`numeric_index` only means "needs 1-based/0-based conversion"). In every -# entry here the list field's own name matches its enclosing block's name. +# mechanically; these are rewritten by an explicit, audited per-field +# allowlist, since v1 has no attribute that signals a cellid (`numeric_index` +# only means "needs 1-based/0-based conversion"). In every entry here the list +# field's own name matches its enclosing block's name. # -# Each column also refers to one of two models' grids (see `v2.Cellid`), which +# Each column also refers to one of two models' grids (see `v2.CellModel`), which # v1 only says in prose and MF6 hard-codes (IDM's `StructArray.f90` maps # `CELLIDM1`/`CELLIDM2` to `EXGMNAMEA`/`EXGMNAMEB`; `GhostNode.f90` reads # `cellidn` and `cellidsj` in model 1's grid, `cellidm` in model 2's). @@ -604,23 +604,33 @@ def _mark_lonely_pk(blocks: dict[str, v2.Block]) -> dict[str, v2.Block]: } -def _as_cellid(field: v2.InputField, model: Literal["1", "2"]) -> v2.InputField: - """Rewrite an integer column as an `ncelldim`-led integer array, the axis - `ncelldim` varying fastest (each cellid's components are contiguous), - referring to the given model's grid. `_mark_cellids` sets `index`.""" +def _cellid_base(field: "v2.Integer | v2.Array") -> dict[str, Any]: + """The attributes a cellid keeps from the field it replaces: the common + ones, less those a cellid can't have (`netcdf`).""" + base = field.model_dump(include=set(v2.InputFieldBase.model_fields)) + base.pop("type", None) # the serializer restores it + base.pop("netcdf", None) + return base + + +def _as_cellid(field: v2.InputField, model: Literal["1", "2"] | None = None) -> v2.InputField: + """Rewrite an integer column as a cellid in the given model's grid: a + `CellID` if it's one cellid (a plain integer, or a v1 `shape (ncelldim)` + array), else an array of them, shaped by what counts them (GNC's + `cellidsj`, v1 `shape (numalphaj)`).""" if isinstance(field, v2.Integer): - base = field.model_dump(include=set(v2.InputFieldBase.model_fields)) - base.pop("type", None) # the serializer restores it - return v2.Array(**base, dtype="integer", shape=["ncelldim"], cellid=model, index=True) + return v2.CellID(**_cellid_base(field), model=model) if isinstance(field, v2.Array) and field.dtype == "integer": - shape = field.shape if field.shape[:1] == ["ncelldim"] else ["ncelldim", *field.shape] - return field.model_copy(update={"shape": shape, "cellid": model}) + shape = field.shape[1:] if field.shape[:1] == ["ncelldim"] else field.shape + if not shape: + return v2.CellID(**_cellid_base(field), model=model) + return v2.Array(**_cellid_base(field), dtype="cellid", shape=shape, model=model) return field def _fix_cellid_fields(name: str, blocks: dict[str, v2.Block]) -> dict[str, v2.Block]: - """Rewrite this component's known cellid columns into the standard - `ncelldim`-shaped form. See `_CELLID_FIELDS`.""" + """Rewrite this component's known cellid columns as cellids. See + `_CELLID_FIELDS`.""" entry = _CELLID_FIELDS.get(name) if entry is None: return blocks @@ -643,6 +653,32 @@ def _fix_cellid_fields(name: str, blocks: dict[str, v2.Block]) -> dict[str, v2.B return {**blocks, block_name: new_block} +# Cellid columns that may refer to no cell, given as zero for every component. +# MF6 allows it only where it calls `nodeu_from_cellid` with `allow_zero`, which +# v1 says only in prose: an SFR reach not connected to the groundwater model +# (`gwf-sfr.f90`), and a dummy contributing cell with a zero factor +# (`GhostNode.f90`). Entries are (block, fields). +_CELLID_ALLOW_ZERO: dict[str, tuple[str, set[str]]] = { + "gwf-sfr": ("packagedata", {"cellid"}), + "gwf-gnc": ("gncdata", {"cellidsj"}), +} + + +def _fix_cellid_allow_zero(name: str, blocks: dict[str, v2.Block]) -> dict[str, v2.Block]: + """Mark this component's cellids that may refer to no cell. See + `_CELLID_ALLOW_ZERO`.""" + if (entry := _CELLID_ALLOW_ZERO.get(name)) is None: + return blocks + block_name, names = entry + + def _replace(field: Any, _in_union: bool) -> Any: + if not v2._is_cellid(field): + raise ValueError(f"{name}: {field.name!r} is not a cellid") + return field.model_copy(update={"allow_zero": True}) + + return _replace_named(name, blocks, block_name, _replace, names) + + def _replace_named( name: str, blocks: dict[str, v2.Block], @@ -798,15 +834,15 @@ def _link(field: Any) -> Any: def _mark_cellids(blocks: dict[str, v2.Block]) -> dict[str, v2.Block]: - """Mark every cellid column `index=True, cellid=True`: an integer array in a - list item whose first (fastest-varying) axis is `ncelldim`. Every v1 field - shaped by `ncelldim` is a cellid, so this needs no allowlist. A column - `_fix_cellid_fields` already gave a model (`"1"`/`"2"`) keeps it.""" + """Rewrite every other cellid column as a cellid in the component's own + grid: an integer array in a list item whose first (fastest-varying) axis + is `ncelldim`. Every v1 field shaped by `ncelldim` is a cellid, so this + needs no allowlist.""" def _mark(field: Any) -> Any: if isinstance(field, v2.Array): if field.dtype == "integer" and field.shape[:1] == ["ncelldim"]: - return field.model_copy(update={"index": True, "cellid": field.cellid or True}) + return _as_cellid(field) return field if isinstance(field, v2.Record): fields = {n: _mark(f) for n, f in field.fields.items()} @@ -1843,14 +1879,7 @@ def _to_id_union() -> v2.Union: removed=removed, deprecated=deprecated, arms={ - "cellid": v2.Array( - name="cellid", - tagged=False, - dtype="integer", - shape=["ncelldim"], - index=True, - cellid=True, - ), + "cellid": v2.CellID(name="cellid", tagged=False), "index": v2.Integer(name="index", tagged=False, index=True), "boundname": v2.String(name="boundname", tagged=False), }, @@ -2256,6 +2285,7 @@ def _lookup(rname: str) -> dict | None: blocks = _fix_number_or_word_fields(name, blocks) blocks = _fix_string_time_series(name, blocks) blocks = _mark_cellids(blocks) + blocks = _fix_cellid_allow_zero(name, blocks) blocks = _apply_fk_backfill(name, blocks) blocks = _apply_array_fk_backfill(name, blocks) blocks = _link_namefile_fields(name, blocks) diff --git a/modflow_devtools/dfns/observations.py b/modflow_devtools/dfns/observations.py index ed9dd032..99f93e29 100644 --- a/modflow_devtools/dfns/observations.py +++ b/modflow_devtools/dfns/observations.py @@ -18,14 +18,12 @@ def _index(name: str, fk: str | None = None) -> v2.Integer: return v2.Integer(name=name, tagged=False, index=True, fk=fk) -def _cellid(name: str = "cellid") -> v2.Array: - return v2.Array( - name=name, tagged=False, dtype="integer", shape=["ncelldim"], index=True, cellid=True - ) +def _cellid(name: str = "cellid") -> v2.CellID: + return v2.CellID(name=name, tagged=False) def _record( - *fields: "v2.Integer | v2.Double | v2.String | v2.Array | v2.Union", + *fields: "v2.Integer | v2.Double | v2.String | v2.CellID | v2.Array | v2.Union", ) -> v2.Record: """ID and ID2, named after both (e.g. ``ifno_iconn``) so records that are arms of the same union get distinct names.""" @@ -33,7 +31,7 @@ def _record( 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: +def _or_boundname(form: "v2.Integer | v2.CellID | 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, arms={form.name: form, "boundname": boundname}) diff --git a/modflow_devtools/dfns/schema.json b/modflow_devtools/dfns/schema.json index 5f43434c..589ce9c0 100644 --- a/modflow_devtools/dfns/schema.json +++ b/modflow_devtools/dfns/schema.json @@ -99,7 +99,8 @@ "keyword", "integer", "double", - "string" + "string", + "cellid" ], "title": "Dtype", "type": "string" @@ -147,21 +148,26 @@ "default": null, "title": "Fk" }, - "cellid": { + "model": { "anyOf": [ - { - "type": "boolean" - }, { "enum": [ "1", "2" ], "type": "string" + }, + { + "type": "null" } ], + "default": null, + "title": "Model" + }, + "allow_zero": { "default": false, - "title": "Cellid" + "title": "Allow Zero", + "type": "boolean" } }, "required": [ @@ -182,6 +188,7 @@ "discriminator": { "mapping": { "array": "#/$defs/Array", + "cellid": "#/$defs/CellID", "double": "#/$defs/Double", "file": "#/$defs/File", "integer": "#/$defs/Integer", @@ -206,6 +213,9 @@ { "$ref": "#/$defs/Double" }, + { + "$ref": "#/$defs/CellID" + }, { "$ref": "#/$defs/File" }, @@ -257,6 +267,7 @@ "discriminator": { "mapping": { "array": "#/$defs/Array", + "cellid": "#/$defs/CellID", "double": "#/$defs/Double", "file": "#/$defs/File", "integer": "#/$defs/Integer", @@ -281,6 +292,9 @@ { "$ref": "#/$defs/Double" }, + { + "$ref": "#/$defs/CellID" + }, { "$ref": "#/$defs/File" }, @@ -311,6 +325,125 @@ "title": "BlockHeader", "type": "object" }, + "CellID": { + "description": "A grid cell reference: `ncelldim` integers, its components in the grid\nit refers to (layer, row, col for DIS; layer, cell2d for DISV; node for\nDISU). Always 1-based in the file, 0-based in memory. Its width is the\ngrid's, so unlike an array it has no shape.", + "properties": { + "name": { + "title": "Name", + "type": "string" + }, + "longname": { + "anyOf": [ + { + "type": "string" + }, + { + "type": "null" + } + ], + "default": null, + "title": "Longname" + }, + "description": { + "anyOf": [ + { + "type": "string" + }, + { + "type": "null" + } + ], + "default": null, + "title": "Description" + }, + "optional": { + "default": false, + "title": "Optional", + "type": "boolean" + }, + "default": { + "anyOf": [ + {}, + { + "type": "null" + } + ], + "default": null, + "title": "Default" + }, + "developmode": { + "default": false, + "title": "Developmode", + "type": "boolean" + }, + "netcdf": { + "default": false, + "title": "Netcdf", + "type": "boolean" + }, + "tagged": { + "default": true, + "title": "Tagged", + "type": "boolean" + }, + "removed": { + "anyOf": [ + { + "type": "string" + }, + { + "type": "null" + } + ], + "default": null, + "title": "Removed" + }, + "deprecated": { + "anyOf": [ + { + "type": "string" + }, + { + "type": "null" + } + ], + "default": null, + "title": "Deprecated" + }, + "type": { + "const": "cellid", + "default": "cellid", + "title": "Type", + "type": "string" + }, + "model": { + "anyOf": [ + { + "enum": [ + "1", + "2" + ], + "type": "string" + }, + { + "type": "null" + } + ], + "default": null, + "title": "Model" + }, + "allow_zero": { + "default": false, + "title": "Allow Zero", + "type": "boolean" + } + }, + "required": [ + "name" + ], + "title": "CellID", + "type": "object" + }, "Double": { "properties": { "name": { @@ -1349,6 +1482,7 @@ "discriminator": { "mapping": { "array": "#/$defs/Array", + "cellid": "#/$defs/CellID", "double": "#/$defs/Double", "integer": "#/$defs/Integer", "record": "#/$defs/Record", @@ -1367,6 +1501,9 @@ { "$ref": "#/$defs/String" }, + { + "$ref": "#/$defs/CellID" + }, { "$ref": "#/$defs/Array" }, @@ -1562,6 +1699,7 @@ "discriminator": { "mapping": { "array": "#/$defs/Array", + "cellid": "#/$defs/CellID", "double": "#/$defs/Double", "integer": "#/$defs/Integer", "record": "#/$defs/Record", @@ -1580,6 +1718,9 @@ { "$ref": "#/$defs/String" }, + { + "$ref": "#/$defs/CellID" + }, { "$ref": "#/$defs/Array" }, @@ -1728,6 +1869,7 @@ { "discriminator": { "mapping": { + "cellid": "#/$defs/CellID", "double": "#/$defs/Double", "file": "#/$defs/File", "integer": "#/$defs/Integer", @@ -1749,6 +1891,9 @@ { "$ref": "#/$defs/Double" }, + { + "$ref": "#/$defs/CellID" + }, { "$ref": "#/$defs/File" } @@ -1940,6 +2085,7 @@ "discriminator": { "mapping": { "array": "#/$defs/Array", + "cellid": "#/$defs/CellID", "double": "#/$defs/Double", "integer": "#/$defs/Integer", "record": "#/$defs/Record", @@ -1958,6 +2104,9 @@ { "$ref": "#/$defs/String" }, + { + "$ref": "#/$defs/CellID" + }, { "$ref": "#/$defs/Array" }, @@ -2233,6 +2382,7 @@ { "discriminator": { "mapping": { + "cellid": "#/$defs/CellID", "double": "#/$defs/Double", "file": "#/$defs/File", "integer": "#/$defs/Integer", @@ -2254,6 +2404,9 @@ { "$ref": "#/$defs/Double" }, + { + "$ref": "#/$defs/CellID" + }, { "$ref": "#/$defs/File" } diff --git a/modflow_devtools/dfns/schema.py b/modflow_devtools/dfns/schema.py index 77d07a69..6b7221dc 100644 --- a/modflow_devtools/dfns/schema.py +++ b/modflow_devtools/dfns/schema.py @@ -10,7 +10,6 @@ from pydantic import ( BaseModel, SerializationInfo, - StrictBool, computed_field, field_validator, model_serializer, @@ -148,12 +147,11 @@ class String(InputFieldBase): # only the field's description defines (e.g. SFR's `ic`). Index = bool | Literal["signed"] -# `True`: a cellid in the grid of the component's own model. `"1"` / `"2"`: a -# cellid in the grid of the first / second model of the enclosing context, i.e. +# Which model's grid a cellid refers to. `None`: the component's own model. +# `"1"` / `"2"`: the first / second model of the enclosing context, i.e. # `EXGMNAMEA` / `EXGMNAMEB` under an exchange; under a single model both are -# that model. Strings, not ints, since `True == 1`; and `StrictBool`, so an int -# `1` is rejected rather than coerced to `True`. -Cellid = StrictBool | Literal["1", "2"] +# that model. +CellModel = Literal["1", "2"] | None class Integer(InputFieldBase): @@ -171,6 +169,20 @@ class Double(InputFieldBase): time_series: bool = False +class CellID(InputFieldBase): + """A grid cell reference: `ncelldim` integers, its components in the grid + it refers to (layer, row, col for DIS; layer, cell2d for DISV; node for + DISU). Always 1-based in the file, 0-based in memory. Its width is the + grid's, so unlike an array it has no shape.""" + + type: Literal["cellid"] = PydanticField(default="cellid", frozen=True) + model: CellModel = None + # Whether it may refer to no cell, by giving zero for every component + # (MF6's `allow_zero` in `nodeu_from_cellid`). Not `optional`: the + # zeros are still written. + allow_zero: bool = False + + class File(InputFieldBase): type: Literal["file"] = PydanticField(default="file", frozen=True) direction: Literal["in", "out"] @@ -186,24 +198,22 @@ class File(InputFieldBase): Scalar = Annotated[ - Keyword | String | Integer | Double | File, + Keyword | String | Integer | Double | CellID | File, PydanticField(discriminator="type"), ] class Array(InputFieldBase): type: Literal["array"] = PydanticField(default="array", frozen=True) - dtype: Literal["keyword", "integer", "double", "string"] + dtype: Literal["keyword", "integer", "double", "string", "cellid"] shape: list[str] = [] time_series: bool = False layered: bool = False index: Index = False fk: str | None = None - # A cellid, or several: a grid cell reference resolved against the grid - # the column refers to (DIS/DISV/DISU). The first (fastest-varying) axis - # is `ncelldim`, one cellid's components; any further axes count cellids. - # See `Cellid` for which grid. - cellid: Cellid = False + # For dtype="cellid" only: each element is a `CellID` with these. + model: CellModel = None + allow_zero: bool = False @model_validator(mode="after") def _check_index_dtype(self) -> "Array": @@ -212,18 +222,18 @@ def _check_index_dtype(self) -> "Array": f"Array {self.name!r}: index={self.index!r} requires dtype='integer', " f"got {self.dtype!r}" ) - if self.cellid and self.dtype != "integer": - raise ValueError( - f"Array {self.name!r}: cellid={self.cellid!r} requires dtype='integer', " - f"got {self.dtype!r}" - ) - if self.cellid and not self.index: - raise ValueError(f"Array {self.name!r}: cellid={self.cellid!r} requires index=True") - if self.cellid and self.shape[:1] != ["ncelldim"]: - raise ValueError( - f"Array {self.name!r}: cellid={self.cellid!r} requires shape to start with " - f"'ncelldim', got {self.shape!r}" - ) + if self.dtype != "cellid": + for attr in ("model", "allow_zero"): + if getattr(self, attr): + raise ValueError( + f"Array {self.name!r}: {attr} requires dtype='cellid', got {self.dtype!r}" + ) + else: + for attr in ("time_series", "layered", "netcdf"): + if getattr(self, attr): + raise ValueError( + f"Array {self.name!r}: {attr} is not valid with dtype='cellid'" + ) if self.fk is not None and self.dtype != "integer": raise ValueError( f"Array {self.name!r}: fk requires dtype='integer', got {self.dtype!r}" @@ -301,7 +311,7 @@ def _leading_tags(field: "InputField", *, every_line: bool = False) -> list[str] match field: case Keyword(): return [field.name, *field.aliases] - case String() | Integer() | Double() | Array() | File(): + case String() | Integer() | Double() | CellID() | Array() | File(): return [field.name] if field.tagged else [] case Record(): first = next(iter(field.fields.values()), None) @@ -362,7 +372,7 @@ def children(self) -> "dict[str, InputField]": InputField = Annotated[ - Keyword | String | Integer | Double | File | Array | Record | Union | List, + Keyword | String | Integer | Double | CellID | File | Array | Record | Union | List, PydanticField(discriminator="type"), ] @@ -382,7 +392,9 @@ def _collect_fields( def _render_shape(field: "Array") -> str: - return f"({', '.join(field.shape)})" if field.shape else "" + # A cellid's components vary fastest, so `ncelldim` comes first. + shape = ["ncelldim", *field.shape] if field.dtype == "cellid" else field.shape + return f"({', '.join(shape)})" if shape else "" def _render_file(field: "File") -> str: @@ -453,6 +465,8 @@ def _wrap(token: str) -> str: case String() | Integer() | Double(): token = _ts_token(field.name, time_series=field.time_series) return _wrap(_tag(field, token)) + case CellID(): + return _wrap(_tag(field, f"<{field.name}(ncelldim)>")) case File(): return _wrap(_render_file(field)) case Array(): @@ -1140,7 +1154,7 @@ def _serialize(self, handler: Any, info: SerializationInfo) -> dict[str, Any]: ObservationField = Annotated[ - Integer | Double | String | Array | Record | Union, + Integer | Double | String | CellID | Array | Record | Union, PydanticField(discriminator="type"), ] @@ -1444,8 +1458,8 @@ def _validate_fk_fields(component: "ComponentBase", spec: "Dfns") -> None: counterpart (see `Array.fk`). Two forms (see docs/md/dfnspec.md, "Primary and foreign keys"); grid-cell - references are a separate mechanism entirely (the `cellid` attribute, not an - `fk` value — see `Array.cellid`): + references are a separate mechanism entirely (the `cellid` type, not an + `fk` value — see `CellID`): - Hierarchical path fk ("[component.]block.field", no fk_ref): the named block must be a list block whose item has a pk field, or, for a String, @@ -1614,14 +1628,18 @@ def _validate_file_links(component: "ComponentBase", spec: "Dfns") -> None: ) +def _is_cellid(field: "InputField") -> bool: + """Whether `field` is a cellid, or an array of them.""" + return isinstance(field, CellID) or (isinstance(field, Array) and field.dtype == "cellid") + + def _validate_cellid_fields(component: "ComponentBase") -> None: """ - A cellid array (`cellid` set, see `Array.cellid`) is only meaningful as a - column in a list item, where each row names its cell(s), or in an - observation field, which reads like one. Its dtype and shape are checked by - `Array` itself. + A cellid (a `CellID`, or an `Array` with dtype="cellid") is only + meaningful as a column in a list item, where each row names its cell(s), + or in an observation field, which reads like one. - Which grid a cellid refers to (see `Cellid`) must be unambiguous: an + Which grid a cellid refers to (its `model`) must be unambiguous: an exchange's cellids refer to one of its two models, never its own, so each must say which (`"1"` / `"2"`); and a list item naming either model on one cellid column must name one on every cellid column (GNC's `cellidn`, @@ -1629,25 +1647,26 @@ def _validate_cellid_fields(component: "ComponentBase") -> None: """ exchange = getattr(component, "subtype", None) == "exchange" - def _cellids(field: "InputField", in_item: bool) -> list[list[Array]]: + def _cellids(field: "InputField", in_item: bool) -> "list[list[CellID | Array]]": """The cellid columns of each way a row may read `field`: one alternative per union arm, combined with the cellids beside it.""" - if isinstance(field, Array) and field.cellid: + if _is_cellid(field): + assert isinstance(field, (CellID, Array)) if not in_item: raise ValueError( - f"Array {field.name!r}: cellid={field.cellid!r} is only valid on a " + f"{type(field).__name__} {field.name!r}: a cellid is only valid as a " f"column in a list item" ) - if exchange and field.cellid is True: + if exchange and field.model is None: raise ValueError( - f"Array {field.name!r}: an exchange's cellid must say which model's " - f"grid it refers to (cellid='1' or '2'), got cellid=True" + f"{type(field).__name__} {field.name!r}: an exchange's cellid must say " + f"which model's grid it refers to (model='1' or '2')" ) return [[field]] if isinstance(field, List): _check_item(field.item) elif isinstance(field, Record): - rows: list[list[Array]] = [[]] + rows: list[list[CellID | Array]] = [[]] for subfield in field.fields.values(): rows = [row + alt for row in rows for alt in _cellids(subfield, in_item)] return rows @@ -1658,10 +1677,10 @@ def _cellids(field: "InputField", in_item: bool) -> list[list[Array]]: def _check_item(item: "InputField") -> None: for cellids in _cellids(item, True): - if len({c.cellid is True for c in cellids}) > 1: - names = {c.name: c.cellid for c in cellids} + if len({c.model is None for c in cellids}) > 1: + names = {c.name: c.model for c in cellids} raise ValueError( - f"Cellid columns {names!r} mix cellid=True with '1'/'2': if one names " + f"Cellid columns {names!r} mix model=None with '1'/'2': if one names " f"a model, every cellid column in the item must" ) @@ -1733,11 +1752,7 @@ def _check_array(arr: "Array", enclosing: "Record | None") -> None: f"have an undeclared shape (self-sizing)" ) return # self-sizing: nothing to validate - # A cellid's leading `ncelldim` is the width of a cell in the grid it - # refers to, not a dim in this component's scope (an exchange refers - # to two grids, neither its parent), so it's not resolved here. - shape = arr.shape[1:] if arr.cellid else arr.shape - for elem in shape: + for elem in arr.shape: _validate_shape_element(elem, arr, component, enclosing, known_dims, spec) for block in component.blocks.values():