Skip to content

refactor(dfns): introduce cell ID type #394

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wpbonelli merged 1 commit into from
Oct 15, 2026
Merged

refactor(dfns): introduce cell ID type #394

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
10 changes: 2 additions & 8 deletions autotest/dfns/__snapshots__/v2.0.0.dev2/chf-cdb.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,16 +86,10 @@
"type": "record",
"fields": {
"cellid": {
"type": "array",
"type": "cellid",
"longname": "cell identifier",
"description": "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell.",
"tagged": false,
"dtype": "integer",
"index": true,
"cellid": true,
"shape": [
"ncelldim"
]
"tagged": false
},
"idcxs": {
"type": "integer",
Expand Down
8 changes: 1 addition & 7 deletions autotest/dfns/__snapshots__/v2.0.0.dev2/chf-cdb.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,16 +75,10 @@ name = "stress_period_data"
type = "record"

[blocks.period.fields.stress_period_data.item.fields.cellid]
type = "array"
type = "cellid"
longname = "cell identifier"
description = "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell."
tagged = false
dtype = "integer"
index = true
cellid = true
shape = [
"ncelldim",
]

[blocks.period.fields.stress_period_data.item.fields.idcxs]
type = "integer"
Expand Down
7 changes: 1 addition & 6 deletions autotest/dfns/__snapshots__/v2.0.0.dev2/chf-cdb.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,19 +84,14 @@ blocks:
type: record
fields:
cellid:
type: array
type: cellid
longname: cell identifier
description: is the cell identifier, and depends on the type of grid that is used for the
simulation. For a structured grid that uses the DIS input file, CELLID is the layer,
row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D
number. If the model uses the unstructured discretization (DISU) input file, CELLID is
the node number for the cell.
tagged: false
dtype: integer
index: true
cellid: true
shape:
- ncelldim
idcxs:
type: integer
longname: cross section identifier
Expand Down
10 changes: 2 additions & 8 deletions autotest/dfns/__snapshots__/v2.0.0.dev2/chf-chd.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,16 +115,10 @@
"type": "record",
"fields": {
"cellid": {
"type": "array",
"type": "cellid",
"longname": "cell identifier",
"description": "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell.",
"tagged": false,
"dtype": "integer",
"index": true,
"cellid": true,
"shape": [
"ncelldim"
]
"tagged": false
},
"head": {
"type": "double",
Expand Down
8 changes: 1 addition & 7 deletions autotest/dfns/__snapshots__/v2.0.0.dev2/chf-chd.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,16 +102,10 @@ name = "stress_period_data"
type = "record"

[blocks.period.fields.stress_period_data.item.fields.cellid]
type = "array"
type = "cellid"
longname = "cell identifier"
description = "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell."
tagged = false
dtype = "integer"
index = true
cellid = true
shape = [
"ncelldim",
]

[blocks.period.fields.stress_period_data.item.fields.head]
type = "double"
Expand Down
7 changes: 1 addition & 6 deletions autotest/dfns/__snapshots__/v2.0.0.dev2/chf-chd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,19 +109,14 @@ blocks:
type: record
fields:
cellid:
type: array
type: cellid
longname: cell identifier
description: is the cell identifier, and depends on the type of grid that is used for the
simulation. For a structured grid that uses the DIS input file, CELLID is the layer,
row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D
number. If the model uses the unstructured discretization (DISU) input file, CELLID is
the node number for the cell.
tagged: false
dtype: integer
index: true
cellid: true
shape:
- ncelldim
head:
type: double
longname: head value assigned to constant head
Expand Down
10 changes: 2 additions & 8 deletions autotest/dfns/__snapshots__/v2.0.0.dev2/chf-evp.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,16 +115,10 @@
"type": "record",
"fields": {
"cellid": {
"type": "array",
"type": "cellid",
"longname": "cell identifier",
"description": "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell.",
"tagged": false,
"dtype": "integer",
"index": true,
"cellid": true,
"shape": [
"ncelldim"
]
"tagged": false
},
"evaporation": {
"type": "double",
Expand Down
8 changes: 1 addition & 7 deletions autotest/dfns/__snapshots__/v2.0.0.dev2/chf-evp.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,16 +102,10 @@ name = "stress_period_data"
type = "record"

[blocks.period.fields.stress_period_data.item.fields.cellid]
type = "array"
type = "cellid"
longname = "cell identifier"
description = "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell."
tagged = false
dtype = "integer"
index = true
cellid = true
shape = [
"ncelldim",
]

[blocks.period.fields.stress_period_data.item.fields.evaporation]
type = "double"
Expand Down
7 changes: 1 addition & 6 deletions autotest/dfns/__snapshots__/v2.0.0.dev2/chf-evp.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,19 +109,14 @@ blocks:
type: record
fields:
cellid:
type: array
type: cellid
longname: cell identifier
description: is the cell identifier, and depends on the type of grid that is used for the
simulation. For a structured grid that uses the DIS input file, CELLID is the layer,
row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D
number. If the model uses the unstructured discretization (DISU) input file, CELLID is
the node number for the cell.
tagged: false
dtype: integer
index: true
cellid: true
shape:
- ncelldim
evaporation:
type: double
longname: evaporation rate
Expand Down
10 changes: 2 additions & 8 deletions autotest/dfns/__snapshots__/v2.0.0.dev2/chf-flw.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,16 +115,10 @@
"type": "record",
"fields": {
"cellid": {
"type": "array",
"type": "cellid",
"longname": "cell identifier",
"description": "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell.",
"tagged": false,
"dtype": "integer",
"index": true,
"cellid": true,
"shape": [
"ncelldim"
]
"tagged": false
},
"q": {
"type": "double",
Expand Down
8 changes: 1 addition & 7 deletions autotest/dfns/__snapshots__/v2.0.0.dev2/chf-flw.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,16 +102,10 @@ name = "stress_period_data"
type = "record"

[blocks.period.fields.stress_period_data.item.fields.cellid]
type = "array"
type = "cellid"
longname = "cell identifier"
description = "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell."
tagged = false
dtype = "integer"
index = true
cellid = true
shape = [
"ncelldim",
]

[blocks.period.fields.stress_period_data.item.fields.q]
type = "double"
Expand Down
7 changes: 1 addition & 6 deletions autotest/dfns/__snapshots__/v2.0.0.dev2/chf-flw.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,19 +108,14 @@ blocks:
type: record
fields:
cellid:
type: array
type: cellid
longname: cell identifier
description: is the cell identifier, and depends on the type of grid that is used for the
simulation. For a structured grid that uses the DIS input file, CELLID is the layer,
row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D
number. If the model uses the unstructured discretization (DISU) input file, CELLID is
the node number for the cell.
tagged: false
dtype: integer
index: true
cellid: true
shape:
- ncelldim
q:
type: double
longname: well rate
Expand Down
10 changes: 2 additions & 8 deletions autotest/dfns/__snapshots__/v2.0.0.dev2/chf-pcp.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,16 +115,10 @@
"type": "record",
"fields": {
"cellid": {
"type": "array",
"type": "cellid",
"longname": "cell identifier",
"description": "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell.",
"tagged": false,
"dtype": "integer",
"index": true,
"cellid": true,
"shape": [
"ncelldim"
]
"tagged": false
},
"precipitation": {
"type": "double",
Expand Down
8 changes: 1 addition & 7 deletions autotest/dfns/__snapshots__/v2.0.0.dev2/chf-pcp.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,16 +102,10 @@ name = "stress_period_data"
type = "record"

[blocks.period.fields.stress_period_data.item.fields.cellid]
type = "array"
type = "cellid"
longname = "cell identifier"
description = "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell."
tagged = false
dtype = "integer"
index = true
cellid = true
shape = [
"ncelldim",
]

[blocks.period.fields.stress_period_data.item.fields.precipitation]
type = "double"
Expand Down
7 changes: 1 addition & 6 deletions autotest/dfns/__snapshots__/v2.0.0.dev2/chf-pcp.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,19 +109,14 @@ blocks:
type: record
fields:
cellid:
type: array
type: cellid
longname: cell identifier
description: is the cell identifier, and depends on the type of grid that is used for the
simulation. For a structured grid that uses the DIS input file, CELLID is the layer,
row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D
number. If the model uses the unstructured discretization (DISU) input file, CELLID is
the node number for the cell.
tagged: false
dtype: integer
index: true
cellid: true
shape:
- ncelldim
precipitation:
type: double
longname: precipitation rate
Expand Down
10 changes: 2 additions & 8 deletions autotest/dfns/__snapshots__/v2.0.0.dev2/chf-zdg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,16 +109,10 @@
"type": "record",
"fields": {
"cellid": {
"type": "array",
"type": "cellid",
"longname": "cell identifier",
"description": "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell.",
"tagged": false,
"dtype": "integer",
"index": true,
"cellid": true,
"shape": [
"ncelldim"
]
"tagged": false
},
"idcxs": {
"type": "integer",
Expand Down
8 changes: 1 addition & 7 deletions autotest/dfns/__snapshots__/v2.0.0.dev2/chf-zdg.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,16 +96,10 @@ name = "stress_period_data"
type = "record"

[blocks.period.fields.stress_period_data.item.fields.cellid]
type = "array"
type = "cellid"
longname = "cell identifier"
description = "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell."
tagged = false
dtype = "integer"
index = true
cellid = true
shape = [
"ncelldim",
]

[blocks.period.fields.stress_period_data.item.fields.idcxs]
type = "integer"
Expand Down
7 changes: 1 addition & 6 deletions autotest/dfns/__snapshots__/v2.0.0.dev2/chf-zdg.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,19 +104,14 @@ blocks:
type: record
fields:
cellid:
type: array
type: cellid
longname: cell identifier
description: is the cell identifier, and depends on the type of grid that is used for the
simulation. For a structured grid that uses the DIS input file, CELLID is the layer,
row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D
number. If the model uses the unstructured discretization (DISU) input file, CELLID is
the node number for the cell.
tagged: false
dtype: integer
index: true
cellid: true
shape:
- ncelldim
idcxs:
type: integer
longname: cross section identifier
Expand Down
18 changes: 4 additions & 14 deletions autotest/dfns/__snapshots__/v2.0.0.dev2/exg-chfgwf.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,28 +72,18 @@
"type": "record",
"fields": {
"cellidm1": {
"type": "array",
"type": "cellid",
"longname": "cellid of cell in surface water model",
"description": "is the cellid of the cell in model 1, which must be the surface water model. For a structured grid that uses the DIS input file, CELLIDM1 is the layer, row, and column numbers of the cell. For a grid that uses the DISV input file, CELLIDM1 is the layer number and CELL2D number for the two cells. If the model uses the unstructured discretization (DISU) input file, then CELLIDM1 is the node number for the cell.",
"tagged": false,
"dtype": "integer",
"index": true,
"cellid": "1",
"shape": [
"ncelldim"
]
"model": "1"
},
"cellidm2": {
"type": "array",
"type": "cellid",
"longname": "cellid of cell in groundwater model",
"description": "is the cellid of the cell in model 2, which must be the groundwater model. For a structured grid that uses the DIS input file, CELLIDM2 is the layer, row, and column numbers of the cell. For a grid that uses the DISV input file, CELLIDM2 is the layer number and CELL2D number for the two cells. If the model uses the unstructured discretization (DISU) input file, then CELLIDM2 is the node number for the cell.",
"tagged": false,
"dtype": "integer",
"index": true,
"cellid": "2",
"shape": [
"ncelldim"
]
"model": "2"
},
"bedleak": {
"type": "double",
Expand Down
Loading
Loading