Skip to content

feat(dfns): declare dynamic keywords explicitly #396

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 4 commits into from
Oct 21, 2026
Merged

feat(dfns): declare dynamic keywords explicitly #396

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4716027
feat(dfns): mark model-name keys in sim-nam
wpbonelli Oct 21, 2026
89779e0
feat(dfns): mark dynamic keywords explicitly
wpbonelli Oct 21, 2026
0853bd6
refactor(dfns): require only a static fk for dynamic keywords
wpbonelli Oct 21, 2026
ef2ded7
docs(dfns): allow a bare-block fk without fk_ref in the spec
wpbonelli Oct 21, 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
3 changes: 2 additions & 1 deletion autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chdg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,8 @@
"longname": "auxiliary variable name",
"description": "name of the auxiliary variable the following array sets; must be one of the auxiliary variables.",
"tagged": false,
"fk": "options.auxiliary"
"fk": "options.auxiliary",
"dynamic": true
},
"aux": {
"type": "array",
Expand Down
1 change: 1 addition & 0 deletions autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chdg.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ longname = "auxiliary variable name"
description = "name of the auxiliary variable the following array sets; must be one of the auxiliary variables."
tagged = false
fk = "options.auxiliary"
dynamic = true

[blocks.period.fields.aux.item.fields.aux]
type = "array"
Expand Down
1 change: 1 addition & 0 deletions autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chdg.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,7 @@ blocks:
auxiliary variables.
tagged: false
fk: options.auxiliary
dynamic: true
aux:
type: array
longname: constant head auxiliary variable iaux
Expand Down
3 changes: 2 additions & 1 deletion autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drng.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,8 @@
"longname": "auxiliary variable name",
"description": "name of the auxiliary variable the following array sets; must be one of the auxiliary variables.",
"tagged": false,
"fk": "options.auxiliary"
"fk": "options.auxiliary",
"dynamic": true
},
"aux": {
"type": "array",
Expand Down
1 change: 1 addition & 0 deletions autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drng.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@ longname = "auxiliary variable name"
description = "name of the auxiliary variable the following array sets; must be one of the auxiliary variables."
tagged = false
fk = "options.auxiliary"
dynamic = true

[blocks.period.fields.aux.item.fields.aux]
type = "array"
Expand Down
1 change: 1 addition & 0 deletions autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drng.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,7 @@ blocks:
auxiliary variables.
tagged: false
fk: options.auxiliary
dynamic: true
aux:
type: array
longname: drain auxiliary variable iaux
Expand Down
3 changes: 2 additions & 1 deletion autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-evta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,8 @@
"longname": "auxiliary variable name",
"description": "name of the auxiliary variable the following array sets; must be one of the auxiliary variables.",
"tagged": false,
"fk": "options.auxiliary"
"fk": "options.auxiliary",
"dynamic": true
},
"aux": {
"type": "array",
Expand Down
1 change: 1 addition & 0 deletions autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-evta.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,7 @@ longname = "auxiliary variable name"
description = "name of the auxiliary variable the following array sets; must be one of the auxiliary variables."
tagged = false
fk = "options.auxiliary"
dynamic = true

[blocks.period.fields.aux.item.fields.aux]
type = "array"
Expand Down
1 change: 1 addition & 0 deletions autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-evta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,7 @@ blocks:
auxiliary variables.
tagged: false
fk: options.auxiliary
dynamic: true
aux:
type: array
longname: evapotranspiration auxiliary variable iaux
Expand Down
3 changes: 2 additions & 1 deletion autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghbg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,8 @@
"longname": "auxiliary variable name",
"description": "name of the auxiliary variable the following array sets; must be one of the auxiliary variables.",
"tagged": false,
"fk": "options.auxiliary"
"fk": "options.auxiliary",
"dynamic": true
},
"aux": {
"type": "array",
Expand Down
1 change: 1 addition & 0 deletions autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghbg.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@ longname = "auxiliary variable name"
description = "name of the auxiliary variable the following array sets; must be one of the auxiliary variables."
tagged = false
fk = "options.auxiliary"
dynamic = true

[blocks.period.fields.aux.item.fields.aux]
type = "array"
Expand Down
1 change: 1 addition & 0 deletions autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghbg.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@ blocks:
auxiliary variables.
tagged: false
fk: options.auxiliary
dynamic: true
aux:
type: array
longname: general-head boundary auxiliary variable iaux
Expand Down
3 changes: 2 additions & 1 deletion autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rcha.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,8 @@
"longname": "auxiliary variable name",
"description": "name of the auxiliary variable the following array sets; must be one of the auxiliary variables.",
"tagged": false,
"fk": "options.auxiliary"
"fk": "options.auxiliary",
"dynamic": true
},
"aux": {
"type": "array",
Expand Down
1 change: 1 addition & 0 deletions autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rcha.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,7 @@ longname = "auxiliary variable name"
description = "name of the auxiliary variable the following array sets; must be one of the auxiliary variables."
tagged = false
fk = "options.auxiliary"
dynamic = true

[blocks.period.fields.aux.item.fields.aux]
type = "array"
Expand Down
1 change: 1 addition & 0 deletions autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rcha.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,7 @@ blocks:
auxiliary variables.
tagged: false
fk: options.auxiliary
dynamic: true
aux:
type: array
longname: recharge auxiliary variable iaux
Expand Down
3 changes: 2 additions & 1 deletion autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rivg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,8 @@
"longname": "auxiliary variable name",
"description": "name of the auxiliary variable the following array sets; must be one of the auxiliary variables.",
"tagged": false,
"fk": "options.auxiliary"
"fk": "options.auxiliary",
"dynamic": true
},
"aux": {
"type": "array",
Expand Down
1 change: 1 addition & 0 deletions autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rivg.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,7 @@ longname = "auxiliary variable name"
description = "name of the auxiliary variable the following array sets; must be one of the auxiliary variables."
tagged = false
fk = "options.auxiliary"
dynamic = true

[blocks.period.fields.aux.item.fields.aux]
type = "array"
Expand Down
1 change: 1 addition & 0 deletions autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rivg.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,7 @@ blocks:
auxiliary variables.
tagged: false
fk: options.auxiliary
dynamic: true
aux:
type: array
longname: river auxiliary variable iaux
Expand Down
3 changes: 2 additions & 1 deletion autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-welg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,8 @@
"longname": "auxiliary variable name",
"description": "name of the auxiliary variable the following array sets; must be one of the auxiliary variables.",
"tagged": false,
"fk": "options.auxiliary"
"fk": "options.auxiliary",
"dynamic": true
},
"aux": {
"type": "array",
Expand Down
1 change: 1 addition & 0 deletions autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-welg.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@ longname = "auxiliary variable name"
description = "name of the auxiliary variable the following array sets; must be one of the auxiliary variables."
tagged = false
fk = "options.auxiliary"
dynamic = true

[blocks.period.fields.aux.item.fields.aux]
type = "array"
Expand Down
1 change: 1 addition & 0 deletions autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-welg.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,7 @@ blocks:
auxiliary variables.
tagged: false
fk: options.auxiliary
dynamic: true
aux:
type: array
longname: well auxiliary variable iaux
Expand Down
12 changes: 8 additions & 4 deletions autotest/dfns/__snapshots__/v2.0.0.dev2/sim-nam.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,8 @@
"type": "string",
"longname": "name of model",
"description": "is the user-assigned name of the model. The model name cannot exceed 16 characters and must not have blanks within the name. The model name is case insensitive; any lowercase letters are converted and stored as upper case letters.",
"tagged": false
"tagged": false,
"pk": true
}
}
}
Expand Down Expand Up @@ -146,13 +147,15 @@
"type": "string",
"longname": "name of model A",
"description": "is the name of the first model that is part of this exchange.",
"tagged": false
"tagged": false,
"fk": "models.mname"
},
"exgmnameb": {
"type": "string",
"longname": "name of model B",
"description": "is the name of the second model that is part of this exchange.",
"tagged": false
"tagged": false,
"fk": "models.mname"
}
}
}
Expand Down Expand Up @@ -201,7 +204,8 @@
"longname": "array of model names in this solution",
"description": "is the array of model names to add to this solution. The number of model names is determined by the number of model names the user provides on this line.",
"tagged": false,
"dtype": "string"
"dtype": "string",
"fk": "models.mname"
}
}
}
Expand Down
4 changes: 4 additions & 0 deletions autotest/dfns/__snapshots__/v2.0.0.dev2/sim-nam.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ type = "string"
longname = "name of model"
description = "is the user-assigned name of the model. The model name cannot exceed 16 characters and must not have blanks within the name. The model name is case insensitive; any lowercase letters are converted and stored as upper case letters."
tagged = false
pk = true

[blocks.exchanges.fields.exchanges]
type = "list"
Expand Down Expand Up @@ -129,12 +130,14 @@ type = "string"
longname = "name of model A"
description = "is the name of the first model that is part of this exchange."
tagged = false
fk = "models.mname"

[blocks.exchanges.fields.exchanges.item.fields.exgmnameb]
type = "string"
longname = "name of model B"
description = "is the name of the second model that is part of this exchange."
tagged = false
fk = "models.mname"

[blocks.solutiongroup.fields.mxiter]
type = "integer"
Expand Down Expand Up @@ -178,6 +181,7 @@ longname = "array of model names in this solution"
description = "is the array of model names to add to this solution. The number of model names is determined by the number of model names the user provides on this line."
tagged = false
dtype = "string"
fk = "models.mname"

[blocks.solutiongroup.header.field]
name = "group_num"
Expand Down
4 changes: 4 additions & 0 deletions autotest/dfns/__snapshots__/v2.0.0.dev2/sim-nam.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ blocks:
and must not have blanks within the name. The model name is case insensitive; any lowercase
letters are converted and stored as upper case letters.
tagged: false
pk: true
exchanges:
fields:
exchanges:
Expand Down Expand Up @@ -135,11 +136,13 @@ blocks:
longname: name of model A
description: is the name of the first model that is part of this exchange.
tagged: false
fk: models.mname
exgmnameb:
type: string
longname: name of model B
description: is the name of the second model that is part of this exchange.
tagged: false
fk: models.mname
solutiongroup:
fields:
mxiter:
Expand Down Expand Up @@ -182,6 +185,7 @@ blocks:
is determined by the number of model names the user provides on this line.
tagged: false
dtype: string
fk: models.mname
header:
field:
name: group_num
Expand Down
3 changes: 2 additions & 1 deletion autotest/dfns/__snapshots__/v2.0.0.dev2/utl-hpc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@
"type": "string",
"longname": "model name",
"description": "is the unique model name.",
"tagged": false
"tagged": false,
"fk": "sim-nam.models.mname"
},
"mrank": {
"type": "integer",
Expand Down
1 change: 1 addition & 0 deletions autotest/dfns/__snapshots__/v2.0.0.dev2/utl-hpc.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ type = "string"
longname = "model name"
description = "is the unique model name."
tagged = false
fk = "sim-nam.models.mname"

[blocks.partitions.fields.partitions.item.fields.mrank]
type = "integer"
Expand Down
1 change: 1 addition & 0 deletions autotest/dfns/__snapshots__/v2.0.0.dev2/utl-hpc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ blocks:
longname: model name
description: is the unique model name.
tagged: false
fk: sim-nam.models.mname
mrank:
type: integer
longname: model rank
Expand Down
3 changes: 2 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 @@ -138,7 +138,8 @@
"longname": "auxiliary variable name",
"description": "name of the auxiliary variable the following array sets; must be one of the auxiliary variables.",
"tagged": false,
"fk": "options.auxiliary"
"fk": "options.auxiliary",
"dynamic": true
},
"aux": {
"type": "array",
Expand Down
1 change: 1 addition & 0 deletions 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 @@ -126,6 +126,7 @@ longname = "auxiliary variable name"
description = "name of the auxiliary variable the following array sets; must be one of the auxiliary variables."
tagged = false
fk = "options.auxiliary"
dynamic = true

[blocks.period.fields.aux.item.fields.aux]
type = "array"
Expand Down
1 change: 1 addition & 0 deletions 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 @@ -138,6 +138,7 @@ blocks:
auxiliary variables.
tagged: false
fk: options.auxiliary
dynamic: true
aux:
type: array
longname: constant head auxiliary variable iaux
Expand Down
3 changes: 2 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 @@ -161,7 +161,8 @@
"longname": "auxiliary variable name",
"description": "name of the auxiliary variable the following array sets; must be one of the auxiliary variables.",
"tagged": false,
"fk": "options.auxiliary"
"fk": "options.auxiliary",
"dynamic": true
},
"aux": {
"type": "array",
Expand Down
1 change: 1 addition & 0 deletions 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 @@ -149,6 +149,7 @@ longname = "auxiliary variable name"
description = "name of the auxiliary variable the following array sets; must be one of the auxiliary variables."
tagged = false
fk = "options.auxiliary"
dynamic = true

[blocks.period.fields.aux.item.fields.aux]
type = "array"
Expand Down
1 change: 1 addition & 0 deletions 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 @@ -167,6 +167,7 @@ blocks:
auxiliary variables.
tagged: false
fk: options.auxiliary
dynamic: true
aux:
type: array
longname: drain auxiliary variable iaux
Expand Down
3 changes: 2 additions & 1 deletion autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,8 @@
"longname": "auxiliary variable name",
"description": "name of the auxiliary variable the following array sets; must be one of the auxiliary variables.",
"tagged": false,
"fk": "options.auxiliary"
"fk": "options.auxiliary",
"dynamic": true
},
"aux": {
"type": "array",
Expand Down
1 change: 1 addition & 0 deletions autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evta.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,7 @@ longname = "auxiliary variable name"
description = "name of the auxiliary variable the following array sets; must be one of the auxiliary variables."
tagged = false
fk = "options.auxiliary"
dynamic = true

[blocks.period.fields.aux.item.fields.aux]
type = "array"
Expand Down
1 change: 1 addition & 0 deletions autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,7 @@ blocks:
auxiliary variables.
tagged: false
fk: options.auxiliary
dynamic: true
aux:
type: array
longname: evapotranspiration auxiliary variable iaux
Expand Down
3 changes: 2 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 @@ -148,7 +148,8 @@
"longname": "auxiliary variable name",
"description": "name of the auxiliary variable the following array sets; must be one of the auxiliary variables.",
"tagged": false,
"fk": "options.auxiliary"
"fk": "options.auxiliary",
"dynamic": true
},
"aux": {
"type": "array",
Expand Down
Loading
Loading