Skip to content

refactor(dfns): split Dim into InputDim and RuntimeDim #353

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
Aug 27, 2026
Merged

refactor(dfns): split Dim into InputDim and RuntimeDim #353

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
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion autotest/dfns/__snapshots__/v2.0.0.dev3/chf-cdb.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@
},
"naux": {
"value": "len(auxiliary)"
},
}
},
"runtime_dims": {
"nbound": {
"set_in": "rp"
},
Expand Down
4 changes: 2 additions & 2 deletions autotest/dfns/__snapshots__/v2.0.0.dev3/chf-cdb.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ value = "len(auxiliary)"
[dims.naux]
value = "len(auxiliary)"

[dims.nbound]
[runtime_dims.nbound]
set_in = "rp"

[dims.ncolbnd]
[runtime_dims.ncolbnd]
set_in = "ar"

[blocks.options.fields.auxiliary]
Expand Down
1 change: 1 addition & 0 deletions autotest/dfns/__snapshots__/v2.0.0.dev3/chf-cdb.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ dims:
value: len(auxiliary)
naux:
value: len(auxiliary)
runtime_dims:
nbound:
set_in: rp
ncolbnd:
Expand Down
4 changes: 3 additions & 1 deletion autotest/dfns/__snapshots__/v2.0.0.dev3/chf-chd.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@
},
"naux": {
"value": "len(auxiliary)"
},
}
},
"runtime_dims": {
"nbound": {
"set_in": "rp"
},
Expand Down
4 changes: 2 additions & 2 deletions autotest/dfns/__snapshots__/v2.0.0.dev3/chf-chd.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ value = "len(auxiliary)"
[dims.naux]
value = "len(auxiliary)"

[dims.nbound]
[runtime_dims.nbound]
set_in = "rp"

[dims.ncolbnd]
[runtime_dims.ncolbnd]
set_in = "ar"

[blocks.options.fields.auxiliary]
Expand Down
1 change: 1 addition & 0 deletions autotest/dfns/__snapshots__/v2.0.0.dev3/chf-chd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ dims:
value: len(auxiliary)
naux:
value: len(auxiliary)
runtime_dims:
nbound:
set_in: rp
ncolbnd:
Expand Down
2 changes: 1 addition & 1 deletion autotest/dfns/__snapshots__/v2.0.0.dev3/chf-dfw.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"schema_version": "2.0.0.dev3",
"name": "chf-dfw",
"parent": "chf-nam",
"dims": {
"runtime_dims": {
"nodes": {
"set_in": "ar"
}
Expand Down
2 changes: 1 addition & 1 deletion autotest/dfns/__snapshots__/v2.0.0.dev3/chf-dfw.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ schema_version = "2.0.0.dev3"
name = "chf-dfw"
parent = "chf-nam"

[dims.nodes]
[runtime_dims.nodes]
set_in = "ar"

[blocks.options.fields.central_in_space]
Expand Down
2 changes: 1 addition & 1 deletion autotest/dfns/__snapshots__/v2.0.0.dev3/chf-dfw.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ type: package
schema_version: 2.0.0.dev3
name: chf-dfw
parent: chf-nam
dims:
runtime_dims:
nodes:
set_in: ar
blocks:
Expand Down
28 changes: 28 additions & 0 deletions autotest/dfns/__snapshots__/v2.0.0.dev3/chf-disv1d.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,14 @@
"scope": "model"
}
},
"runtime_dims": {
"nodes": {
"set_in": "ar"
},
"nodesuser": {
"set_in": "ar"
}
},
"blocks": {
"options": {
"fields": {
Expand Down Expand Up @@ -259,6 +267,26 @@
"shape": [
"nodes"
]
},
"nodeuser": {
"type": "array",
"readonly": true,
"set_in": "ar",
"description": "Maps each packed (active-cell) node position to its full-grid user node number. Index map for the runtime 'nodes' dimension.",
"dtype": "integer",
"shape": [
"nodes"
]
},
"nodereduced": {
"type": "array",
"readonly": true,
"set_in": "ar",
"description": "Maps each full-grid user node number to its packed (active-cell) node position, or a nonpositive sentinel if the cell is inactive.",
"dtype": "integer",
"shape": [
"nodesuser"
]
}
}
}
26 changes: 26 additions & 0 deletions autotest/dfns/__snapshots__/v2.0.0.dev3/chf-disv1d.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@ scope = "model"
value = "1"
scope = "model"

[runtime_dims.nodes]
set_in = "ar"

[runtime_dims.nodesuser]
set_in = "ar"

[blocks.options.fields.length_units]
type = "string"
longname = "model length units"
Expand Down Expand Up @@ -228,3 +234,23 @@ dtype = "integer"
shape = [
"nodes",
]

[memory.nodeuser]
type = "array"
readonly = true
set_in = "ar"
description = "Maps each packed (active-cell) node position to its full-grid user node number. Index map for the runtime 'nodes' dimension."
dtype = "integer"
shape = [
"nodes",
]

[memory.nodereduced]
type = "array"
readonly = true
set_in = "ar"
description = "Maps each full-grid user node number to its packed (active-cell) node position, or a nonpositive sentinel if the cell is inactive."
dtype = "integer"
shape = [
"nodesuser",
]
23 changes: 23 additions & 0 deletions autotest/dfns/__snapshots__/v2.0.0.dev3/chf-disv1d.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,11 @@ dims:
ncelldim:
value: '1'
scope: model
runtime_dims:
nodes:
set_in: ar
nodesuser:
set_in: ar
blocks:
options:
fields:
Expand Down Expand Up @@ -232,3 +237,21 @@ memory:
dtype: integer
shape:
- nodes
nodeuser:
type: array
readonly: true
set_in: ar
description: Maps each packed (active-cell) node position to its full-grid user node number. Index
map for the runtime 'nodes' dimension.
dtype: integer
shape:
- nodes
nodereduced:
type: array
readonly: true
set_in: ar
description: Maps each full-grid user node number to its packed (active-cell) node position, or a
nonpositive sentinel if the cell is inactive.
dtype: integer
shape:
- nodesuser
4 changes: 3 additions & 1 deletion autotest/dfns/__snapshots__/v2.0.0.dev3/chf-evp.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@
},
"naux": {
"value": "len(auxiliary)"
},
}
},
"runtime_dims": {
"nbound": {
"set_in": "rp"
},
Expand Down
4 changes: 2 additions & 2 deletions autotest/dfns/__snapshots__/v2.0.0.dev3/chf-evp.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ value = "len(auxiliary)"
[dims.naux]
value = "len(auxiliary)"

[dims.nbound]
[runtime_dims.nbound]
set_in = "rp"

[dims.ncolbnd]
[runtime_dims.ncolbnd]
set_in = "ar"

[blocks.options.fields.auxiliary]
Expand Down
1 change: 1 addition & 0 deletions autotest/dfns/__snapshots__/v2.0.0.dev3/chf-evp.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ dims:
value: len(auxiliary)
naux:
value: len(auxiliary)
runtime_dims:
nbound:
set_in: rp
ncolbnd:
Expand Down
4 changes: 3 additions & 1 deletion autotest/dfns/__snapshots__/v2.0.0.dev3/chf-flw.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@
},
"naux": {
"value": "len(auxiliary)"
},
}
},
"runtime_dims": {
"nbound": {
"set_in": "rp"
},
Expand Down
4 changes: 2 additions & 2 deletions autotest/dfns/__snapshots__/v2.0.0.dev3/chf-flw.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ value = "len(auxiliary)"
[dims.naux]
value = "len(auxiliary)"

[dims.nbound]
[runtime_dims.nbound]
set_in = "rp"

[dims.ncolbnd]
[runtime_dims.ncolbnd]
set_in = "ar"

[blocks.options.fields.auxiliary]
Expand Down
1 change: 1 addition & 0 deletions autotest/dfns/__snapshots__/v2.0.0.dev3/chf-flw.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ dims:
value: len(auxiliary)
naux:
value: len(auxiliary)
runtime_dims:
nbound:
set_in: rp
ncolbnd:
Expand Down
2 changes: 1 addition & 1 deletion autotest/dfns/__snapshots__/v2.0.0.dev3/chf-ic.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"schema_version": "2.0.0.dev3",
"name": "chf-ic",
"parent": "chf-nam",
"dims": {
"runtime_dims": {
"nodes": {
"set_in": "ar"
}
Expand Down
2 changes: 1 addition & 1 deletion autotest/dfns/__snapshots__/v2.0.0.dev3/chf-ic.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ schema_version = "2.0.0.dev3"
name = "chf-ic"
parent = "chf-nam"

[dims.nodes]
[runtime_dims.nodes]
set_in = "ar"

[blocks.options.fields.export_array_ascii]
Expand Down
2 changes: 1 addition & 1 deletion autotest/dfns/__snapshots__/v2.0.0.dev3/chf-ic.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ type: package
schema_version: 2.0.0.dev3
name: chf-ic
parent: chf-nam
dims:
runtime_dims:
nodes:
set_in: ar
blocks:
Expand Down
2 changes: 1 addition & 1 deletion autotest/dfns/__snapshots__/v2.0.0.dev3/chf-nam.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"name": "chf-nam",
"parent": "sim-nam",
"dependent_variable": "stage",
"dims": {
"runtime_dims": {
"nja": {
"set_in": "ar"
},
Expand Down
4 changes: 2 additions & 2 deletions autotest/dfns/__snapshots__/v2.0.0.dev3/chf-nam.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ name = "chf-nam"
parent = "sim-nam"
dependent_variable = "stage"

[dims.nja]
[runtime_dims.nja]
set_in = "ar"

[dims.nodes]
[runtime_dims.nodes]
set_in = "ar"

[blocks.options.fields.list]
Expand Down
2 changes: 1 addition & 1 deletion autotest/dfns/__snapshots__/v2.0.0.dev3/chf-nam.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ schema_version: 2.0.0.dev3
name: chf-nam
parent: sim-nam
dependent_variable: stage
dims:
runtime_dims:
nja:
set_in: ar
nodes:
Expand Down
4 changes: 3 additions & 1 deletion autotest/dfns/__snapshots__/v2.0.0.dev3/chf-pcp.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@
},
"naux": {
"value": "len(auxiliary)"
},
}
},
"runtime_dims": {
"nbound": {
"set_in": "rp"
},
Expand Down
4 changes: 2 additions & 2 deletions autotest/dfns/__snapshots__/v2.0.0.dev3/chf-pcp.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ value = "len(auxiliary)"
[dims.naux]
value = "len(auxiliary)"

[dims.nbound]
[runtime_dims.nbound]
set_in = "rp"

[dims.ncolbnd]
[runtime_dims.ncolbnd]
set_in = "ar"

[blocks.options.fields.auxiliary]
Expand Down
1 change: 1 addition & 0 deletions autotest/dfns/__snapshots__/v2.0.0.dev3/chf-pcp.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ dims:
value: len(auxiliary)
naux:
value: len(auxiliary)
runtime_dims:
nbound:
set_in: rp
ncolbnd:
Expand Down
4 changes: 3 additions & 1 deletion autotest/dfns/__snapshots__/v2.0.0.dev3/chf-zdg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@
},
"naux": {
"value": "len(auxiliary)"
},
}
},
"runtime_dims": {
"nbound": {
"set_in": "rp"
},
Expand Down
4 changes: 2 additions & 2 deletions autotest/dfns/__snapshots__/v2.0.0.dev3/chf-zdg.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ value = "len(auxiliary)"
[dims.naux]
value = "len(auxiliary)"

[dims.nbound]
[runtime_dims.nbound]
set_in = "rp"

[dims.ncolbnd]
[runtime_dims.ncolbnd]
set_in = "ar"

[blocks.options.fields.auxiliary]
Expand Down
1 change: 1 addition & 0 deletions autotest/dfns/__snapshots__/v2.0.0.dev3/chf-zdg.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ dims:
value: len(auxiliary)
naux:
value: len(auxiliary)
runtime_dims:
nbound:
set_in: rp
ncolbnd:
Expand Down
Loading
Loading