Skip to content

fix(dfn): drop step 7 of the dev3 migration #366

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
mjreno merged 2 commits into from
Sep 22, 2026
Merged

fix(dfn): drop step 7 of the dev3 migration #366

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8b623db
drop step 7 of the dev3 dfn migration
mjreno Sep 22, 2026
7940035
update tests
mjreno Sep 22, 2026
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
13 changes: 12 additions & 1 deletion autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chdg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@
"multi": true,
"subtype": "stress",
"dims": {
"maxbound": {
"value": "maxbound",
"scope": "model"
},
"auxiliary": {
"value": "len(auxiliary)"
},
Expand Down Expand Up @@ -96,7 +100,14 @@
}
},
"dimensions": {
"fields": {}
"fields": {
"maxbound": {
"type": "integer",
"longname": "maximum number of constant head cells in any stress period",
"description": "integer value specifying the maximum number of constant-head cells that will be specified for use during any stress period.",
"optional": true
}
}
},
"period": {
"fields": {
Expand Down
10 changes: 9 additions & 1 deletion autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chdg.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ parent = "gwf-nam"
multi = true
subtype = "stress"

[dims.maxbound]
value = "maxbound"
scope = "model"

[dims.auxiliary]
value = "len(auxiliary)"

Expand Down Expand Up @@ -84,7 +88,11 @@ description = "turn off Newton for unconfined cells"
optional = true
developmode = true

[blocks.dimensions.fields]
[blocks.dimensions.fields.maxbound]
type = "integer"
longname = "maximum number of constant head cells in any stress period"
description = "integer value specifying the maximum number of constant-head cells that will be specified for use during any stress period."
optional = true

[blocks.period.fields.head]
type = "array"
Expand Down
11 changes: 10 additions & 1 deletion autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chdg.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ parent: gwf-nam
multi: true
subtype: stress
dims:
maxbound:
value: maxbound
scope: model
auxiliary:
value: len(auxiliary)
naux:
Expand Down Expand Up @@ -96,7 +99,13 @@ blocks:
optional: true
developmode: true
dimensions:
fields: {}
fields:
maxbound:
type: integer
longname: maximum number of constant head cells in any stress period
description: integer value specifying the maximum number of constant-head cells that will be specified
for use during any stress period.
optional: true
period:
fields:
head:
Expand Down
13 changes: 12 additions & 1 deletion autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drng.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@
"multi": true,
"subtype": "stress",
"dims": {
"maxbound": {
"value": "maxbound",
"scope": "model"
},
"auxiliary": {
"value": "len(auxiliary)"
},
Expand Down Expand Up @@ -107,7 +111,14 @@
}
},
"dimensions": {
"fields": {}
"fields": {
"maxbound": {
"type": "integer",
"longname": "maximum number of drain cells in any stress period",
"description": "integer value specifying the maximum number of drains cells that will be specified for use during any stress period.",
"optional": true
}
}
},
"period": {
"fields": {
Expand Down
10 changes: 9 additions & 1 deletion autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drng.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ parent = "gwf-nam"
multi = true
subtype = "stress"

[dims.maxbound]
value = "maxbound"
scope = "model"

[dims.auxiliary]
value = "len(auxiliary)"

Expand Down Expand Up @@ -95,7 +99,11 @@ description = "cubic-scaling is used to scale the drain conductance"
optional = true
developmode = true

[blocks.dimensions.fields]
[blocks.dimensions.fields.maxbound]
type = "integer"
longname = "maximum number of drain cells in any stress period"
description = "integer value specifying the maximum number of drains cells that will be specified for use during any stress period."
optional = true

[blocks.period.fields.elev]
type = "array"
Expand Down
11 changes: 10 additions & 1 deletion autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drng.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ parent: gwf-nam
multi: true
subtype: stress
dims:
maxbound:
value: maxbound
scope: model
auxiliary:
value: len(auxiliary)
naux:
Expand Down Expand Up @@ -115,7 +118,13 @@ blocks:
optional: true
developmode: true
dimensions:
fields: {}
fields:
maxbound:
type: integer
longname: maximum number of drain cells in any stress period
description: integer value specifying the maximum number of drains cells that will be specified
for use during any stress period.
optional: true
period:
fields:
elev:
Expand Down
13 changes: 12 additions & 1 deletion autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghbg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@
"multi": true,
"subtype": "stress",
"dims": {
"maxbound": {
"value": "maxbound",
"scope": "model"
},
"auxiliary": {
"value": "len(auxiliary)"
},
Expand Down Expand Up @@ -94,7 +98,14 @@
}
},
"dimensions": {
"fields": {}
"fields": {
"maxbound": {
"type": "integer",
"longname": "maximum number of general-head boundaries in any stress period",
"description": "integer value specifying the maximum number of general-head boundary cells that will be specified for use during any stress period.",
"optional": true
}
}
},
"period": {
"fields": {
Expand Down
10 changes: 9 additions & 1 deletion autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghbg.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ parent = "gwf-nam"
multi = true
subtype = "stress"

[dims.maxbound]
value = "maxbound"
scope = "model"

[dims.auxiliary]
value = "len(auxiliary)"

Expand Down Expand Up @@ -82,7 +86,11 @@ longname = "export array variables to netcdf output files."
description = "keyword that specifies input gridded arrays should be written to the model output NetCDF file with attributes that support using the generated file as a MODFLOW 6 simulation input. This option only has an effect when an output model NetCDF file is configured and the simulation is run in VALIDATE mode, otherwise it is ignored."
optional = true

[blocks.dimensions.fields]
[blocks.dimensions.fields.maxbound]
type = "integer"
longname = "maximum number of general-head boundaries in any stress period"
description = "integer value specifying the maximum number of general-head boundary cells that will be specified for use during any stress period."
optional = true

[blocks.period.fields.bhead]
type = "array"
Expand Down
11 changes: 10 additions & 1 deletion autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghbg.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ parent: gwf-nam
multi: true
subtype: stress
dims:
maxbound:
value: maxbound
scope: model
auxiliary:
value: len(auxiliary)
naux:
Expand Down Expand Up @@ -97,7 +100,13 @@ blocks:
simulation is run in VALIDATE mode, otherwise it is ignored.
optional: true
dimensions:
fields: {}
fields:
maxbound:
type: integer
longname: maximum number of general-head boundaries in any stress period
description: integer value specifying the maximum number of general-head boundary cells that will
be specified for use during any stress period.
optional: true
period:
fields:
bhead:
Expand Down
13 changes: 12 additions & 1 deletion autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rivg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@
"multi": true,
"subtype": "stress",
"dims": {
"maxbound": {
"value": "maxbound",
"scope": "model"
},
"auxiliary": {
"value": "len(auxiliary)"
},
Expand Down Expand Up @@ -94,7 +98,14 @@
}
},
"dimensions": {
"fields": {}
"fields": {
"maxbound": {
"type": "integer",
"longname": "maximum number of river cells in any stress period",
"description": "integer value specifying the maximum number of rivers cells that will be specified for use during any stress period.",
"optional": true
}
}
},
"period": {
"fields": {
Expand Down
10 changes: 9 additions & 1 deletion autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rivg.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ parent = "gwf-nam"
multi = true
subtype = "stress"

[dims.maxbound]
value = "maxbound"
scope = "model"

[dims.auxiliary]
value = "len(auxiliary)"

Expand Down Expand Up @@ -82,7 +86,11 @@ longname = "export array variables to netcdf output files."
description = "keyword that specifies input gridded arrays should be written to the model output NetCDF file with attributes that support using the generated file as a MODFLOW 6 simulation input. This option only has an effect when an output model NetCDF file is configured and the simulation is run in VALIDATE mode, otherwise it is ignored."
optional = true

[blocks.dimensions.fields]
[blocks.dimensions.fields.maxbound]
type = "integer"
longname = "maximum number of river cells in any stress period"
description = "integer value specifying the maximum number of rivers cells that will be specified for use during any stress period."
optional = true

[blocks.period.fields.stage]
type = "array"
Expand Down
11 changes: 10 additions & 1 deletion autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rivg.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ parent: gwf-nam
multi: true
subtype: stress
dims:
maxbound:
value: maxbound
scope: model
auxiliary:
value: len(auxiliary)
naux:
Expand Down Expand Up @@ -96,7 +99,13 @@ blocks:
simulation is run in VALIDATE mode, otherwise it is ignored.
optional: true
dimensions:
fields: {}
fields:
maxbound:
type: integer
longname: maximum number of river cells in any stress period
description: integer value specifying the maximum number of rivers cells that will be specified
for use during any stress period.
optional: true
period:
fields:
stage:
Expand Down
13 changes: 12 additions & 1 deletion autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-welg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@
"multi": true,
"subtype": "stress",
"dims": {
"maxbound": {
"value": "maxbound",
"scope": "model"
},
"auxiliary": {
"value": "len(auxiliary)"
},
Expand Down Expand Up @@ -124,7 +128,14 @@
}
},
"dimensions": {
"fields": {}
"fields": {
"maxbound": {
"type": "integer",
"longname": "maximum number of wells in any stress period",
"description": "integer value specifying the maximum number of wells cells that will be specified for use during any stress period.",
"optional": true
}
}
},
"period": {
"fields": {
Expand Down
10 changes: 9 additions & 1 deletion autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-welg.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ parent = "gwf-nam"
multi = true
subtype = "stress"

[dims.maxbound]
value = "maxbound"
scope = "model"

[dims.auxiliary]
value = "len(auxiliary)"

Expand Down Expand Up @@ -110,7 +114,11 @@ longname = "export array variables to netcdf output files."
description = "keyword that specifies input gridded arrays should be written to the model output NetCDF file with attributes that support using the generated file as a MODFLOW 6 simulation input. This option only has an effect when an output model NetCDF file is configured and the simulation is run in VALIDATE mode, otherwise it is ignored."
optional = true

[blocks.dimensions.fields]
[blocks.dimensions.fields.maxbound]
type = "integer"
longname = "maximum number of wells in any stress period"
description = "integer value specifying the maximum number of wells cells that will be specified for use during any stress period."
optional = true

[blocks.period.fields.q]
type = "array"
Expand Down
11 changes: 10 additions & 1 deletion autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-welg.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ parent: gwf-nam
multi: true
subtype: stress
dims:
maxbound:
value: maxbound
scope: model
auxiliary:
value: len(auxiliary)
naux:
Expand Down Expand Up @@ -136,7 +139,13 @@ blocks:
simulation is run in VALIDATE mode, otherwise it is ignored.
optional: true
dimensions:
fields: {}
fields:
maxbound:
type: integer
longname: maximum number of wells in any stress period
description: integer value specifying the maximum number of wells cells that will be specified
for use during any stress period.
optional: true
period:
fields:
q:
Expand Down
Loading
Loading