Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ jobs:
uses: actions/checkout@v4
with:
repository: MODFLOW-ORG/modflow6
ref: "6.7.0"
path: modflow6

- name: Setup uv
Expand Down
2 changes: 1 addition & 1 deletion autotest/dfns/__snapshots__/v2.0.0.dev0/gwe-adv.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"reader": "urword",
"optional": true,
"longname": "advective scheme",
"description": "scheme used to solve the advection term. Can be upstream, central, TVD, or UTVD. If not specified, upstream weighting is the default weighting scheme.",
"description": "scheme used to solve the advection term. Can be upstream, central, or TVD. If not specified, upstream weighting is the default weighting scheme.",
"valid": "central upstream tvd"
},
"ats_percel": {
Expand Down
2 changes: 1 addition & 1 deletion autotest/dfns/__snapshots__/v2.0.0.dev0/gwe-adv.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ type = "string"
reader = "urword"
optional = true
longname = "advective scheme"
description = "scheme used to solve the advection term. Can be upstream, central, TVD, or UTVD. If not specified, upstream weighting is the default weighting scheme."
description = "scheme used to solve the advection term. Can be upstream, central, or TVD. If not specified, upstream weighting is the default weighting scheme."
valid = "central upstream tvd"

[options.ats_percel]
Expand Down
4 changes: 2 additions & 2 deletions autotest/dfns/__snapshots__/v2.0.0.dev0/gwe-adv.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ options:
reader: urword
optional: true
longname: advective scheme
description: scheme used to solve the advection term. Can be upstream, central, TVD, or UTVD. If
not specified, upstream weighting is the default weighting scheme.
description: scheme used to solve the advection term. Can be upstream, central, or TVD. If not specified,
upstream weighting is the default weighting scheme.
valid: central upstream tvd
ats_percel:
block: options
Expand Down
6 changes: 3 additions & 3 deletions autotest/dfns/__snapshots__/v2.0.0.dev0/gwe-ctp.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
"optional": true,
"longname": "print input to listing file",
"description": "keyword to indicate that the list of constant temperature information will be written to the listing file immediately after it is read.",
"mf6internal": "iprpak"
"mf6internal": "iprflow"
},
"print_flows": {
"block": "options",
Expand All @@ -61,7 +61,7 @@
"optional": true,
"longname": "print calculated flows to listing file",
"description": "keyword to indicate that the list of constant temperature flow rates will be printed to the listing file for every stress period time step in which 'BUDGET PRINT' is specified in Output Control. If there is no Output Control option and 'PRINT_FLOWS' is specified, then flow rates are printed for the last time step of each stress period.",
"mf6internal": "iprflow"
"mf6internal": "ipakcb"
},
"save_flows": {
"block": "options",
Expand All @@ -70,7 +70,7 @@
"optional": true,
"longname": "save constant temperature flows to budget file",
"description": "keyword to indicate that constant temperature flow terms will be written to the file specified with 'BUDGET FILEOUT' in Output Control.",
"mf6internal": "ipakcb"
"mf6internal": "iprpak"
},
"timeseries": {
"block": "options",
Expand Down
6 changes: 3 additions & 3 deletions autotest/dfns/__snapshots__/v2.0.0.dev0/gwe-ctp.toml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ reader = "urword"
optional = true
longname = "print input to listing file"
description = "keyword to indicate that the list of constant temperature information will be written to the listing file immediately after it is read."
mf6internal = "iprpak"
mf6internal = "iprflow"

[options.print_flows]
block = "options"
Expand All @@ -58,7 +58,7 @@ reader = "urword"
optional = true
longname = "print calculated flows to listing file"
description = "keyword to indicate that the list of constant temperature flow rates will be printed to the listing file for every stress period time step in which 'BUDGET PRINT' is specified in Output Control. If there is no Output Control option and 'PRINT_FLOWS' is specified, then flow rates are printed for the last time step of each stress period."
mf6internal = "iprflow"
mf6internal = "ipakcb"

[options.save_flows]
block = "options"
Expand All @@ -67,7 +67,7 @@ reader = "urword"
optional = true
longname = "save constant temperature flows to budget file"
description = "keyword to indicate that constant temperature flow terms will be written to the file specified with 'BUDGET FILEOUT' in Output Control."
mf6internal = "ipakcb"
mf6internal = "iprpak"

[options.timeseries]
block = "options"
Expand Down
6 changes: 3 additions & 3 deletions autotest/dfns/__snapshots__/v2.0.0.dev0/gwe-ctp.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ options:
longname: print input to listing file
description: keyword to indicate that the list of constant temperature information will be written
to the listing file immediately after it is read.
mf6internal: iprpak
mf6internal: iprflow
print_flows:
block: options
type: keyword
Expand All @@ -65,7 +65,7 @@ options:
to the listing file for every stress period time step in which 'BUDGET PRINT' is specified in Output
Control. If there is no Output Control option and 'PRINT_FLOWS' is specified, then flow rates are
printed for the last time step of each stress period.
mf6internal: iprflow
mf6internal: ipakcb
save_flows:
block: options
type: keyword
Expand All @@ -74,7 +74,7 @@ options:
longname: save constant temperature flows to budget file
description: keyword to indicate that constant temperature flow terms will be written to the file
specified with 'BUDGET FILEOUT' in Output Control.
mf6internal: ipakcb
mf6internal: iprpak
timeseries:
block: options
type: record ts6 filein ts6_filename
Expand Down
4 changes: 2 additions & 2 deletions autotest/dfns/__snapshots__/v2.0.0.dev0/gwe-esl.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
"type": "keyword",
"reader": "urword",
"optional": true,
"longname": "save ESL flows to budget file",
"longname": "save well flows to budget file",
"description": "keyword to indicate that energy source loading flow terms will be written to the file specified with 'BUDGET FILEOUT' in Output Control.",
"mf6internal": "ipakcb"
},
Expand Down Expand Up @@ -166,7 +166,7 @@
"type": "string",
"reader": "urword",
"optional": true,
"longname": "energy source loading name",
"longname": "well name",
"description": "name of the energy source 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.",
"tagged": false,
"in_record": true
Expand Down
4 changes: 2 additions & 2 deletions autotest/dfns/__snapshots__/v2.0.0.dev0/gwe-esl.toml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ block = "options"
type = "keyword"
reader = "urword"
optional = true
longname = "save ESL flows to budget file"
longname = "save well flows to budget file"
description = "keyword to indicate that energy source loading flow terms will be written to the file specified with 'BUDGET FILEOUT' in Output Control."
mf6internal = "ipakcb"

Expand Down Expand Up @@ -162,7 +162,7 @@ block = "period"
type = "string"
reader = "urword"
optional = true
longname = "energy source loading name"
longname = "well name"
description = "name of the energy source 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."
tagged = false
in_record = true
4 changes: 2 additions & 2 deletions autotest/dfns/__snapshots__/v2.0.0.dev0/gwe-esl.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ options:
type: keyword
reader: urword
optional: true
longname: save ESL flows to budget file
longname: save well flows to budget file
description: keyword to indicate that energy source loading flow terms will be written to the file
specified with 'BUDGET FILEOUT' in Output Control.
mf6internal: ipakcb
Expand Down Expand Up @@ -176,7 +176,7 @@ period:
type: string
reader: urword
optional: true
longname: energy source loading name
longname: well name
description: name of the energy source 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.
Expand Down
2 changes: 1 addition & 1 deletion autotest/dfns/__snapshots__/v2.0.0.dev0/gwe-mve.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"type": "keyword",
"reader": "urword",
"optional": true,
"longname": "save MVE flows to budget file",
"longname": "save lake flows to budget file",
"description": "keyword to indicate that lake flow terms will be written to the file specified with 'BUDGET FILEOUT' in Output Control."
},
"budget_filerecord": {
Expand Down
2 changes: 1 addition & 1 deletion autotest/dfns/__snapshots__/v2.0.0.dev0/gwe-mve.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ block = "options"
type = "keyword"
reader = "urword"
optional = true
longname = "save MVE flows to budget file"
longname = "save lake flows to budget file"
description = "keyword to indicate that lake flow terms will be written to the file specified with 'BUDGET FILEOUT' in Output Control."

[options.budget_filerecord]
Expand Down
2 changes: 1 addition & 1 deletion autotest/dfns/__snapshots__/v2.0.0.dev0/gwe-mve.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ options:
type: keyword
reader: urword
optional: true
longname: save MVE flows to budget file
longname: save lake flows to budget file
description: keyword to indicate that lake flow terms will be written to the file specified with 'BUDGET
FILEOUT' in Output Control.
budget_filerecord:
Expand Down
3 changes: 0 additions & 3 deletions autotest/dfns/__snapshots__/v2.0.0.dev0/gwe-ssm.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@
"advanced": false,
"multi": false,
"schema_version": "2.0.0.dev0",
"subcomponents": [
"utl-spc"
],
"options": {
"print_flows": {
"block": "options",
Expand Down
3 changes: 0 additions & 3 deletions autotest/dfns/__snapshots__/v2.0.0.dev0/gwe-ssm.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@ name = "gwe-ssm"
advanced = false
multi = false
schema_version = "2.0.0.dev0"
subcomponents = [
"utl-spc",
]

[options.print_flows]
block = "options"
Expand Down
2 changes: 0 additions & 2 deletions autotest/dfns/__snapshots__/v2.0.0.dev0/gwe-ssm.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ name: gwe-ssm
advanced: false
multi: false
schema_version: 2.0.0.dev0
subcomponents:
- utl-spc
options:
print_flows:
block: options
Expand Down
4 changes: 2 additions & 2 deletions autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-csub.json
Original file line number Diff line number Diff line change
Expand Up @@ -751,7 +751,7 @@
"type": "string",
"reader": "urword",
"optional": true,
"longname": "interbed name",
"longname": "well name",
"description": "name of the CSUB 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.",
"tagged": false,
"in_record": true
Expand Down Expand Up @@ -788,7 +788,7 @@
"block": "period",
"type": "double precision",
"reader": "urword",
"longname": "geostatic stress offset",
"longname": "well stress offset",
"description": "is the stress offset for the cell. SIG0 is added to the calculated geostatic stress for the cell. SIG0 is specified only if MAXSIG0 is specified to be greater than 0 in the DIMENSIONS block. If 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.",
"tagged": false,
"in_record": true,
Expand Down
4 changes: 2 additions & 2 deletions autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-csub.toml
Original file line number Diff line number Diff line change
Expand Up @@ -725,7 +725,7 @@ block = "packagedata"
type = "string"
reader = "urword"
optional = true
longname = "interbed name"
longname = "well name"
description = "name of the CSUB 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."
tagged = false
in_record = true
Expand Down Expand Up @@ -760,7 +760,7 @@ in_record = true
block = "period"
type = "double precision"
reader = "urword"
longname = "geostatic stress offset"
longname = "well stress offset"
description = "is the stress offset for the cell. SIG0 is added to the calculated geostatic stress for the cell. SIG0 is specified only if MAXSIG0 is specified to be greater than 0 in the DIMENSIONS block. If 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."
tagged = false
in_record = true
Expand Down
4 changes: 2 additions & 2 deletions autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-csub.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -748,7 +748,7 @@ packagedata:
type: string
reader: urword
optional: true
longname: interbed name
longname: well name
description: name of the CSUB 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.
Expand Down Expand Up @@ -785,7 +785,7 @@ period:
block: period
type: double precision
reader: urword
longname: geostatic stress offset
longname: well stress offset
description: is the stress offset for the cell. SIG0 is added to the calculated geostatic stress
for the cell. SIG0 is specified only if MAXSIG0 is specified to be greater than 0 in the DIMENSIONS
block. If the Options block includes a TIMESERIESFILE entry (see the 'Time-Variable Input'
Expand Down
2 changes: 1 addition & 1 deletion autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-drn.json
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
"type": "keyword",
"reader": "urword",
"optional": true,
"longname": "save DRN flows to budget file",
"longname": "save CHD flows to budget file",
"description": "keyword to indicate that drain flow terms will be written to the file specified with 'BUDGET FILEOUT' in Output Control.",
"mf6internal": "ipakcb"
},
Expand Down
2 changes: 1 addition & 1 deletion autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-drn.toml
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ block = "options"
type = "keyword"
reader = "urword"
optional = true
longname = "save DRN flows to budget file"
longname = "save CHD flows to budget file"
description = "keyword to indicate that drain flow terms will be written to the file specified with 'BUDGET FILEOUT' in Output Control."
mf6internal = "ipakcb"

Expand Down
2 changes: 1 addition & 1 deletion autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-drn.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ options:
type: keyword
reader: urword
optional: true
longname: save DRN flows to budget file
longname: save CHD flows to budget file
description: keyword to indicate that drain flow terms will be written to the file specified with
'BUDGET FILEOUT' in Output Control.
mf6internal: ipakcb
Expand Down
4 changes: 2 additions & 2 deletions autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-evta.json
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
"type": "keyword",
"reader": "urword",
"optional": true,
"longname": "save EVTA flows to budget file",
"longname": "save CHD flows to budget file",
"description": "keyword to indicate that evapotranspiration flow terms will be written to the file specified with 'BUDGET FILEOUT' in Output Control.",
"mf6internal": "ipakcb"
},
Expand Down Expand Up @@ -151,7 +151,7 @@
"shape": "(ncol*nrow; ncpl)",
"default": 0.001,
"reader": "readarray",
"longname": "evapotranspiration rate",
"longname": "evapotranspiration surface",
"description": "is the maximum ET flux rate ($LT^{-1}$).",
"time_series": true,
"netcdf": true
Expand Down
4 changes: 2 additions & 2 deletions autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-evta.toml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ block = "options"
type = "keyword"
reader = "urword"
optional = true
longname = "save EVTA flows to budget file"
longname = "save CHD flows to budget file"
description = "keyword to indicate that evapotranspiration flow terms will be written to the file specified with 'BUDGET FILEOUT' in Output Control."
mf6internal = "ipakcb"

Expand Down Expand Up @@ -148,7 +148,7 @@ type = "double precision"
shape = "(ncol*nrow; ncpl)"
default = 0.001
reader = "readarray"
longname = "evapotranspiration rate"
longname = "evapotranspiration surface"
description = "is the maximum ET flux rate ($LT^{-1}$)."
time_series = true
netcdf = true
Expand Down
4 changes: 2 additions & 2 deletions autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-evta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ options:
type: keyword
reader: urword
optional: true
longname: save EVTA flows to budget file
longname: save CHD flows to budget file
description: keyword to indicate that evapotranspiration flow terms will be written to the file specified
with 'BUDGET FILEOUT' in Output Control.
mf6internal: ipakcb
Expand Down Expand Up @@ -159,7 +159,7 @@ period:
shape: (ncol*nrow; ncpl)
default: 0.001
reader: readarray
longname: evapotranspiration rate
longname: evapotranspiration surface
description: is the maximum ET flux rate ($LT^{-1}$).
time_series: true
netcdf: true
Expand Down
2 changes: 1 addition & 1 deletion autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-ghb.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
"type": "keyword",
"reader": "urword",
"optional": true,
"longname": "save GHB flows to budget file",
"longname": "save CHD flows to budget file",
"description": "keyword to indicate that general-head boundary flow terms will be written to the file specified with 'BUDGET FILEOUT' in Output Control.",
"mf6internal": "ipakcb"
},
Expand Down
2 changes: 1 addition & 1 deletion autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-ghb.toml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ block = "options"
type = "keyword"
reader = "urword"
optional = true
longname = "save GHB flows to budget file"
longname = "save CHD flows to budget file"
description = "keyword to indicate that general-head boundary flow terms will be written to the file specified with 'BUDGET FILEOUT' in Output Control."
mf6internal = "ipakcb"

Expand Down
2 changes: 1 addition & 1 deletion autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-ghb.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ options:
type: keyword
reader: urword
optional: true
longname: save GHB flows to budget file
longname: save CHD flows to budget file
description: keyword to indicate that general-head boundary flow terms will be written to the file
specified with 'BUDGET FILEOUT' in Output Control.
mf6internal: ipakcb
Expand Down
2 changes: 1 addition & 1 deletion autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-hfb.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"shape": "(ncelldim)",
"reader": "urword",
"longname": "first cell adjacent to barrier",
"description": "identifier for the first cell. For a structured grid that uses the DIS input file, CELLID1 is the layer, row, and column numbers of the cell. For a grid that uses the DISV input file, CELLID1 is the layer number and CELL2D number for the two cells. If the model uses the unstructured discretization (DISU) input file, then CELLID1 is the node number for the cell. The barrier is located between cells designated as CELLID1 and CELLID2. The program will terminate with an error if CELLID1 and CELLID2 are not horizontally or vertically adjacent.",
"description": "identifier for the first cell. For a structured grid that uses the DIS input file, CELLID1 is the layer, row, and column numbers of the cell. For a grid that uses the DISV input file, CELLID1 is the layer number and CELL2D number for the two cells. If the model uses the unstructured discretization (DISU) input file, then CELLID1 is the node numbers for the cell. The barrier is located between cells designated as CELLID1 and CELLID2. For models that use the DIS and DISV grid types, the layer number for CELLID1 and CELLID2 must be the same. For all grid types, cells must be horizontally or vertically adjacent.",
"tagged": false,
"in_record": true
},
Expand Down
Loading
Loading