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 d9463636..66c92118 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-cdb.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-cdb.json @@ -289,5 +289,47 @@ "naux" ] } + }, + "observations": { + "cdb": { + "type": "union", + "tagged": false, + "arms": { + "cellid": { + "type": "array", + "tagged": false, + "dtype": "integer", + "index": true, + "cellid": true, + "shape": [ + "ncelldim" + ] + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "to-mvr": { + "type": "union", + "tagged": false, + "arms": { + "cellid": { + "type": "array", + "tagged": false, + "dtype": "integer", + "index": true, + "cellid": true, + "shape": [ + "ncelldim" + ] + }, + "boundname": { + "type": "string", + "tagged": false + } + } + } } } \ No newline at end of file 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 560541d1..3086eb16 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-cdb.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-cdb.toml @@ -265,3 +265,39 @@ dtype = "string" shape = [ "naux", ] + +[observations.cdb] +type = "union" +tagged = false + +[observations.cdb.arms.cellid] +type = "array" +tagged = false +dtype = "integer" +index = true +cellid = true +shape = [ + "ncelldim", +] + +[observations.cdb.arms.boundname] +type = "string" +tagged = false + +[observations.to-mvr] +type = "union" +tagged = false + +[observations.to-mvr.arms.cellid] +type = "array" +tagged = false +dtype = "integer" +index = true +cellid = true +shape = [ + "ncelldim", +] + +[observations.to-mvr.arms.boundname] +type = "string" +tagged = false 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 566631bb..02d59d97 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-cdb.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-cdb.yaml @@ -265,3 +265,34 @@ memory: dtype: string shape: - naux +observations: + cdb: + type: union + tagged: false + arms: + cellid: + type: array + tagged: false + dtype: integer + index: true + cellid: true + shape: + - ncelldim + boundname: + type: string + tagged: false + to-mvr: + type: union + tagged: false + arms: + cellid: + type: array + 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 cce45ccf..232e5833 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-chd.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-chd.json @@ -297,5 +297,27 @@ "nbound" ] } + }, + "observations": { + "chd": { + "type": "union", + "tagged": false, + "arms": { + "cellid": { + "type": "array", + "tagged": false, + "dtype": "integer", + "index": true, + "cellid": true, + "shape": [ + "ncelldim" + ] + }, + "boundname": { + "type": "string", + "tagged": false + } + } + } } } \ No newline at end of file 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 0c55331f..20106d4a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-chd.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-chd.toml @@ -271,3 +271,21 @@ shape = [ "naux", "nbound", ] + +[observations.chd] +type = "union" +tagged = false + +[observations.chd.arms.cellid] +type = "array" +tagged = false +dtype = "integer" +index = true +cellid = true +shape = [ + "ncelldim", +] + +[observations.chd.arms.boundname] +type = "string" +tagged = false 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 d01dc122..7fb6e247 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-chd.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-chd.yaml @@ -268,3 +268,19 @@ memory: shape: - naux - nbound +observations: + chd: + type: union + tagged: false + arms: + cellid: + type: array + 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-dfw.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-dfw.json index eda9b60d..133dd4f1 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-dfw.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-dfw.json @@ -168,5 +168,12 @@ "nodes" ] } + }, + "observations": { + "ext-outflow": { + "type": "integer", + "tagged": false, + "index": true + } } } \ No newline at end of file diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-dfw.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-dfw.toml index 913c558a..1e28ffd2 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-dfw.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-dfw.toml @@ -152,3 +152,8 @@ dtype = "integer" shape = [ "nodes", ] + +[observations.ext-outflow] +type = "integer" +tagged = false +index = true diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-dfw.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-dfw.yaml index 90f9d757..741c85d5 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-dfw.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-dfw.yaml @@ -157,3 +157,8 @@ memory: dtype: integer shape: - nodes +observations: + ext-outflow: + type: integer + tagged: false + index: true 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 dbfce3c7..f2aa0fa9 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-evp.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-evp.json @@ -307,5 +307,27 @@ "naux" ] } + }, + "observations": { + "evp": { + "type": "union", + "tagged": false, + "arms": { + "cellid": { + "type": "array", + "tagged": false, + "dtype": "integer", + "index": true, + "cellid": true, + "shape": [ + "ncelldim" + ] + }, + "boundname": { + "type": "string", + "tagged": false + } + } + } } } \ No newline at end of file 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 c4db8416..a79ff873 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-evp.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-evp.toml @@ -281,3 +281,21 @@ dtype = "string" shape = [ "naux", ] + +[observations.evp] +type = "union" +tagged = false + +[observations.evp.arms.cellid] +type = "array" +tagged = false +dtype = "integer" +index = true +cellid = true +shape = [ + "ncelldim", +] + +[observations.evp.arms.boundname] +type = "string" +tagged = false 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 7693aa32..cfec83f2 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-evp.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-evp.yaml @@ -278,3 +278,19 @@ memory: dtype: string shape: - naux +observations: + evp: + type: union + tagged: false + arms: + cellid: + type: array + 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 b726ce41..d5d658f4 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-flw.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-flw.json @@ -299,5 +299,47 @@ "nbound" ] } + }, + "observations": { + "flw": { + "type": "union", + "tagged": false, + "arms": { + "cellid": { + "type": "array", + "tagged": false, + "dtype": "integer", + "index": true, + "cellid": true, + "shape": [ + "ncelldim" + ] + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "to-mvr": { + "type": "union", + "tagged": false, + "arms": { + "cellid": { + "type": "array", + "tagged": false, + "dtype": "integer", + "index": true, + "cellid": true, + "shape": [ + "ncelldim" + ] + }, + "boundname": { + "type": "string", + "tagged": false + } + } + } } } \ No newline at end of file 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 e058ac60..ae492a41 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-flw.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-flw.toml @@ -273,3 +273,39 @@ shape = [ "naux", "nbound", ] + +[observations.flw] +type = "union" +tagged = false + +[observations.flw.arms.cellid] +type = "array" +tagged = false +dtype = "integer" +index = true +cellid = true +shape = [ + "ncelldim", +] + +[observations.flw.arms.boundname] +type = "string" +tagged = false + +[observations.to-mvr] +type = "union" +tagged = false + +[observations.to-mvr.arms.cellid] +type = "array" +tagged = false +dtype = "integer" +index = true +cellid = true +shape = [ + "ncelldim", +] + +[observations.to-mvr.arms.boundname] +type = "string" +tagged = false 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 40bef500..c35449f4 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-flw.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-flw.yaml @@ -270,3 +270,34 @@ memory: shape: - naux - nbound +observations: + flw: + type: union + tagged: false + arms: + cellid: + type: array + tagged: false + dtype: integer + index: true + cellid: true + shape: + - ncelldim + boundname: + type: string + tagged: false + to-mvr: + type: union + tagged: false + arms: + cellid: + type: array + 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 c97cb30b..520e4fc1 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-nam.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-nam.json @@ -166,5 +166,43 @@ "nja" ] } + }, + "observations": { + "stage": { + "type": "array", + "tagged": false, + "dtype": "integer", + "index": true, + "cellid": true, + "shape": [ + "ncelldim" + ] + }, + "flow-ja-face": { + "type": "record", + "tagged": false, + "fields": { + "cellid": { + "type": "array", + "tagged": false, + "dtype": "integer", + "index": true, + "cellid": true, + "shape": [ + "ncelldim" + ] + }, + "cellid2": { + "type": "array", + "tagged": false, + "dtype": "integer", + "index": true, + "cellid": true, + "shape": [ + "ncelldim" + ] + } + } + } } } \ No newline at end of file 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 43db7e90..9093ff1d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-nam.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-nam.toml @@ -148,3 +148,37 @@ dtype = "integer" shape = [ "nja", ] + +[observations.stage] +type = "array" +tagged = false +dtype = "integer" +index = true +cellid = true +shape = [ + "ncelldim", +] + +[observations.flow-ja-face] +type = "record" +tagged = false + +[observations.flow-ja-face.fields.cellid] +type = "array" +tagged = false +dtype = "integer" +index = true +cellid = true +shape = [ + "ncelldim", +] + +[observations.flow-ja-face.fields.cellid2] +type = "array" +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 7138080e..df4a87b0 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-nam.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-nam.yaml @@ -160,3 +160,32 @@ memory: dtype: integer shape: - nja +observations: + stage: + type: array + tagged: false + dtype: integer + index: true + cellid: true + shape: + - ncelldim + flow-ja-face: + type: record + tagged: false + fields: + cellid: + type: array + tagged: false + dtype: integer + index: true + cellid: true + shape: + - ncelldim + cellid2: + type: array + 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 3f561a46..cc24e5fc 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-pcp.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-pcp.json @@ -307,5 +307,27 @@ "naux" ] } + }, + "observations": { + "pcp": { + "type": "union", + "tagged": false, + "arms": { + "cellid": { + "type": "array", + "tagged": false, + "dtype": "integer", + "index": true, + "cellid": true, + "shape": [ + "ncelldim" + ] + }, + "boundname": { + "type": "string", + "tagged": false + } + } + } } } \ No newline at end of file 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 f940eb04..6ebca60f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-pcp.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-pcp.toml @@ -281,3 +281,21 @@ dtype = "string" shape = [ "naux", ] + +[observations.pcp] +type = "union" +tagged = false + +[observations.pcp.arms.cellid] +type = "array" +tagged = false +dtype = "integer" +index = true +cellid = true +shape = [ + "ncelldim", +] + +[observations.pcp.arms.boundname] +type = "string" +tagged = false 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 c249ff5c..9cb5c5af 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-pcp.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-pcp.yaml @@ -278,3 +278,19 @@ memory: dtype: string shape: - naux +observations: + pcp: + type: union + tagged: false + arms: + cellid: + type: array + 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 763473c4..efce3597 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-zdg.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-zdg.json @@ -325,5 +325,47 @@ "naux" ] } + }, + "observations": { + "zdg": { + "type": "union", + "tagged": false, + "arms": { + "cellid": { + "type": "array", + "tagged": false, + "dtype": "integer", + "index": true, + "cellid": true, + "shape": [ + "ncelldim" + ] + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "to-mvr": { + "type": "union", + "tagged": false, + "arms": { + "cellid": { + "type": "array", + "tagged": false, + "dtype": "integer", + "index": true, + "cellid": true, + "shape": [ + "ncelldim" + ] + }, + "boundname": { + "type": "string", + "tagged": false + } + } + } } } \ No newline at end of file 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 593b6bb9..50be67ab 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-zdg.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-zdg.toml @@ -299,3 +299,39 @@ dtype = "string" shape = [ "naux", ] + +[observations.zdg] +type = "union" +tagged = false + +[observations.zdg.arms.cellid] +type = "array" +tagged = false +dtype = "integer" +index = true +cellid = true +shape = [ + "ncelldim", +] + +[observations.zdg.arms.boundname] +type = "string" +tagged = false + +[observations.to-mvr] +type = "union" +tagged = false + +[observations.to-mvr.arms.cellid] +type = "array" +tagged = false +dtype = "integer" +index = true +cellid = true +shape = [ + "ncelldim", +] + +[observations.to-mvr.arms.boundname] +type = "string" +tagged = false 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 f32d23d3..fe966815 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-zdg.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-zdg.yaml @@ -305,3 +305,34 @@ memory: dtype: string shape: - naux +observations: + zdg: + type: union + tagged: false + arms: + cellid: + type: array + tagged: false + dtype: integer + index: true + cellid: true + shape: + - ncelldim + boundname: + type: string + tagged: false + to-mvr: + type: union + tagged: false + arms: + cellid: + type: array + 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-gwegwe.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwegwe.json index ef48370b..2bc969fb 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwegwe.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwegwe.json @@ -335,5 +335,22 @@ "naux" ] } + }, + "observations": { + "flow-ja-face": { + "type": "union", + "tagged": false, + "arms": { + "iexg": { + "type": "integer", + "tagged": false, + "index": true + }, + "boundname": { + "type": "string", + "tagged": false + } + } + } } } \ No newline at end of file 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 cd0fc48b..fe6e6498 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwegwe.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwegwe.toml @@ -311,3 +311,16 @@ dtype = "string" shape = [ "naux", ] + +[observations.flow-ja-face] +type = "union" +tagged = false + +[observations.flow-ja-face.arms.iexg] +type = "integer" +tagged = false +index = true + +[observations.flow-ja-face.arms.boundname] +type = "string" +tagged = false 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 57cbcb72..89ceecc5 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwegwe.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwegwe.yaml @@ -312,3 +312,15 @@ memory: dtype: string shape: - naux +observations: + flow-ja-face: + type: union + tagged: false + arms: + iexg: + type: integer + tagged: false + index: true + boundname: + type: string + tagged: false 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 4d920e2f..6d95f77c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwfgwf.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwfgwf.json @@ -363,5 +363,22 @@ "naux" ] } + }, + "observations": { + "flow-ja-face": { + "type": "union", + "tagged": false, + "arms": { + "iexg": { + "type": "integer", + "tagged": false, + "index": true + }, + "boundname": { + "type": "string", + "tagged": false + } + } + } } } \ No newline at end of file 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 9e862441..f282d378 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwfgwf.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwfgwf.toml @@ -335,3 +335,16 @@ dtype = "string" shape = [ "naux", ] + +[observations.flow-ja-face] +type = "union" +tagged = false + +[observations.flow-ja-face.arms.iexg] +type = "integer" +tagged = false +index = true + +[observations.flow-ja-face.arms.boundname] +type = "string" +tagged = false 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 3d1716a7..9b757442 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwfgwf.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwfgwf.yaml @@ -358,3 +358,15 @@ memory: dtype: string shape: - naux +observations: + flow-ja-face: + type: union + tagged: false + arms: + iexg: + type: integer + tagged: false + index: true + boundname: + type: string + tagged: false 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 f3e52343..2019d0e9 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwtgwt.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwtgwt.json @@ -335,5 +335,22 @@ "naux" ] } + }, + "observations": { + "flow-ja-face": { + "type": "union", + "tagged": false, + "arms": { + "iexg": { + "type": "integer", + "tagged": false, + "index": true + }, + "boundname": { + "type": "string", + "tagged": false + } + } + } } } \ No newline at end of file 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 5e68a92e..7daa1957 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwtgwt.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwtgwt.toml @@ -311,3 +311,16 @@ dtype = "string" shape = [ "naux", ] + +[observations.flow-ja-face] +type = "union" +tagged = false + +[observations.flow-ja-face.arms.iexg] +type = "integer" +tagged = false +index = true + +[observations.flow-ja-face.arms.boundname] +type = "string" +tagged = false 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 8774294f..64dd63ee 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwtgwt.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwtgwt.yaml @@ -310,3 +310,15 @@ memory: dtype: string shape: - naux +observations: + flow-ja-face: + type: union + tagged: false + arms: + iexg: + type: integer + tagged: false + index: true + boundname: + type: string + tagged: false 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 93389f7e..2b31497e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ctp.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ctp.json @@ -312,5 +312,27 @@ "naux" ] } + }, + "observations": { + "ctp": { + "type": "union", + "tagged": false, + "arms": { + "cellid": { + "type": "array", + "tagged": false, + "dtype": "integer", + "index": true, + "cellid": true, + "shape": [ + "ncelldim" + ] + }, + "boundname": { + "type": "string", + "tagged": false + } + } + } } } \ No newline at end of file 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 b34c3bae..b4cc807e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ctp.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ctp.toml @@ -286,3 +286,21 @@ dtype = "string" shape = [ "naux", ] + +[observations.ctp] +type = "union" +tagged = false + +[observations.ctp.arms.cellid] +type = "array" +tagged = false +dtype = "integer" +index = true +cellid = true +shape = [ + "ncelldim", +] + +[observations.ctp.arms.boundname] +type = "string" +tagged = false 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 d89c9f09..048558b1 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ctp.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ctp.yaml @@ -280,3 +280,19 @@ memory: dtype: string shape: - naux +observations: + ctp: + type: union + tagged: false + arms: + cellid: + type: array + 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 35ab8587..125e84e0 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-esl.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-esl.json @@ -309,5 +309,47 @@ "naux" ] } + }, + "observations": { + "esl": { + "type": "union", + "tagged": false, + "arms": { + "cellid": { + "type": "array", + "tagged": false, + "dtype": "integer", + "index": true, + "cellid": true, + "shape": [ + "ncelldim" + ] + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "to-mvr": { + "type": "union", + "tagged": false, + "arms": { + "cellid": { + "type": "array", + "tagged": false, + "dtype": "integer", + "index": true, + "cellid": true, + "shape": [ + "ncelldim" + ] + }, + "boundname": { + "type": "string", + "tagged": false + } + } + } } } \ No newline at end of file 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 822c6cb0..6f91f2be 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-esl.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-esl.toml @@ -283,3 +283,39 @@ dtype = "string" shape = [ "naux", ] + +[observations.esl] +type = "union" +tagged = false + +[observations.esl.arms.cellid] +type = "array" +tagged = false +dtype = "integer" +index = true +cellid = true +shape = [ + "ncelldim", +] + +[observations.esl.arms.boundname] +type = "string" +tagged = false + +[observations.to-mvr] +type = "union" +tagged = false + +[observations.to-mvr.arms.cellid] +type = "array" +tagged = false +dtype = "integer" +index = true +cellid = true +shape = [ + "ncelldim", +] + +[observations.to-mvr.arms.boundname] +type = "string" +tagged = false 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 d9a0b92c..5bc7a18d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-esl.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-esl.yaml @@ -279,3 +279,34 @@ memory: dtype: string shape: - naux +observations: + esl: + type: union + tagged: false + arms: + cellid: + type: array + tagged: false + dtype: integer + index: true + cellid: true + shape: + - ncelldim + boundname: + type: string + tagged: false + to-mvr: + type: union + tagged: false + arms: + cellid: + type: array + 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-lke.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-lke.json index d104907e..2ceff9e9 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-lke.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-lke.json @@ -435,5 +435,226 @@ "ncv" ] } + }, + "observations": { + "temperature": { + "type": "union", + "tagged": false, + "arms": { + "lakeno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.lakeno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "storage": { + "type": "union", + "tagged": false, + "arms": { + "lakeno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.lakeno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "constant": { + "type": "union", + "tagged": false, + "arms": { + "lakeno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.lakeno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "from-mvr": { + "type": "union", + "tagged": false, + "arms": { + "lakeno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.lakeno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "lke": { + "type": "union", + "tagged": false, + "arms": { + "lakeno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.lakeno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "rainfall": { + "type": "union", + "tagged": false, + "arms": { + "lakeno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.lakeno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "evaporation": { + "type": "union", + "tagged": false, + "arms": { + "lakeno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.lakeno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "runoff": { + "type": "union", + "tagged": false, + "arms": { + "lakeno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.lakeno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "ext-inflow": { + "type": "union", + "tagged": false, + "arms": { + "lakeno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.lakeno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "withdrawal": { + "type": "union", + "tagged": false, + "arms": { + "lakeno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.lakeno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "ext-outflow": { + "type": "union", + "tagged": false, + "arms": { + "lakeno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.lakeno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "flow-ja-face": { + "type": "union", + "tagged": false, + "arms": { + "lakeno": { + "type": "record", + "tagged": false, + "fields": { + "lakeno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.lakeno" + }, + "lakeno2": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.lakeno" + } + } + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "to-mvr": { + "type": "union", + "tagged": false, + "arms": { + "outletno": { + "type": "integer", + "tagged": false, + "index": true + }, + "boundname": { + "type": "string", + "tagged": false + } + } + } } } \ No newline at end of file diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-lke.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-lke.toml index b7cfcd55..ec244cf2 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-lke.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-lke.toml @@ -397,3 +397,194 @@ dtype = "double" shape = [ "ncv", ] + +[observations.temperature] +type = "union" +tagged = false + +[observations.temperature.arms.lakeno] +type = "integer" +tagged = false +index = true +fk = "packagedata.lakeno" + +[observations.temperature.arms.boundname] +type = "string" +tagged = false + +[observations.storage] +type = "union" +tagged = false + +[observations.storage.arms.lakeno] +type = "integer" +tagged = false +index = true +fk = "packagedata.lakeno" + +[observations.storage.arms.boundname] +type = "string" +tagged = false + +[observations.constant] +type = "union" +tagged = false + +[observations.constant.arms.lakeno] +type = "integer" +tagged = false +index = true +fk = "packagedata.lakeno" + +[observations.constant.arms.boundname] +type = "string" +tagged = false + +[observations.from-mvr] +type = "union" +tagged = false + +[observations.from-mvr.arms.lakeno] +type = "integer" +tagged = false +index = true +fk = "packagedata.lakeno" + +[observations.from-mvr.arms.boundname] +type = "string" +tagged = false + +[observations.lke] +type = "union" +tagged = false + +[observations.lke.arms.lakeno] +type = "integer" +tagged = false +index = true +fk = "packagedata.lakeno" + +[observations.lke.arms.boundname] +type = "string" +tagged = false + +[observations.rainfall] +type = "union" +tagged = false + +[observations.rainfall.arms.lakeno] +type = "integer" +tagged = false +index = true +fk = "packagedata.lakeno" + +[observations.rainfall.arms.boundname] +type = "string" +tagged = false + +[observations.evaporation] +type = "union" +tagged = false + +[observations.evaporation.arms.lakeno] +type = "integer" +tagged = false +index = true +fk = "packagedata.lakeno" + +[observations.evaporation.arms.boundname] +type = "string" +tagged = false + +[observations.runoff] +type = "union" +tagged = false + +[observations.runoff.arms.lakeno] +type = "integer" +tagged = false +index = true +fk = "packagedata.lakeno" + +[observations.runoff.arms.boundname] +type = "string" +tagged = false + +[observations.ext-inflow] +type = "union" +tagged = false + +[observations.ext-inflow.arms.lakeno] +type = "integer" +tagged = false +index = true +fk = "packagedata.lakeno" + +[observations.ext-inflow.arms.boundname] +type = "string" +tagged = false + +[observations.withdrawal] +type = "union" +tagged = false + +[observations.withdrawal.arms.lakeno] +type = "integer" +tagged = false +index = true +fk = "packagedata.lakeno" + +[observations.withdrawal.arms.boundname] +type = "string" +tagged = false + +[observations.ext-outflow] +type = "union" +tagged = false + +[observations.ext-outflow.arms.lakeno] +type = "integer" +tagged = false +index = true +fk = "packagedata.lakeno" + +[observations.ext-outflow.arms.boundname] +type = "string" +tagged = false + +[observations.flow-ja-face] +type = "union" +tagged = false + +[observations.flow-ja-face.arms.lakeno] +type = "record" +tagged = false + +[observations.flow-ja-face.arms.lakeno.fields.lakeno] +type = "integer" +tagged = false +index = true +fk = "packagedata.lakeno" + +[observations.flow-ja-face.arms.lakeno.fields.lakeno2] +type = "integer" +tagged = false +index = true +fk = "packagedata.lakeno" + +[observations.flow-ja-face.arms.boundname] +type = "string" +tagged = false + +[observations.to-mvr] +type = "union" +tagged = false + +[observations.to-mvr.arms.outletno] +type = "integer" +tagged = false +index = true + +[observations.to-mvr.arms.boundname] +type = "string" +tagged = false diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-lke.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-lke.yaml index 6c6f303f..c1dfec06 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-lke.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-lke.yaml @@ -422,3 +422,168 @@ memory: dtype: double shape: - ncv +observations: + temperature: + type: union + tagged: false + arms: + lakeno: + type: integer + tagged: false + index: true + fk: packagedata.lakeno + boundname: + type: string + tagged: false + storage: + type: union + tagged: false + arms: + lakeno: + type: integer + tagged: false + index: true + fk: packagedata.lakeno + boundname: + type: string + tagged: false + constant: + type: union + tagged: false + arms: + lakeno: + type: integer + tagged: false + index: true + fk: packagedata.lakeno + boundname: + type: string + tagged: false + from-mvr: + type: union + tagged: false + arms: + lakeno: + type: integer + tagged: false + index: true + fk: packagedata.lakeno + boundname: + type: string + tagged: false + lke: + type: union + tagged: false + arms: + lakeno: + type: integer + tagged: false + index: true + fk: packagedata.lakeno + boundname: + type: string + tagged: false + rainfall: + type: union + tagged: false + arms: + lakeno: + type: integer + tagged: false + index: true + fk: packagedata.lakeno + boundname: + type: string + tagged: false + evaporation: + type: union + tagged: false + arms: + lakeno: + type: integer + tagged: false + index: true + fk: packagedata.lakeno + boundname: + type: string + tagged: false + runoff: + type: union + tagged: false + arms: + lakeno: + type: integer + tagged: false + index: true + fk: packagedata.lakeno + boundname: + type: string + tagged: false + ext-inflow: + type: union + tagged: false + arms: + lakeno: + type: integer + tagged: false + index: true + fk: packagedata.lakeno + boundname: + type: string + tagged: false + withdrawal: + type: union + tagged: false + arms: + lakeno: + type: integer + tagged: false + index: true + fk: packagedata.lakeno + boundname: + type: string + tagged: false + ext-outflow: + type: union + tagged: false + arms: + lakeno: + type: integer + tagged: false + index: true + fk: packagedata.lakeno + boundname: + type: string + tagged: false + flow-ja-face: + type: union + tagged: false + arms: + lakeno: + type: record + tagged: false + fields: + lakeno: + type: integer + tagged: false + index: true + fk: packagedata.lakeno + lakeno2: + type: integer + tagged: false + index: true + fk: packagedata.lakeno + boundname: + type: string + tagged: false + to-mvr: + type: union + tagged: false + arms: + outletno: + type: integer + tagged: false + index: true + boundname: + type: string + tagged: false diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-mwe.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-mwe.json index e205d93e..b93610b7 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-mwe.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-mwe.json @@ -390,5 +390,162 @@ "ncv" ] } + }, + "observations": { + "temperature": { + "type": "union", + "tagged": false, + "arms": { + "mawno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.mawno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "storage": { + "type": "union", + "tagged": false, + "arms": { + "mawno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.mawno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "constant": { + "type": "union", + "tagged": false, + "arms": { + "mawno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.mawno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "from-mvr": { + "type": "union", + "tagged": false, + "arms": { + "mawno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.mawno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "rate": { + "type": "union", + "tagged": false, + "arms": { + "mawno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.mawno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "fw-rate": { + "type": "union", + "tagged": false, + "arms": { + "mawno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.mawno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "rate-to-mvr": { + "type": "union", + "tagged": false, + "arms": { + "mawno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.mawno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "fw-rate-to-mvr": { + "type": "union", + "tagged": false, + "arms": { + "mawno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.mawno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "mwe": { + "type": "union", + "tagged": false, + "arms": { + "mawno": { + "type": "record", + "tagged": false, + "fields": { + "mawno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.mawno" + }, + "iconn": { + "type": "integer", + "tagged": false, + "index": true + } + } + }, + "boundname": { + "type": "string", + "tagged": false + } + } + } } } \ No newline at end of file diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-mwe.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-mwe.toml index a9502f4c..fcf1f3f0 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-mwe.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-mwe.toml @@ -352,3 +352,138 @@ dtype = "double" shape = [ "ncv", ] + +[observations.temperature] +type = "union" +tagged = false + +[observations.temperature.arms.mawno] +type = "integer" +tagged = false +index = true +fk = "packagedata.mawno" + +[observations.temperature.arms.boundname] +type = "string" +tagged = false + +[observations.storage] +type = "union" +tagged = false + +[observations.storage.arms.mawno] +type = "integer" +tagged = false +index = true +fk = "packagedata.mawno" + +[observations.storage.arms.boundname] +type = "string" +tagged = false + +[observations.constant] +type = "union" +tagged = false + +[observations.constant.arms.mawno] +type = "integer" +tagged = false +index = true +fk = "packagedata.mawno" + +[observations.constant.arms.boundname] +type = "string" +tagged = false + +[observations.from-mvr] +type = "union" +tagged = false + +[observations.from-mvr.arms.mawno] +type = "integer" +tagged = false +index = true +fk = "packagedata.mawno" + +[observations.from-mvr.arms.boundname] +type = "string" +tagged = false + +[observations.rate] +type = "union" +tagged = false + +[observations.rate.arms.mawno] +type = "integer" +tagged = false +index = true +fk = "packagedata.mawno" + +[observations.rate.arms.boundname] +type = "string" +tagged = false + +[observations.fw-rate] +type = "union" +tagged = false + +[observations.fw-rate.arms.mawno] +type = "integer" +tagged = false +index = true +fk = "packagedata.mawno" + +[observations.fw-rate.arms.boundname] +type = "string" +tagged = false + +[observations.rate-to-mvr] +type = "union" +tagged = false + +[observations.rate-to-mvr.arms.mawno] +type = "integer" +tagged = false +index = true +fk = "packagedata.mawno" + +[observations.rate-to-mvr.arms.boundname] +type = "string" +tagged = false + +[observations.fw-rate-to-mvr] +type = "union" +tagged = false + +[observations.fw-rate-to-mvr.arms.mawno] +type = "integer" +tagged = false +index = true +fk = "packagedata.mawno" + +[observations.fw-rate-to-mvr.arms.boundname] +type = "string" +tagged = false + +[observations.mwe] +type = "union" +tagged = false + +[observations.mwe.arms.mawno] +type = "record" +tagged = false + +[observations.mwe.arms.mawno.fields.mawno] +type = "integer" +tagged = false +index = true +fk = "packagedata.mawno" + +[observations.mwe.arms.mawno.fields.iconn] +type = "integer" +tagged = false +index = true + +[observations.mwe.arms.boundname] +type = "string" +tagged = false diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-mwe.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-mwe.yaml index 2154e425..9b4c5ce3 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-mwe.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-mwe.yaml @@ -375,3 +375,120 @@ memory: dtype: double shape: - ncv +observations: + temperature: + type: union + tagged: false + arms: + mawno: + type: integer + tagged: false + index: true + fk: packagedata.mawno + boundname: + type: string + tagged: false + storage: + type: union + tagged: false + arms: + mawno: + type: integer + tagged: false + index: true + fk: packagedata.mawno + boundname: + type: string + tagged: false + constant: + type: union + tagged: false + arms: + mawno: + type: integer + tagged: false + index: true + fk: packagedata.mawno + boundname: + type: string + tagged: false + from-mvr: + type: union + tagged: false + arms: + mawno: + type: integer + tagged: false + index: true + fk: packagedata.mawno + boundname: + type: string + tagged: false + rate: + type: union + tagged: false + arms: + mawno: + type: integer + tagged: false + index: true + fk: packagedata.mawno + boundname: + type: string + tagged: false + fw-rate: + type: union + tagged: false + arms: + mawno: + type: integer + tagged: false + index: true + fk: packagedata.mawno + boundname: + type: string + tagged: false + rate-to-mvr: + type: union + tagged: false + arms: + mawno: + type: integer + tagged: false + index: true + fk: packagedata.mawno + boundname: + type: string + tagged: false + fw-rate-to-mvr: + type: union + tagged: false + arms: + mawno: + type: integer + tagged: false + index: true + fk: packagedata.mawno + boundname: + type: string + tagged: false + mwe: + type: union + tagged: false + arms: + mawno: + type: record + tagged: false + fields: + mawno: + type: integer + tagged: false + index: true + fk: packagedata.mawno + iconn: + type: integer + tagged: false + index: true + 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 2224ea12..26347315 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-nam.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-nam.json @@ -225,5 +225,43 @@ "nja" ] } + }, + "observations": { + "temperature": { + "type": "array", + "tagged": false, + "dtype": "integer", + "index": true, + "cellid": true, + "shape": [ + "ncelldim" + ] + }, + "flow-ja-face": { + "type": "record", + "tagged": false, + "fields": { + "cellid": { + "type": "array", + "tagged": false, + "dtype": "integer", + "index": true, + "cellid": true, + "shape": [ + "ncelldim" + ] + }, + "cellid2": { + "type": "array", + "tagged": false, + "dtype": "integer", + "index": true, + "cellid": true, + "shape": [ + "ncelldim" + ] + } + } + } } } \ No newline at end of file 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 fa7543f3..858101ae 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-nam.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-nam.toml @@ -203,3 +203,37 @@ dtype = "integer" shape = [ "nja", ] + +[observations.temperature] +type = "array" +tagged = false +dtype = "integer" +index = true +cellid = true +shape = [ + "ncelldim", +] + +[observations.flow-ja-face] +type = "record" +tagged = false + +[observations.flow-ja-face.fields.cellid] +type = "array" +tagged = false +dtype = "integer" +index = true +cellid = true +shape = [ + "ncelldim", +] + +[observations.flow-ja-face.fields.cellid2] +type = "array" +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 36534a95..b7312ba6 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-nam.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-nam.yaml @@ -203,3 +203,32 @@ memory: dtype: integer shape: - nja +observations: + temperature: + type: array + tagged: false + dtype: integer + index: true + cellid: true + shape: + - ncelldim + flow-ja-face: + type: record + tagged: false + fields: + cellid: + type: array + tagged: false + dtype: integer + index: true + cellid: true + shape: + - ncelldim + cellid2: + type: array + tagged: false + dtype: integer + index: true + cellid: true + shape: + - ncelldim diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-sfe.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-sfe.json index a0df9c2f..bab54a85 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-sfe.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-sfe.json @@ -455,5 +455,227 @@ "ncv" ] } + }, + "observations": { + "temperature": { + "type": "union", + "tagged": false, + "arms": { + "rno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.rno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "storage": { + "type": "union", + "tagged": false, + "arms": { + "rno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.rno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "constant": { + "type": "union", + "tagged": false, + "arms": { + "rno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.rno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "from-mvr": { + "type": "union", + "tagged": false, + "arms": { + "rno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.rno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "sfe": { + "type": "union", + "tagged": false, + "arms": { + "rno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.rno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "strmbd-cond": { + "type": "union", + "tagged": false, + "arms": { + "rno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.rno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "to-mvr": { + "type": "union", + "tagged": false, + "arms": { + "rno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.rno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "rainfall": { + "type": "union", + "tagged": false, + "arms": { + "rno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.rno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "evaporation": { + "type": "union", + "tagged": false, + "arms": { + "rno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.rno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "runoff": { + "type": "union", + "tagged": false, + "arms": { + "rno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.rno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "ext-inflow": { + "type": "union", + "tagged": false, + "arms": { + "rno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.rno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "ext-outflow": { + "type": "union", + "tagged": false, + "arms": { + "rno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.rno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "flow-ja-face": { + "type": "union", + "tagged": false, + "arms": { + "rno": { + "type": "record", + "tagged": false, + "fields": { + "rno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.rno" + }, + "rno2": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.rno" + } + } + }, + "boundname": { + "type": "string", + "tagged": false + } + } + } } } \ No newline at end of file diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-sfe.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-sfe.toml index 497d0364..b2a75ac2 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-sfe.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-sfe.toml @@ -417,3 +417,195 @@ dtype = "double" shape = [ "ncv", ] + +[observations.temperature] +type = "union" +tagged = false + +[observations.temperature.arms.rno] +type = "integer" +tagged = false +index = true +fk = "packagedata.rno" + +[observations.temperature.arms.boundname] +type = "string" +tagged = false + +[observations.storage] +type = "union" +tagged = false + +[observations.storage.arms.rno] +type = "integer" +tagged = false +index = true +fk = "packagedata.rno" + +[observations.storage.arms.boundname] +type = "string" +tagged = false + +[observations.constant] +type = "union" +tagged = false + +[observations.constant.arms.rno] +type = "integer" +tagged = false +index = true +fk = "packagedata.rno" + +[observations.constant.arms.boundname] +type = "string" +tagged = false + +[observations.from-mvr] +type = "union" +tagged = false + +[observations.from-mvr.arms.rno] +type = "integer" +tagged = false +index = true +fk = "packagedata.rno" + +[observations.from-mvr.arms.boundname] +type = "string" +tagged = false + +[observations.sfe] +type = "union" +tagged = false + +[observations.sfe.arms.rno] +type = "integer" +tagged = false +index = true +fk = "packagedata.rno" + +[observations.sfe.arms.boundname] +type = "string" +tagged = false + +[observations.strmbd-cond] +type = "union" +tagged = false + +[observations.strmbd-cond.arms.rno] +type = "integer" +tagged = false +index = true +fk = "packagedata.rno" + +[observations.strmbd-cond.arms.boundname] +type = "string" +tagged = false + +[observations.to-mvr] +type = "union" +tagged = false + +[observations.to-mvr.arms.rno] +type = "integer" +tagged = false +index = true +fk = "packagedata.rno" + +[observations.to-mvr.arms.boundname] +type = "string" +tagged = false + +[observations.rainfall] +type = "union" +tagged = false + +[observations.rainfall.arms.rno] +type = "integer" +tagged = false +index = true +fk = "packagedata.rno" + +[observations.rainfall.arms.boundname] +type = "string" +tagged = false + +[observations.evaporation] +type = "union" +tagged = false + +[observations.evaporation.arms.rno] +type = "integer" +tagged = false +index = true +fk = "packagedata.rno" + +[observations.evaporation.arms.boundname] +type = "string" +tagged = false + +[observations.runoff] +type = "union" +tagged = false + +[observations.runoff.arms.rno] +type = "integer" +tagged = false +index = true +fk = "packagedata.rno" + +[observations.runoff.arms.boundname] +type = "string" +tagged = false + +[observations.ext-inflow] +type = "union" +tagged = false + +[observations.ext-inflow.arms.rno] +type = "integer" +tagged = false +index = true +fk = "packagedata.rno" + +[observations.ext-inflow.arms.boundname] +type = "string" +tagged = false + +[observations.ext-outflow] +type = "union" +tagged = false + +[observations.ext-outflow.arms.rno] +type = "integer" +tagged = false +index = true +fk = "packagedata.rno" + +[observations.ext-outflow.arms.boundname] +type = "string" +tagged = false + +[observations.flow-ja-face] +type = "union" +tagged = false + +[observations.flow-ja-face.arms.rno] +type = "record" +tagged = false + +[observations.flow-ja-face.arms.rno.fields.rno] +type = "integer" +tagged = false +index = true +fk = "packagedata.rno" + +[observations.flow-ja-face.arms.rno.fields.rno2] +type = "integer" +tagged = false +index = true +fk = "packagedata.rno" + +[observations.flow-ja-face.arms.boundname] +type = "string" +tagged = false diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-sfe.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-sfe.yaml index 1acb015e..b7151809 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-sfe.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-sfe.yaml @@ -438,3 +438,169 @@ memory: dtype: double shape: - ncv +observations: + temperature: + type: union + tagged: false + arms: + rno: + type: integer + tagged: false + index: true + fk: packagedata.rno + boundname: + type: string + tagged: false + storage: + type: union + tagged: false + arms: + rno: + type: integer + tagged: false + index: true + fk: packagedata.rno + boundname: + type: string + tagged: false + constant: + type: union + tagged: false + arms: + rno: + type: integer + tagged: false + index: true + fk: packagedata.rno + boundname: + type: string + tagged: false + from-mvr: + type: union + tagged: false + arms: + rno: + type: integer + tagged: false + index: true + fk: packagedata.rno + boundname: + type: string + tagged: false + sfe: + type: union + tagged: false + arms: + rno: + type: integer + tagged: false + index: true + fk: packagedata.rno + boundname: + type: string + tagged: false + strmbd-cond: + type: union + tagged: false + arms: + rno: + type: integer + tagged: false + index: true + fk: packagedata.rno + boundname: + type: string + tagged: false + to-mvr: + type: union + tagged: false + arms: + rno: + type: integer + tagged: false + index: true + fk: packagedata.rno + boundname: + type: string + tagged: false + rainfall: + type: union + tagged: false + arms: + rno: + type: integer + tagged: false + index: true + fk: packagedata.rno + boundname: + type: string + tagged: false + evaporation: + type: union + tagged: false + arms: + rno: + type: integer + tagged: false + index: true + fk: packagedata.rno + boundname: + type: string + tagged: false + runoff: + type: union + tagged: false + arms: + rno: + type: integer + tagged: false + index: true + fk: packagedata.rno + boundname: + type: string + tagged: false + ext-inflow: + type: union + tagged: false + arms: + rno: + type: integer + tagged: false + index: true + fk: packagedata.rno + boundname: + type: string + tagged: false + ext-outflow: + type: union + tagged: false + arms: + rno: + type: integer + tagged: false + index: true + fk: packagedata.rno + boundname: + type: string + tagged: false + flow-ja-face: + type: union + tagged: false + arms: + rno: + type: record + tagged: false + fields: + rno: + type: integer + tagged: false + index: true + fk: packagedata.rno + rno2: + type: integer + tagged: false + index: true + fk: packagedata.rno + boundname: + type: string + tagged: false diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-uze.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-uze.json index 34e4922d..24d81d17 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-uze.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-uze.json @@ -373,5 +373,195 @@ "ncv" ] } + }, + "observations": { + "temperature": { + "type": "union", + "tagged": false, + "arms": { + "uzfno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.uzfno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "storage": { + "type": "union", + "tagged": false, + "arms": { + "uzfno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.uzfno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "constant": { + "type": "union", + "tagged": false, + "arms": { + "uzfno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.uzfno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "from-mvr": { + "type": "union", + "tagged": false, + "arms": { + "uzfno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.uzfno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "uze": { + "type": "union", + "tagged": false, + "arms": { + "uzfno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.uzfno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "thermal-equil": { + "type": "union", + "tagged": false, + "arms": { + "uzfno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.uzfno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "infiltration": { + "type": "union", + "tagged": false, + "arms": { + "uzfno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.uzfno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "rej-inf": { + "type": "union", + "tagged": false, + "arms": { + "uzfno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.uzfno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "uzet": { + "type": "union", + "tagged": false, + "arms": { + "uzfno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.uzfno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "rej-inf-to-mvr": { + "type": "union", + "tagged": false, + "arms": { + "uzfno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.uzfno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "flow-ja-face": { + "type": "union", + "tagged": false, + "arms": { + "uzfno": { + "type": "record", + "tagged": false, + "fields": { + "uzfno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.uzfno" + }, + "uzfno2": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.uzfno" + } + } + }, + "boundname": { + "type": "string", + "tagged": false + } + } + } } } \ No newline at end of file diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-uze.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-uze.toml index 8ad3f953..a7098c70 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-uze.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-uze.toml @@ -335,3 +335,167 @@ dtype = "double" shape = [ "ncv", ] + +[observations.temperature] +type = "union" +tagged = false + +[observations.temperature.arms.uzfno] +type = "integer" +tagged = false +index = true +fk = "packagedata.uzfno" + +[observations.temperature.arms.boundname] +type = "string" +tagged = false + +[observations.storage] +type = "union" +tagged = false + +[observations.storage.arms.uzfno] +type = "integer" +tagged = false +index = true +fk = "packagedata.uzfno" + +[observations.storage.arms.boundname] +type = "string" +tagged = false + +[observations.constant] +type = "union" +tagged = false + +[observations.constant.arms.uzfno] +type = "integer" +tagged = false +index = true +fk = "packagedata.uzfno" + +[observations.constant.arms.boundname] +type = "string" +tagged = false + +[observations.from-mvr] +type = "union" +tagged = false + +[observations.from-mvr.arms.uzfno] +type = "integer" +tagged = false +index = true +fk = "packagedata.uzfno" + +[observations.from-mvr.arms.boundname] +type = "string" +tagged = false + +[observations.uze] +type = "union" +tagged = false + +[observations.uze.arms.uzfno] +type = "integer" +tagged = false +index = true +fk = "packagedata.uzfno" + +[observations.uze.arms.boundname] +type = "string" +tagged = false + +[observations.thermal-equil] +type = "union" +tagged = false + +[observations.thermal-equil.arms.uzfno] +type = "integer" +tagged = false +index = true +fk = "packagedata.uzfno" + +[observations.thermal-equil.arms.boundname] +type = "string" +tagged = false + +[observations.infiltration] +type = "union" +tagged = false + +[observations.infiltration.arms.uzfno] +type = "integer" +tagged = false +index = true +fk = "packagedata.uzfno" + +[observations.infiltration.arms.boundname] +type = "string" +tagged = false + +[observations.rej-inf] +type = "union" +tagged = false + +[observations.rej-inf.arms.uzfno] +type = "integer" +tagged = false +index = true +fk = "packagedata.uzfno" + +[observations.rej-inf.arms.boundname] +type = "string" +tagged = false + +[observations.uzet] +type = "union" +tagged = false + +[observations.uzet.arms.uzfno] +type = "integer" +tagged = false +index = true +fk = "packagedata.uzfno" + +[observations.uzet.arms.boundname] +type = "string" +tagged = false + +[observations.rej-inf-to-mvr] +type = "union" +tagged = false + +[observations.rej-inf-to-mvr.arms.uzfno] +type = "integer" +tagged = false +index = true +fk = "packagedata.uzfno" + +[observations.rej-inf-to-mvr.arms.boundname] +type = "string" +tagged = false + +[observations.flow-ja-face] +type = "union" +tagged = false + +[observations.flow-ja-face.arms.uzfno] +type = "record" +tagged = false + +[observations.flow-ja-face.arms.uzfno.fields.uzfno] +type = "integer" +tagged = false +index = true +fk = "packagedata.uzfno" + +[observations.flow-ja-face.arms.uzfno.fields.uzfno2] +type = "integer" +tagged = false +index = true +fk = "packagedata.uzfno" + +[observations.flow-ja-face.arms.boundname] +type = "string" +tagged = false diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-uze.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-uze.yaml index 52bed8ff..89967deb 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-uze.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-uze.yaml @@ -364,3 +364,145 @@ memory: dtype: double shape: - ncv +observations: + temperature: + type: union + tagged: false + arms: + uzfno: + type: integer + tagged: false + index: true + fk: packagedata.uzfno + boundname: + type: string + tagged: false + storage: + type: union + tagged: false + arms: + uzfno: + type: integer + tagged: false + index: true + fk: packagedata.uzfno + boundname: + type: string + tagged: false + constant: + type: union + tagged: false + arms: + uzfno: + type: integer + tagged: false + index: true + fk: packagedata.uzfno + boundname: + type: string + tagged: false + from-mvr: + type: union + tagged: false + arms: + uzfno: + type: integer + tagged: false + index: true + fk: packagedata.uzfno + boundname: + type: string + tagged: false + uze: + type: union + tagged: false + arms: + uzfno: + type: integer + tagged: false + index: true + fk: packagedata.uzfno + boundname: + type: string + tagged: false + thermal-equil: + type: union + tagged: false + arms: + uzfno: + type: integer + tagged: false + index: true + fk: packagedata.uzfno + boundname: + type: string + tagged: false + infiltration: + type: union + tagged: false + arms: + uzfno: + type: integer + tagged: false + index: true + fk: packagedata.uzfno + boundname: + type: string + tagged: false + rej-inf: + type: union + tagged: false + arms: + uzfno: + type: integer + tagged: false + index: true + fk: packagedata.uzfno + boundname: + type: string + tagged: false + uzet: + type: union + tagged: false + arms: + uzfno: + type: integer + tagged: false + index: true + fk: packagedata.uzfno + boundname: + type: string + tagged: false + rej-inf-to-mvr: + type: union + tagged: false + arms: + uzfno: + type: integer + tagged: false + index: true + fk: packagedata.uzfno + boundname: + type: string + tagged: false + flow-ja-face: + type: union + tagged: false + arms: + uzfno: + type: record + tagged: false + fields: + uzfno: + type: integer + tagged: false + index: true + fk: packagedata.uzfno + uzfno2: + type: integer + tagged: false + index: true + fk: packagedata.uzfno + boundname: + type: string + tagged: false 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 235535cc..ad449532 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-api.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-api.json @@ -93,5 +93,47 @@ "source": "maxbound", "type": "integer" } + }, + "observations": { + "api": { + "type": "union", + "tagged": false, + "arms": { + "cellid": { + "type": "array", + "tagged": false, + "dtype": "integer", + "index": true, + "cellid": true, + "shape": [ + "ncelldim" + ] + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "to-mvr": { + "type": "union", + "tagged": false, + "arms": { + "cellid": { + "type": "array", + "tagged": false, + "dtype": "integer", + "index": true, + "cellid": true, + "shape": [ + "ncelldim" + ] + }, + "boundname": { + "type": "string", + "tagged": false + } + } + } } } \ No newline at end of file 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 23bc645a..5e0ea8a7 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-api.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-api.toml @@ -77,3 +77,39 @@ type = "integer" set_in = "ar" source = "maxbound" type = "integer" + +[observations.api] +type = "union" +tagged = false + +[observations.api.arms.cellid] +type = "array" +tagged = false +dtype = "integer" +index = true +cellid = true +shape = [ + "ncelldim", +] + +[observations.api.arms.boundname] +type = "string" +tagged = false + +[observations.to-mvr] +type = "union" +tagged = false + +[observations.to-mvr.arms.cellid] +type = "array" +tagged = false +dtype = "integer" +index = true +cellid = true +shape = [ + "ncelldim", +] + +[observations.to-mvr.arms.boundname] +type = "string" +tagged = false 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 d52574b7..b92d7ed8 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-api.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-api.yaml @@ -82,3 +82,34 @@ memory: set_in: ar source: maxbound type: integer +observations: + api: + type: union + tagged: false + arms: + cellid: + type: array + tagged: false + dtype: integer + index: true + cellid: true + shape: + - ncelldim + boundname: + type: string + tagged: false + to-mvr: + type: union + tagged: false + arms: + cellid: + type: array + 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 e8bafef8..92265a64 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chd.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chd.json @@ -319,5 +319,27 @@ "naux" ] } + }, + "observations": { + "chd": { + "type": "union", + "tagged": false, + "arms": { + "cellid": { + "type": "array", + "tagged": false, + "dtype": "integer", + "index": true, + "cellid": true, + "shape": [ + "ncelldim" + ] + }, + "boundname": { + "type": "string", + "tagged": false + } + } + } } } \ No newline at end of file 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 0ddc9b70..fe602a5e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chd.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chd.toml @@ -293,3 +293,21 @@ dtype = "string" shape = [ "naux", ] + +[observations.chd] +type = "union" +tagged = false + +[observations.chd.arms.cellid] +type = "array" +tagged = false +dtype = "integer" +index = true +cellid = true +shape = [ + "ncelldim", +] + +[observations.chd.arms.boundname] +type = "string" +tagged = false 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 d526faad..6f61f82d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chd.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chd.yaml @@ -286,3 +286,19 @@ memory: dtype: string shape: - naux +observations: + chd: + type: union + tagged: false + arms: + cellid: + type: array + 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 21ef3126..3ff56aeb 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chdg.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chdg.json @@ -305,5 +305,27 @@ "naux" ] } + }, + "observations": { + "chd": { + "type": "union", + "tagged": false, + "arms": { + "cellid": { + "type": "array", + "tagged": false, + "dtype": "integer", + "index": true, + "cellid": true, + "shape": [ + "ncelldim" + ] + }, + "boundname": { + "type": "string", + "tagged": false + } + } + } } } \ No newline at end of file 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 1a864549..16d45794 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chdg.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chdg.toml @@ -281,3 +281,21 @@ dtype = "string" shape = [ "naux", ] + +[observations.chd] +type = "union" +tagged = false + +[observations.chd.arms.cellid] +type = "array" +tagged = false +dtype = "integer" +index = true +cellid = true +shape = [ + "ncelldim", +] + +[observations.chd.arms.boundname] +type = "string" +tagged = false 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 02b278e9..d6afb09f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chdg.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chdg.yaml @@ -271,3 +271,19 @@ memory: dtype: string shape: - naux +observations: + chd: + type: union + tagged: false + arms: + cellid: + type: array + 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 1716a9c2..d5efdfbc 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-csub.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-csub.json @@ -700,5 +700,414 @@ "nodes" ] } + }, + "observations": { + "csub": { + "type": "union", + "tagged": false, + "arms": { + "icsubno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.icsubno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "inelastic-csub": { + "type": "union", + "tagged": false, + "arms": { + "icsubno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.icsubno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "elastic-csub": { + "type": "union", + "tagged": false, + "arms": { + "icsubno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.icsubno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "delay-flowtop": { + "type": "union", + "tagged": false, + "arms": { + "icsubno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.icsubno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "delay-flowbot": { + "type": "union", + "tagged": false, + "arms": { + "icsubno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.icsubno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "sk": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.icsubno" + }, + "ske": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.icsubno" + }, + "theta": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.icsubno" + }, + "thickness": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.icsubno" + }, + "interbed-compaction": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.icsubno" + }, + "interbed-compaction-pct": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.icsubno" + }, + "inelastic-compaction": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.icsubno" + }, + "elastic-compaction": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.icsubno" + }, + "delay-head": { + "type": "record", + "tagged": false, + "fields": { + "icsubno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.icsubno" + }, + "idcellno": { + "type": "integer", + "tagged": false, + "index": true + } + } + }, + "delay-gstress": { + "type": "record", + "tagged": false, + "fields": { + "icsubno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.icsubno" + }, + "idcellno": { + "type": "integer", + "tagged": false, + "index": true + } + } + }, + "delay-estress": { + "type": "record", + "tagged": false, + "fields": { + "icsubno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.icsubno" + }, + "idcellno": { + "type": "integer", + "tagged": false, + "index": true + } + } + }, + "delay-preconstress": { + "type": "record", + "tagged": false, + "fields": { + "icsubno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.icsubno" + }, + "idcellno": { + "type": "integer", + "tagged": false, + "index": true + } + } + }, + "delay-compaction": { + "type": "record", + "tagged": false, + "fields": { + "icsubno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.icsubno" + }, + "idcellno": { + "type": "integer", + "tagged": false, + "index": true + } + } + }, + "delay-thickness": { + "type": "record", + "tagged": false, + "fields": { + "icsubno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.icsubno" + }, + "idcellno": { + "type": "integer", + "tagged": false, + "index": true + } + } + }, + "delay-theta": { + "type": "record", + "tagged": false, + "fields": { + "icsubno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.icsubno" + }, + "idcellno": { + "type": "integer", + "tagged": false, + "index": true + } + } + }, + "coarse-csub": { + "type": "array", + "tagged": false, + "dtype": "integer", + "index": true, + "cellid": true, + "shape": [ + "ncelldim" + ] + }, + "csub-cell": { + "type": "array", + "tagged": false, + "dtype": "integer", + "index": true, + "cellid": true, + "shape": [ + "ncelldim" + ] + }, + "wcomp-csub-cell": { + "type": "array", + "tagged": false, + "dtype": "integer", + "index": true, + "cellid": true, + "shape": [ + "ncelldim" + ] + }, + "sk-cell": { + "type": "array", + "tagged": false, + "dtype": "integer", + "index": true, + "cellid": true, + "shape": [ + "ncelldim" + ] + }, + "ske-cell": { + "type": "array", + "tagged": false, + "dtype": "integer", + "index": true, + "cellid": true, + "shape": [ + "ncelldim" + ] + }, + "estress-cell": { + "type": "array", + "tagged": false, + "dtype": "integer", + "index": true, + "cellid": true, + "shape": [ + "ncelldim" + ] + }, + "gstress-cell": { + "type": "array", + "tagged": false, + "dtype": "integer", + "index": true, + "cellid": true, + "shape": [ + "ncelldim" + ] + }, + "preconstress-cell": { + "type": "array", + "tagged": false, + "dtype": "integer", + "index": true, + "cellid": true, + "shape": [ + "ncelldim" + ] + }, + "coarse-compaction": { + "type": "array", + "tagged": false, + "dtype": "integer", + "index": true, + "cellid": true, + "shape": [ + "ncelldim" + ] + }, + "compaction-cell": { + "type": "array", + "tagged": false, + "dtype": "integer", + "index": true, + "cellid": true, + "shape": [ + "ncelldim" + ] + }, + "inelastic-compaction-cell": { + "type": "array", + "tagged": false, + "dtype": "integer", + "index": true, + "cellid": true, + "shape": [ + "ncelldim" + ] + }, + "elastic-compaction-cell": { + "type": "array", + "tagged": false, + "dtype": "integer", + "index": true, + "cellid": true, + "shape": [ + "ncelldim" + ] + }, + "coarse-thickness": { + "type": "array", + "tagged": false, + "dtype": "integer", + "index": true, + "cellid": true, + "shape": [ + "ncelldim" + ] + }, + "thickness-cell": { + "type": "array", + "tagged": false, + "dtype": "integer", + "index": true, + "cellid": true, + "shape": [ + "ncelldim" + ] + }, + "coarse-theta": { + "type": "array", + "tagged": false, + "dtype": "integer", + "index": true, + "cellid": true, + "shape": [ + "ncelldim" + ] + }, + "theta-cell": { + "type": "array", + "tagged": false, + "dtype": "integer", + "index": true, + "cellid": true, + "shape": [ + "ncelldim" + ] + } } } \ 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 612eca81..08395b4d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-csub.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-csub.toml @@ -646,3 +646,386 @@ dtype = "double" shape = [ "nodes", ] + +[observations.csub] +type = "union" +tagged = false + +[observations.csub.arms.icsubno] +type = "integer" +tagged = false +index = true +fk = "packagedata.icsubno" + +[observations.csub.arms.boundname] +type = "string" +tagged = false + +[observations.inelastic-csub] +type = "union" +tagged = false + +[observations.inelastic-csub.arms.icsubno] +type = "integer" +tagged = false +index = true +fk = "packagedata.icsubno" + +[observations.inelastic-csub.arms.boundname] +type = "string" +tagged = false + +[observations.elastic-csub] +type = "union" +tagged = false + +[observations.elastic-csub.arms.icsubno] +type = "integer" +tagged = false +index = true +fk = "packagedata.icsubno" + +[observations.elastic-csub.arms.boundname] +type = "string" +tagged = false + +[observations.delay-flowtop] +type = "union" +tagged = false + +[observations.delay-flowtop.arms.icsubno] +type = "integer" +tagged = false +index = true +fk = "packagedata.icsubno" + +[observations.delay-flowtop.arms.boundname] +type = "string" +tagged = false + +[observations.delay-flowbot] +type = "union" +tagged = false + +[observations.delay-flowbot.arms.icsubno] +type = "integer" +tagged = false +index = true +fk = "packagedata.icsubno" + +[observations.delay-flowbot.arms.boundname] +type = "string" +tagged = false + +[observations.sk] +type = "integer" +tagged = false +index = true +fk = "packagedata.icsubno" + +[observations.ske] +type = "integer" +tagged = false +index = true +fk = "packagedata.icsubno" + +[observations.theta] +type = "integer" +tagged = false +index = true +fk = "packagedata.icsubno" + +[observations.thickness] +type = "integer" +tagged = false +index = true +fk = "packagedata.icsubno" + +[observations.interbed-compaction] +type = "integer" +tagged = false +index = true +fk = "packagedata.icsubno" + +[observations.interbed-compaction-pct] +type = "integer" +tagged = false +index = true +fk = "packagedata.icsubno" + +[observations.inelastic-compaction] +type = "integer" +tagged = false +index = true +fk = "packagedata.icsubno" + +[observations.elastic-compaction] +type = "integer" +tagged = false +index = true +fk = "packagedata.icsubno" + +[observations.delay-head] +type = "record" +tagged = false + +[observations.delay-head.fields.icsubno] +type = "integer" +tagged = false +index = true +fk = "packagedata.icsubno" + +[observations.delay-head.fields.idcellno] +type = "integer" +tagged = false +index = true + +[observations.delay-gstress] +type = "record" +tagged = false + +[observations.delay-gstress.fields.icsubno] +type = "integer" +tagged = false +index = true +fk = "packagedata.icsubno" + +[observations.delay-gstress.fields.idcellno] +type = "integer" +tagged = false +index = true + +[observations.delay-estress] +type = "record" +tagged = false + +[observations.delay-estress.fields.icsubno] +type = "integer" +tagged = false +index = true +fk = "packagedata.icsubno" + +[observations.delay-estress.fields.idcellno] +type = "integer" +tagged = false +index = true + +[observations.delay-preconstress] +type = "record" +tagged = false + +[observations.delay-preconstress.fields.icsubno] +type = "integer" +tagged = false +index = true +fk = "packagedata.icsubno" + +[observations.delay-preconstress.fields.idcellno] +type = "integer" +tagged = false +index = true + +[observations.delay-compaction] +type = "record" +tagged = false + +[observations.delay-compaction.fields.icsubno] +type = "integer" +tagged = false +index = true +fk = "packagedata.icsubno" + +[observations.delay-compaction.fields.idcellno] +type = "integer" +tagged = false +index = true + +[observations.delay-thickness] +type = "record" +tagged = false + +[observations.delay-thickness.fields.icsubno] +type = "integer" +tagged = false +index = true +fk = "packagedata.icsubno" + +[observations.delay-thickness.fields.idcellno] +type = "integer" +tagged = false +index = true + +[observations.delay-theta] +type = "record" +tagged = false + +[observations.delay-theta.fields.icsubno] +type = "integer" +tagged = false +index = true +fk = "packagedata.icsubno" + +[observations.delay-theta.fields.idcellno] +type = "integer" +tagged = false +index = true + +[observations.coarse-csub] +type = "array" +tagged = false +dtype = "integer" +index = true +cellid = true +shape = [ + "ncelldim", +] + +[observations.csub-cell] +type = "array" +tagged = false +dtype = "integer" +index = true +cellid = true +shape = [ + "ncelldim", +] + +[observations.wcomp-csub-cell] +type = "array" +tagged = false +dtype = "integer" +index = true +cellid = true +shape = [ + "ncelldim", +] + +[observations.sk-cell] +type = "array" +tagged = false +dtype = "integer" +index = true +cellid = true +shape = [ + "ncelldim", +] + +[observations.ske-cell] +type = "array" +tagged = false +dtype = "integer" +index = true +cellid = true +shape = [ + "ncelldim", +] + +[observations.estress-cell] +type = "array" +tagged = false +dtype = "integer" +index = true +cellid = true +shape = [ + "ncelldim", +] + +[observations.gstress-cell] +type = "array" +tagged = false +dtype = "integer" +index = true +cellid = true +shape = [ + "ncelldim", +] + +[observations.preconstress-cell] +type = "array" +tagged = false +dtype = "integer" +index = true +cellid = true +shape = [ + "ncelldim", +] + +[observations.coarse-compaction] +type = "array" +tagged = false +dtype = "integer" +index = true +cellid = true +shape = [ + "ncelldim", +] + +[observations.compaction-cell] +type = "array" +tagged = false +dtype = "integer" +index = true +cellid = true +shape = [ + "ncelldim", +] + +[observations.inelastic-compaction-cell] +type = "array" +tagged = false +dtype = "integer" +index = true +cellid = true +shape = [ + "ncelldim", +] + +[observations.elastic-compaction-cell] +type = "array" +tagged = false +dtype = "integer" +index = true +cellid = true +shape = [ + "ncelldim", +] + +[observations.coarse-thickness] +type = "array" +tagged = false +dtype = "integer" +index = true +cellid = true +shape = [ + "ncelldim", +] + +[observations.thickness-cell] +type = "array" +tagged = false +dtype = "integer" +index = true +cellid = true +shape = [ + "ncelldim", +] + +[observations.coarse-theta] +type = "array" +tagged = false +dtype = "integer" +index = true +cellid = true +shape = [ + "ncelldim", +] + +[observations.theta-cell] +type = "array" +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 e0ebbab2..02179c11 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-csub.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-csub.yaml @@ -658,3 +658,323 @@ memory: dtype: double shape: - nodes +observations: + csub: + type: union + tagged: false + arms: + icsubno: + type: integer + tagged: false + index: true + fk: packagedata.icsubno + boundname: + type: string + tagged: false + inelastic-csub: + type: union + tagged: false + arms: + icsubno: + type: integer + tagged: false + index: true + fk: packagedata.icsubno + boundname: + type: string + tagged: false + elastic-csub: + type: union + tagged: false + arms: + icsubno: + type: integer + tagged: false + index: true + fk: packagedata.icsubno + boundname: + type: string + tagged: false + delay-flowtop: + type: union + tagged: false + arms: + icsubno: + type: integer + tagged: false + index: true + fk: packagedata.icsubno + boundname: + type: string + tagged: false + delay-flowbot: + type: union + tagged: false + arms: + icsubno: + type: integer + tagged: false + index: true + fk: packagedata.icsubno + boundname: + type: string + tagged: false + sk: + type: integer + tagged: false + index: true + fk: packagedata.icsubno + ske: + type: integer + tagged: false + index: true + fk: packagedata.icsubno + theta: + type: integer + tagged: false + index: true + fk: packagedata.icsubno + thickness: + type: integer + tagged: false + index: true + fk: packagedata.icsubno + interbed-compaction: + type: integer + tagged: false + index: true + fk: packagedata.icsubno + interbed-compaction-pct: + type: integer + tagged: false + index: true + fk: packagedata.icsubno + inelastic-compaction: + type: integer + tagged: false + index: true + fk: packagedata.icsubno + elastic-compaction: + type: integer + tagged: false + index: true + fk: packagedata.icsubno + delay-head: + type: record + tagged: false + fields: + icsubno: + type: integer + tagged: false + index: true + fk: packagedata.icsubno + idcellno: + type: integer + tagged: false + index: true + delay-gstress: + type: record + tagged: false + fields: + icsubno: + type: integer + tagged: false + index: true + fk: packagedata.icsubno + idcellno: + type: integer + tagged: false + index: true + delay-estress: + type: record + tagged: false + fields: + icsubno: + type: integer + tagged: false + index: true + fk: packagedata.icsubno + idcellno: + type: integer + tagged: false + index: true + delay-preconstress: + type: record + tagged: false + fields: + icsubno: + type: integer + tagged: false + index: true + fk: packagedata.icsubno + idcellno: + type: integer + tagged: false + index: true + delay-compaction: + type: record + tagged: false + fields: + icsubno: + type: integer + tagged: false + index: true + fk: packagedata.icsubno + idcellno: + type: integer + tagged: false + index: true + delay-thickness: + type: record + tagged: false + fields: + icsubno: + type: integer + tagged: false + index: true + fk: packagedata.icsubno + idcellno: + type: integer + tagged: false + index: true + delay-theta: + type: record + tagged: false + fields: + icsubno: + type: integer + tagged: false + index: true + fk: packagedata.icsubno + idcellno: + type: integer + tagged: false + index: true + coarse-csub: + type: array + tagged: false + dtype: integer + index: true + cellid: true + shape: + - ncelldim + csub-cell: + type: array + tagged: false + dtype: integer + index: true + cellid: true + shape: + - ncelldim + wcomp-csub-cell: + type: array + tagged: false + dtype: integer + index: true + cellid: true + shape: + - ncelldim + sk-cell: + type: array + tagged: false + dtype: integer + index: true + cellid: true + shape: + - ncelldim + ske-cell: + type: array + tagged: false + dtype: integer + index: true + cellid: true + shape: + - ncelldim + estress-cell: + type: array + tagged: false + dtype: integer + index: true + cellid: true + shape: + - ncelldim + gstress-cell: + type: array + tagged: false + dtype: integer + index: true + cellid: true + shape: + - ncelldim + preconstress-cell: + type: array + tagged: false + dtype: integer + index: true + cellid: true + shape: + - ncelldim + coarse-compaction: + type: array + tagged: false + dtype: integer + index: true + cellid: true + shape: + - ncelldim + compaction-cell: + type: array + tagged: false + dtype: integer + index: true + cellid: true + shape: + - ncelldim + inelastic-compaction-cell: + type: array + tagged: false + dtype: integer + index: true + cellid: true + shape: + - ncelldim + elastic-compaction-cell: + type: array + tagged: false + dtype: integer + index: true + cellid: true + shape: + - ncelldim + coarse-thickness: + type: array + tagged: false + dtype: integer + index: true + cellid: true + shape: + - ncelldim + thickness-cell: + type: array + tagged: false + dtype: integer + index: true + cellid: true + shape: + - ncelldim + coarse-theta: + type: array + tagged: false + dtype: integer + index: true + cellid: true + shape: + - ncelldim + theta-cell: + type: array + 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 efb00ac2..f8b60d41 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drn.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drn.json @@ -339,5 +339,47 @@ "naux" ] } + }, + "observations": { + "drn": { + "type": "union", + "tagged": false, + "arms": { + "cellid": { + "type": "array", + "tagged": false, + "dtype": "integer", + "index": true, + "cellid": true, + "shape": [ + "ncelldim" + ] + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "to-mvr": { + "type": "union", + "tagged": false, + "arms": { + "cellid": { + "type": "array", + "tagged": false, + "dtype": "integer", + "index": true, + "cellid": true, + "shape": [ + "ncelldim" + ] + }, + "boundname": { + "type": "string", + "tagged": false + } + } + } } } \ No newline at end of file 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 f5a3a2d8..f90b2b08 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drn.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drn.toml @@ -313,3 +313,39 @@ dtype = "string" shape = [ "naux", ] + +[observations.drn] +type = "union" +tagged = false + +[observations.drn.arms.cellid] +type = "array" +tagged = false +dtype = "integer" +index = true +cellid = true +shape = [ + "ncelldim", +] + +[observations.drn.arms.boundname] +type = "string" +tagged = false + +[observations.to-mvr] +type = "union" +tagged = false + +[observations.to-mvr.arms.cellid] +type = "array" +tagged = false +dtype = "integer" +index = true +cellid = true +shape = [ + "ncelldim", +] + +[observations.to-mvr.arms.boundname] +type = "string" +tagged = false 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 834f46ad..ebec6d7d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drn.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drn.yaml @@ -315,3 +315,34 @@ memory: dtype: string shape: - naux +observations: + drn: + type: union + tagged: false + arms: + cellid: + type: array + tagged: false + dtype: integer + index: true + cellid: true + shape: + - ncelldim + boundname: + type: string + tagged: false + to-mvr: + type: union + tagged: false + arms: + cellid: + type: array + 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 c3aa4c66..f1e4c1be 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drng.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drng.json @@ -330,5 +330,47 @@ "naux" ] } + }, + "observations": { + "drn": { + "type": "union", + "tagged": false, + "arms": { + "cellid": { + "type": "array", + "tagged": false, + "dtype": "integer", + "index": true, + "cellid": true, + "shape": [ + "ncelldim" + ] + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "to-mvr": { + "type": "union", + "tagged": false, + "arms": { + "cellid": { + "type": "array", + "tagged": false, + "dtype": "integer", + "index": true, + "cellid": true, + "shape": [ + "ncelldim" + ] + }, + "boundname": { + "type": "string", + "tagged": false + } + } + } } } \ No newline at end of file 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 9e59d1ed..d236529c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drng.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drng.toml @@ -306,3 +306,39 @@ dtype = "string" shape = [ "naux", ] + +[observations.drn] +type = "union" +tagged = false + +[observations.drn.arms.cellid] +type = "array" +tagged = false +dtype = "integer" +index = true +cellid = true +shape = [ + "ncelldim", +] + +[observations.drn.arms.boundname] +type = "string" +tagged = false + +[observations.to-mvr] +type = "union" +tagged = false + +[observations.to-mvr.arms.cellid] +type = "array" +tagged = false +dtype = "integer" +index = true +cellid = true +shape = [ + "ncelldim", +] + +[observations.to-mvr.arms.boundname] +type = "string" +tagged = false 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 3f50220e..281c5cb4 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drng.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drng.yaml @@ -302,3 +302,34 @@ memory: dtype: string shape: - naux +observations: + drn: + type: union + tagged: false + arms: + cellid: + type: array + tagged: false + dtype: integer + index: true + cellid: true + shape: + - ncelldim + boundname: + type: string + tagged: false + to-mvr: + type: union + tagged: false + arms: + cellid: + type: array + 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 64bb8377..5738a0e0 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evt.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evt.json @@ -383,5 +383,27 @@ "naux" ] } + }, + "observations": { + "evt": { + "type": "union", + "tagged": false, + "arms": { + "cellid": { + "type": "array", + "tagged": false, + "dtype": "integer", + "index": true, + "cellid": true, + "shape": [ + "ncelldim" + ] + }, + "boundname": { + "type": "string", + "tagged": false + } + } + } } } \ No newline at end of file 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 69e10ecf..16e86c6b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evt.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evt.toml @@ -357,3 +357,21 @@ dtype = "string" shape = [ "naux", ] + +[observations.evt] +type = "union" +tagged = false + +[observations.evt.arms.cellid] +type = "array" +tagged = false +dtype = "integer" +index = true +cellid = true +shape = [ + "ncelldim", +] + +[observations.evt.arms.boundname] +type = "string" +tagged = false 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 3e31b32f..cec70e3c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evt.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evt.yaml @@ -361,3 +361,19 @@ memory: dtype: string shape: - naux +observations: + evt: + type: union + tagged: false + arms: + cellid: + type: array + 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 5f517620..a269f6a6 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evta.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evta.json @@ -341,5 +341,27 @@ "naux" ] } + }, + "observations": { + "evt": { + "type": "union", + "tagged": false, + "arms": { + "cellid": { + "type": "array", + "tagged": false, + "dtype": "integer", + "index": true, + "cellid": true, + "shape": [ + "ncelldim" + ] + }, + "boundname": { + "type": "string", + "tagged": false + } + } + } } } \ No newline at end of file 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 1193a834..d5a6d36f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evta.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evta.toml @@ -319,3 +319,21 @@ dtype = "string" shape = [ "naux", ] + +[observations.evt] +type = "union" +tagged = false + +[observations.evt.arms.cellid] +type = "array" +tagged = false +dtype = "integer" +index = true +cellid = true +shape = [ + "ncelldim", +] + +[observations.evt.arms.boundname] +type = "string" +tagged = false 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 8b3203db..3d93ca77 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evta.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evta.yaml @@ -307,3 +307,19 @@ memory: dtype: string shape: - naux +observations: + evt: + type: union + tagged: false + arms: + cellid: + type: array + 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 5f6e6d9e..a3e0497b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghb.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghb.json @@ -321,5 +321,47 @@ "naux" ] } + }, + "observations": { + "ghb": { + "type": "union", + "tagged": false, + "arms": { + "cellid": { + "type": "array", + "tagged": false, + "dtype": "integer", + "index": true, + "cellid": true, + "shape": [ + "ncelldim" + ] + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "to-mvr": { + "type": "union", + "tagged": false, + "arms": { + "cellid": { + "type": "array", + "tagged": false, + "dtype": "integer", + "index": true, + "cellid": true, + "shape": [ + "ncelldim" + ] + }, + "boundname": { + "type": "string", + "tagged": false + } + } + } } } \ No newline at end of file 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 3dd305d8..d4b3ed4a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghb.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghb.toml @@ -295,3 +295,39 @@ dtype = "string" shape = [ "naux", ] + +[observations.ghb] +type = "union" +tagged = false + +[observations.ghb.arms.cellid] +type = "array" +tagged = false +dtype = "integer" +index = true +cellid = true +shape = [ + "ncelldim", +] + +[observations.ghb.arms.boundname] +type = "string" +tagged = false + +[observations.to-mvr] +type = "union" +tagged = false + +[observations.to-mvr.arms.cellid] +type = "array" +tagged = false +dtype = "integer" +index = true +cellid = true +shape = [ + "ncelldim", +] + +[observations.to-mvr.arms.boundname] +type = "string" +tagged = false 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 29c410dd..76d56415 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghb.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghb.yaml @@ -293,3 +293,34 @@ memory: dtype: string shape: - naux +observations: + ghb: + type: union + tagged: false + arms: + cellid: + type: array + tagged: false + dtype: integer + index: true + cellid: true + shape: + - ncelldim + boundname: + type: string + tagged: false + to-mvr: + type: union + tagged: false + arms: + cellid: + type: array + 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 4501d814..4c0c25b4 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghbg.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghbg.json @@ -312,5 +312,47 @@ "naux" ] } + }, + "observations": { + "ghb": { + "type": "union", + "tagged": false, + "arms": { + "cellid": { + "type": "array", + "tagged": false, + "dtype": "integer", + "index": true, + "cellid": true, + "shape": [ + "ncelldim" + ] + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "to-mvr": { + "type": "union", + "tagged": false, + "arms": { + "cellid": { + "type": "array", + "tagged": false, + "dtype": "integer", + "index": true, + "cellid": true, + "shape": [ + "ncelldim" + ] + }, + "boundname": { + "type": "string", + "tagged": false + } + } + } } } \ No newline at end of file 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 1ee3341f..c14a0918 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghbg.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghbg.toml @@ -288,3 +288,39 @@ dtype = "string" shape = [ "naux", ] + +[observations.ghb] +type = "union" +tagged = false + +[observations.ghb.arms.cellid] +type = "array" +tagged = false +dtype = "integer" +index = true +cellid = true +shape = [ + "ncelldim", +] + +[observations.ghb.arms.boundname] +type = "string" +tagged = false + +[observations.to-mvr] +type = "union" +tagged = false + +[observations.to-mvr.arms.cellid] +type = "array" +tagged = false +dtype = "integer" +index = true +cellid = true +shape = [ + "ncelldim", +] + +[observations.to-mvr.arms.boundname] +type = "string" +tagged = false 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 a96ae5b9..6b6f8f93 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghbg.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghbg.yaml @@ -280,3 +280,34 @@ memory: dtype: string shape: - naux +observations: + ghb: + type: union + tagged: false + arms: + cellid: + type: array + tagged: false + dtype: integer + index: true + cellid: true + shape: + - ncelldim + boundname: + type: string + tagged: false + to-mvr: + type: union + tagged: false + arms: + cellid: + type: array + 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-lak.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-lak.json index ef6ea488..f6652ae0 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-lak.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-lak.json @@ -774,5 +774,344 @@ "source": "ntables", "type": "integer" } + }, + "observations": { + "stage": { + "type": "union", + "tagged": false, + "arms": { + "ifno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.ifno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "ext-inflow": { + "type": "union", + "tagged": false, + "arms": { + "ifno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.ifno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "outlet-inflow": { + "type": "union", + "tagged": false, + "arms": { + "ifno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.ifno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "inflow": { + "type": "union", + "tagged": false, + "arms": { + "ifno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.ifno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "from-mvr": { + "type": "union", + "tagged": false, + "arms": { + "ifno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.ifno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "rainfall": { + "type": "union", + "tagged": false, + "arms": { + "ifno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.ifno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "runoff": { + "type": "union", + "tagged": false, + "arms": { + "ifno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.ifno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "withdrawal": { + "type": "union", + "tagged": false, + "arms": { + "ifno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.ifno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "evaporation": { + "type": "union", + "tagged": false, + "arms": { + "ifno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.ifno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "storage": { + "type": "union", + "tagged": false, + "arms": { + "ifno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.ifno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "constant": { + "type": "union", + "tagged": false, + "arms": { + "ifno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.ifno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "volume": { + "type": "union", + "tagged": false, + "arms": { + "ifno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.ifno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "surface-area": { + "type": "union", + "tagged": false, + "arms": { + "ifno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.ifno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "lak": { + "type": "union", + "tagged": false, + "arms": { + "ifno": { + "type": "record", + "tagged": false, + "fields": { + "ifno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.ifno" + }, + "iconn": { + "type": "integer", + "tagged": false, + "index": true + } + } + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "wetted-area": { + "type": "union", + "tagged": false, + "arms": { + "ifno": { + "type": "record", + "tagged": false, + "fields": { + "ifno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.ifno" + }, + "iconn": { + "type": "integer", + "tagged": false, + "index": true + } + } + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "conductance": { + "type": "union", + "tagged": false, + "arms": { + "ifno": { + "type": "record", + "tagged": false, + "fields": { + "ifno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.ifno" + }, + "iconn": { + "type": "integer", + "tagged": false, + "index": true + } + } + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "ext-outflow": { + "type": "union", + "tagged": false, + "arms": { + "outletno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "outlets.outletno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "to-mvr": { + "type": "union", + "tagged": false, + "arms": { + "outletno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "outlets.outletno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "outlet": { + "type": "union", + "tagged": false, + "arms": { + "outletno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "outlets.outletno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + } } } \ No newline at end of file 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 09eadcf6..abfb46bb 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-lak.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-lak.toml @@ -690,3 +690,296 @@ type = "integer" set_in = "ar" source = "ntables" type = "integer" + +[observations.stage] +type = "union" +tagged = false + +[observations.stage.arms.ifno] +type = "integer" +tagged = false +index = true +fk = "packagedata.ifno" + +[observations.stage.arms.boundname] +type = "string" +tagged = false + +[observations.ext-inflow] +type = "union" +tagged = false + +[observations.ext-inflow.arms.ifno] +type = "integer" +tagged = false +index = true +fk = "packagedata.ifno" + +[observations.ext-inflow.arms.boundname] +type = "string" +tagged = false + +[observations.outlet-inflow] +type = "union" +tagged = false + +[observations.outlet-inflow.arms.ifno] +type = "integer" +tagged = false +index = true +fk = "packagedata.ifno" + +[observations.outlet-inflow.arms.boundname] +type = "string" +tagged = false + +[observations.inflow] +type = "union" +tagged = false + +[observations.inflow.arms.ifno] +type = "integer" +tagged = false +index = true +fk = "packagedata.ifno" + +[observations.inflow.arms.boundname] +type = "string" +tagged = false + +[observations.from-mvr] +type = "union" +tagged = false + +[observations.from-mvr.arms.ifno] +type = "integer" +tagged = false +index = true +fk = "packagedata.ifno" + +[observations.from-mvr.arms.boundname] +type = "string" +tagged = false + +[observations.rainfall] +type = "union" +tagged = false + +[observations.rainfall.arms.ifno] +type = "integer" +tagged = false +index = true +fk = "packagedata.ifno" + +[observations.rainfall.arms.boundname] +type = "string" +tagged = false + +[observations.runoff] +type = "union" +tagged = false + +[observations.runoff.arms.ifno] +type = "integer" +tagged = false +index = true +fk = "packagedata.ifno" + +[observations.runoff.arms.boundname] +type = "string" +tagged = false + +[observations.withdrawal] +type = "union" +tagged = false + +[observations.withdrawal.arms.ifno] +type = "integer" +tagged = false +index = true +fk = "packagedata.ifno" + +[observations.withdrawal.arms.boundname] +type = "string" +tagged = false + +[observations.evaporation] +type = "union" +tagged = false + +[observations.evaporation.arms.ifno] +type = "integer" +tagged = false +index = true +fk = "packagedata.ifno" + +[observations.evaporation.arms.boundname] +type = "string" +tagged = false + +[observations.storage] +type = "union" +tagged = false + +[observations.storage.arms.ifno] +type = "integer" +tagged = false +index = true +fk = "packagedata.ifno" + +[observations.storage.arms.boundname] +type = "string" +tagged = false + +[observations.constant] +type = "union" +tagged = false + +[observations.constant.arms.ifno] +type = "integer" +tagged = false +index = true +fk = "packagedata.ifno" + +[observations.constant.arms.boundname] +type = "string" +tagged = false + +[observations.volume] +type = "union" +tagged = false + +[observations.volume.arms.ifno] +type = "integer" +tagged = false +index = true +fk = "packagedata.ifno" + +[observations.volume.arms.boundname] +type = "string" +tagged = false + +[observations.surface-area] +type = "union" +tagged = false + +[observations.surface-area.arms.ifno] +type = "integer" +tagged = false +index = true +fk = "packagedata.ifno" + +[observations.surface-area.arms.boundname] +type = "string" +tagged = false + +[observations.lak] +type = "union" +tagged = false + +[observations.lak.arms.ifno] +type = "record" +tagged = false + +[observations.lak.arms.ifno.fields.ifno] +type = "integer" +tagged = false +index = true +fk = "packagedata.ifno" + +[observations.lak.arms.ifno.fields.iconn] +type = "integer" +tagged = false +index = true + +[observations.lak.arms.boundname] +type = "string" +tagged = false + +[observations.wetted-area] +type = "union" +tagged = false + +[observations.wetted-area.arms.ifno] +type = "record" +tagged = false + +[observations.wetted-area.arms.ifno.fields.ifno] +type = "integer" +tagged = false +index = true +fk = "packagedata.ifno" + +[observations.wetted-area.arms.ifno.fields.iconn] +type = "integer" +tagged = false +index = true + +[observations.wetted-area.arms.boundname] +type = "string" +tagged = false + +[observations.conductance] +type = "union" +tagged = false + +[observations.conductance.arms.ifno] +type = "record" +tagged = false + +[observations.conductance.arms.ifno.fields.ifno] +type = "integer" +tagged = false +index = true +fk = "packagedata.ifno" + +[observations.conductance.arms.ifno.fields.iconn] +type = "integer" +tagged = false +index = true + +[observations.conductance.arms.boundname] +type = "string" +tagged = false + +[observations.ext-outflow] +type = "union" +tagged = false + +[observations.ext-outflow.arms.outletno] +type = "integer" +tagged = false +index = true +fk = "outlets.outletno" + +[observations.ext-outflow.arms.boundname] +type = "string" +tagged = false + +[observations.to-mvr] +type = "union" +tagged = false + +[observations.to-mvr.arms.outletno] +type = "integer" +tagged = false +index = true +fk = "outlets.outletno" + +[observations.to-mvr.arms.boundname] +type = "string" +tagged = false + +[observations.outlet] +type = "union" +tagged = false + +[observations.outlet.arms.outletno] +type = "integer" +tagged = false +index = true +fk = "outlets.outletno" + +[observations.outlet.arms.boundname] +type = "string" +tagged = false 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 decf60fb..700388ab 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-lak.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-lak.yaml @@ -836,3 +836,256 @@ memory: set_in: ar source: ntables type: integer +observations: + stage: + type: union + tagged: false + arms: + ifno: + type: integer + tagged: false + index: true + fk: packagedata.ifno + boundname: + type: string + tagged: false + ext-inflow: + type: union + tagged: false + arms: + ifno: + type: integer + tagged: false + index: true + fk: packagedata.ifno + boundname: + type: string + tagged: false + outlet-inflow: + type: union + tagged: false + arms: + ifno: + type: integer + tagged: false + index: true + fk: packagedata.ifno + boundname: + type: string + tagged: false + inflow: + type: union + tagged: false + arms: + ifno: + type: integer + tagged: false + index: true + fk: packagedata.ifno + boundname: + type: string + tagged: false + from-mvr: + type: union + tagged: false + arms: + ifno: + type: integer + tagged: false + index: true + fk: packagedata.ifno + boundname: + type: string + tagged: false + rainfall: + type: union + tagged: false + arms: + ifno: + type: integer + tagged: false + index: true + fk: packagedata.ifno + boundname: + type: string + tagged: false + runoff: + type: union + tagged: false + arms: + ifno: + type: integer + tagged: false + index: true + fk: packagedata.ifno + boundname: + type: string + tagged: false + withdrawal: + type: union + tagged: false + arms: + ifno: + type: integer + tagged: false + index: true + fk: packagedata.ifno + boundname: + type: string + tagged: false + evaporation: + type: union + tagged: false + arms: + ifno: + type: integer + tagged: false + index: true + fk: packagedata.ifno + boundname: + type: string + tagged: false + storage: + type: union + tagged: false + arms: + ifno: + type: integer + tagged: false + index: true + fk: packagedata.ifno + boundname: + type: string + tagged: false + constant: + type: union + tagged: false + arms: + ifno: + type: integer + tagged: false + index: true + fk: packagedata.ifno + boundname: + type: string + tagged: false + volume: + type: union + tagged: false + arms: + ifno: + type: integer + tagged: false + index: true + fk: packagedata.ifno + boundname: + type: string + tagged: false + surface-area: + type: union + tagged: false + arms: + ifno: + type: integer + tagged: false + index: true + fk: packagedata.ifno + boundname: + type: string + tagged: false + lak: + type: union + tagged: false + arms: + ifno: + type: record + tagged: false + fields: + ifno: + type: integer + tagged: false + index: true + fk: packagedata.ifno + iconn: + type: integer + tagged: false + index: true + boundname: + type: string + tagged: false + wetted-area: + type: union + tagged: false + arms: + ifno: + type: record + tagged: false + fields: + ifno: + type: integer + tagged: false + index: true + fk: packagedata.ifno + iconn: + type: integer + tagged: false + index: true + boundname: + type: string + tagged: false + conductance: + type: union + tagged: false + arms: + ifno: + type: record + tagged: false + fields: + ifno: + type: integer + tagged: false + index: true + fk: packagedata.ifno + iconn: + type: integer + tagged: false + index: true + boundname: + type: string + tagged: false + ext-outflow: + type: union + tagged: false + arms: + outletno: + type: integer + tagged: false + index: true + fk: outlets.outletno + boundname: + type: string + tagged: false + to-mvr: + type: union + tagged: false + arms: + outletno: + type: integer + tagged: false + index: true + fk: outlets.outletno + boundname: + type: string + tagged: false + outlet: + type: union + tagged: false + arms: + outletno: + type: integer + tagged: false + index: true + fk: outlets.outletno + boundname: + type: string + tagged: false 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 b5c07be7..4887333c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-maw.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-maw.json @@ -504,5 +504,205 @@ "source": "nmawwells", "type": "integer" } + }, + "observations": { + "head": { + "type": "union", + "tagged": false, + "arms": { + "ifno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.ifno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "from-mvr": { + "type": "union", + "tagged": false, + "arms": { + "ifno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.ifno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "rate": { + "type": "union", + "tagged": false, + "arms": { + "ifno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.ifno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "rate-to-mvr": { + "type": "union", + "tagged": false, + "arms": { + "ifno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.ifno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "fw-rate": { + "type": "union", + "tagged": false, + "arms": { + "ifno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.ifno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "fw-to-mvr": { + "type": "union", + "tagged": false, + "arms": { + "ifno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.ifno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "storage": { + "type": "union", + "tagged": false, + "arms": { + "ifno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.ifno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "constant": { + "type": "union", + "tagged": false, + "arms": { + "ifno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.ifno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "fw-conductance": { + "type": "union", + "tagged": false, + "arms": { + "ifno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.ifno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "maw": { + "type": "union", + "tagged": false, + "arms": { + "ifno": { + "type": "record", + "tagged": false, + "fields": { + "ifno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.ifno" + }, + "icon": { + "type": "integer", + "tagged": false, + "index": true + } + } + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "conductance": { + "type": "union", + "tagged": false, + "arms": { + "ifno": { + "type": "record", + "tagged": false, + "fields": { + "ifno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.ifno" + }, + "icon": { + "type": "integer", + "tagged": false, + "index": true + } + } + }, + "boundname": { + "type": "string", + "tagged": false + } + } + } } } \ No newline at end of file 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 e633003f..e98cf307 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-maw.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-maw.toml @@ -450,3 +450,175 @@ tagged = false set_in = "ar" source = "nmawwells" type = "integer" + +[observations.head] +type = "union" +tagged = false + +[observations.head.arms.ifno] +type = "integer" +tagged = false +index = true +fk = "packagedata.ifno" + +[observations.head.arms.boundname] +type = "string" +tagged = false + +[observations.from-mvr] +type = "union" +tagged = false + +[observations.from-mvr.arms.ifno] +type = "integer" +tagged = false +index = true +fk = "packagedata.ifno" + +[observations.from-mvr.arms.boundname] +type = "string" +tagged = false + +[observations.rate] +type = "union" +tagged = false + +[observations.rate.arms.ifno] +type = "integer" +tagged = false +index = true +fk = "packagedata.ifno" + +[observations.rate.arms.boundname] +type = "string" +tagged = false + +[observations.rate-to-mvr] +type = "union" +tagged = false + +[observations.rate-to-mvr.arms.ifno] +type = "integer" +tagged = false +index = true +fk = "packagedata.ifno" + +[observations.rate-to-mvr.arms.boundname] +type = "string" +tagged = false + +[observations.fw-rate] +type = "union" +tagged = false + +[observations.fw-rate.arms.ifno] +type = "integer" +tagged = false +index = true +fk = "packagedata.ifno" + +[observations.fw-rate.arms.boundname] +type = "string" +tagged = false + +[observations.fw-to-mvr] +type = "union" +tagged = false + +[observations.fw-to-mvr.arms.ifno] +type = "integer" +tagged = false +index = true +fk = "packagedata.ifno" + +[observations.fw-to-mvr.arms.boundname] +type = "string" +tagged = false + +[observations.storage] +type = "union" +tagged = false + +[observations.storage.arms.ifno] +type = "integer" +tagged = false +index = true +fk = "packagedata.ifno" + +[observations.storage.arms.boundname] +type = "string" +tagged = false + +[observations.constant] +type = "union" +tagged = false + +[observations.constant.arms.ifno] +type = "integer" +tagged = false +index = true +fk = "packagedata.ifno" + +[observations.constant.arms.boundname] +type = "string" +tagged = false + +[observations.fw-conductance] +type = "union" +tagged = false + +[observations.fw-conductance.arms.ifno] +type = "integer" +tagged = false +index = true +fk = "packagedata.ifno" + +[observations.fw-conductance.arms.boundname] +type = "string" +tagged = false + +[observations.maw] +type = "union" +tagged = false + +[observations.maw.arms.ifno] +type = "record" +tagged = false + +[observations.maw.arms.ifno.fields.ifno] +type = "integer" +tagged = false +index = true +fk = "packagedata.ifno" + +[observations.maw.arms.ifno.fields.icon] +type = "integer" +tagged = false +index = true + +[observations.maw.arms.boundname] +type = "string" +tagged = false + +[observations.conductance] +type = "union" +tagged = false + +[observations.conductance.arms.ifno] +type = "record" +tagged = false + +[observations.conductance.arms.ifno.fields.ifno] +type = "integer" +tagged = false +index = true +fk = "packagedata.ifno" + +[observations.conductance.arms.ifno.fields.icon] +type = "integer" +tagged = false +index = true + +[observations.conductance.arms.boundname] +type = "string" +tagged = false 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 40738e1a..a5530c6a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-maw.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-maw.yaml @@ -580,3 +580,152 @@ memory: set_in: ar source: nmawwells type: integer +observations: + head: + type: union + tagged: false + arms: + ifno: + type: integer + tagged: false + index: true + fk: packagedata.ifno + boundname: + type: string + tagged: false + from-mvr: + type: union + tagged: false + arms: + ifno: + type: integer + tagged: false + index: true + fk: packagedata.ifno + boundname: + type: string + tagged: false + rate: + type: union + tagged: false + arms: + ifno: + type: integer + tagged: false + index: true + fk: packagedata.ifno + boundname: + type: string + tagged: false + rate-to-mvr: + type: union + tagged: false + arms: + ifno: + type: integer + tagged: false + index: true + fk: packagedata.ifno + boundname: + type: string + tagged: false + fw-rate: + type: union + tagged: false + arms: + ifno: + type: integer + tagged: false + index: true + fk: packagedata.ifno + boundname: + type: string + tagged: false + fw-to-mvr: + type: union + tagged: false + arms: + ifno: + type: integer + tagged: false + index: true + fk: packagedata.ifno + boundname: + type: string + tagged: false + storage: + type: union + tagged: false + arms: + ifno: + type: integer + tagged: false + index: true + fk: packagedata.ifno + boundname: + type: string + tagged: false + constant: + type: union + tagged: false + arms: + ifno: + type: integer + tagged: false + index: true + fk: packagedata.ifno + boundname: + type: string + tagged: false + fw-conductance: + type: union + tagged: false + arms: + ifno: + type: integer + tagged: false + index: true + fk: packagedata.ifno + boundname: + type: string + tagged: false + maw: + type: union + tagged: false + arms: + ifno: + type: record + tagged: false + fields: + ifno: + type: integer + tagged: false + index: true + fk: packagedata.ifno + icon: + type: integer + tagged: false + index: true + boundname: + type: string + tagged: false + conductance: + type: union + tagged: false + arms: + ifno: + type: record + tagged: false + fields: + ifno: + type: integer + tagged: false + index: true + fk: packagedata.ifno + icon: + type: integer + tagged: false + index: true + boundname: + type: string + tagged: false 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 1fb07bd7..5d4d9240 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-nam.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-nam.json @@ -233,5 +233,53 @@ "nja" ] } + }, + "observations": { + "head": { + "type": "array", + "tagged": false, + "dtype": "integer", + "index": true, + "cellid": true, + "shape": [ + "ncelldim" + ] + }, + "drawdown": { + "type": "array", + "tagged": false, + "dtype": "integer", + "index": true, + "cellid": true, + "shape": [ + "ncelldim" + ] + }, + "flow-ja-face": { + "type": "record", + "tagged": false, + "fields": { + "cellid": { + "type": "array", + "tagged": false, + "dtype": "integer", + "index": true, + "cellid": true, + "shape": [ + "ncelldim" + ] + }, + "cellid2": { + "type": "array", + "tagged": false, + "dtype": "integer", + "index": true, + "cellid": true, + "shape": [ + "ncelldim" + ] + } + } + } } } \ No newline at end of file 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 c2ff48a4..ad0122e4 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-nam.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-nam.toml @@ -209,3 +209,47 @@ dtype = "integer" shape = [ "nja", ] + +[observations.head] +type = "array" +tagged = false +dtype = "integer" +index = true +cellid = true +shape = [ + "ncelldim", +] + +[observations.drawdown] +type = "array" +tagged = false +dtype = "integer" +index = true +cellid = true +shape = [ + "ncelldim", +] + +[observations.flow-ja-face] +type = "record" +tagged = false + +[observations.flow-ja-face.fields.cellid] +type = "array" +tagged = false +dtype = "integer" +index = true +cellid = true +shape = [ + "ncelldim", +] + +[observations.flow-ja-face.fields.cellid2] +type = "array" +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 ab17a4da..a68de218 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-nam.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-nam.yaml @@ -213,3 +213,40 @@ memory: dtype: integer shape: - nja +observations: + head: + type: array + tagged: false + dtype: integer + index: true + cellid: true + shape: + - ncelldim + drawdown: + type: array + tagged: false + dtype: integer + index: true + cellid: true + shape: + - ncelldim + flow-ja-face: + type: record + tagged: false + fields: + cellid: + type: array + tagged: false + dtype: integer + index: true + cellid: true + shape: + - ncelldim + cellid2: + type: array + 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 291c2c89..f1154601 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rch.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rch.json @@ -313,5 +313,27 @@ "naux" ] } + }, + "observations": { + "rch": { + "type": "union", + "tagged": false, + "arms": { + "cellid": { + "type": "array", + "tagged": false, + "dtype": "integer", + "index": true, + "cellid": true, + "shape": [ + "ncelldim" + ] + }, + "boundname": { + "type": "string", + "tagged": false + } + } + } } } \ No newline at end of file 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 3c23d0cd..7d882173 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rch.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rch.toml @@ -287,3 +287,21 @@ dtype = "string" shape = [ "naux", ] + +[observations.rch] +type = "union" +tagged = false + +[observations.rch.arms.cellid] +type = "array" +tagged = false +dtype = "integer" +index = true +cellid = true +shape = [ + "ncelldim", +] + +[observations.rch.arms.boundname] +type = "string" +tagged = false 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 acc180cc..2da81895 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rch.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rch.yaml @@ -284,3 +284,19 @@ memory: dtype: string shape: - naux +observations: + rch: + type: union + tagged: false + arms: + cellid: + type: array + 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 fff530d7..a7862c57 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rcha.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rcha.json @@ -319,5 +319,27 @@ "naux" ] } + }, + "observations": { + "rch": { + "type": "union", + "tagged": false, + "arms": { + "cellid": { + "type": "array", + "tagged": false, + "dtype": "integer", + "index": true, + "cellid": true, + "shape": [ + "ncelldim" + ] + }, + "boundname": { + "type": "string", + "tagged": false + } + } + } } } \ No newline at end of file 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 e015fb54..f0e83df1 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rcha.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rcha.toml @@ -297,3 +297,21 @@ dtype = "string" shape = [ "naux", ] + +[observations.rch] +type = "union" +tagged = false + +[observations.rch.arms.cellid] +type = "array" +tagged = false +dtype = "integer" +index = true +cellid = true +shape = [ + "ncelldim", +] + +[observations.rch.arms.boundname] +type = "string" +tagged = false 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 67f1f062..cf7ccc51 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rcha.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rcha.yaml @@ -291,3 +291,19 @@ memory: dtype: string shape: - naux +observations: + rch: + type: union + tagged: false + arms: + cellid: + type: array + 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 1cafa539..bce0da9e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-riv.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-riv.json @@ -328,5 +328,47 @@ "naux" ] } + }, + "observations": { + "riv": { + "type": "union", + "tagged": false, + "arms": { + "cellid": { + "type": "array", + "tagged": false, + "dtype": "integer", + "index": true, + "cellid": true, + "shape": [ + "ncelldim" + ] + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "to-mvr": { + "type": "union", + "tagged": false, + "arms": { + "cellid": { + "type": "array", + "tagged": false, + "dtype": "integer", + "index": true, + "cellid": true, + "shape": [ + "ncelldim" + ] + }, + "boundname": { + "type": "string", + "tagged": false + } + } + } } } \ No newline at end of file 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 14d31586..5f9eed4e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-riv.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-riv.toml @@ -302,3 +302,39 @@ dtype = "string" shape = [ "naux", ] + +[observations.riv] +type = "union" +tagged = false + +[observations.riv.arms.cellid] +type = "array" +tagged = false +dtype = "integer" +index = true +cellid = true +shape = [ + "ncelldim", +] + +[observations.riv.arms.boundname] +type = "string" +tagged = false + +[observations.to-mvr] +type = "union" +tagged = false + +[observations.to-mvr.arms.cellid] +type = "array" +tagged = false +dtype = "integer" +index = true +cellid = true +shape = [ + "ncelldim", +] + +[observations.to-mvr.arms.boundname] +type = "string" +tagged = false 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 dd530ee2..53df75d1 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-riv.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-riv.yaml @@ -300,3 +300,34 @@ memory: dtype: string shape: - naux +observations: + riv: + type: union + tagged: false + arms: + cellid: + type: array + tagged: false + dtype: integer + index: true + cellid: true + shape: + - ncelldim + boundname: + type: string + tagged: false + to-mvr: + type: union + tagged: false + arms: + cellid: + type: array + 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 e3f96fb6..a2c5b3bb 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rivg.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rivg.json @@ -324,5 +324,47 @@ "naux" ] } + }, + "observations": { + "riv": { + "type": "union", + "tagged": false, + "arms": { + "cellid": { + "type": "array", + "tagged": false, + "dtype": "integer", + "index": true, + "cellid": true, + "shape": [ + "ncelldim" + ] + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "to-mvr": { + "type": "union", + "tagged": false, + "arms": { + "cellid": { + "type": "array", + "tagged": false, + "dtype": "integer", + "index": true, + "cellid": true, + "shape": [ + "ncelldim" + ] + }, + "boundname": { + "type": "string", + "tagged": false + } + } + } } } \ No newline at end of file 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 cffe3dfc..a948f3b2 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rivg.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rivg.toml @@ -300,3 +300,39 @@ dtype = "string" shape = [ "naux", ] + +[observations.riv] +type = "union" +tagged = false + +[observations.riv.arms.cellid] +type = "array" +tagged = false +dtype = "integer" +index = true +cellid = true +shape = [ + "ncelldim", +] + +[observations.riv.arms.boundname] +type = "string" +tagged = false + +[observations.to-mvr] +type = "union" +tagged = false + +[observations.to-mvr.arms.cellid] +type = "array" +tagged = false +dtype = "integer" +index = true +cellid = true +shape = [ + "ncelldim", +] + +[observations.to-mvr.arms.boundname] +type = "string" +tagged = false 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 7be0aa41..59ce263e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rivg.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rivg.yaml @@ -289,3 +289,34 @@ memory: dtype: string shape: - naux +observations: + riv: + type: union + tagged: false + arms: + cellid: + type: array + tagged: false + dtype: integer + index: true + cellid: true + shape: + - ncelldim + boundname: + type: string + tagged: false + to-mvr: + type: union + tagged: false + arms: + cellid: + type: array + 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 dcbb6720..de6f874e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sfr.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sfr.json @@ -755,5 +755,279 @@ "maxbound" ] } + }, + "observations": { + "stage": { + "type": "union", + "tagged": false, + "arms": { + "ifno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.ifno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "ext-inflow": { + "type": "union", + "tagged": false, + "arms": { + "ifno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.ifno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "inflow": { + "type": "union", + "tagged": false, + "arms": { + "ifno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.ifno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "from-mvr": { + "type": "union", + "tagged": false, + "arms": { + "ifno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.ifno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "rainfall": { + "type": "union", + "tagged": false, + "arms": { + "ifno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.ifno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "runoff": { + "type": "union", + "tagged": false, + "arms": { + "ifno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.ifno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "sfr": { + "type": "union", + "tagged": false, + "arms": { + "ifno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.ifno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "evaporation": { + "type": "union", + "tagged": false, + "arms": { + "ifno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.ifno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "outflow": { + "type": "union", + "tagged": false, + "arms": { + "ifno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.ifno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "ext-outflow": { + "type": "union", + "tagged": false, + "arms": { + "ifno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.ifno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "to-mvr": { + "type": "union", + "tagged": false, + "arms": { + "ifno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.ifno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "upstream-flow": { + "type": "union", + "tagged": false, + "arms": { + "ifno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.ifno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "downstream-flow": { + "type": "union", + "tagged": false, + "arms": { + "ifno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.ifno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "depth": { + "type": "union", + "tagged": false, + "arms": { + "ifno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.ifno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "wet-perimeter": { + "type": "union", + "tagged": false, + "arms": { + "ifno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.ifno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "wet-area": { + "type": "union", + "tagged": false, + "arms": { + "ifno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.ifno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "wet-width": { + "type": "union", + "tagged": false, + "arms": { + "ifno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.ifno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + } } } \ No newline at end of file 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 1f50922f..1c020796 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sfr.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sfr.toml @@ -683,3 +683,241 @@ dtype = "integer" shape = [ "maxbound", ] + +[observations.stage] +type = "union" +tagged = false + +[observations.stage.arms.ifno] +type = "integer" +tagged = false +index = true +fk = "packagedata.ifno" + +[observations.stage.arms.boundname] +type = "string" +tagged = false + +[observations.ext-inflow] +type = "union" +tagged = false + +[observations.ext-inflow.arms.ifno] +type = "integer" +tagged = false +index = true +fk = "packagedata.ifno" + +[observations.ext-inflow.arms.boundname] +type = "string" +tagged = false + +[observations.inflow] +type = "union" +tagged = false + +[observations.inflow.arms.ifno] +type = "integer" +tagged = false +index = true +fk = "packagedata.ifno" + +[observations.inflow.arms.boundname] +type = "string" +tagged = false + +[observations.from-mvr] +type = "union" +tagged = false + +[observations.from-mvr.arms.ifno] +type = "integer" +tagged = false +index = true +fk = "packagedata.ifno" + +[observations.from-mvr.arms.boundname] +type = "string" +tagged = false + +[observations.rainfall] +type = "union" +tagged = false + +[observations.rainfall.arms.ifno] +type = "integer" +tagged = false +index = true +fk = "packagedata.ifno" + +[observations.rainfall.arms.boundname] +type = "string" +tagged = false + +[observations.runoff] +type = "union" +tagged = false + +[observations.runoff.arms.ifno] +type = "integer" +tagged = false +index = true +fk = "packagedata.ifno" + +[observations.runoff.arms.boundname] +type = "string" +tagged = false + +[observations.sfr] +type = "union" +tagged = false + +[observations.sfr.arms.ifno] +type = "integer" +tagged = false +index = true +fk = "packagedata.ifno" + +[observations.sfr.arms.boundname] +type = "string" +tagged = false + +[observations.evaporation] +type = "union" +tagged = false + +[observations.evaporation.arms.ifno] +type = "integer" +tagged = false +index = true +fk = "packagedata.ifno" + +[observations.evaporation.arms.boundname] +type = "string" +tagged = false + +[observations.outflow] +type = "union" +tagged = false + +[observations.outflow.arms.ifno] +type = "integer" +tagged = false +index = true +fk = "packagedata.ifno" + +[observations.outflow.arms.boundname] +type = "string" +tagged = false + +[observations.ext-outflow] +type = "union" +tagged = false + +[observations.ext-outflow.arms.ifno] +type = "integer" +tagged = false +index = true +fk = "packagedata.ifno" + +[observations.ext-outflow.arms.boundname] +type = "string" +tagged = false + +[observations.to-mvr] +type = "union" +tagged = false + +[observations.to-mvr.arms.ifno] +type = "integer" +tagged = false +index = true +fk = "packagedata.ifno" + +[observations.to-mvr.arms.boundname] +type = "string" +tagged = false + +[observations.upstream-flow] +type = "union" +tagged = false + +[observations.upstream-flow.arms.ifno] +type = "integer" +tagged = false +index = true +fk = "packagedata.ifno" + +[observations.upstream-flow.arms.boundname] +type = "string" +tagged = false + +[observations.downstream-flow] +type = "union" +tagged = false + +[observations.downstream-flow.arms.ifno] +type = "integer" +tagged = false +index = true +fk = "packagedata.ifno" + +[observations.downstream-flow.arms.boundname] +type = "string" +tagged = false + +[observations.depth] +type = "union" +tagged = false + +[observations.depth.arms.ifno] +type = "integer" +tagged = false +index = true +fk = "packagedata.ifno" + +[observations.depth.arms.boundname] +type = "string" +tagged = false + +[observations.wet-perimeter] +type = "union" +tagged = false + +[observations.wet-perimeter.arms.ifno] +type = "integer" +tagged = false +index = true +fk = "packagedata.ifno" + +[observations.wet-perimeter.arms.boundname] +type = "string" +tagged = false + +[observations.wet-area] +type = "union" +tagged = false + +[observations.wet-area.arms.ifno] +type = "integer" +tagged = false +index = true +fk = "packagedata.ifno" + +[observations.wet-area.arms.boundname] +type = "string" +tagged = false + +[observations.wet-width] +type = "union" +tagged = false + +[observations.wet-width.arms.ifno] +type = "integer" +tagged = false +index = true +fk = "packagedata.ifno" + +[observations.wet-width.arms.boundname] +type = "string" +tagged = false 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 f0f98ec5..b3fc0f15 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sfr.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sfr.yaml @@ -801,3 +801,208 @@ memory: dtype: integer shape: - maxbound +observations: + stage: + type: union + tagged: false + arms: + ifno: + type: integer + tagged: false + index: true + fk: packagedata.ifno + boundname: + type: string + tagged: false + ext-inflow: + type: union + tagged: false + arms: + ifno: + type: integer + tagged: false + index: true + fk: packagedata.ifno + boundname: + type: string + tagged: false + inflow: + type: union + tagged: false + arms: + ifno: + type: integer + tagged: false + index: true + fk: packagedata.ifno + boundname: + type: string + tagged: false + from-mvr: + type: union + tagged: false + arms: + ifno: + type: integer + tagged: false + index: true + fk: packagedata.ifno + boundname: + type: string + tagged: false + rainfall: + type: union + tagged: false + arms: + ifno: + type: integer + tagged: false + index: true + fk: packagedata.ifno + boundname: + type: string + tagged: false + runoff: + type: union + tagged: false + arms: + ifno: + type: integer + tagged: false + index: true + fk: packagedata.ifno + boundname: + type: string + tagged: false + sfr: + type: union + tagged: false + arms: + ifno: + type: integer + tagged: false + index: true + fk: packagedata.ifno + boundname: + type: string + tagged: false + evaporation: + type: union + tagged: false + arms: + ifno: + type: integer + tagged: false + index: true + fk: packagedata.ifno + boundname: + type: string + tagged: false + outflow: + type: union + tagged: false + arms: + ifno: + type: integer + tagged: false + index: true + fk: packagedata.ifno + boundname: + type: string + tagged: false + ext-outflow: + type: union + tagged: false + arms: + ifno: + type: integer + tagged: false + index: true + fk: packagedata.ifno + boundname: + type: string + tagged: false + to-mvr: + type: union + tagged: false + arms: + ifno: + type: integer + tagged: false + index: true + fk: packagedata.ifno + boundname: + type: string + tagged: false + upstream-flow: + type: union + tagged: false + arms: + ifno: + type: integer + tagged: false + index: true + fk: packagedata.ifno + boundname: + type: string + tagged: false + downstream-flow: + type: union + tagged: false + arms: + ifno: + type: integer + tagged: false + index: true + fk: packagedata.ifno + boundname: + type: string + tagged: false + depth: + type: union + tagged: false + arms: + ifno: + type: integer + tagged: false + index: true + fk: packagedata.ifno + boundname: + type: string + tagged: false + wet-perimeter: + type: union + tagged: false + arms: + ifno: + type: integer + tagged: false + index: true + fk: packagedata.ifno + boundname: + type: string + tagged: false + wet-area: + type: union + tagged: false + arms: + ifno: + type: integer + tagged: false + index: true + fk: packagedata.ifno + boundname: + type: string + tagged: false + wet-width: + type: union + tagged: false + arms: + ifno: + type: integer + tagged: false + index: true + fk: packagedata.ifno + boundname: + type: string + tagged: false 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 60a27947..4022e25e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-uzf.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-uzf.json @@ -436,5 +436,209 @@ "source": "nwavesets", "type": "integer" } + }, + "observations": { + "uzf-gwrch": { + "type": "union", + "tagged": false, + "arms": { + "ifno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.ifno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "uzf-gwd": { + "type": "union", + "tagged": false, + "arms": { + "ifno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.ifno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "uzf-gwd-to-mvr": { + "type": "union", + "tagged": false, + "arms": { + "ifno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.ifno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "uzf-gwet": { + "type": "union", + "tagged": false, + "arms": { + "ifno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.ifno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "infiltration": { + "type": "union", + "tagged": false, + "arms": { + "ifno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.ifno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "from-mvr": { + "type": "union", + "tagged": false, + "arms": { + "ifno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.ifno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "rej-inf": { + "type": "union", + "tagged": false, + "arms": { + "ifno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.ifno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "rej-inf-to-mvr": { + "type": "union", + "tagged": false, + "arms": { + "ifno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.ifno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "uzet": { + "type": "union", + "tagged": false, + "arms": { + "ifno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.ifno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "storage": { + "type": "union", + "tagged": false, + "arms": { + "ifno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.ifno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "net-infiltration": { + "type": "union", + "tagged": false, + "arms": { + "ifno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.ifno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "water-content": { + "type": "record", + "tagged": false, + "fields": { + "ifno": { + "type": "union", + "tagged": false, + "arms": { + "ifno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.ifno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "depth": { + "type": "double", + "tagged": false + } + } + } } } \ No newline at end of file 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 2d48df10..e9ef3f48 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-uzf.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-uzf.toml @@ -398,3 +398,179 @@ type = "integer" set_in = "ar" source = "nwavesets" type = "integer" + +[observations.uzf-gwrch] +type = "union" +tagged = false + +[observations.uzf-gwrch.arms.ifno] +type = "integer" +tagged = false +index = true +fk = "packagedata.ifno" + +[observations.uzf-gwrch.arms.boundname] +type = "string" +tagged = false + +[observations.uzf-gwd] +type = "union" +tagged = false + +[observations.uzf-gwd.arms.ifno] +type = "integer" +tagged = false +index = true +fk = "packagedata.ifno" + +[observations.uzf-gwd.arms.boundname] +type = "string" +tagged = false + +[observations.uzf-gwd-to-mvr] +type = "union" +tagged = false + +[observations.uzf-gwd-to-mvr.arms.ifno] +type = "integer" +tagged = false +index = true +fk = "packagedata.ifno" + +[observations.uzf-gwd-to-mvr.arms.boundname] +type = "string" +tagged = false + +[observations.uzf-gwet] +type = "union" +tagged = false + +[observations.uzf-gwet.arms.ifno] +type = "integer" +tagged = false +index = true +fk = "packagedata.ifno" + +[observations.uzf-gwet.arms.boundname] +type = "string" +tagged = false + +[observations.infiltration] +type = "union" +tagged = false + +[observations.infiltration.arms.ifno] +type = "integer" +tagged = false +index = true +fk = "packagedata.ifno" + +[observations.infiltration.arms.boundname] +type = "string" +tagged = false + +[observations.from-mvr] +type = "union" +tagged = false + +[observations.from-mvr.arms.ifno] +type = "integer" +tagged = false +index = true +fk = "packagedata.ifno" + +[observations.from-mvr.arms.boundname] +type = "string" +tagged = false + +[observations.rej-inf] +type = "union" +tagged = false + +[observations.rej-inf.arms.ifno] +type = "integer" +tagged = false +index = true +fk = "packagedata.ifno" + +[observations.rej-inf.arms.boundname] +type = "string" +tagged = false + +[observations.rej-inf-to-mvr] +type = "union" +tagged = false + +[observations.rej-inf-to-mvr.arms.ifno] +type = "integer" +tagged = false +index = true +fk = "packagedata.ifno" + +[observations.rej-inf-to-mvr.arms.boundname] +type = "string" +tagged = false + +[observations.uzet] +type = "union" +tagged = false + +[observations.uzet.arms.ifno] +type = "integer" +tagged = false +index = true +fk = "packagedata.ifno" + +[observations.uzet.arms.boundname] +type = "string" +tagged = false + +[observations.storage] +type = "union" +tagged = false + +[observations.storage.arms.ifno] +type = "integer" +tagged = false +index = true +fk = "packagedata.ifno" + +[observations.storage.arms.boundname] +type = "string" +tagged = false + +[observations.net-infiltration] +type = "union" +tagged = false + +[observations.net-infiltration.arms.ifno] +type = "integer" +tagged = false +index = true +fk = "packagedata.ifno" + +[observations.net-infiltration.arms.boundname] +type = "string" +tagged = false + +[observations.water-content] +type = "record" +tagged = false + +[observations.water-content.fields.ifno] +type = "union" +tagged = false + +[observations.water-content.fields.ifno.arms.ifno] +type = "integer" +tagged = false +index = true +fk = "packagedata.ifno" + +[observations.water-content.fields.ifno.arms.boundname] +type = "string" +tagged = false + +[observations.water-content.fields.depth] +type = "double" +tagged = false 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 ad89b5b0..6f357653 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-uzf.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-uzf.yaml @@ -460,3 +460,155 @@ memory: set_in: ar source: nwavesets type: integer +observations: + uzf-gwrch: + type: union + tagged: false + arms: + ifno: + type: integer + tagged: false + index: true + fk: packagedata.ifno + boundname: + type: string + tagged: false + uzf-gwd: + type: union + tagged: false + arms: + ifno: + type: integer + tagged: false + index: true + fk: packagedata.ifno + boundname: + type: string + tagged: false + uzf-gwd-to-mvr: + type: union + tagged: false + arms: + ifno: + type: integer + tagged: false + index: true + fk: packagedata.ifno + boundname: + type: string + tagged: false + uzf-gwet: + type: union + tagged: false + arms: + ifno: + type: integer + tagged: false + index: true + fk: packagedata.ifno + boundname: + type: string + tagged: false + infiltration: + type: union + tagged: false + arms: + ifno: + type: integer + tagged: false + index: true + fk: packagedata.ifno + boundname: + type: string + tagged: false + from-mvr: + type: union + tagged: false + arms: + ifno: + type: integer + tagged: false + index: true + fk: packagedata.ifno + boundname: + type: string + tagged: false + rej-inf: + type: union + tagged: false + arms: + ifno: + type: integer + tagged: false + index: true + fk: packagedata.ifno + boundname: + type: string + tagged: false + rej-inf-to-mvr: + type: union + tagged: false + arms: + ifno: + type: integer + tagged: false + index: true + fk: packagedata.ifno + boundname: + type: string + tagged: false + uzet: + type: union + tagged: false + arms: + ifno: + type: integer + tagged: false + index: true + fk: packagedata.ifno + boundname: + type: string + tagged: false + storage: + type: union + tagged: false + arms: + ifno: + type: integer + tagged: false + index: true + fk: packagedata.ifno + boundname: + type: string + tagged: false + net-infiltration: + type: union + tagged: false + arms: + ifno: + type: integer + tagged: false + index: true + fk: packagedata.ifno + boundname: + type: string + tagged: false + water-content: + type: record + tagged: false + fields: + ifno: + type: union + tagged: false + arms: + ifno: + type: integer + tagged: false + index: true + fk: packagedata.ifno + boundname: + type: string + tagged: false + depth: + type: double + tagged: false 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 67b8f92a..4730c88a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-wel.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-wel.json @@ -359,5 +359,67 @@ "naux" ] } + }, + "observations": { + "wel": { + "type": "union", + "tagged": false, + "arms": { + "cellid": { + "type": "array", + "tagged": false, + "dtype": "integer", + "index": true, + "cellid": true, + "shape": [ + "ncelldim" + ] + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "to-mvr": { + "type": "union", + "tagged": false, + "arms": { + "cellid": { + "type": "array", + "tagged": false, + "dtype": "integer", + "index": true, + "cellid": true, + "shape": [ + "ncelldim" + ] + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "wel-reduction": { + "type": "union", + "tagged": false, + "arms": { + "cellid": { + "type": "array", + "tagged": false, + "dtype": "integer", + "index": true, + "cellid": true, + "shape": [ + "ncelldim" + ] + }, + "boundname": { + "type": "string", + "tagged": false + } + } + } } } \ No newline at end of file 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 1c5d9589..2affc3ff 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-wel.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-wel.toml @@ -331,3 +331,57 @@ dtype = "string" shape = [ "naux", ] + +[observations.wel] +type = "union" +tagged = false + +[observations.wel.arms.cellid] +type = "array" +tagged = false +dtype = "integer" +index = true +cellid = true +shape = [ + "ncelldim", +] + +[observations.wel.arms.boundname] +type = "string" +tagged = false + +[observations.to-mvr] +type = "union" +tagged = false + +[observations.to-mvr.arms.cellid] +type = "array" +tagged = false +dtype = "integer" +index = true +cellid = true +shape = [ + "ncelldim", +] + +[observations.to-mvr.arms.boundname] +type = "string" +tagged = false + +[observations.wel-reduction] +type = "union" +tagged = false + +[observations.wel-reduction.arms.cellid] +type = "array" +tagged = false +dtype = "integer" +index = true +cellid = true +shape = [ + "ncelldim", +] + +[observations.wel-reduction.arms.boundname] +type = "string" +tagged = false 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 cca0a0a4..1d633a4f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-wel.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-wel.yaml @@ -336,3 +336,49 @@ memory: dtype: string shape: - naux +observations: + wel: + type: union + tagged: false + arms: + cellid: + type: array + tagged: false + dtype: integer + index: true + cellid: true + shape: + - ncelldim + boundname: + type: string + tagged: false + to-mvr: + type: union + tagged: false + arms: + cellid: + type: array + tagged: false + dtype: integer + index: true + cellid: true + shape: + - ncelldim + boundname: + type: string + tagged: false + wel-reduction: + type: union + tagged: false + arms: + cellid: + type: array + 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 6750148e..8fc970fd 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-welg.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-welg.json @@ -345,5 +345,67 @@ "naux" ] } + }, + "observations": { + "wel": { + "type": "union", + "tagged": false, + "arms": { + "cellid": { + "type": "array", + "tagged": false, + "dtype": "integer", + "index": true, + "cellid": true, + "shape": [ + "ncelldim" + ] + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "to-mvr": { + "type": "union", + "tagged": false, + "arms": { + "cellid": { + "type": "array", + "tagged": false, + "dtype": "integer", + "index": true, + "cellid": true, + "shape": [ + "ncelldim" + ] + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "wel-reduction": { + "type": "union", + "tagged": false, + "arms": { + "cellid": { + "type": "array", + "tagged": false, + "dtype": "integer", + "index": true, + "cellid": true, + "shape": [ + "ncelldim" + ] + }, + "boundname": { + "type": "string", + "tagged": false + } + } + } } } \ No newline at end of file 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 f0c5489f..712ef5ff 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-welg.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-welg.toml @@ -319,3 +319,57 @@ dtype = "string" shape = [ "naux", ] + +[observations.wel] +type = "union" +tagged = false + +[observations.wel.arms.cellid] +type = "array" +tagged = false +dtype = "integer" +index = true +cellid = true +shape = [ + "ncelldim", +] + +[observations.wel.arms.boundname] +type = "string" +tagged = false + +[observations.to-mvr] +type = "union" +tagged = false + +[observations.to-mvr.arms.cellid] +type = "array" +tagged = false +dtype = "integer" +index = true +cellid = true +shape = [ + "ncelldim", +] + +[observations.to-mvr.arms.boundname] +type = "string" +tagged = false + +[observations.wel-reduction] +type = "union" +tagged = false + +[observations.wel-reduction.arms.cellid] +type = "array" +tagged = false +dtype = "integer" +index = true +cellid = true +shape = [ + "ncelldim", +] + +[observations.wel-reduction.arms.boundname] +type = "string" +tagged = false 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 3272797d..4027ea8c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-welg.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-welg.yaml @@ -322,3 +322,49 @@ memory: dtype: string shape: - naux +observations: + wel: + type: union + tagged: false + arms: + cellid: + type: array + tagged: false + dtype: integer + index: true + cellid: true + shape: + - ncelldim + boundname: + type: string + tagged: false + to-mvr: + type: union + tagged: false + arms: + cellid: + type: array + tagged: false + dtype: integer + index: true + cellid: true + shape: + - ncelldim + boundname: + type: string + tagged: false + wel-reduction: + type: union + tagged: false + arms: + cellid: + type: array + 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 1d6c1def..69093ab8 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-api.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-api.json @@ -93,5 +93,47 @@ "source": "maxbound", "type": "integer" } + }, + "observations": { + "api": { + "type": "union", + "tagged": false, + "arms": { + "cellid": { + "type": "array", + "tagged": false, + "dtype": "integer", + "index": true, + "cellid": true, + "shape": [ + "ncelldim" + ] + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "to-mvr": { + "type": "union", + "tagged": false, + "arms": { + "cellid": { + "type": "array", + "tagged": false, + "dtype": "integer", + "index": true, + "cellid": true, + "shape": [ + "ncelldim" + ] + }, + "boundname": { + "type": "string", + "tagged": false + } + } + } } } \ No newline at end of file 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 58b0483d..f2d37934 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-api.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-api.toml @@ -77,3 +77,39 @@ type = "integer" set_in = "ar" source = "maxbound" type = "integer" + +[observations.api] +type = "union" +tagged = false + +[observations.api.arms.cellid] +type = "array" +tagged = false +dtype = "integer" +index = true +cellid = true +shape = [ + "ncelldim", +] + +[observations.api.arms.boundname] +type = "string" +tagged = false + +[observations.to-mvr] +type = "union" +tagged = false + +[observations.to-mvr.arms.cellid] +type = "array" +tagged = false +dtype = "integer" +index = true +cellid = true +shape = [ + "ncelldim", +] + +[observations.to-mvr.arms.boundname] +type = "string" +tagged = false 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 94997ac8..42c55c46 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-api.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-api.yaml @@ -82,3 +82,34 @@ memory: set_in: ar source: maxbound type: integer +observations: + api: + type: union + tagged: false + arms: + cellid: + type: array + tagged: false + dtype: integer + index: true + cellid: true + shape: + - ncelldim + boundname: + type: string + tagged: false + to-mvr: + type: union + tagged: false + arms: + cellid: + type: array + 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 17da5f4b..fa279d23 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-cnc.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-cnc.json @@ -312,5 +312,27 @@ "naux" ] } + }, + "observations": { + "cnc": { + "type": "union", + "tagged": false, + "arms": { + "cellid": { + "type": "array", + "tagged": false, + "dtype": "integer", + "index": true, + "cellid": true, + "shape": [ + "ncelldim" + ] + }, + "boundname": { + "type": "string", + "tagged": false + } + } + } } } \ No newline at end of file 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 b28213c5..a5a1990d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-cnc.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-cnc.toml @@ -286,3 +286,21 @@ dtype = "string" shape = [ "naux", ] + +[observations.cnc] +type = "union" +tagged = false + +[observations.cnc.arms.cellid] +type = "array" +tagged = false +dtype = "integer" +index = true +cellid = true +shape = [ + "ncelldim", +] + +[observations.cnc.arms.boundname] +type = "string" +tagged = false 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 2d206a27..51919f5e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-cnc.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-cnc.yaml @@ -280,3 +280,19 @@ memory: dtype: string shape: - naux +observations: + cnc: + type: union + tagged: false + arms: + cellid: + type: array + 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-lkt.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-lkt.json index 365a6eb8..d5639ae1 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-lkt.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-lkt.json @@ -403,5 +403,237 @@ "ncv" ] } + }, + "observations": { + "concentration": { + "type": "union", + "tagged": false, + "arms": { + "ifno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.ifno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "storage": { + "type": "union", + "tagged": false, + "arms": { + "ifno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.ifno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "constant": { + "type": "union", + "tagged": false, + "arms": { + "ifno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.ifno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "from-mvr": { + "type": "union", + "tagged": false, + "arms": { + "ifno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.ifno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "rainfall": { + "type": "union", + "tagged": false, + "arms": { + "ifno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.ifno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "evaporation": { + "type": "union", + "tagged": false, + "arms": { + "ifno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.ifno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "runoff": { + "type": "union", + "tagged": false, + "arms": { + "ifno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.ifno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "ext-inflow": { + "type": "union", + "tagged": false, + "arms": { + "ifno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.ifno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "withdrawal": { + "type": "union", + "tagged": false, + "arms": { + "ifno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.ifno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "ext-outflow": { + "type": "union", + "tagged": false, + "arms": { + "ifno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.ifno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "flow-ja-face": { + "type": "union", + "tagged": false, + "arms": { + "ifno": { + "type": "record", + "tagged": false, + "fields": { + "ifno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.ifno" + }, + "ifno2": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.ifno" + } + } + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "to-mvr": { + "type": "union", + "tagged": false, + "arms": { + "outletno": { + "type": "integer", + "tagged": false, + "index": true + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "lkt": { + "type": "union", + "tagged": false, + "arms": { + "ifno": { + "type": "record", + "tagged": false, + "fields": { + "ifno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.ifno" + }, + "iconn": { + "type": "integer", + "tagged": false, + "index": true + } + } + }, + "boundname": { + "type": "string", + "tagged": false + } + } + } } } \ No newline at end of file diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-lkt.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-lkt.toml index 315ff2e4..ef3bfcaf 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-lkt.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-lkt.toml @@ -365,3 +365,203 @@ dtype = "double" shape = [ "ncv", ] + +[observations.concentration] +type = "union" +tagged = false + +[observations.concentration.arms.ifno] +type = "integer" +tagged = false +index = true +fk = "packagedata.ifno" + +[observations.concentration.arms.boundname] +type = "string" +tagged = false + +[observations.storage] +type = "union" +tagged = false + +[observations.storage.arms.ifno] +type = "integer" +tagged = false +index = true +fk = "packagedata.ifno" + +[observations.storage.arms.boundname] +type = "string" +tagged = false + +[observations.constant] +type = "union" +tagged = false + +[observations.constant.arms.ifno] +type = "integer" +tagged = false +index = true +fk = "packagedata.ifno" + +[observations.constant.arms.boundname] +type = "string" +tagged = false + +[observations.from-mvr] +type = "union" +tagged = false + +[observations.from-mvr.arms.ifno] +type = "integer" +tagged = false +index = true +fk = "packagedata.ifno" + +[observations.from-mvr.arms.boundname] +type = "string" +tagged = false + +[observations.rainfall] +type = "union" +tagged = false + +[observations.rainfall.arms.ifno] +type = "integer" +tagged = false +index = true +fk = "packagedata.ifno" + +[observations.rainfall.arms.boundname] +type = "string" +tagged = false + +[observations.evaporation] +type = "union" +tagged = false + +[observations.evaporation.arms.ifno] +type = "integer" +tagged = false +index = true +fk = "packagedata.ifno" + +[observations.evaporation.arms.boundname] +type = "string" +tagged = false + +[observations.runoff] +type = "union" +tagged = false + +[observations.runoff.arms.ifno] +type = "integer" +tagged = false +index = true +fk = "packagedata.ifno" + +[observations.runoff.arms.boundname] +type = "string" +tagged = false + +[observations.ext-inflow] +type = "union" +tagged = false + +[observations.ext-inflow.arms.ifno] +type = "integer" +tagged = false +index = true +fk = "packagedata.ifno" + +[observations.ext-inflow.arms.boundname] +type = "string" +tagged = false + +[observations.withdrawal] +type = "union" +tagged = false + +[observations.withdrawal.arms.ifno] +type = "integer" +tagged = false +index = true +fk = "packagedata.ifno" + +[observations.withdrawal.arms.boundname] +type = "string" +tagged = false + +[observations.ext-outflow] +type = "union" +tagged = false + +[observations.ext-outflow.arms.ifno] +type = "integer" +tagged = false +index = true +fk = "packagedata.ifno" + +[observations.ext-outflow.arms.boundname] +type = "string" +tagged = false + +[observations.flow-ja-face] +type = "union" +tagged = false + +[observations.flow-ja-face.arms.ifno] +type = "record" +tagged = false + +[observations.flow-ja-face.arms.ifno.fields.ifno] +type = "integer" +tagged = false +index = true +fk = "packagedata.ifno" + +[observations.flow-ja-face.arms.ifno.fields.ifno2] +type = "integer" +tagged = false +index = true +fk = "packagedata.ifno" + +[observations.flow-ja-face.arms.boundname] +type = "string" +tagged = false + +[observations.to-mvr] +type = "union" +tagged = false + +[observations.to-mvr.arms.outletno] +type = "integer" +tagged = false +index = true + +[observations.to-mvr.arms.boundname] +type = "string" +tagged = false + +[observations.lkt] +type = "union" +tagged = false + +[observations.lkt.arms.ifno] +type = "record" +tagged = false + +[observations.lkt.arms.ifno.fields.ifno] +type = "integer" +tagged = false +index = true +fk = "packagedata.ifno" + +[observations.lkt.arms.ifno.fields.iconn] +type = "integer" +tagged = false +index = true + +[observations.lkt.arms.boundname] +type = "string" +tagged = false diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-lkt.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-lkt.yaml index f042f9df..22234cf0 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-lkt.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-lkt.yaml @@ -395,3 +395,176 @@ memory: dtype: double shape: - ncv +observations: + concentration: + type: union + tagged: false + arms: + ifno: + type: integer + tagged: false + index: true + fk: packagedata.ifno + boundname: + type: string + tagged: false + storage: + type: union + tagged: false + arms: + ifno: + type: integer + tagged: false + index: true + fk: packagedata.ifno + boundname: + type: string + tagged: false + constant: + type: union + tagged: false + arms: + ifno: + type: integer + tagged: false + index: true + fk: packagedata.ifno + boundname: + type: string + tagged: false + from-mvr: + type: union + tagged: false + arms: + ifno: + type: integer + tagged: false + index: true + fk: packagedata.ifno + boundname: + type: string + tagged: false + rainfall: + type: union + tagged: false + arms: + ifno: + type: integer + tagged: false + index: true + fk: packagedata.ifno + boundname: + type: string + tagged: false + evaporation: + type: union + tagged: false + arms: + ifno: + type: integer + tagged: false + index: true + fk: packagedata.ifno + boundname: + type: string + tagged: false + runoff: + type: union + tagged: false + arms: + ifno: + type: integer + tagged: false + index: true + fk: packagedata.ifno + boundname: + type: string + tagged: false + ext-inflow: + type: union + tagged: false + arms: + ifno: + type: integer + tagged: false + index: true + fk: packagedata.ifno + boundname: + type: string + tagged: false + withdrawal: + type: union + tagged: false + arms: + ifno: + type: integer + tagged: false + index: true + fk: packagedata.ifno + boundname: + type: string + tagged: false + ext-outflow: + type: union + tagged: false + arms: + ifno: + type: integer + tagged: false + index: true + fk: packagedata.ifno + boundname: + type: string + tagged: false + flow-ja-face: + type: union + tagged: false + arms: + ifno: + type: record + tagged: false + fields: + ifno: + type: integer + tagged: false + index: true + fk: packagedata.ifno + ifno2: + type: integer + tagged: false + index: true + fk: packagedata.ifno + boundname: + type: string + tagged: false + to-mvr: + type: union + tagged: false + arms: + outletno: + type: integer + tagged: false + index: true + boundname: + type: string + tagged: false + lkt: + type: union + tagged: false + arms: + ifno: + type: record + tagged: false + fields: + ifno: + type: integer + tagged: false + index: true + fk: packagedata.ifno + iconn: + type: integer + tagged: false + index: true + boundname: + type: string + tagged: false diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-mwt.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-mwt.json index 28970c7b..cac1109a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-mwt.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-mwt.json @@ -358,5 +358,162 @@ "ncv" ] } + }, + "observations": { + "concentration": { + "type": "union", + "tagged": false, + "arms": { + "ifno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.ifno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "storage": { + "type": "union", + "tagged": false, + "arms": { + "ifno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.ifno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "constant": { + "type": "union", + "tagged": false, + "arms": { + "ifno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.ifno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "from-mvr": { + "type": "union", + "tagged": false, + "arms": { + "ifno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.ifno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "rate": { + "type": "union", + "tagged": false, + "arms": { + "ifno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.ifno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "fw-rate": { + "type": "union", + "tagged": false, + "arms": { + "ifno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.ifno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "rate-to-mvr": { + "type": "union", + "tagged": false, + "arms": { + "ifno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.ifno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "fw-rate-to-mvr": { + "type": "union", + "tagged": false, + "arms": { + "ifno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.ifno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "mwt": { + "type": "union", + "tagged": false, + "arms": { + "ifno": { + "type": "record", + "tagged": false, + "fields": { + "ifno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.ifno" + }, + "iconn": { + "type": "integer", + "tagged": false, + "index": true + } + } + }, + "boundname": { + "type": "string", + "tagged": false + } + } + } } } \ No newline at end of file diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-mwt.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-mwt.toml index 2f20d3b7..30f57e91 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-mwt.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-mwt.toml @@ -320,3 +320,138 @@ dtype = "double" shape = [ "ncv", ] + +[observations.concentration] +type = "union" +tagged = false + +[observations.concentration.arms.ifno] +type = "integer" +tagged = false +index = true +fk = "packagedata.ifno" + +[observations.concentration.arms.boundname] +type = "string" +tagged = false + +[observations.storage] +type = "union" +tagged = false + +[observations.storage.arms.ifno] +type = "integer" +tagged = false +index = true +fk = "packagedata.ifno" + +[observations.storage.arms.boundname] +type = "string" +tagged = false + +[observations.constant] +type = "union" +tagged = false + +[observations.constant.arms.ifno] +type = "integer" +tagged = false +index = true +fk = "packagedata.ifno" + +[observations.constant.arms.boundname] +type = "string" +tagged = false + +[observations.from-mvr] +type = "union" +tagged = false + +[observations.from-mvr.arms.ifno] +type = "integer" +tagged = false +index = true +fk = "packagedata.ifno" + +[observations.from-mvr.arms.boundname] +type = "string" +tagged = false + +[observations.rate] +type = "union" +tagged = false + +[observations.rate.arms.ifno] +type = "integer" +tagged = false +index = true +fk = "packagedata.ifno" + +[observations.rate.arms.boundname] +type = "string" +tagged = false + +[observations.fw-rate] +type = "union" +tagged = false + +[observations.fw-rate.arms.ifno] +type = "integer" +tagged = false +index = true +fk = "packagedata.ifno" + +[observations.fw-rate.arms.boundname] +type = "string" +tagged = false + +[observations.rate-to-mvr] +type = "union" +tagged = false + +[observations.rate-to-mvr.arms.ifno] +type = "integer" +tagged = false +index = true +fk = "packagedata.ifno" + +[observations.rate-to-mvr.arms.boundname] +type = "string" +tagged = false + +[observations.fw-rate-to-mvr] +type = "union" +tagged = false + +[observations.fw-rate-to-mvr.arms.ifno] +type = "integer" +tagged = false +index = true +fk = "packagedata.ifno" + +[observations.fw-rate-to-mvr.arms.boundname] +type = "string" +tagged = false + +[observations.mwt] +type = "union" +tagged = false + +[observations.mwt.arms.ifno] +type = "record" +tagged = false + +[observations.mwt.arms.ifno.fields.ifno] +type = "integer" +tagged = false +index = true +fk = "packagedata.ifno" + +[observations.mwt.arms.ifno.fields.iconn] +type = "integer" +tagged = false +index = true + +[observations.mwt.arms.boundname] +type = "string" +tagged = false diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-mwt.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-mwt.yaml index 1639a729..9dc45235 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-mwt.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-mwt.yaml @@ -347,3 +347,120 @@ memory: dtype: double shape: - ncv +observations: + concentration: + type: union + tagged: false + arms: + ifno: + type: integer + tagged: false + index: true + fk: packagedata.ifno + boundname: + type: string + tagged: false + storage: + type: union + tagged: false + arms: + ifno: + type: integer + tagged: false + index: true + fk: packagedata.ifno + boundname: + type: string + tagged: false + constant: + type: union + tagged: false + arms: + ifno: + type: integer + tagged: false + index: true + fk: packagedata.ifno + boundname: + type: string + tagged: false + from-mvr: + type: union + tagged: false + arms: + ifno: + type: integer + tagged: false + index: true + fk: packagedata.ifno + boundname: + type: string + tagged: false + rate: + type: union + tagged: false + arms: + ifno: + type: integer + tagged: false + index: true + fk: packagedata.ifno + boundname: + type: string + tagged: false + fw-rate: + type: union + tagged: false + arms: + ifno: + type: integer + tagged: false + index: true + fk: packagedata.ifno + boundname: + type: string + tagged: false + rate-to-mvr: + type: union + tagged: false + arms: + ifno: + type: integer + tagged: false + index: true + fk: packagedata.ifno + boundname: + type: string + tagged: false + fw-rate-to-mvr: + type: union + tagged: false + arms: + ifno: + type: integer + tagged: false + index: true + fk: packagedata.ifno + boundname: + type: string + tagged: false + mwt: + type: union + tagged: false + arms: + ifno: + type: record + tagged: false + fields: + ifno: + type: integer + tagged: false + index: true + fk: packagedata.ifno + iconn: + type: integer + tagged: false + index: true + 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 f0ff3d3b..e7870c04 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-nam.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-nam.json @@ -225,5 +225,43 @@ "nja" ] } + }, + "observations": { + "concentration": { + "type": "array", + "tagged": false, + "dtype": "integer", + "index": true, + "cellid": true, + "shape": [ + "ncelldim" + ] + }, + "flow-ja-face": { + "type": "record", + "tagged": false, + "fields": { + "cellid": { + "type": "array", + "tagged": false, + "dtype": "integer", + "index": true, + "cellid": true, + "shape": [ + "ncelldim" + ] + }, + "cellid2": { + "type": "array", + "tagged": false, + "dtype": "integer", + "index": true, + "cellid": true, + "shape": [ + "ncelldim" + ] + } + } + } } } \ No newline at end of file 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 4f4aacdd..4ad580a7 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-nam.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-nam.toml @@ -203,3 +203,37 @@ dtype = "integer" shape = [ "nja", ] + +[observations.concentration] +type = "array" +tagged = false +dtype = "integer" +index = true +cellid = true +shape = [ + "ncelldim", +] + +[observations.flow-ja-face] +type = "record" +tagged = false + +[observations.flow-ja-face.fields.cellid] +type = "array" +tagged = false +dtype = "integer" +index = true +cellid = true +shape = [ + "ncelldim", +] + +[observations.flow-ja-face.fields.cellid2] +type = "array" +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 6eddd197..829d022d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-nam.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-nam.yaml @@ -203,3 +203,32 @@ memory: dtype: integer shape: - nja +observations: + concentration: + type: array + tagged: false + dtype: integer + index: true + cellid: true + shape: + - ncelldim + flow-ja-face: + type: record + tagged: false + fields: + cellid: + type: array + tagged: false + dtype: integer + index: true + cellid: true + shape: + - ncelldim + cellid2: + type: array + tagged: false + dtype: integer + index: true + cellid: true + shape: + - ncelldim diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-sft.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-sft.json index a847b037..27ae0cda 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-sft.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-sft.json @@ -423,5 +423,211 @@ "ncv" ] } + }, + "observations": { + "concentration": { + "type": "union", + "tagged": false, + "arms": { + "ifno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.ifno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "storage": { + "type": "union", + "tagged": false, + "arms": { + "ifno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.ifno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "constant": { + "type": "union", + "tagged": false, + "arms": { + "ifno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.ifno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "from-mvr": { + "type": "union", + "tagged": false, + "arms": { + "ifno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.ifno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "sft": { + "type": "union", + "tagged": false, + "arms": { + "ifno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.ifno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "to-mvr": { + "type": "union", + "tagged": false, + "arms": { + "ifno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.ifno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "rainfall": { + "type": "union", + "tagged": false, + "arms": { + "ifno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.ifno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "evaporation": { + "type": "union", + "tagged": false, + "arms": { + "ifno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.ifno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "runoff": { + "type": "union", + "tagged": false, + "arms": { + "ifno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.ifno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "ext-inflow": { + "type": "union", + "tagged": false, + "arms": { + "ifno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.ifno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "ext-outflow": { + "type": "union", + "tagged": false, + "arms": { + "ifno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.ifno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "flow-ja-face": { + "type": "union", + "tagged": false, + "arms": { + "ifno": { + "type": "record", + "tagged": false, + "fields": { + "ifno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.ifno" + }, + "ifno2": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.ifno" + } + } + }, + "boundname": { + "type": "string", + "tagged": false + } + } + } } } \ No newline at end of file diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-sft.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-sft.toml index a0342685..88f51c3f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-sft.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-sft.toml @@ -385,3 +385,181 @@ dtype = "double" shape = [ "ncv", ] + +[observations.concentration] +type = "union" +tagged = false + +[observations.concentration.arms.ifno] +type = "integer" +tagged = false +index = true +fk = "packagedata.ifno" + +[observations.concentration.arms.boundname] +type = "string" +tagged = false + +[observations.storage] +type = "union" +tagged = false + +[observations.storage.arms.ifno] +type = "integer" +tagged = false +index = true +fk = "packagedata.ifno" + +[observations.storage.arms.boundname] +type = "string" +tagged = false + +[observations.constant] +type = "union" +tagged = false + +[observations.constant.arms.ifno] +type = "integer" +tagged = false +index = true +fk = "packagedata.ifno" + +[observations.constant.arms.boundname] +type = "string" +tagged = false + +[observations.from-mvr] +type = "union" +tagged = false + +[observations.from-mvr.arms.ifno] +type = "integer" +tagged = false +index = true +fk = "packagedata.ifno" + +[observations.from-mvr.arms.boundname] +type = "string" +tagged = false + +[observations.sft] +type = "union" +tagged = false + +[observations.sft.arms.ifno] +type = "integer" +tagged = false +index = true +fk = "packagedata.ifno" + +[observations.sft.arms.boundname] +type = "string" +tagged = false + +[observations.to-mvr] +type = "union" +tagged = false + +[observations.to-mvr.arms.ifno] +type = "integer" +tagged = false +index = true +fk = "packagedata.ifno" + +[observations.to-mvr.arms.boundname] +type = "string" +tagged = false + +[observations.rainfall] +type = "union" +tagged = false + +[observations.rainfall.arms.ifno] +type = "integer" +tagged = false +index = true +fk = "packagedata.ifno" + +[observations.rainfall.arms.boundname] +type = "string" +tagged = false + +[observations.evaporation] +type = "union" +tagged = false + +[observations.evaporation.arms.ifno] +type = "integer" +tagged = false +index = true +fk = "packagedata.ifno" + +[observations.evaporation.arms.boundname] +type = "string" +tagged = false + +[observations.runoff] +type = "union" +tagged = false + +[observations.runoff.arms.ifno] +type = "integer" +tagged = false +index = true +fk = "packagedata.ifno" + +[observations.runoff.arms.boundname] +type = "string" +tagged = false + +[observations.ext-inflow] +type = "union" +tagged = false + +[observations.ext-inflow.arms.ifno] +type = "integer" +tagged = false +index = true +fk = "packagedata.ifno" + +[observations.ext-inflow.arms.boundname] +type = "string" +tagged = false + +[observations.ext-outflow] +type = "union" +tagged = false + +[observations.ext-outflow.arms.ifno] +type = "integer" +tagged = false +index = true +fk = "packagedata.ifno" + +[observations.ext-outflow.arms.boundname] +type = "string" +tagged = false + +[observations.flow-ja-face] +type = "union" +tagged = false + +[observations.flow-ja-face.arms.ifno] +type = "record" +tagged = false + +[observations.flow-ja-face.arms.ifno.fields.ifno] +type = "integer" +tagged = false +index = true +fk = "packagedata.ifno" + +[observations.flow-ja-face.arms.ifno.fields.ifno2] +type = "integer" +tagged = false +index = true +fk = "packagedata.ifno" + +[observations.flow-ja-face.arms.boundname] +type = "string" +tagged = false diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-sft.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-sft.yaml index 13bbac1b..da0a3838 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-sft.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-sft.yaml @@ -409,3 +409,157 @@ memory: dtype: double shape: - ncv +observations: + concentration: + type: union + tagged: false + arms: + ifno: + type: integer + tagged: false + index: true + fk: packagedata.ifno + boundname: + type: string + tagged: false + storage: + type: union + tagged: false + arms: + ifno: + type: integer + tagged: false + index: true + fk: packagedata.ifno + boundname: + type: string + tagged: false + constant: + type: union + tagged: false + arms: + ifno: + type: integer + tagged: false + index: true + fk: packagedata.ifno + boundname: + type: string + tagged: false + from-mvr: + type: union + tagged: false + arms: + ifno: + type: integer + tagged: false + index: true + fk: packagedata.ifno + boundname: + type: string + tagged: false + sft: + type: union + tagged: false + arms: + ifno: + type: integer + tagged: false + index: true + fk: packagedata.ifno + boundname: + type: string + tagged: false + to-mvr: + type: union + tagged: false + arms: + ifno: + type: integer + tagged: false + index: true + fk: packagedata.ifno + boundname: + type: string + tagged: false + rainfall: + type: union + tagged: false + arms: + ifno: + type: integer + tagged: false + index: true + fk: packagedata.ifno + boundname: + type: string + tagged: false + evaporation: + type: union + tagged: false + arms: + ifno: + type: integer + tagged: false + index: true + fk: packagedata.ifno + boundname: + type: string + tagged: false + runoff: + type: union + tagged: false + arms: + ifno: + type: integer + tagged: false + index: true + fk: packagedata.ifno + boundname: + type: string + tagged: false + ext-inflow: + type: union + tagged: false + arms: + ifno: + type: integer + tagged: false + index: true + fk: packagedata.ifno + boundname: + type: string + tagged: false + ext-outflow: + type: union + tagged: false + arms: + ifno: + type: integer + tagged: false + index: true + fk: packagedata.ifno + boundname: + type: string + tagged: false + flow-ja-face: + type: union + tagged: false + arms: + ifno: + type: record + tagged: false + fields: + ifno: + type: integer + tagged: false + index: true + fk: packagedata.ifno + ifno2: + type: integer + tagged: false + index: true + fk: packagedata.ifno + boundname: + type: string + tagged: false 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 a84aeba6..da654d1c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-src.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-src.json @@ -320,5 +320,47 @@ "naux" ] } + }, + "observations": { + "src": { + "type": "union", + "tagged": false, + "arms": { + "cellid": { + "type": "array", + "tagged": false, + "dtype": "integer", + "index": true, + "cellid": true, + "shape": [ + "ncelldim" + ] + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "to-mvr": { + "type": "union", + "tagged": false, + "arms": { + "cellid": { + "type": "array", + "tagged": false, + "dtype": "integer", + "index": true, + "cellid": true, + "shape": [ + "ncelldim" + ] + }, + "boundname": { + "type": "string", + "tagged": false + } + } + } } } \ No newline at end of file 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 57078a9b..879f10d3 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-src.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-src.toml @@ -294,3 +294,39 @@ dtype = "string" shape = [ "naux", ] + +[observations.src] +type = "union" +tagged = false + +[observations.src.arms.cellid] +type = "array" +tagged = false +dtype = "integer" +index = true +cellid = true +shape = [ + "ncelldim", +] + +[observations.src.arms.boundname] +type = "string" +tagged = false + +[observations.to-mvr] +type = "union" +tagged = false + +[observations.to-mvr.arms.cellid] +type = "array" +tagged = false +dtype = "integer" +index = true +cellid = true +shape = [ + "ncelldim", +] + +[observations.to-mvr.arms.boundname] +type = "string" +tagged = false 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 4958eba1..a1e2b382 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-src.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-src.yaml @@ -298,3 +298,34 @@ memory: dtype: string shape: - naux +observations: + src: + type: union + tagged: false + arms: + cellid: + type: array + tagged: false + dtype: integer + index: true + cellid: true + shape: + - ncelldim + boundname: + type: string + tagged: false + to-mvr: + type: union + tagged: false + arms: + cellid: + type: array + 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-uzt.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-uzt.json index feac2831..3814e241 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-uzt.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-uzt.json @@ -373,5 +373,179 @@ "ncv" ] } + }, + "observations": { + "concentration": { + "type": "union", + "tagged": false, + "arms": { + "ifno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.ifno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "storage": { + "type": "union", + "tagged": false, + "arms": { + "ifno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.ifno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "constant": { + "type": "union", + "tagged": false, + "arms": { + "ifno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.ifno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "from-mvr": { + "type": "union", + "tagged": false, + "arms": { + "ifno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.ifno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "uzt": { + "type": "union", + "tagged": false, + "arms": { + "ifno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.ifno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "infiltration": { + "type": "union", + "tagged": false, + "arms": { + "ifno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.ifno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "rej-inf": { + "type": "union", + "tagged": false, + "arms": { + "ifno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.ifno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "uzet": { + "type": "union", + "tagged": false, + "arms": { + "ifno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.ifno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "rej-inf-to-mvr": { + "type": "union", + "tagged": false, + "arms": { + "ifno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.ifno" + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "flow-ja-face": { + "type": "union", + "tagged": false, + "arms": { + "ifno": { + "type": "record", + "tagged": false, + "fields": { + "ifno": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.ifno" + }, + "ifno2": { + "type": "integer", + "tagged": false, + "index": true, + "fk": "packagedata.ifno" + } + } + }, + "boundname": { + "type": "string", + "tagged": false + } + } + } } } \ No newline at end of file diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-uzt.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-uzt.toml index 016434a0..a4bbf49c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-uzt.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-uzt.toml @@ -335,3 +335,153 @@ dtype = "double" shape = [ "ncv", ] + +[observations.concentration] +type = "union" +tagged = false + +[observations.concentration.arms.ifno] +type = "integer" +tagged = false +index = true +fk = "packagedata.ifno" + +[observations.concentration.arms.boundname] +type = "string" +tagged = false + +[observations.storage] +type = "union" +tagged = false + +[observations.storage.arms.ifno] +type = "integer" +tagged = false +index = true +fk = "packagedata.ifno" + +[observations.storage.arms.boundname] +type = "string" +tagged = false + +[observations.constant] +type = "union" +tagged = false + +[observations.constant.arms.ifno] +type = "integer" +tagged = false +index = true +fk = "packagedata.ifno" + +[observations.constant.arms.boundname] +type = "string" +tagged = false + +[observations.from-mvr] +type = "union" +tagged = false + +[observations.from-mvr.arms.ifno] +type = "integer" +tagged = false +index = true +fk = "packagedata.ifno" + +[observations.from-mvr.arms.boundname] +type = "string" +tagged = false + +[observations.uzt] +type = "union" +tagged = false + +[observations.uzt.arms.ifno] +type = "integer" +tagged = false +index = true +fk = "packagedata.ifno" + +[observations.uzt.arms.boundname] +type = "string" +tagged = false + +[observations.infiltration] +type = "union" +tagged = false + +[observations.infiltration.arms.ifno] +type = "integer" +tagged = false +index = true +fk = "packagedata.ifno" + +[observations.infiltration.arms.boundname] +type = "string" +tagged = false + +[observations.rej-inf] +type = "union" +tagged = false + +[observations.rej-inf.arms.ifno] +type = "integer" +tagged = false +index = true +fk = "packagedata.ifno" + +[observations.rej-inf.arms.boundname] +type = "string" +tagged = false + +[observations.uzet] +type = "union" +tagged = false + +[observations.uzet.arms.ifno] +type = "integer" +tagged = false +index = true +fk = "packagedata.ifno" + +[observations.uzet.arms.boundname] +type = "string" +tagged = false + +[observations.rej-inf-to-mvr] +type = "union" +tagged = false + +[observations.rej-inf-to-mvr.arms.ifno] +type = "integer" +tagged = false +index = true +fk = "packagedata.ifno" + +[observations.rej-inf-to-mvr.arms.boundname] +type = "string" +tagged = false + +[observations.flow-ja-face] +type = "union" +tagged = false + +[observations.flow-ja-face.arms.ifno] +type = "record" +tagged = false + +[observations.flow-ja-face.arms.ifno.fields.ifno] +type = "integer" +tagged = false +index = true +fk = "packagedata.ifno" + +[observations.flow-ja-face.arms.ifno.fields.ifno2] +type = "integer" +tagged = false +index = true +fk = "packagedata.ifno" + +[observations.flow-ja-face.arms.boundname] +type = "string" +tagged = false diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-uzt.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-uzt.yaml index ba0ea976..94f251f8 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-uzt.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-uzt.yaml @@ -365,3 +365,133 @@ memory: dtype: double shape: - ncv +observations: + concentration: + type: union + tagged: false + arms: + ifno: + type: integer + tagged: false + index: true + fk: packagedata.ifno + boundname: + type: string + tagged: false + storage: + type: union + tagged: false + arms: + ifno: + type: integer + tagged: false + index: true + fk: packagedata.ifno + boundname: + type: string + tagged: false + constant: + type: union + tagged: false + arms: + ifno: + type: integer + tagged: false + index: true + fk: packagedata.ifno + boundname: + type: string + tagged: false + from-mvr: + type: union + tagged: false + arms: + ifno: + type: integer + tagged: false + index: true + fk: packagedata.ifno + boundname: + type: string + tagged: false + uzt: + type: union + tagged: false + arms: + ifno: + type: integer + tagged: false + index: true + fk: packagedata.ifno + boundname: + type: string + tagged: false + infiltration: + type: union + tagged: false + arms: + ifno: + type: integer + tagged: false + index: true + fk: packagedata.ifno + boundname: + type: string + tagged: false + rej-inf: + type: union + tagged: false + arms: + ifno: + type: integer + tagged: false + index: true + fk: packagedata.ifno + boundname: + type: string + tagged: false + uzet: + type: union + tagged: false + arms: + ifno: + type: integer + tagged: false + index: true + fk: packagedata.ifno + boundname: + type: string + tagged: false + rej-inf-to-mvr: + type: union + tagged: false + arms: + ifno: + type: integer + tagged: false + index: true + fk: packagedata.ifno + boundname: + type: string + tagged: false + flow-ja-face: + type: union + tagged: false + arms: + ifno: + type: record + tagged: false + fields: + ifno: + type: integer + tagged: false + index: true + fk: packagedata.ifno + ifno2: + type: integer + tagged: false + index: true + fk: packagedata.ifno + 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 90d5aa62..9ba423e8 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-cdb.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-cdb.json @@ -288,5 +288,47 @@ "naux" ] } + }, + "observations": { + "cdb": { + "type": "union", + "tagged": false, + "arms": { + "cellid": { + "type": "array", + "tagged": false, + "dtype": "integer", + "index": true, + "cellid": true, + "shape": [ + "ncelldim" + ] + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "to-mvr": { + "type": "union", + "tagged": false, + "arms": { + "cellid": { + "type": "array", + "tagged": false, + "dtype": "integer", + "index": true, + "cellid": true, + "shape": [ + "ncelldim" + ] + }, + "boundname": { + "type": "string", + "tagged": false + } + } + } } } \ No newline at end of file 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 4a48d23a..83ead55d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-cdb.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-cdb.toml @@ -264,3 +264,39 @@ dtype = "string" shape = [ "naux", ] + +[observations.cdb] +type = "union" +tagged = false + +[observations.cdb.arms.cellid] +type = "array" +tagged = false +dtype = "integer" +index = true +cellid = true +shape = [ + "ncelldim", +] + +[observations.cdb.arms.boundname] +type = "string" +tagged = false + +[observations.to-mvr] +type = "union" +tagged = false + +[observations.to-mvr.arms.cellid] +type = "array" +tagged = false +dtype = "integer" +index = true +cellid = true +shape = [ + "ncelldim", +] + +[observations.to-mvr.arms.boundname] +type = "string" +tagged = false 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 3499950a..fcf16908 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-cdb.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-cdb.yaml @@ -264,3 +264,34 @@ memory: dtype: string shape: - naux +observations: + cdb: + type: union + tagged: false + arms: + cellid: + type: array + tagged: false + dtype: integer + index: true + cellid: true + shape: + - ncelldim + boundname: + type: string + tagged: false + to-mvr: + type: union + tagged: false + arms: + cellid: + type: array + 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 95515e97..8fed2530 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-chd.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-chd.json @@ -297,5 +297,27 @@ "nbound" ] } + }, + "observations": { + "chd": { + "type": "union", + "tagged": false, + "arms": { + "cellid": { + "type": "array", + "tagged": false, + "dtype": "integer", + "index": true, + "cellid": true, + "shape": [ + "ncelldim" + ] + }, + "boundname": { + "type": "string", + "tagged": false + } + } + } } } \ No newline at end of file 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 db75bfbb..0df0a517 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-chd.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-chd.toml @@ -271,3 +271,21 @@ shape = [ "naux", "nbound", ] + +[observations.chd] +type = "union" +tagged = false + +[observations.chd.arms.cellid] +type = "array" +tagged = false +dtype = "integer" +index = true +cellid = true +shape = [ + "ncelldim", +] + +[observations.chd.arms.boundname] +type = "string" +tagged = false 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 c2fd4928..0bb576e2 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-chd.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-chd.yaml @@ -268,3 +268,19 @@ memory: shape: - naux - nbound +observations: + chd: + type: union + tagged: false + arms: + cellid: + type: array + 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-dfw.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-dfw.json index 8899ec4a..02351530 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-dfw.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-dfw.json @@ -168,5 +168,12 @@ "nodes" ] } + }, + "observations": { + "ext-outflow": { + "type": "integer", + "tagged": false, + "index": true + } } } \ No newline at end of file diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-dfw.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-dfw.toml index 6e0e358e..1af54b15 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-dfw.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-dfw.toml @@ -152,3 +152,8 @@ dtype = "integer" shape = [ "nodes", ] + +[observations.ext-outflow] +type = "integer" +tagged = false +index = true diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-dfw.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-dfw.yaml index 5bf91695..9ebb24ed 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-dfw.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-dfw.yaml @@ -157,3 +157,8 @@ memory: dtype: integer shape: - nodes +observations: + ext-outflow: + type: integer + tagged: false + index: true 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 ea878c70..d56d2109 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-evp.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-evp.json @@ -307,5 +307,27 @@ "naux" ] } + }, + "observations": { + "evp": { + "type": "union", + "tagged": false, + "arms": { + "cellid": { + "type": "array", + "tagged": false, + "dtype": "integer", + "index": true, + "cellid": true, + "shape": [ + "ncelldim" + ] + }, + "boundname": { + "type": "string", + "tagged": false + } + } + } } } \ No newline at end of file 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 0134f246..23c89d1a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-evp.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-evp.toml @@ -281,3 +281,21 @@ dtype = "string" shape = [ "naux", ] + +[observations.evp] +type = "union" +tagged = false + +[observations.evp.arms.cellid] +type = "array" +tagged = false +dtype = "integer" +index = true +cellid = true +shape = [ + "ncelldim", +] + +[observations.evp.arms.boundname] +type = "string" +tagged = false 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 b9f89752..844477f3 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-evp.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-evp.yaml @@ -278,3 +278,19 @@ memory: dtype: string shape: - naux +observations: + evp: + type: union + tagged: false + arms: + cellid: + type: array + 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 38a83789..89ce042d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-flw.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-flw.json @@ -299,5 +299,47 @@ "nbound" ] } + }, + "observations": { + "flw": { + "type": "union", + "tagged": false, + "arms": { + "cellid": { + "type": "array", + "tagged": false, + "dtype": "integer", + "index": true, + "cellid": true, + "shape": [ + "ncelldim" + ] + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "to-mvr": { + "type": "union", + "tagged": false, + "arms": { + "cellid": { + "type": "array", + "tagged": false, + "dtype": "integer", + "index": true, + "cellid": true, + "shape": [ + "ncelldim" + ] + }, + "boundname": { + "type": "string", + "tagged": false + } + } + } } } \ No newline at end of file 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 e46420e1..49271ea6 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-flw.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-flw.toml @@ -273,3 +273,39 @@ shape = [ "naux", "nbound", ] + +[observations.flw] +type = "union" +tagged = false + +[observations.flw.arms.cellid] +type = "array" +tagged = false +dtype = "integer" +index = true +cellid = true +shape = [ + "ncelldim", +] + +[observations.flw.arms.boundname] +type = "string" +tagged = false + +[observations.to-mvr] +type = "union" +tagged = false + +[observations.to-mvr.arms.cellid] +type = "array" +tagged = false +dtype = "integer" +index = true +cellid = true +shape = [ + "ncelldim", +] + +[observations.to-mvr.arms.boundname] +type = "string" +tagged = false 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 e39a7d2e..10d34d0d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-flw.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-flw.yaml @@ -270,3 +270,34 @@ memory: shape: - naux - nbound +observations: + flw: + type: union + tagged: false + arms: + cellid: + type: array + tagged: false + dtype: integer + index: true + cellid: true + shape: + - ncelldim + boundname: + type: string + tagged: false + to-mvr: + type: union + tagged: false + arms: + cellid: + type: array + 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 0cf9a043..02ffda71 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-nam.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-nam.json @@ -166,5 +166,43 @@ "nja" ] } + }, + "observations": { + "stage": { + "type": "array", + "tagged": false, + "dtype": "integer", + "index": true, + "cellid": true, + "shape": [ + "ncelldim" + ] + }, + "flow-ja-face": { + "type": "record", + "tagged": false, + "fields": { + "cellid": { + "type": "array", + "tagged": false, + "dtype": "integer", + "index": true, + "cellid": true, + "shape": [ + "ncelldim" + ] + }, + "cellid2": { + "type": "array", + "tagged": false, + "dtype": "integer", + "index": true, + "cellid": true, + "shape": [ + "ncelldim" + ] + } + } + } } } \ No newline at end of file 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 94a6ee57..4d0d5e2f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-nam.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-nam.toml @@ -148,3 +148,37 @@ dtype = "integer" shape = [ "nja", ] + +[observations.stage] +type = "array" +tagged = false +dtype = "integer" +index = true +cellid = true +shape = [ + "ncelldim", +] + +[observations.flow-ja-face] +type = "record" +tagged = false + +[observations.flow-ja-face.fields.cellid] +type = "array" +tagged = false +dtype = "integer" +index = true +cellid = true +shape = [ + "ncelldim", +] + +[observations.flow-ja-face.fields.cellid2] +type = "array" +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 23b48774..641b2fcd 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-nam.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-nam.yaml @@ -160,3 +160,32 @@ memory: dtype: integer shape: - nja +observations: + stage: + type: array + tagged: false + dtype: integer + index: true + cellid: true + shape: + - ncelldim + flow-ja-face: + type: record + tagged: false + fields: + cellid: + type: array + tagged: false + dtype: integer + index: true + cellid: true + shape: + - ncelldim + cellid2: + type: array + 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 1ec3996d..9733a88c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-pcp.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-pcp.json @@ -307,5 +307,27 @@ "naux" ] } + }, + "observations": { + "pcp": { + "type": "union", + "tagged": false, + "arms": { + "cellid": { + "type": "array", + "tagged": false, + "dtype": "integer", + "index": true, + "cellid": true, + "shape": [ + "ncelldim" + ] + }, + "boundname": { + "type": "string", + "tagged": false + } + } + } } } \ No newline at end of file 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 1ffaa5e8..fcd5d1bd 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-pcp.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-pcp.toml @@ -281,3 +281,21 @@ dtype = "string" shape = [ "naux", ] + +[observations.pcp] +type = "union" +tagged = false + +[observations.pcp.arms.cellid] +type = "array" +tagged = false +dtype = "integer" +index = true +cellid = true +shape = [ + "ncelldim", +] + +[observations.pcp.arms.boundname] +type = "string" +tagged = false 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 656ad9ea..60abc49f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-pcp.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-pcp.yaml @@ -278,3 +278,19 @@ memory: dtype: string shape: - naux +observations: + pcp: + type: union + tagged: false + arms: + cellid: + type: array + 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 e064745d..d2116c9c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-zdg.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-zdg.json @@ -325,5 +325,47 @@ "naux" ] } + }, + "observations": { + "zdg": { + "type": "union", + "tagged": false, + "arms": { + "cellid": { + "type": "array", + "tagged": false, + "dtype": "integer", + "index": true, + "cellid": true, + "shape": [ + "ncelldim" + ] + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "to-mvr": { + "type": "union", + "tagged": false, + "arms": { + "cellid": { + "type": "array", + "tagged": false, + "dtype": "integer", + "index": true, + "cellid": true, + "shape": [ + "ncelldim" + ] + }, + "boundname": { + "type": "string", + "tagged": false + } + } + } } } \ No newline at end of file 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 233c0814..e75591d8 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-zdg.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-zdg.toml @@ -299,3 +299,39 @@ dtype = "string" shape = [ "naux", ] + +[observations.zdg] +type = "union" +tagged = false + +[observations.zdg.arms.cellid] +type = "array" +tagged = false +dtype = "integer" +index = true +cellid = true +shape = [ + "ncelldim", +] + +[observations.zdg.arms.boundname] +type = "string" +tagged = false + +[observations.to-mvr] +type = "union" +tagged = false + +[observations.to-mvr.arms.cellid] +type = "array" +tagged = false +dtype = "integer" +index = true +cellid = true +shape = [ + "ncelldim", +] + +[observations.to-mvr.arms.boundname] +type = "string" +tagged = false 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 b03ad3de..02c3b0af 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-zdg.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-zdg.yaml @@ -305,3 +305,34 @@ memory: dtype: string shape: - naux +observations: + zdg: + type: union + tagged: false + arms: + cellid: + type: array + tagged: false + dtype: integer + index: true + cellid: true + shape: + - ncelldim + boundname: + type: string + tagged: false + to-mvr: + type: union + tagged: false + arms: + cellid: + type: array + 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-cdb.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-cdb.json index dfeb9664..5800dd76 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-cdb.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-cdb.json @@ -288,5 +288,47 @@ "naux" ] } + }, + "observations": { + "cdb": { + "type": "union", + "tagged": false, + "arms": { + "cellid": { + "type": "array", + "tagged": false, + "dtype": "integer", + "index": true, + "cellid": true, + "shape": [ + "ncelldim" + ] + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "to-mvr": { + "type": "union", + "tagged": false, + "arms": { + "cellid": { + "type": "array", + "tagged": false, + "dtype": "integer", + "index": true, + "cellid": true, + "shape": [ + "ncelldim" + ] + }, + "boundname": { + "type": "string", + "tagged": false + } + } + } } } \ No newline at end of file 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 1220aa15..1dc5c4b9 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-cdb.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-cdb.toml @@ -264,3 +264,39 @@ dtype = "string" shape = [ "naux", ] + +[observations.cdb] +type = "union" +tagged = false + +[observations.cdb.arms.cellid] +type = "array" +tagged = false +dtype = "integer" +index = true +cellid = true +shape = [ + "ncelldim", +] + +[observations.cdb.arms.boundname] +type = "string" +tagged = false + +[observations.to-mvr] +type = "union" +tagged = false + +[observations.to-mvr.arms.cellid] +type = "array" +tagged = false +dtype = "integer" +index = true +cellid = true +shape = [ + "ncelldim", +] + +[observations.to-mvr.arms.boundname] +type = "string" +tagged = false 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 f942f99d..a736b9c3 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-cdb.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-cdb.yaml @@ -265,3 +265,34 @@ memory: dtype: string shape: - naux +observations: + cdb: + type: union + tagged: false + arms: + cellid: + type: array + tagged: false + dtype: integer + index: true + cellid: true + shape: + - ncelldim + boundname: + type: string + tagged: false + to-mvr: + type: union + tagged: false + arms: + cellid: + type: array + 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 641f064b..1f6ecaf3 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-chd.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-chd.json @@ -297,5 +297,27 @@ "nbound" ] } + }, + "observations": { + "chd": { + "type": "union", + "tagged": false, + "arms": { + "cellid": { + "type": "array", + "tagged": false, + "dtype": "integer", + "index": true, + "cellid": true, + "shape": [ + "ncelldim" + ] + }, + "boundname": { + "type": "string", + "tagged": false + } + } + } } } \ No newline at end of file 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 6c6cd57c..188af68f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-chd.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-chd.toml @@ -271,3 +271,21 @@ shape = [ "naux", "nbound", ] + +[observations.chd] +type = "union" +tagged = false + +[observations.chd.arms.cellid] +type = "array" +tagged = false +dtype = "integer" +index = true +cellid = true +shape = [ + "ncelldim", +] + +[observations.chd.arms.boundname] +type = "string" +tagged = false 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 1e501e3d..6ef5bede 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-chd.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-chd.yaml @@ -268,3 +268,19 @@ memory: shape: - naux - nbound +observations: + chd: + type: union + tagged: false + arms: + cellid: + type: array + 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-dfw.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-dfw.json index 86bfa351..06de79d3 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-dfw.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-dfw.json @@ -167,5 +167,12 @@ "nodes" ] } + }, + "observations": { + "ext-outflow": { + "type": "integer", + "tagged": false, + "index": true + } } } \ No newline at end of file diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-dfw.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-dfw.toml index 95d4388a..59c11edd 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-dfw.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-dfw.toml @@ -151,3 +151,8 @@ dtype = "integer" shape = [ "nodes", ] + +[observations.ext-outflow] +type = "integer" +tagged = false +index = true diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-dfw.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-dfw.yaml index 5394e32c..398d5ebd 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-dfw.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-dfw.yaml @@ -156,3 +156,8 @@ memory: dtype: integer shape: - nodes +observations: + ext-outflow: + type: integer + tagged: false + index: true 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 bff332d4..9307957f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-evp.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-evp.json @@ -307,5 +307,27 @@ "naux" ] } + }, + "observations": { + "evp": { + "type": "union", + "tagged": false, + "arms": { + "cellid": { + "type": "array", + "tagged": false, + "dtype": "integer", + "index": true, + "cellid": true, + "shape": [ + "ncelldim" + ] + }, + "boundname": { + "type": "string", + "tagged": false + } + } + } } } \ No newline at end of file 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 2d185536..7f52d53c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-evp.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-evp.toml @@ -281,3 +281,21 @@ dtype = "string" shape = [ "naux", ] + +[observations.evp] +type = "union" +tagged = false + +[observations.evp.arms.cellid] +type = "array" +tagged = false +dtype = "integer" +index = true +cellid = true +shape = [ + "ncelldim", +] + +[observations.evp.arms.boundname] +type = "string" +tagged = false 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 ec1f9e31..99872318 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-evp.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-evp.yaml @@ -278,3 +278,19 @@ memory: dtype: string shape: - naux +observations: + evp: + type: union + tagged: false + arms: + cellid: + type: array + 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 88238f6d..25c1311a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-flw.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-flw.json @@ -299,5 +299,47 @@ "nbound" ] } + }, + "observations": { + "flw": { + "type": "union", + "tagged": false, + "arms": { + "cellid": { + "type": "array", + "tagged": false, + "dtype": "integer", + "index": true, + "cellid": true, + "shape": [ + "ncelldim" + ] + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "to-mvr": { + "type": "union", + "tagged": false, + "arms": { + "cellid": { + "type": "array", + "tagged": false, + "dtype": "integer", + "index": true, + "cellid": true, + "shape": [ + "ncelldim" + ] + }, + "boundname": { + "type": "string", + "tagged": false + } + } + } } } \ No newline at end of file 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 bffef9df..bf8fea1d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-flw.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-flw.toml @@ -273,3 +273,39 @@ shape = [ "naux", "nbound", ] + +[observations.flw] +type = "union" +tagged = false + +[observations.flw.arms.cellid] +type = "array" +tagged = false +dtype = "integer" +index = true +cellid = true +shape = [ + "ncelldim", +] + +[observations.flw.arms.boundname] +type = "string" +tagged = false + +[observations.to-mvr] +type = "union" +tagged = false + +[observations.to-mvr.arms.cellid] +type = "array" +tagged = false +dtype = "integer" +index = true +cellid = true +shape = [ + "ncelldim", +] + +[observations.to-mvr.arms.boundname] +type = "string" +tagged = false 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 db379352..92fd3a47 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-flw.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-flw.yaml @@ -270,3 +270,34 @@ memory: shape: - naux - nbound +observations: + flw: + type: union + tagged: false + arms: + cellid: + type: array + tagged: false + dtype: integer + index: true + cellid: true + shape: + - ncelldim + boundname: + type: string + tagged: false + to-mvr: + type: union + tagged: false + arms: + cellid: + type: array + 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 3ea85c7b..e1c31ff8 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-nam.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-nam.json @@ -166,5 +166,43 @@ "nja" ] } + }, + "observations": { + "stage": { + "type": "array", + "tagged": false, + "dtype": "integer", + "index": true, + "cellid": true, + "shape": [ + "ncelldim" + ] + }, + "flow-ja-face": { + "type": "record", + "tagged": false, + "fields": { + "cellid": { + "type": "array", + "tagged": false, + "dtype": "integer", + "index": true, + "cellid": true, + "shape": [ + "ncelldim" + ] + }, + "cellid2": { + "type": "array", + "tagged": false, + "dtype": "integer", + "index": true, + "cellid": true, + "shape": [ + "ncelldim" + ] + } + } + } } } \ No newline at end of file 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 2a720c64..b72f308e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-nam.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-nam.toml @@ -148,3 +148,37 @@ dtype = "integer" shape = [ "nja", ] + +[observations.stage] +type = "array" +tagged = false +dtype = "integer" +index = true +cellid = true +shape = [ + "ncelldim", +] + +[observations.flow-ja-face] +type = "record" +tagged = false + +[observations.flow-ja-face.fields.cellid] +type = "array" +tagged = false +dtype = "integer" +index = true +cellid = true +shape = [ + "ncelldim", +] + +[observations.flow-ja-face.fields.cellid2] +type = "array" +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 4e56b35f..99e6f94c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-nam.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-nam.yaml @@ -160,3 +160,32 @@ memory: dtype: integer shape: - nja +observations: + stage: + type: array + tagged: false + dtype: integer + index: true + cellid: true + shape: + - ncelldim + flow-ja-face: + type: record + tagged: false + fields: + cellid: + type: array + tagged: false + dtype: integer + index: true + cellid: true + shape: + - ncelldim + cellid2: + type: array + 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 6eceea29..23ea5b9b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-pcp.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-pcp.json @@ -307,5 +307,27 @@ "naux" ] } + }, + "observations": { + "pcp": { + "type": "union", + "tagged": false, + "arms": { + "cellid": { + "type": "array", + "tagged": false, + "dtype": "integer", + "index": true, + "cellid": true, + "shape": [ + "ncelldim" + ] + }, + "boundname": { + "type": "string", + "tagged": false + } + } + } } } \ No newline at end of file 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 b967e0b4..03c5bbd7 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-pcp.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-pcp.toml @@ -281,3 +281,21 @@ dtype = "string" shape = [ "naux", ] + +[observations.pcp] +type = "union" +tagged = false + +[observations.pcp.arms.cellid] +type = "array" +tagged = false +dtype = "integer" +index = true +cellid = true +shape = [ + "ncelldim", +] + +[observations.pcp.arms.boundname] +type = "string" +tagged = false 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 efd3cc9b..7eb2d86e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-pcp.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-pcp.yaml @@ -278,3 +278,19 @@ memory: dtype: string shape: - naux +observations: + pcp: + type: union + tagged: false + arms: + cellid: + type: array + 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 d6f9e958..92ad06f0 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-zdg.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-zdg.json @@ -324,5 +324,47 @@ "naux" ] } + }, + "observations": { + "zdg": { + "type": "union", + "tagged": false, + "arms": { + "cellid": { + "type": "array", + "tagged": false, + "dtype": "integer", + "index": true, + "cellid": true, + "shape": [ + "ncelldim" + ] + }, + "boundname": { + "type": "string", + "tagged": false + } + } + }, + "to-mvr": { + "type": "union", + "tagged": false, + "arms": { + "cellid": { + "type": "array", + "tagged": false, + "dtype": "integer", + "index": true, + "cellid": true, + "shape": [ + "ncelldim" + ] + }, + "boundname": { + "type": "string", + "tagged": false + } + } + } } } \ No newline at end of file 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 7a5d1c22..a29087d4 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-zdg.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-zdg.toml @@ -298,3 +298,39 @@ dtype = "string" shape = [ "naux", ] + +[observations.zdg] +type = "union" +tagged = false + +[observations.zdg.arms.cellid] +type = "array" +tagged = false +dtype = "integer" +index = true +cellid = true +shape = [ + "ncelldim", +] + +[observations.zdg.arms.boundname] +type = "string" +tagged = false + +[observations.to-mvr] +type = "union" +tagged = false + +[observations.to-mvr.arms.cellid] +type = "array" +tagged = false +dtype = "integer" +index = true +cellid = true +shape = [ + "ncelldim", +] + +[observations.to-mvr.arms.boundname] +type = "string" +tagged = false 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 f378b91f..3aef8a79 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-zdg.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-zdg.yaml @@ -305,3 +305,34 @@ memory: dtype: string shape: - naux +observations: + zdg: + type: union + tagged: false + arms: + cellid: + type: array + tagged: false + dtype: integer + index: true + cellid: true + shape: + - ncelldim + boundname: + type: string + tagged: false + to-mvr: + type: union + tagged: false + arms: + cellid: + type: array + tagged: false + dtype: integer + index: true + cellid: true + shape: + - ncelldim + boundname: + type: string + tagged: false diff --git a/autotest/dfns/test_migrate.py b/autotest/dfns/test_migrate.py index 4d4aba6c..e494809f 100644 --- a/autotest/dfns/test_migrate.py +++ b/autotest/dfns/test_migrate.py @@ -386,6 +386,88 @@ def test_migrate_obs_id_union(dfn_dir, col, optional): assert not any(arm.tagged for arm in field.arms.values()) +def _obs_forms(field) -> list[tuple]: + """The token sequences an observation field reads, each a tuple of + columns: ("cellid",), ("boundname",), ("double", name) or ("index", fk).""" + if isinstance(field, v2.Union): + return [f for arm in field.arms.values() for f in _obs_forms(arm)] + if isinstance(field, v2.Record): + forms: 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: + return [(("cellid",),)] + if isinstance(field, v2.String): + return [(("boundname",),)] + if isinstance(field, v2.Double): + return [(("double", field.name),)] + assert isinstance(field, v2.Integer) and field.index + return [(("index", field.fk),)] + + +_CELL = ("cellid",) +_NAME = ("boundname",) + + +@pytest.mark.parametrize( + "name, obstype, forms", + [ + # CSUB mixes index- and cellid-keyed obstypes, some without boundnames + ("gwf-csub", "csub", [(("index", "packagedata.icsubno"),), (_NAME,)]), + ("gwf-csub", "sk", [(("index", "packagedata.icsubno"),)]), + ("gwf-csub", "csub-cell", [(_CELL,)]), + ("gwf-csub", "delay-head", [(("index", "packagedata.icsubno"), ("index", None))]), + # UZF's water-content depth isn't an id, and follows a boundname too + ( + "gwf-uzf", + "water-content", + [(("index", "packagedata.ifno"), ("double", "depth")), (_NAME, ("double", "depth"))], + ), + ("gwf-uzf", "uzet", [(("index", "packagedata.ifno"),), (_NAME,)]), + # a connection number follows a lake number, but not a boundname + ("gwf-lak", "lak", [(("index", "packagedata.ifno"), ("index", None)), (_NAME,)]), + ("gwf-lak", "outlet", [(("index", "outlets.outletno"),), (_NAME,)]), + ( + "gwt-lkt", + "flow-ja-face", + [(("index", "packagedata.ifno"), ("index", "packagedata.ifno")), (_NAME,)], + ), + # MF6 reads no id2 for lke, though its docs list one + ("gwe-lke", "lke", [(("index", "packagedata.lakeno"),), (_NAME,)]), + ("gwf-wel", "wel", [(_CELL,), (_NAME,)]), + ("gwf-nam", "flow-ja-face", [(_CELL, _CELL)]), + # an exchange id is a row number in exchangedata, which has no pk + ("exg-gwegwe", "flow-ja-face", [(("index", None),), (_NAME,)]), + ], +) +def test_migrate_observations(dfn_dir, name, obstype, forms): + component = _migrate_dev3(dfn_dir, name) + assert component.observations is not None + field = component.observations[obstype] + assert field.name == obstype + assert _obs_forms(field) == forms + + +def test_migrate_observations_on_obs_parents(dev3): + """Every component with an OBS file gets observations, except the + SWF-GWF exchanges, which MF6 registers no observation types for.""" + out, _ = dev3 + spec = v2.Dfns.load(out) + obs_parents = { + name + for name, c in spec.components.items() + if isinstance(c, v2.Model) + or any( + getattr(f, "component", None) == "utl-obs" + for f in c.get_fields(recurse=True).values(multi=True) + ) + } + with_obs = {name for name, c in spec.components.items() if c.observations} + assert obs_parents - with_obs == {"exg-chfgwf", "exg-olfgwf", "prt-nam"} + assert with_obs <= obs_parents + + def test_migrate_sfr_ic_is_signed_index(dfn_dir): component = _migrate_dev3(dfn_dir, "gwf-sfr") item = component.blocks["connectiondata"].fields["connectiondata"].item diff --git a/autotest/dfns/test_schema_relations.py b/autotest/dfns/test_schema_relations.py index 039b8601..4eba0286 100644 --- a/autotest/dfns/test_schema_relations.py +++ b/autotest/dfns/test_schema_relations.py @@ -248,6 +248,69 @@ def test_dfns_validate_cellid_outside_list_item(): Dfns(components={"gwf-nam": gwf, "gwf-gnc": pkg}) +# --- observation types --- + + +def _obs_spec(observations: dict) -> dict: + """gwf-lak with a packagedata list keyed by `ifno`.""" + pkg_item = Record(name="item", fields={"ifno": Integer(name="ifno", pk=True)}) + pkg_list = List(name="packagedata", item=pkg_item) + lak = Package( + name="gwf-lak", + parent="gwf-nam", + blocks={"packagedata": Block(name="packagedata", fields={"packagedata": pkg_list})}, + observations=observations, + ) + return {"gwf-nam": Model(name="gwf-nam"), "gwf-lak": lak} + + +def _lak_obs(fk: str = "packagedata.ifno", tagged: bool = False) -> Union: + """LAK's `lak` obstype: a lake and connection, or a boundname.""" + feature = Record( + name="ifno", + tagged=False, + fields={ + "ifno": Integer(name="ifno", tagged=False, index=True, fk=fk), + "iconn": Integer(name="iconn", tagged=tagged, index=True), + }, + ) + boundname = String(name="boundname", tagged=False) + return Union(name="lak", tagged=False, arms={"ifno": feature, "boundname": boundname}) + + +def test_dfns_validate_observations(): + observations = { + "lak": _lak_obs(), + "head": Array( + name="head", tagged=False, dtype="integer", shape=["ncelldim"], index=True, cellid=True + ), + } + spec = Dfns(components=_obs_spec(observations)) + assert spec.components["gwf-lak"].observations == observations + + +def test_dfns_validate_observations_unresolved_fk(): + with pytest.raises(ValueError, match="is not a list block"): + Dfns(components=_obs_spec({"lak": _lak_obs(fk="nosuch.ifno")})) + + +def test_dfns_validate_observations_untagged(): + with pytest.raises(ValueError, match=r"\['iconn'\] must be untagged"): + Dfns(components=_obs_spec({"lak": _lak_obs(tagged=True)})) + + +def test_dfns_validate_observations_lower_case(): + with pytest.raises(ValueError, match="must be lower case"): + Dfns(components=_obs_spec({"LAK": _lak_obs()})) + + +def test_dfns_validate_observations_at_most_two_columns(): + fields = {n: Integer(name=n, tagged=False, index=True) for n in ("a", "b", "c")} + observations = {"x": Record(name="x", tagged=False, fields=fields)} + with pytest.raises(ValueError, match="at most id2"): + Dfns(components=_obs_spec(observations)) + + # --- file links (File.component / component_ftype) --- diff --git a/docs/md/dfnspec.md b/docs/md/dfnspec.md index b3ce2a8f..f37e44bd 100644 --- a/docs/md/dfnspec.md +++ b/docs/md/dfnspec.md @@ -13,6 +13,7 @@ This document describes the MODFLOW 6 component definition (DFN) system. This sy - [`schema_version`](#schema_version) - [`dims`](#dims) - [`memory`](#memory) + - [`observations`](#observations) - [Component types](#component-types) - [Simulation](#simulation) - [Model](#model) @@ -122,6 +123,7 @@ Component definitions consist of a number of attributes: - `dims`: named dimensions resolvable from input fields, available for use in array shapes - `runtime_dims`: named dimensions whose value is only known once MODFLOW runs, available for use in memory variable shapes - `memory`: API-accessible runtime variable definitions +- `observations`: the observation types the component accepts in its OBS file Components may refer to, i.e. be constrained by, other components. Cross-component constraints include parent-child relations, model-solution compatibility restrictions, and primary/foreign keys. @@ -184,6 +186,10 @@ A component that other components' input files link (see [File](#file)), such as If a component does not provide a `memory` catalog, all memory-managed variables in the component's runtime context will be readonly by default. To allow MODFLOW API access to runtime variables, they must be defined in the `memory` catalog. +#### `observations` + +`{string: Integer | Double | String | Array | Record | Union} (default: {})`. The observation types the component accepts in its OBS file, keyed by lower-case name. Each is an untagged field for the values that follow the observation type: its ID and ID2. + ### Component types Three component types can be distinguished: simulation, model, and package. @@ -529,7 +535,7 @@ Type `union`. Sum type. `{string: Scalar | Array | Record}`. Subfields, required. -A union is usually keyword-led: each arm begins with its own keyword, which picks the arm. An untagged union's arms begin with a value instead, and the value alone may not pick the arm. `utl-obs`'s `id` is a cellid, a 1-based index (e.g. a lake number), or a boundname, depending on the parent package and the observation type. As with a runtime-resolved [foreign key](#primary-and-foreign-keys), the codec resolves which arm applies. +A union is usually keyword-led: each arm begins with its own keyword, which picks the arm. An untagged union's arms begin with a value instead, and the value alone may not pick the arm. `utl-obs`'s `id` is a cellid, a 1-based index (e.g. a lake number), or a boundname, depending on the parent package and the observation type. The parent's [`observations`](#observations) say which. #### List diff --git a/modflow_devtools/dfns/migrate_to_v2_0_0_dev3.py b/modflow_devtools/dfns/migrate_to_v2_0_0_dev3.py index 103c3704..d2ff247c 100644 --- a/modflow_devtools/dfns/migrate_to_v2_0_0_dev3.py +++ b/modflow_devtools/dfns/migrate_to_v2_0_0_dev3.py @@ -18,6 +18,10 @@ Package-specific variables that are not captured by the above (e.g. ``k → k11``, ``condsat``, ``area``) are hardcoded and override any entry with the same name. + +Components that accept an OBS file also get an ``observations`` table, the +observation types they accept and what each one's IDs hold. See +``modflow_devtools.dfns.observations``. """ from collections.abc import Mapping @@ -27,6 +31,7 @@ from modflow_devtools.dfns import schema as v2 from modflow_devtools.dfns.migrate_to_v2_0_0_dev2 import to_v2_0_0_dev2, try_parse_bool +from modflow_devtools.dfns.observations import OBSERVATIONS # --------------------------------------------------------------------------- # dtype translation @@ -1479,6 +1484,7 @@ def to_v2_0_0_dev3( update={ "schema_version": "2.0.0.dev3", "memory": memory or None, + "observations": OBSERVATIONS.get(name), "dims": existing_input_dims or None, "runtime_dims": existing_runtime_dims or None, "blocks": blocks, diff --git a/modflow_devtools/dfns/observations.py b/modflow_devtools/dfns/observations.py new file mode 100644 index 00000000..864944f3 --- /dev/null +++ b/modflow_devtools/dfns/observations.py @@ -0,0 +1,333 @@ +"""Observation types each component accepts in its OBS file. + +Transcribed from MF6: the obstypes each package registers (`StoreObsType`) and +how its id processor reads ID and ID2. Where the docs (`doc/Common/*obs.tex`) +disagree, the Fortran wins (e.g. the docs list an ID2 for GWE LKE's `lke`, +which MF6 doesn't read). + +PRT's PRP registers obstypes but its DFN has no OBS file, so it's left out, as +are the SWF-GWF exchanges, which register none. +""" + +from modflow_devtools.dfns import schema as v2 + +_Field = v2.ObservationField + + +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 _record(*fields: "v2.Integer | v2.Double | v2.Array | v2.Union") -> v2.Record: + """ID and ID2, named after the first.""" + return v2.Record(name=fields[0].name, tagged=False, fields={f.name: f for f in fields}) + + +def _or_boundname(form: "v2.Integer | v2.Array | v2.Record") -> v2.Union: + """``form``, or a boundname instead, after which MF6 reads no ID2.""" + boundname = v2.String(name="boundname", tagged=False) + return v2.Union(name=form.name, tagged=False, arms={form.name: form, "boundname": boundname}) + + +def _all(field: _Field, *obstypes: str) -> dict[str, _Field]: + """Obstypes that all take ``field``.""" + return dict.fromkeys(obstypes, field) + + +_CELL = _cellid() +_CELL_OR_NAME = _or_boundname(_cellid()) +# DFW reads a single node number, whatever the grid's cellid width. +_NODE = _index("node") + + +def _feature(pk: str) -> v2.Union: + return _or_boundname(_index(pk, fk=f"packagedata.{pk}")) + + +def _connection(pk: str, iconn: str = "iconn") -> v2.Union: + """A feature and one of its connections, or a boundname for all of them.""" + return _or_boundname(_record(_index(pk, fk=f"packagedata.{pk}"), _index(iconn))) + + +# Stress packages +_CHD = _all(_CELL_OR_NAME, "chd") +_WEL = _all(_CELL_OR_NAME, "wel", "to-mvr", "wel-reduction") +_DRN = _all(_CELL_OR_NAME, "drn", "to-mvr") +_RIV = _all(_CELL_OR_NAME, "riv", "to-mvr") +_GHB = _all(_CELL_OR_NAME, "ghb", "to-mvr") +_RCH = _all(_CELL_OR_NAME, "rch") +_EVT = _all(_CELL_OR_NAME, "evt") +_API = _all(_CELL_OR_NAME, "api", "to-mvr") +_CNC = _all(_CELL_OR_NAME, "cnc") +_SRC = _all(_CELL_OR_NAME, "src", "to-mvr") +_CTP = _all(_CELL_OR_NAME, "ctp") +_ESL = _all(_CELL_OR_NAME, "esl", "to-mvr") +_CDB = _all(_CELL_OR_NAME, "cdb", "to-mvr") +_FLW = _all(_CELL_OR_NAME, "flw", "to-mvr") +_EVP = _all(_CELL_OR_NAME, "evp") +_PCP = _all(_CELL_OR_NAME, "pcp") +_ZDG = _all(_CELL_OR_NAME, "zdg", "to-mvr") +_DFW = _all(_NODE, "ext-outflow") + + +# Models +def _model(*depvars: str) -> dict[str, _Field]: + return {**_all(_CELL, *depvars), "flow-ja-face": _record(_cellid(), _cellid("cellid2"))} + + +_GWF_MODEL = _model("head", "drawdown") +_GWT_MODEL = _model("concentration") +_GWE_MODEL = _model("temperature") +_SWF_MODEL = _model("stage") + +# Exchanges: an id is a row number in EXCHANGEDATA, which has no pk column. +_EXCHANGE = _all(_or_boundname(_index("iexg")), "flow-ja-face") + +# CSUB +_ICSUBNO = _index("icsubno", fk="packagedata.icsubno") +_CSUB = { + **_all(_feature("icsubno"), "csub", "inelastic-csub", "elastic-csub"), + **_all(_feature("icsubno"), "delay-flowtop", "delay-flowbot"), + **_all( + _ICSUBNO, + "sk", + "ske", + "theta", + "thickness", + "interbed-compaction", + "interbed-compaction-pct", + "inelastic-compaction", + "elastic-compaction", + ), + **{ + o: _record(_ICSUBNO, _index("idcellno")) + for o in ( + "delay-head", + "delay-gstress", + "delay-estress", + "delay-preconstress", + "delay-compaction", + "delay-thickness", + "delay-theta", + ) + }, + **_all( + _CELL, + "coarse-csub", + "csub-cell", + "wcomp-csub-cell", + "sk-cell", + "ske-cell", + "estress-cell", + "gstress-cell", + "preconstress-cell", + "coarse-compaction", + "compaction-cell", + "inelastic-compaction-cell", + "elastic-compaction-cell", + "coarse-thickness", + "thickness-cell", + "coarse-theta", + "theta-cell", + ), +} + +# Advanced flow packages +_LAK_OUTLET = _or_boundname(_index("outletno", fk="outlets.outletno")) +_LAK = { + **_all( + _feature("ifno"), + "stage", + "ext-inflow", + "outlet-inflow", + "inflow", + "from-mvr", + "rainfall", + "runoff", + "withdrawal", + "evaporation", + "storage", + "constant", + "volume", + "surface-area", + ), + **_all(_connection("ifno"), "lak", "wetted-area", "conductance"), + **_all(_LAK_OUTLET, "ext-outflow", "to-mvr", "outlet"), +} +_MAW = { + **_all( + _feature("ifno"), + "head", + "from-mvr", + "rate", + "rate-to-mvr", + "fw-rate", + "fw-to-mvr", + "storage", + "constant", + "fw-conductance", + ), + **_all(_connection("ifno", "icon"), "maw", "conductance"), +} +_SFR = _all( + _feature("ifno"), + "stage", + "ext-inflow", + "inflow", + "from-mvr", + "rainfall", + "runoff", + "sfr", + "evaporation", + "outflow", + "ext-outflow", + "to-mvr", + "upstream-flow", + "downstream-flow", + "depth", + "wet-perimeter", + "wet-area", + "wet-width", +) +_UZF = { + **_all( + _feature("ifno"), + "uzf-gwrch", + "uzf-gwd", + "uzf-gwd-to-mvr", + "uzf-gwet", + "infiltration", + "from-mvr", + "rej-inf", + "rej-inf-to-mvr", + "uzet", + "storage", + "net-infiltration", + ), + # The depth follows a boundname too. + "water-content": _record(_feature("ifno"), v2.Double(name="depth", tagged=False)), +} + + +# Advanced transport packages +def _apt(pk: str, depvar: str, *obstypes: str) -> dict[str, _Field]: + """Obstypes common to every APT package plus ``obstypes``, all keyed by + feature. Those taking an ID2 are added by the caller.""" + return _all(_feature(pk), depvar, "storage", "constant", "from-mvr", *obstypes) + + +def _flow_ja_face(pk: str) -> v2.Union: + """Flow between two features, or all those with a boundname.""" + fk = f"packagedata.{pk}" + return _or_boundname(_record(_index(pk, fk=fk), _index(f"{pk}2", fk=fk))) + + +# LKT/LKE's to-mvr is keyed by the flow package's outlet, not in this component. +_FLOW_OUTLET = _or_boundname(_index("outletno")) +_LAKE_TERMS = ("rainfall", "evaporation", "runoff", "ext-inflow", "withdrawal", "ext-outflow") +_STREAM_TERMS = ("to-mvr", "rainfall", "evaporation", "runoff", "ext-inflow", "ext-outflow") +_WELL_TERMS = ("rate", "fw-rate", "rate-to-mvr", "fw-rate-to-mvr") +_UZ_TERMS = ("infiltration", "rej-inf", "uzet", "rej-inf-to-mvr") + +_LKT = { + **_apt("ifno", "concentration", *_LAKE_TERMS), + "flow-ja-face": _flow_ja_face("ifno"), + "to-mvr": _FLOW_OUTLET, + "lkt": _connection("ifno"), +} +_SFT = { + **_apt("ifno", "concentration", "sft", *_STREAM_TERMS), + "flow-ja-face": _flow_ja_face("ifno"), +} +_MWT = { + **_apt("ifno", "concentration", *_WELL_TERMS), + "mwt": _connection("ifno"), +} +_UZT = { + **_apt("ifno", "concentration", "uzt", *_UZ_TERMS), + "flow-ja-face": _flow_ja_face("ifno"), +} +_LKE = { + **_apt("lakeno", "temperature", "lke", *_LAKE_TERMS), + "flow-ja-face": _flow_ja_face("lakeno"), + "to-mvr": _FLOW_OUTLET, +} +_SFE = { + **_apt("rno", "temperature", "sfe", "strmbd-cond", *_STREAM_TERMS), + "flow-ja-face": _flow_ja_face("rno"), +} +_MWE = { + **_apt("mawno", "temperature", *_WELL_TERMS), + "mwe": _connection("mawno"), +} +_UZE = { + **_apt("uzfno", "temperature", "uze", "thermal-equil", *_UZ_TERMS), + "flow-ja-face": _flow_ja_face("uzfno"), +} + +_TABLES: dict[str, dict[str, _Field]] = { + **{f"{m}-nam": _SWF_MODEL for m in ("chf", "olf", "swf")}, + **{f"{m}-chd": _CHD for m in ("gwf", "chf", "olf", "swf")}, + **{ + f"{m}-{p}": t + for m in ("chf", "olf", "swf") + for p, t in ( + ("cdb", _CDB), + ("dfw", _DFW), + ("evp", _EVP), + ("flw", _FLW), + ("pcp", _PCP), + ("zdg", _ZDG), + ) + }, + "exg-gwegwe": _EXCHANGE, + "exg-gwfgwf": _EXCHANGE, + "exg-gwtgwt": _EXCHANGE, + "gwe-ctp": _CTP, + "gwe-esl": _ESL, + "gwe-lke": _LKE, + "gwe-mwe": _MWE, + "gwe-nam": _GWE_MODEL, + "gwe-sfe": _SFE, + "gwe-uze": _UZE, + "gwf-api": _API, + "gwf-chdg": _CHD, + "gwf-csub": _CSUB, + "gwf-drn": _DRN, + "gwf-drng": _DRN, + "gwf-evt": _EVT, + "gwf-evta": _EVT, + "gwf-ghb": _GHB, + "gwf-ghbg": _GHB, + "gwf-lak": _LAK, + "gwf-maw": _MAW, + "gwf-nam": _GWF_MODEL, + "gwf-rch": _RCH, + "gwf-rcha": _RCH, + "gwf-riv": _RIV, + "gwf-rivg": _RIV, + "gwf-sfr": _SFR, + "gwf-uzf": _UZF, + "gwf-wel": _WEL, + "gwf-welg": _WEL, + "gwt-api": _API, + "gwt-cnc": _CNC, + "gwt-lkt": _LKT, + "gwt-mwt": _MWT, + "gwt-nam": _GWT_MODEL, + "gwt-sft": _SFT, + "gwt-src": _SRC, + "gwt-uzt": _UZT, +} + +# Observation types by component name, each field named after its obstype. +OBSERVATIONS: dict[str, dict[str, _Field]] = { + component: {o: f.model_copy(update={"name": o}) for o, f in table.items()} + for component, table in _TABLES.items() +} diff --git a/modflow_devtools/dfns/schema.json b/modflow_devtools/dfns/schema.json index ceb716ad..59809150 100644 --- a/modflow_devtools/dfns/schema.json +++ b/modflow_devtools/dfns/schema.json @@ -1336,6 +1336,51 @@ "default": null, "title": "Memory" }, + "observations": { + "anyOf": [ + { + "additionalProperties": { + "discriminator": { + "mapping": { + "array": "#/$defs/Array", + "double": "#/$defs/Double", + "integer": "#/$defs/Integer", + "record": "#/$defs/Record", + "string": "#/$defs/String", + "union": "#/$defs/Union" + }, + "propertyName": "type" + }, + "oneOf": [ + { + "$ref": "#/$defs/Integer" + }, + { + "$ref": "#/$defs/Double" + }, + { + "$ref": "#/$defs/String" + }, + { + "$ref": "#/$defs/Array" + }, + { + "$ref": "#/$defs/Record" + }, + { + "$ref": "#/$defs/Union" + } + ] + }, + "type": "object" + }, + { + "type": "null" + } + ], + "default": null, + "title": "Observations" + }, "type": { "const": "model", "default": "model", @@ -1504,6 +1549,51 @@ "default": null, "title": "Memory" }, + "observations": { + "anyOf": [ + { + "additionalProperties": { + "discriminator": { + "mapping": { + "array": "#/$defs/Array", + "double": "#/$defs/Double", + "integer": "#/$defs/Integer", + "record": "#/$defs/Record", + "string": "#/$defs/String", + "union": "#/$defs/Union" + }, + "propertyName": "type" + }, + "oneOf": [ + { + "$ref": "#/$defs/Integer" + }, + { + "$ref": "#/$defs/Double" + }, + { + "$ref": "#/$defs/String" + }, + { + "$ref": "#/$defs/Array" + }, + { + "$ref": "#/$defs/Record" + }, + { + "$ref": "#/$defs/Union" + } + ] + }, + "type": "object" + }, + { + "type": "null" + } + ], + "default": null, + "title": "Observations" + }, "type": { "const": "package", "default": "package", @@ -1842,6 +1932,51 @@ "default": null, "title": "Memory" }, + "observations": { + "anyOf": [ + { + "additionalProperties": { + "discriminator": { + "mapping": { + "array": "#/$defs/Array", + "double": "#/$defs/Double", + "integer": "#/$defs/Integer", + "record": "#/$defs/Record", + "string": "#/$defs/String", + "union": "#/$defs/Union" + }, + "propertyName": "type" + }, + "oneOf": [ + { + "$ref": "#/$defs/Integer" + }, + { + "$ref": "#/$defs/Double" + }, + { + "$ref": "#/$defs/String" + }, + { + "$ref": "#/$defs/Array" + }, + { + "$ref": "#/$defs/Record" + }, + { + "$ref": "#/$defs/Union" + } + ] + }, + "type": "object" + }, + { + "type": "null" + } + ], + "default": null, + "title": "Observations" + }, "type": { "const": "simulation", "default": "simulation", diff --git a/modflow_devtools/dfns/schema.py b/modflow_devtools/dfns/schema.py index 50bed4ba..ac785f7a 100644 --- a/modflow_devtools/dfns/schema.py +++ b/modflow_devtools/dfns/schema.py @@ -922,6 +922,12 @@ def _serialize(self, handler: Any, info: SerializationInfo) -> dict[str, Any]: ] +ObservationField = Annotated[ + Integer | Double | String | Array | Record | Union, + PydanticField(discriminator="type"), +] + + class ComponentBase(BaseModel): schema_version: str | None = None name: str @@ -935,6 +941,9 @@ class ComponentBase(BaseModel): runtime_dims: dict[str, RuntimeDim] | None = None blocks: dict[str, Block] | None = None memory: dict[str, MemoryVariable] | None = None + # Observation types this component accepts in its OBS file, keyed by + # (lower-case) name. See `ObservationField`. + observations: dict[str, ObservationField] | None = None @model_serializer(mode="wrap") def _serialize(self, handler: Any) -> dict[str, Any]: @@ -1232,9 +1241,9 @@ def _validate_fk_fields(component: "ComponentBase", spec: "Dfns") -> None: runtime, so no further structural check is possible statically. A hierarchical-path fk may not be combined with fk_ref. + + Observation fields (see `ObservationField`) are checked like a list item's. """ - if not component.blocks: - return def _check_fields(fields: dict, dynamic_key: "InputField | None" = None) -> None: for field in fields.values(): @@ -1321,8 +1330,9 @@ def _check_fields(fields: dict, dynamic_key: "InputField | None" = None) -> None else: _check_fields({form.name: form}) - for block in component.blocks.values(): + for block in (component.blocks or {}).values(): _check_fields(block.fields) + _check_fields(component.observations or {}) def _iter_files(fields: "Mapping[str, InputField]"): @@ -1386,11 +1396,10 @@ def _validate_file_links(component: "ComponentBase", spec: "Dfns") -> None: def _validate_cellid_fields(component: "ComponentBase") -> None: """ A cellid array (`cellid=True`, see `Array.cellid`) is only meaningful as a - column in a list item, where each row names its cell(s). Its dtype and - shape are checked by `Array` itself. + 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. """ - if not component.blocks: - return def _check(field: "InputField", in_item: bool) -> None: if isinstance(field, Array) and field.cellid and not in_item: @@ -1406,9 +1415,42 @@ def _check(field: "InputField", in_item: bool) -> None: for arm in field.arms.values(): _check(arm, in_item) - for block in component.blocks.values(): + for block in (component.blocks or {}).values(): for field in block.fields.values(): _check(field, False) + for obs_field in (component.observations or {}).values(): + _check(obs_field, True) + + +def _obs_columns(field: "InputField") -> list[int]: + """How many `utl-obs` columns each form of an observation field fills.""" + if isinstance(field, Union): + return [n for arm in field.arms.values() for n in _obs_columns(arm)] + return [len(field.fields) if isinstance(field, Record) else 1] + + +def _validate_observations(component: "ComponentBase") -> None: + """ + Each observation field (see `ObservationField`) must be untagged + throughout and fill one or two columns, `id` and optionally `id2`. + Its fks are checked by `_validate_fk_fields`. + """ + for obstype, field in (component.observations or {}).items(): + where = f"Observation {obstype!r}" + if obstype != obstype.lower(): + raise ValueError(f"{where}: name must be lower case") + tagged = [f.name for f in _iter_subfields(field) if f.tagged] + if tagged: + raise ValueError(f"{where}: {tagged} must be untagged") + if any(n not in (1, 2) for n in _obs_columns(field)): + raise ValueError(f"{where}: each form must fill id and at most id2") + + +def _iter_subfields(field: "InputField"): + """Yield ``field`` and every field nested in it.""" + yield field + for child in getattr(field, "children", {}).values(): + yield from _iter_subfields(child) def _validate_array_shapes( @@ -1573,6 +1615,7 @@ def _inject_names(comp_data: dict) -> None: Necessary to compensate for field and block names being absent in serialized DFN file data. """ + _inject_field_names(comp_data.get("observations") or {}) for block_name, block in (comp_data.get("blocks") or {}).items(): block.setdefault("name", block_name) _inject_field_names(block.get("fields") or {}) @@ -1735,6 +1778,8 @@ def _validate_relations(self) -> "Dfns": _validate_file_links(component, self) for name, component in self.components.items(): _validate_cellid_fields(component) + for name, component in self.components.items(): + _validate_observations(component) for name, component in self.components.items(): _validate_array_shapes(component, name, self) for name, component in self.components.items():