Skip to content

fix(dfns): fix multiple issues #343

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 12, 2026
Merged

fix(dfns): fix multiple issues #343

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
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion autotest/__snapshots__/.numpy_snapshot_version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.4.5
2.5.2
2 changes: 1 addition & 1 deletion autotest/dfns/__snapshots__/.numpy_snapshot_version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.4.5
2.5.2
21 changes: 18 additions & 3 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 @@ -52,10 +52,16 @@
"optional": true,
"fields": {
"obs6": {
"type": "file",
"type": "keyword",
"longname": "obs keyword",
"description": "keyword to specify that record corresponds to an observations file.",
"mode": "filein"
"description": "keyword to specify that record corresponds to an observations file."
},
"obs6_filename": {
"type": "file",
"longname": "obs6 input filename",
"description": "name of input file to define observations for the CDB package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the CDB package.",
"tagged": false,
"direction": "in"
}
}
}
Expand All @@ -81,6 +87,7 @@
"type": "array",
"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",
"shape": [
"ncelldim"
Expand All @@ -104,6 +111,7 @@
"longname": "auxiliary variables",
"description": "represents the values of the auxiliary variables for each zero-depth-gradient boundary. The values of auxiliary variables must be present for each zero-depth-gradient boundary. The values must be specified in the order of the auxiliary variables specified in the OPTIONS block. If the package supports time series and the Options block includes a TIMESERIESFILE entry (see the 'Time-Variable Input' section), values can be obtained from a time series by entering the time-series name in place of a numeric value.",
"optional": true,
"tagged": false,
"dtype": "double",
"time_series": true,
"shape": [
Expand All @@ -123,6 +131,13 @@
"maxbound"
]
}
},
"header": {
"name": "iper",
"type": "integer",
"longname": "stress period number",
"description": "integer value specifying the starting stress period number for which the data specified in the PERIOD block apply. IPER must be less than or equal to NPER in the TDIS Package and greater than zero. The IPER value assigned to a stress period block must be greater than the IPER value assigned for the previous PERIOD block. The information specified in the PERIOD block will continue to apply for all subsequent stress periods, unless the program encounters another PERIOD block.",
"tagged": false
}
}
}
Expand Down
19 changes: 17 additions & 2 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 @@ -47,10 +47,16 @@ type = "record"
optional = true

[blocks.options.fields.obs_filerecord.fields.obs6]
type = "file"
type = "keyword"
longname = "obs keyword"
description = "keyword to specify that record corresponds to an observations file."
mode = "filein"

[blocks.options.fields.obs_filerecord.fields.obs6_filename]
type = "file"
longname = "obs6 input filename"
description = "name of input file to define observations for the CDB package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the CDB package."
tagged = false
direction = "in"

[blocks.dimensions.fields.maxbound]
type = "integer"
Expand All @@ -70,6 +76,7 @@ type = "record"
type = "array"
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"
shape = [
"ncelldim",
Expand All @@ -93,6 +100,7 @@ type = "array"
longname = "auxiliary variables"
description = "represents the values of the auxiliary variables for each zero-depth-gradient boundary. The values of auxiliary variables must be present for each zero-depth-gradient boundary. The values must be specified in the order of the auxiliary variables specified in the OPTIONS block. If the package supports time series and the Options block includes a TIMESERIESFILE entry (see the 'Time-Variable Input' section), values can be obtained from a time series by entering the time-series name in place of a numeric value."
optional = true
tagged = false
dtype = "double"
time_series = true
shape = [
Expand All @@ -105,3 +113,10 @@ longname = "zero-depth-gradient boundary name"
description = "name of the zero-depth-gradient boundary cell. BOUNDNAME is an ASCII character variable that can contain as many as 40 characters. If BOUNDNAME contains spaces in it, then the entire name must be enclosed within single quotes."
optional = true
tagged = false

[blocks.period.header]
name = "iper"
type = "integer"
longname = "stress period number"
description = "integer value specifying the starting stress period number for which the data specified in the PERIOD block apply. IPER must be less than or equal to NPER in the TDIS Package and greater than zero. The IPER value assigned to a stress period block must be greater than the IPER value assigned for the previous PERIOD block. The information specified in the PERIOD block will continue to apply for all subsequent stress periods, unless the program encounters another PERIOD block."
tagged = false
23 changes: 21 additions & 2 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 @@ -56,10 +56,17 @@ blocks:
optional: true
fields:
obs6:
type: file
type: keyword
longname: obs keyword
description: keyword to specify that record corresponds to an observations file.
mode: filein
obs6_filename:
type: file
longname: obs6 input filename
description: name of input file to define observations for the CDB package. See the 'Observation
utility' section for instructions for preparing observation input files. Table {#2} lists
observation type(s) supported by the CDB package.
tagged: false
direction: in
dimensions:
fields:
maxbound:
Expand All @@ -82,6 +89,7 @@ blocks:
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
shape:
- ncelldim
Expand Down Expand Up @@ -112,6 +120,7 @@ blocks:
a TIMESERIESFILE entry (see the 'Time-Variable Input' section), values can be obtained
from a time series by entering the time-series name in place of a numeric value.
optional: true
tagged: false
dtype: double
time_series: true
shape:
Expand All @@ -126,3 +135,13 @@ blocks:
tagged: false
shape:
- maxbound
header:
name: iper
type: integer
longname: stress period number
description: integer value specifying the starting stress period number for which the data specified
in the PERIOD block apply. IPER must be less than or equal to NPER in the TDIS Package and greater
than zero. The IPER value assigned to a stress period block must be greater than the IPER value
assigned for the previous PERIOD block. The information specified in the PERIOD block will continue
to apply for all subsequent stress periods, unless the program encounters another PERIOD block.
tagged: false
33 changes: 27 additions & 6 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 @@ -58,10 +58,16 @@
"optional": true,
"fields": {
"ts6": {
"type": "file",
"type": "keyword",
"longname": "head keyword",
"description": "keyword to specify that record corresponds to a time-series file.",
"mode": "filein"
"description": "keyword to specify that record corresponds to a time-series file."
},
"ts6_filename": {
"type": "file",
"longname": "file name of time series information",
"description": "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability.",
"tagged": false,
"direction": "in"
}
}
},
Expand All @@ -70,10 +76,16 @@
"optional": true,
"fields": {
"obs6": {
"type": "file",
"type": "keyword",
"longname": "obs keyword",
"description": "keyword to specify that record corresponds to an observations file.",
"mode": "filein"
"description": "keyword to specify that record corresponds to an observations file."
},
"obs6_filename": {
"type": "file",
"longname": "obs6 input filename",
"description": "name of input file to define observations for the CHD package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the CHD package.",
"tagged": false,
"direction": "in"
}
}
}
Expand All @@ -99,6 +111,7 @@
"type": "array",
"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",
"shape": [
"ncelldim"
Expand All @@ -116,6 +129,7 @@
"longname": "auxiliary variables",
"description": "represents the values of the auxiliary variables for each constant head. The values of auxiliary variables must be present for each constant head. The values must be specified in the order of the auxiliary variables specified in the OPTIONS block. If the package supports time series and the Options block includes a TIMESERIESFILE entry (see the 'Time-Variable Input' section), values can be obtained from a time series by entering the time-series name in place of a numeric value.",
"optional": true,
"tagged": false,
"dtype": "double",
"time_series": true,
"shape": [
Expand All @@ -135,6 +149,13 @@
"maxbound"
]
}
},
"header": {
"name": "iper",
"type": "integer",
"longname": "stress period number",
"description": "integer value specifying the starting stress period number for which the data specified in the PERIOD block apply. IPER must be less than or equal to NPER in the TDIS Package and greater than zero. The IPER value assigned to a stress period block must be greater than the IPER value assigned for the previous PERIOD block. The information specified in the PERIOD block will continue to apply for all subsequent stress periods, unless the program encounters another PERIOD block.",
"tagged": false
}
}
}
Expand Down
29 changes: 25 additions & 4 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 @@ -53,20 +53,32 @@ type = "record"
optional = true

[blocks.options.fields.ts_filerecord.fields.ts6]
type = "file"
type = "keyword"
longname = "head keyword"
description = "keyword to specify that record corresponds to a time-series file."
mode = "filein"

[blocks.options.fields.ts_filerecord.fields.ts6_filename]
type = "file"
longname = "file name of time series information"
description = "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability."
tagged = false
direction = "in"

[blocks.options.fields.obs_filerecord]
type = "record"
optional = true

[blocks.options.fields.obs_filerecord.fields.obs6]
type = "file"
type = "keyword"
longname = "obs keyword"
description = "keyword to specify that record corresponds to an observations file."
mode = "filein"

[blocks.options.fields.obs_filerecord.fields.obs6_filename]
type = "file"
longname = "obs6 input filename"
description = "name of input file to define observations for the CHD package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the CHD package."
tagged = false
direction = "in"

[blocks.dimensions.fields.maxbound]
type = "integer"
Expand All @@ -86,6 +98,7 @@ type = "record"
type = "array"
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"
shape = [
"ncelldim",
Expand All @@ -103,6 +116,7 @@ type = "array"
longname = "auxiliary variables"
description = "represents the values of the auxiliary variables for each constant head. The values of auxiliary variables must be present for each constant head. The values must be specified in the order of the auxiliary variables specified in the OPTIONS block. If the package supports time series and the Options block includes a TIMESERIESFILE entry (see the 'Time-Variable Input' section), values can be obtained from a time series by entering the time-series name in place of a numeric value."
optional = true
tagged = false
dtype = "double"
time_series = true
shape = [
Expand All @@ -115,3 +129,10 @@ longname = "constant head boundary name"
description = "name of the constant head boundary cell. BOUNDNAME is an ASCII character variable that can contain as many as 40 characters. If BOUNDNAME contains spaces in it, then the entire name must be enclosed within single quotes."
optional = true
tagged = false

[blocks.period.header]
name = "iper"
type = "integer"
longname = "stress period number"
description = "integer value specifying the starting stress period number for which the data specified in the PERIOD block apply. IPER must be less than or equal to NPER in the TDIS Package and greater than zero. The IPER value assigned to a stress period block must be greater than the IPER value assigned for the previous PERIOD block. The information specified in the PERIOD block will continue to apply for all subsequent stress periods, unless the program encounters another PERIOD block."
tagged = false
34 changes: 30 additions & 4 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 @@ -61,19 +61,33 @@ blocks:
optional: true
fields:
ts6:
type: file
type: keyword
longname: head keyword
description: keyword to specify that record corresponds to a time-series file.
mode: filein
ts6_filename:
type: file
longname: file name of time series information
description: defines a time-series file defining time series that can be used to assign time-varying
values. See the 'Time-Variable Input' section for instructions on using the time-series
capability.
tagged: false
direction: in
obs_filerecord:
type: record
optional: true
fields:
obs6:
type: file
type: keyword
longname: obs keyword
description: keyword to specify that record corresponds to an observations file.
mode: filein
obs6_filename:
type: file
longname: obs6 input filename
description: name of input file to define observations for the CHD package. See the 'Observation
utility' section for instructions for preparing observation input files. Table {#2} lists
observation type(s) supported by the CHD package.
tagged: false
direction: in
dimensions:
fields:
maxbound:
Expand All @@ -96,6 +110,7 @@ blocks:
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
shape:
- ncelldim
Expand All @@ -117,6 +132,7 @@ blocks:
(see the 'Time-Variable Input' section), values can be obtained from a time series by
entering the time-series name in place of a numeric value.
optional: true
tagged: false
dtype: double
time_series: true
shape:
Expand All @@ -131,3 +147,13 @@ blocks:
tagged: false
shape:
- maxbound
header:
name: iper
type: integer
longname: stress period number
description: integer value specifying the starting stress period number for which the data specified
in the PERIOD block apply. IPER must be less than or equal to NPER in the TDIS Package and greater
than zero. The IPER value assigned to a stress period block must be greater than the IPER value
assigned for the previous PERIOD block. The information specified in the PERIOD block will continue
to apply for all subsequent stress periods, unless the program encounters another PERIOD block.
tagged: false
12 changes: 9 additions & 3 deletions autotest/dfns/__snapshots__/v2.0.0.dev2/chf-dfw.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,16 @@
"optional": true,
"fields": {
"obs6": {
"type": "file",
"type": "keyword",
"longname": "obs keyword",
"description": "keyword to specify that record corresponds to an observations file.",
"mode": "filein"
"description": "keyword to specify that record corresponds to an observations file."
},
"obs6_filename": {
"type": "file",
"longname": "obs6 input filename",
"description": "name of input file to define observations for the DFW package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the DFW package.",
"tagged": false,
"direction": "in"
}
}
},
Expand Down
10 changes: 8 additions & 2 deletions autotest/dfns/__snapshots__/v2.0.0.dev2/chf-dfw.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,16 @@ type = "record"
optional = true

[blocks.options.fields.obs_filerecord.fields.obs6]
type = "file"
type = "keyword"
longname = "obs keyword"
description = "keyword to specify that record corresponds to an observations file."
mode = "filein"

[blocks.options.fields.obs_filerecord.fields.obs6_filename]
type = "file"
longname = "obs6 input filename"
description = "name of input file to define observations for the DFW package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the DFW package."
tagged = false
direction = "in"

[blocks.options.fields.export_array_ascii]
type = "keyword"
Expand Down
Loading
Loading