From 87f98fa3601f5c91f365ab1c28671d8ff8039aec Mon Sep 17 00:00:00 2001 From: wpbonelli Date: Tue, 23 Jun 2026 07:39:49 -0700 Subject: [PATCH 1/2] test(dfns): switch snapshots to release 6.7.0 --- .github/workflows/ci.yml | 1 + .../__snapshots__/v2.0.0.dev0/gwe-adv.json | 2 +- .../__snapshots__/v2.0.0.dev0/gwe-adv.toml | 2 +- .../__snapshots__/v2.0.0.dev0/gwe-adv.yaml | 4 +-- .../__snapshots__/v2.0.0.dev0/gwe-ctp.json | 6 ++-- .../__snapshots__/v2.0.0.dev0/gwe-ctp.toml | 6 ++-- .../__snapshots__/v2.0.0.dev0/gwe-ctp.yaml | 6 ++-- .../__snapshots__/v2.0.0.dev0/gwe-esl.json | 4 +-- .../__snapshots__/v2.0.0.dev0/gwe-esl.toml | 4 +-- .../__snapshots__/v2.0.0.dev0/gwe-esl.yaml | 4 +-- .../__snapshots__/v2.0.0.dev0/gwe-mve.json | 2 +- .../__snapshots__/v2.0.0.dev0/gwe-mve.toml | 2 +- .../__snapshots__/v2.0.0.dev0/gwe-mve.yaml | 2 +- .../__snapshots__/v2.0.0.dev0/gwe-ssm.json | 3 -- .../__snapshots__/v2.0.0.dev0/gwe-ssm.toml | 3 -- .../__snapshots__/v2.0.0.dev0/gwe-ssm.yaml | 2 -- .../__snapshots__/v2.0.0.dev0/gwf-csub.json | 4 +-- .../__snapshots__/v2.0.0.dev0/gwf-csub.toml | 4 +-- .../__snapshots__/v2.0.0.dev0/gwf-csub.yaml | 4 +-- .../__snapshots__/v2.0.0.dev0/gwf-drn.json | 2 +- .../__snapshots__/v2.0.0.dev0/gwf-drn.toml | 2 +- .../__snapshots__/v2.0.0.dev0/gwf-drn.yaml | 2 +- .../__snapshots__/v2.0.0.dev0/gwf-evta.json | 4 +-- .../__snapshots__/v2.0.0.dev0/gwf-evta.toml | 4 +-- .../__snapshots__/v2.0.0.dev0/gwf-evta.yaml | 4 +-- .../__snapshots__/v2.0.0.dev0/gwf-ghb.json | 2 +- .../__snapshots__/v2.0.0.dev0/gwf-ghb.toml | 2 +- .../__snapshots__/v2.0.0.dev0/gwf-ghb.yaml | 2 +- .../__snapshots__/v2.0.0.dev0/gwf-hfb.json | 2 +- .../__snapshots__/v2.0.0.dev0/gwf-hfb.toml | 2 +- .../__snapshots__/v2.0.0.dev0/gwf-hfb.yaml | 7 +++-- .../__snapshots__/v2.0.0.dev0/gwf-npf.json | 12 ++------ .../__snapshots__/v2.0.0.dev0/gwf-npf.toml | 6 ---- .../__snapshots__/v2.0.0.dev0/gwf-npf.yaml | 5 ---- .../__snapshots__/v2.0.0.dev0/gwf-rcha.json | 2 +- .../__snapshots__/v2.0.0.dev0/gwf-rcha.toml | 2 +- .../__snapshots__/v2.0.0.dev0/gwf-rcha.yaml | 2 +- .../__snapshots__/v2.0.0.dev0/gwf-riv.json | 4 +-- .../__snapshots__/v2.0.0.dev0/gwf-riv.toml | 4 +-- .../__snapshots__/v2.0.0.dev0/gwf-riv.yaml | 4 +-- .../__snapshots__/v2.0.0.dev0/gwf-rivg.json | 2 +- .../__snapshots__/v2.0.0.dev0/gwf-rivg.toml | 2 +- .../__snapshots__/v2.0.0.dev0/gwf-rivg.yaml | 2 +- .../__snapshots__/v2.0.0.dev0/gwf-sto.json | 3 -- .../__snapshots__/v2.0.0.dev0/gwf-sto.toml | 3 -- .../__snapshots__/v2.0.0.dev0/gwf-sto.yaml | 2 -- .../__snapshots__/v2.0.0.dev0/gwt-cnc.json | 6 ++-- .../__snapshots__/v2.0.0.dev0/gwt-cnc.toml | 6 ++-- .../__snapshots__/v2.0.0.dev0/gwt-cnc.yaml | 6 ++-- .../__snapshots__/v2.0.0.dev0/gwt-mvt.json | 2 +- .../__snapshots__/v2.0.0.dev0/gwt-mvt.toml | 2 +- .../__snapshots__/v2.0.0.dev0/gwt-mvt.yaml | 2 +- .../__snapshots__/v2.0.0.dev0/gwt-src.json | 4 +-- .../__snapshots__/v2.0.0.dev0/gwt-src.toml | 4 +-- .../__snapshots__/v2.0.0.dev0/gwt-src.yaml | 4 +-- .../__snapshots__/v2.0.0.dev0/gwt-ssm.json | 3 -- .../__snapshots__/v2.0.0.dev0/gwt-ssm.toml | 3 -- .../__snapshots__/v2.0.0.dev0/gwt-ssm.yaml | 2 -- .../__snapshots__/v2.0.0.dev0/prt-oc.json | 8 ----- .../__snapshots__/v2.0.0.dev0/prt-oc.toml | 8 ----- .../__snapshots__/v2.0.0.dev0/prt-oc.yaml | 13 -------- .../__snapshots__/v2.0.0.dev0/sln-ims.json | 4 +-- .../__snapshots__/v2.0.0.dev0/sln-ims.toml | 4 +-- .../__snapshots__/v2.0.0.dev0/sln-ims.yaml | 4 +-- .../__snapshots__/v2.0.0.dev0/utl-ncf.json | 12 ++++---- .../__snapshots__/v2.0.0.dev0/utl-ncf.toml | 12 ++++---- .../__snapshots__/v2.0.0.dev0/utl-ncf.yaml | 30 ++++++++++--------- .../__snapshots__/v2.0.0.dev0/utl-spca.json | 6 ++-- .../__snapshots__/v2.0.0.dev0/utl-spca.toml | 2 -- .../__snapshots__/v2.0.0.dev0/utl-spca.yaml | 2 -- .../__snapshots__/v2.0.0.dev0/utl-tvs.json | 3 +- .../__snapshots__/v2.0.0.dev0/utl-tvs.toml | 1 - .../__snapshots__/v2.0.0.dev0/utl-tvs.yaml | 1 - .../__snapshots__/v2.0.0.dev1/gwe-adv.json | 2 +- .../__snapshots__/v2.0.0.dev1/gwe-adv.toml | 2 +- .../__snapshots__/v2.0.0.dev1/gwe-adv.yaml | 4 +-- .../__snapshots__/v2.0.0.dev1/gwe-ctp.json | 6 ++-- .../__snapshots__/v2.0.0.dev1/gwe-ctp.toml | 6 ++-- .../__snapshots__/v2.0.0.dev1/gwe-ctp.yaml | 6 ++-- .../__snapshots__/v2.0.0.dev1/gwe-esl.json | 4 +-- .../__snapshots__/v2.0.0.dev1/gwe-esl.toml | 4 +-- .../__snapshots__/v2.0.0.dev1/gwe-esl.yaml | 4 +-- .../__snapshots__/v2.0.0.dev1/gwe-mve.json | 2 +- .../__snapshots__/v2.0.0.dev1/gwe-mve.toml | 2 +- .../__snapshots__/v2.0.0.dev1/gwe-mve.yaml | 2 +- .../__snapshots__/v2.0.0.dev1/gwe-ssm.json | 3 -- .../__snapshots__/v2.0.0.dev1/gwe-ssm.toml | 3 -- .../__snapshots__/v2.0.0.dev1/gwe-ssm.yaml | 2 -- .../__snapshots__/v2.0.0.dev1/gwf-csub.json | 4 +-- .../__snapshots__/v2.0.0.dev1/gwf-csub.toml | 4 +-- .../__snapshots__/v2.0.0.dev1/gwf-csub.yaml | 4 +-- .../__snapshots__/v2.0.0.dev1/gwf-drn.json | 2 +- .../__snapshots__/v2.0.0.dev1/gwf-drn.toml | 2 +- .../__snapshots__/v2.0.0.dev1/gwf-drn.yaml | 2 +- .../__snapshots__/v2.0.0.dev1/gwf-evta.json | 4 +-- .../__snapshots__/v2.0.0.dev1/gwf-evta.toml | 4 +-- .../__snapshots__/v2.0.0.dev1/gwf-evta.yaml | 4 +-- .../__snapshots__/v2.0.0.dev1/gwf-ghb.json | 2 +- .../__snapshots__/v2.0.0.dev1/gwf-ghb.toml | 2 +- .../__snapshots__/v2.0.0.dev1/gwf-ghb.yaml | 2 +- .../__snapshots__/v2.0.0.dev1/gwf-hfb.json | 2 +- .../__snapshots__/v2.0.0.dev1/gwf-hfb.toml | 2 +- .../__snapshots__/v2.0.0.dev1/gwf-hfb.yaml | 7 +++-- .../__snapshots__/v2.0.0.dev1/gwf-npf.json | 3 -- .../__snapshots__/v2.0.0.dev1/gwf-npf.toml | 3 -- .../__snapshots__/v2.0.0.dev1/gwf-npf.yaml | 2 -- .../__snapshots__/v2.0.0.dev1/gwf-rcha.json | 2 +- .../__snapshots__/v2.0.0.dev1/gwf-rcha.toml | 2 +- .../__snapshots__/v2.0.0.dev1/gwf-rcha.yaml | 2 +- .../__snapshots__/v2.0.0.dev1/gwf-riv.json | 4 +-- .../__snapshots__/v2.0.0.dev1/gwf-riv.toml | 4 +-- .../__snapshots__/v2.0.0.dev1/gwf-riv.yaml | 4 +-- .../__snapshots__/v2.0.0.dev1/gwf-rivg.json | 2 +- .../__snapshots__/v2.0.0.dev1/gwf-rivg.toml | 2 +- .../__snapshots__/v2.0.0.dev1/gwf-rivg.yaml | 2 +- .../__snapshots__/v2.0.0.dev1/gwf-sto.json | 3 -- .../__snapshots__/v2.0.0.dev1/gwf-sto.toml | 3 -- .../__snapshots__/v2.0.0.dev1/gwf-sto.yaml | 2 -- .../__snapshots__/v2.0.0.dev1/gwt-cnc.json | 6 ++-- .../__snapshots__/v2.0.0.dev1/gwt-cnc.toml | 6 ++-- .../__snapshots__/v2.0.0.dev1/gwt-cnc.yaml | 6 ++-- .../__snapshots__/v2.0.0.dev1/gwt-mvt.json | 2 +- .../__snapshots__/v2.0.0.dev1/gwt-mvt.toml | 2 +- .../__snapshots__/v2.0.0.dev1/gwt-mvt.yaml | 2 +- .../__snapshots__/v2.0.0.dev1/gwt-src.json | 4 +-- .../__snapshots__/v2.0.0.dev1/gwt-src.toml | 4 +-- .../__snapshots__/v2.0.0.dev1/gwt-src.yaml | 4 +-- .../__snapshots__/v2.0.0.dev1/gwt-ssm.json | 3 -- .../__snapshots__/v2.0.0.dev1/gwt-ssm.toml | 3 -- .../__snapshots__/v2.0.0.dev1/gwt-ssm.yaml | 2 -- .../__snapshots__/v2.0.0.dev1/prt-oc.json | 8 ----- .../__snapshots__/v2.0.0.dev1/prt-oc.toml | 8 ----- .../__snapshots__/v2.0.0.dev1/prt-oc.yaml | 13 -------- .../__snapshots__/v2.0.0.dev1/sln-ims.json | 4 +-- .../__snapshots__/v2.0.0.dev1/sln-ims.toml | 4 +-- .../__snapshots__/v2.0.0.dev1/sln-ims.yaml | 4 +-- .../__snapshots__/v2.0.0.dev1/utl-ncf.json | 12 ++++---- .../__snapshots__/v2.0.0.dev1/utl-ncf.toml | 12 ++++---- .../__snapshots__/v2.0.0.dev1/utl-ncf.yaml | 30 ++++++++++--------- .../__snapshots__/v2.0.0.dev1/utl-spca.json | 2 -- .../__snapshots__/v2.0.0.dev1/utl-spca.toml | 2 -- .../__snapshots__/v2.0.0.dev1/utl-spca.yaml | 2 -- .../__snapshots__/v2.0.0.dev1/utl-tvs.json | 1 - .../__snapshots__/v2.0.0.dev1/utl-tvs.toml | 1 - .../__snapshots__/v2.0.0.dev1/utl-tvs.yaml | 1 - .../__snapshots__/v2.0.0.dev2/gwe-adv.json | 2 +- .../__snapshots__/v2.0.0.dev2/gwe-adv.toml | 2 +- .../__snapshots__/v2.0.0.dev2/gwe-adv.yaml | 4 +-- .../__snapshots__/v2.0.0.dev2/gwe-esl.json | 4 +-- .../__snapshots__/v2.0.0.dev2/gwe-esl.toml | 4 +-- .../__snapshots__/v2.0.0.dev2/gwe-esl.yaml | 4 +-- .../__snapshots__/v2.0.0.dev2/gwe-mve.json | 2 +- .../__snapshots__/v2.0.0.dev2/gwe-mve.toml | 2 +- .../__snapshots__/v2.0.0.dev2/gwe-mve.yaml | 2 +- .../__snapshots__/v2.0.0.dev2/gwf-csub.json | 4 +-- .../__snapshots__/v2.0.0.dev2/gwf-csub.toml | 4 +-- .../__snapshots__/v2.0.0.dev2/gwf-csub.yaml | 4 +-- .../__snapshots__/v2.0.0.dev2/gwf-drn.json | 2 +- .../__snapshots__/v2.0.0.dev2/gwf-drn.toml | 2 +- .../__snapshots__/v2.0.0.dev2/gwf-drn.yaml | 2 +- .../__snapshots__/v2.0.0.dev2/gwf-evta.json | 4 +-- .../__snapshots__/v2.0.0.dev2/gwf-evta.toml | 4 +-- .../__snapshots__/v2.0.0.dev2/gwf-evta.yaml | 4 +-- .../__snapshots__/v2.0.0.dev2/gwf-ghb.json | 2 +- .../__snapshots__/v2.0.0.dev2/gwf-ghb.toml | 2 +- .../__snapshots__/v2.0.0.dev2/gwf-ghb.yaml | 2 +- .../__snapshots__/v2.0.0.dev2/gwf-hfb.json | 2 +- .../__snapshots__/v2.0.0.dev2/gwf-hfb.toml | 2 +- .../__snapshots__/v2.0.0.dev2/gwf-hfb.yaml | 7 +++-- .../__snapshots__/v2.0.0.dev2/gwf-rcha.json | 2 +- .../__snapshots__/v2.0.0.dev2/gwf-rcha.toml | 2 +- .../__snapshots__/v2.0.0.dev2/gwf-rcha.yaml | 2 +- .../__snapshots__/v2.0.0.dev2/gwf-riv.json | 4 +-- .../__snapshots__/v2.0.0.dev2/gwf-riv.toml | 4 +-- .../__snapshots__/v2.0.0.dev2/gwf-riv.yaml | 4 +-- .../__snapshots__/v2.0.0.dev2/gwf-rivg.json | 2 +- .../__snapshots__/v2.0.0.dev2/gwf-rivg.toml | 2 +- .../__snapshots__/v2.0.0.dev2/gwf-rivg.yaml | 2 +- .../__snapshots__/v2.0.0.dev2/gwt-mvt.json | 2 +- .../__snapshots__/v2.0.0.dev2/gwt-mvt.toml | 2 +- .../__snapshots__/v2.0.0.dev2/gwt-mvt.yaml | 2 +- .../__snapshots__/v2.0.0.dev2/gwt-src.json | 4 +-- .../__snapshots__/v2.0.0.dev2/gwt-src.toml | 4 +-- .../__snapshots__/v2.0.0.dev2/gwt-src.yaml | 4 +-- .../__snapshots__/v2.0.0.dev2/prt-oc.json | 6 ---- .../__snapshots__/v2.0.0.dev2/prt-oc.toml | 6 ---- .../__snapshots__/v2.0.0.dev2/prt-oc.yaml | 11 ------- .../__snapshots__/v2.0.0.dev2/sln-ims.json | 4 +-- .../__snapshots__/v2.0.0.dev2/sln-ims.toml | 4 +-- .../__snapshots__/v2.0.0.dev2/sln-ims.yaml | 4 +-- .../__snapshots__/v2.0.0.dev2/utl-ncf.json | 12 ++++---- .../__snapshots__/v2.0.0.dev2/utl-ncf.toml | 12 ++++---- .../__snapshots__/v2.0.0.dev2/utl-ncf.yaml | 30 ++++++++++--------- .../__snapshots__/v2.0.0.dev2/utl-spca.json | 2 -- .../__snapshots__/v2.0.0.dev2/utl-spca.toml | 2 -- .../__snapshots__/v2.0.0.dev2/utl-spca.yaml | 2 -- autotest/dfns/conftest.py | 2 +- 197 files changed, 320 insertions(+), 488 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 68b74bb3..c30c2841 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -95,6 +95,7 @@ jobs: uses: actions/checkout@v4 with: repository: MODFLOW-ORG/modflow6 + ref: "6.7.0" path: modflow6 - name: Setup uv diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwe-adv.json b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwe-adv.json index 81406472..d30bca50 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwe-adv.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwe-adv.json @@ -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": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwe-adv.toml b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwe-adv.toml index 82423d9b..38d03c47 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwe-adv.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwe-adv.toml @@ -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] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwe-adv.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwe-adv.yaml index 6ec8f885..3bc07458 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwe-adv.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwe-adv.yaml @@ -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 diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwe-ctp.json b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwe-ctp.json index abb5c537..7d81016d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwe-ctp.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwe-ctp.json @@ -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", @@ -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", @@ -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", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwe-ctp.toml b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwe-ctp.toml index e1c4e9aa..6cd080b6 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwe-ctp.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwe-ctp.toml @@ -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" @@ -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" @@ -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" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwe-ctp.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwe-ctp.yaml index e3c39578..aea17e38 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwe-ctp.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwe-ctp.yaml @@ -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 @@ -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 @@ -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 diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwe-esl.json b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwe-esl.json index 5f4aa032..898e2d53 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwe-esl.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwe-esl.json @@ -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" }, @@ -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 diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwe-esl.toml b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwe-esl.toml index ea2e91a1..e231e073 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwe-esl.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwe-esl.toml @@ -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" @@ -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 diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwe-esl.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwe-esl.yaml index a02497b1..6621c933 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwe-esl.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwe-esl.yaml @@ -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 @@ -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. diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwe-mve.json b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwe-mve.json index eaff3f54..e3d7dc04 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwe-mve.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwe-mve.json @@ -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": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwe-mve.toml b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwe-mve.toml index 5f23215f..61e3e3a2 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwe-mve.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwe-mve.toml @@ -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] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwe-mve.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwe-mve.yaml index 38324909..0ac3b811 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwe-mve.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwe-mve.yaml @@ -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: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwe-ssm.json b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwe-ssm.json index 73b66928..17459994 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwe-ssm.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwe-ssm.json @@ -3,9 +3,6 @@ "advanced": false, "multi": false, "schema_version": "2.0.0.dev0", - "subcomponents": [ - "utl-spc" - ], "options": { "print_flows": { "block": "options", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwe-ssm.toml b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwe-ssm.toml index ac7908bc..e202ad6a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwe-ssm.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwe-ssm.toml @@ -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" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwe-ssm.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwe-ssm.yaml index 9b71742d..cfaa6c5b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwe-ssm.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwe-ssm.yaml @@ -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 diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-csub.json b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-csub.json index e0a09cdf..94a3bdba 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-csub.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-csub.json @@ -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 @@ -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, diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-csub.toml b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-csub.toml index de482b38..619e2324 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-csub.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-csub.toml @@ -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 @@ -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 diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-csub.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-csub.yaml index 1ceb4a75..cce106a6 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-csub.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-csub.yaml @@ -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. @@ -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' diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-drn.json b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-drn.json index 3c7d65c5..77da71c4 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-drn.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-drn.json @@ -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" }, diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-drn.toml b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-drn.toml index 17571977..f73bb9d1 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-drn.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-drn.toml @@ -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" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-drn.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-drn.yaml index 13dfc646..7c1c929b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-drn.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-drn.yaml @@ -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 diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-evta.json b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-evta.json index a7012589..ae35e38e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-evta.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-evta.json @@ -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" }, @@ -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 diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-evta.toml b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-evta.toml index 12b1515b..02590468 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-evta.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-evta.toml @@ -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" @@ -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 diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-evta.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-evta.yaml index 2dcbdc7e..5177c0fb 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-evta.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-evta.yaml @@ -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 @@ -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 diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-ghb.json b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-ghb.json index 02c0bcc4..3a54c5b1 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-ghb.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-ghb.json @@ -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" }, diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-ghb.toml b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-ghb.toml index ff8a7bc6..14ad0f00 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-ghb.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-ghb.toml @@ -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" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-ghb.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-ghb.yaml index 57f41d80..de6f3e77 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-ghb.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-ghb.yaml @@ -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 diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-hfb.json b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-hfb.json index 926f811a..3904eee6 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-hfb.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-hfb.json @@ -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 }, diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-hfb.toml b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-hfb.toml index ae5e4985..6d05e649 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-hfb.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-hfb.toml @@ -42,7 +42,7 @@ type = "integer" 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 diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-hfb.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-hfb.yaml index 5da1045d..dc05cbf3 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-hfb.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-hfb.yaml @@ -44,9 +44,10 @@ period: 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. + 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 cellid2: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-npf.json b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-npf.json index 1252a181..6d74ce83 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-npf.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-npf.json @@ -12,9 +12,6 @@ "param": "tvk_perioddata" } }, - "subcomponents": [ - "utl-tvk" - ], "options": { "save_flows": { "block": "options", @@ -114,8 +111,7 @@ "optional": false, "longname": "wetting factor to use for rewetting", "description": "is a keyword and factor that is included in the calculation of the head that is initially established at a cell when that cell is converted from dry to wet.", - "in_record": true, - "tagged": true + "in_record": true }, "iwetit": { "block": "options", @@ -124,8 +120,7 @@ "optional": false, "longname": "interval to use for rewetting", "description": "is a keyword and iteration interval for attempting to wet cells. Wetting is attempted every IWETIT iteration. This applies to outer iterations and not inner iterations. If IWETIT is specified as zero or less, then the value is changed to 1.", - "in_record": true, - "tagged": true + "in_record": true }, "ihdwet": { "block": "options", @@ -134,8 +129,7 @@ "optional": false, "longname": "flag to determine wetting equation", "description": "is a keyword and integer flag that determines which equation is used to define the initial head at cells that become wet. If IHDWET is 0, h = BOT + WETFCT (hm - BOT). If IHDWET is not 0, h = BOT + WETFCT (THRESH).", - "in_record": true, - "tagged": true + "in_record": true } } }, diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-npf.toml b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-npf.toml index 108cfd09..77fdd29b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-npf.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-npf.toml @@ -2,9 +2,6 @@ name = "gwf-npf" advanced = false multi = false schema_version = "2.0.0.dev0" -subcomponents = [ - "utl-tvk", -] [fkeys.tvk_filerecord] parent = "parent_package" @@ -110,7 +107,6 @@ optional = false longname = "wetting factor to use for rewetting" description = "is a keyword and factor that is included in the calculation of the head that is initially established at a cell when that cell is converted from dry to wet." in_record = true -tagged = true [options.rewet_record.fields.iwetit] block = "options" @@ -120,7 +116,6 @@ optional = false longname = "interval to use for rewetting" description = "is a keyword and iteration interval for attempting to wet cells. Wetting is attempted every IWETIT iteration. This applies to outer iterations and not inner iterations. If IWETIT is specified as zero or less, then the value is changed to 1." in_record = true -tagged = true [options.rewet_record.fields.ihdwet] block = "options" @@ -130,7 +125,6 @@ optional = false longname = "flag to determine wetting equation" description = "is a keyword and integer flag that determines which equation is used to define the initial head at cells that become wet. If IHDWET is 0, h = BOT + WETFCT (hm - BOT). If IHDWET is not 0, h = BOT + WETFCT (THRESH)." in_record = true -tagged = true [options.xt3doptions] block = "options" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-npf.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-npf.yaml index fabc0dd4..e61cf041 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-npf.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-npf.yaml @@ -9,8 +9,6 @@ fkeys: val: perioddata abbr: tvk param: tvk_perioddata -subcomponents: - - utl-tvk options: save_flows: block: options @@ -130,7 +128,6 @@ options: description: is a keyword and factor that is included in the calculation of the head that is initially established at a cell when that cell is converted from dry to wet. in_record: true - tagged: true iwetit: block: options type: integer @@ -141,7 +138,6 @@ options: every IWETIT iteration. This applies to outer iterations and not inner iterations. If IWETIT is specified as zero or less, then the value is changed to 1. in_record: true - tagged: true ihdwet: block: options type: integer @@ -152,7 +148,6 @@ options: initial head at cells that become wet. If IHDWET is 0, h = BOT + WETFCT (hm - BOT). If IHDWET is not 0, h = BOT + WETFCT (THRESH). in_record: true - tagged: true xt3doptions: block: options type: record diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-rcha.json b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-rcha.json index f1abcf33..5a1747cc 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-rcha.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-rcha.json @@ -77,7 +77,7 @@ "type": "keyword", "reader": "urword", "optional": true, - "longname": "save RCHA flows to budget file", + "longname": "save CHD flows to budget file", "description": "keyword to indicate that recharge flow terms will be written to the file specified with 'BUDGET FILEOUT' in Output Control.", "mf6internal": "ipakcb" }, diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-rcha.toml b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-rcha.toml index 55009b48..f1225b81 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-rcha.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-rcha.toml @@ -74,7 +74,7 @@ block = "options" type = "keyword" reader = "urword" optional = true -longname = "save RCHA flows to budget file" +longname = "save CHD flows to budget file" description = "keyword to indicate that recharge flow terms will be written to the file specified with 'BUDGET FILEOUT' in Output Control." mf6internal = "ipakcb" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-rcha.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-rcha.yaml index 98584e59..3a9830c7 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-rcha.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-rcha.yaml @@ -83,7 +83,7 @@ options: type: keyword reader: urword optional: true - longname: save RCHA flows to budget file + longname: save CHD flows to budget file description: keyword to indicate that recharge flow terms will be written to the file specified with 'BUDGET FILEOUT' in Output Control. mf6internal: ipakcb diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-riv.json b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-riv.json index 63df8601..e80b3a1b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-riv.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-riv.json @@ -68,7 +68,7 @@ "type": "keyword", "reader": "urword", "optional": true, - "longname": "save RIV flows to budget file", + "longname": "save CHD flows to budget file", "description": "keyword to indicate that river flow terms will be written to the file specified with 'BUDGET FILEOUT' in Output Control.", "mf6internal": "ipakcb" }, @@ -194,7 +194,7 @@ "type": "string", "reader": "urword", "optional": true, - "longname": "river name", + "longname": "drain name", "description": "name of the river 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 diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-riv.toml b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-riv.toml index 9c464186..fd653987 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-riv.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-riv.toml @@ -65,7 +65,7 @@ block = "options" type = "keyword" reader = "urword" optional = true -longname = "save RIV flows to budget file" +longname = "save CHD flows to budget file" description = "keyword to indicate that river flow terms will be written to the file specified with 'BUDGET FILEOUT' in Output Control." mf6internal = "ipakcb" @@ -190,7 +190,7 @@ block = "period" type = "string" reader = "urword" optional = true -longname = "river name" +longname = "drain name" description = "name of the river 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 diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-riv.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-riv.yaml index 10c8a006..17ee7ad7 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-riv.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-riv.yaml @@ -70,7 +70,7 @@ options: type: keyword reader: urword optional: true - longname: save RIV flows to budget file + longname: save CHD flows to budget file description: keyword to indicate that river flow terms will be written to the file specified with 'BUDGET FILEOUT' in Output Control. mf6internal: ipakcb @@ -205,7 +205,7 @@ period: type: string reader: urword optional: true - longname: river name + longname: drain name description: name of the river 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. diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-rivg.json b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-rivg.json index f4ad561f..db113fcd 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-rivg.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-rivg.json @@ -130,7 +130,7 @@ "shape": "(nodes)", "default": 3e+30, "reader": "readarray", - "longname": "river conductance", + "longname": "river conductnace", "description": "is the riverbed hydraulic conductance.", "layered": true, "netcdf": true diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-rivg.toml b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-rivg.toml index 6ae4140f..98a30ca6 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-rivg.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-rivg.toml @@ -125,7 +125,7 @@ type = "double precision" shape = "(nodes)" default = 3e+30 reader = "readarray" -longname = "river conductance" +longname = "river conductnace" description = "is the riverbed hydraulic conductance." layered = true netcdf = true diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-rivg.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-rivg.yaml index 8b3c1e99..a30bad67 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-rivg.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-rivg.yaml @@ -137,7 +137,7 @@ period: shape: (nodes) default: 3.0e+30 reader: readarray - longname: river conductance + longname: river conductnace description: is the riverbed hydraulic conductance. layered: true netcdf: true diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-sto.json b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-sto.json index 6a5d0d37..6472ee70 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-sto.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-sto.json @@ -12,9 +12,6 @@ "param": "tvs_perioddata" } }, - "subcomponents": [ - "utl-tvs" - ], "options": { "save_flows": { "block": "options", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-sto.toml b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-sto.toml index 6fbb0806..406414c8 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-sto.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-sto.toml @@ -2,9 +2,6 @@ name = "gwf-sto" advanced = false multi = false schema_version = "2.0.0.dev0" -subcomponents = [ - "utl-tvs", -] [fkeys.tvs_filerecord] parent = "parent_package" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-sto.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-sto.yaml index a3793fcc..e14a8271 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-sto.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwf-sto.yaml @@ -9,8 +9,6 @@ fkeys: val: perioddata abbr: tvs param: tvs_perioddata -subcomponents: - - utl-tvs options: save_flows: block: options diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwt-cnc.json b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwt-cnc.json index f5b696a5..6a6858dc 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwt-cnc.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwt-cnc.json @@ -52,7 +52,7 @@ "optional": true, "longname": "print input to listing file", "description": "keyword to indicate that the list of constant concentration information will be written to the listing file immediately after it is read.", - "mf6internal": "iprpak" + "mf6internal": "iprflow" }, "print_flows": { "block": "options", @@ -61,7 +61,7 @@ "optional": true, "longname": "print calculated flows to listing file", "description": "keyword to indicate that the list of constant concentration 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", @@ -70,7 +70,7 @@ "optional": true, "longname": "save constant concentration flows to budget file", "description": "keyword to indicate that constant concentration flow terms will be written to the file specified with 'BUDGET FILEOUT' in Output Control.", - "mf6internal": "ipakcb" + "mf6internal": "iprpak" }, "timeseries": { "block": "options", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwt-cnc.toml b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwt-cnc.toml index 4f90664e..bc6fcf7d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwt-cnc.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwt-cnc.toml @@ -49,7 +49,7 @@ reader = "urword" optional = true longname = "print input to listing file" description = "keyword to indicate that the list of constant concentration information will be written to the listing file immediately after it is read." -mf6internal = "iprpak" +mf6internal = "iprflow" [options.print_flows] block = "options" @@ -58,7 +58,7 @@ reader = "urword" optional = true longname = "print calculated flows to listing file" description = "keyword to indicate that the list of constant concentration 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" @@ -67,7 +67,7 @@ reader = "urword" optional = true longname = "save constant concentration flows to budget file" description = "keyword to indicate that constant concentration flow terms will be written to the file specified with 'BUDGET FILEOUT' in Output Control." -mf6internal = "ipakcb" +mf6internal = "iprpak" [options.timeseries] block = "options" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwt-cnc.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwt-cnc.yaml index 64829b7f..dcf24299 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwt-cnc.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwt-cnc.yaml @@ -54,7 +54,7 @@ options: longname: print input to listing file description: keyword to indicate that the list of constant concentration information will be written to the listing file immediately after it is read. - mf6internal: iprpak + mf6internal: iprflow print_flows: block: options type: keyword @@ -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 @@ -74,7 +74,7 @@ options: longname: save constant concentration flows to budget file description: keyword to indicate that constant concentration 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 diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwt-mvt.json b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwt-mvt.json index c8a55370..2d07951c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwt-mvt.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwt-mvt.json @@ -32,7 +32,7 @@ "type": "keyword", "reader": "urword", "optional": true, - "longname": "save MVT 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": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwt-mvt.toml b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwt-mvt.toml index 466dc095..ec362b89 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwt-mvt.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwt-mvt.toml @@ -31,7 +31,7 @@ block = "options" type = "keyword" reader = "urword" optional = true -longname = "save MVT 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] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwt-mvt.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwt-mvt.yaml index 03d5d2d3..851fa1a6 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwt-mvt.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwt-mvt.yaml @@ -32,7 +32,7 @@ options: type: keyword reader: urword optional: true - longname: save MVT 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: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwt-src.json b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwt-src.json index 2ab70f69..4378526d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwt-src.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwt-src.json @@ -68,7 +68,7 @@ "type": "keyword", "reader": "urword", "optional": true, - "longname": "save SRC flows to budget file", + "longname": "save well flows to budget file", "description": "keyword to indicate that mass source flow terms will be written to the file specified with 'BUDGET FILEOUT' in Output Control.", "mf6internal": "ipakcb" }, @@ -175,7 +175,7 @@ "type": "string", "reader": "urword", "optional": true, - "longname": "source name", + "longname": "well name", "description": "name of the mass 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 diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwt-src.toml b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwt-src.toml index 107ce9b6..5ad90424 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwt-src.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwt-src.toml @@ -65,7 +65,7 @@ block = "options" type = "keyword" reader = "urword" optional = true -longname = "save SRC flows to budget file" +longname = "save well flows to budget file" description = "keyword to indicate that mass source flow terms will be written to the file specified with 'BUDGET FILEOUT' in Output Control." mf6internal = "ipakcb" @@ -171,7 +171,7 @@ block = "period" type = "string" reader = "urword" optional = true -longname = "source name" +longname = "well name" description = "name of the mass 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 diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwt-src.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwt-src.yaml index fec84d25..d7a11b55 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwt-src.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwt-src.yaml @@ -71,7 +71,7 @@ options: type: keyword reader: urword optional: true - longname: save SRC flows to budget file + longname: save well flows to budget file description: keyword to indicate that mass source flow terms will be written to the file specified with 'BUDGET FILEOUT' in Output Control. mf6internal: ipakcb @@ -193,7 +193,7 @@ period: type: string reader: urword optional: true - longname: source name + longname: well name description: name of the mass 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. diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwt-ssm.json b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwt-ssm.json index 0782b6e4..4eabdb38 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwt-ssm.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwt-ssm.json @@ -3,9 +3,6 @@ "advanced": false, "multi": false, "schema_version": "2.0.0.dev0", - "subcomponents": [ - "utl-spc" - ], "options": { "print_flows": { "block": "options", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwt-ssm.toml b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwt-ssm.toml index 74b38b7d..8c2563d5 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwt-ssm.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwt-ssm.toml @@ -2,9 +2,6 @@ name = "gwt-ssm" advanced = false multi = false schema_version = "2.0.0.dev0" -subcomponents = [ - "utl-spc", -] [options.print_flows] block = "options" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwt-ssm.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwt-ssm.yaml index ea30fd29..1e65b7b8 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev0/gwt-ssm.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev0/gwt-ssm.yaml @@ -2,8 +2,6 @@ name: gwt-ssm advanced: false multi: false schema_version: 2.0.0.dev0 -subcomponents: - - utl-spc options: print_flows: block: options diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev0/prt-oc.json b/autotest/dfns/__snapshots__/v2.0.0.dev0/prt-oc.json index 5c03da7d..d168260b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev0/prt-oc.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev0/prt-oc.json @@ -305,14 +305,6 @@ "longname": "print particle tracking events", "description": "print a verbose particle tracking event trace to standard output", "mf6internal": "dev_dump_evtrace" - }, - "scratch_buffer": { - "block": "options", - "type": "keyword", - "reader": "urword", - "optional": true, - "longname": "buffer track events in scratch file instead of memory", - "description": "keyword to stage track events in a temporary (scratch) file instead of an in-memory buffer. Particle tracking results calculated during a time step are buffered, and output is deferred, until successful completion of the time step. By default, results are buffered in memory. However, for simulations in which a very large number of track events is generated during a time step, memory limits can be exceeded. In such cases, the SCRATCH_BUFFER option can be invoked to buffer results in a scratch file until successful completion of the time step. Buffering in a scratch file is typically slower than buffering in memory." } }, "dimensions": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev0/prt-oc.toml b/autotest/dfns/__snapshots__/v2.0.0.dev0/prt-oc.toml index 6f2c559e..e6f217d4 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev0/prt-oc.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev0/prt-oc.toml @@ -293,14 +293,6 @@ longname = "print particle tracking events" description = "print a verbose particle tracking event trace to standard output" mf6internal = "dev_dump_evtrace" -[options.scratch_buffer] -block = "options" -type = "keyword" -reader = "urword" -optional = true -longname = "buffer track events in scratch file instead of memory" -description = "keyword to stage track events in a temporary (scratch) file instead of an in-memory buffer. Particle tracking results calculated during a time step are buffered, and output is deferred, until successful completion of the time step. By default, results are buffered in memory. However, for simulations in which a very large number of track events is generated during a time step, memory limits can be exceeded. In such cases, the SCRATCH_BUFFER option can be invoked to buffer results in a scratch file until successful completion of the time step. Buffering in a scratch file is typically slower than buffering in memory." - [dimensions.ntracktimes] block = "dimensions" type = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev0/prt-oc.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev0/prt-oc.yaml index ac7c1620..f43cb775 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev0/prt-oc.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev0/prt-oc.yaml @@ -281,19 +281,6 @@ options: longname: print particle tracking events description: print a verbose particle tracking event trace to standard output mf6internal: dev_dump_evtrace - scratch_buffer: - block: options - type: keyword - reader: urword - optional: true - longname: buffer track events in scratch file instead of memory - description: keyword to stage track events in a temporary (scratch) file instead of an in-memory buffer. - Particle tracking results calculated during a time step are buffered, and output is deferred, until - successful completion of the time step. By default, results are buffered in memory. However, for - simulations in which a very large number of track events is generated during a time step, memory - limits can be exceeded. In such cases, the SCRATCH_BUFFER option can be invoked to buffer results - in a scratch file until successful completion of the time step. Buffering in a scratch file is typically - slower than buffering in memory. dimensions: ntracktimes: block: dimensions diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev0/sln-ims.json b/autotest/dfns/__snapshots__/v2.0.0.dev0/sln-ims.json index 12cb8708..86b64b78 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev0/sln-ims.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev0/sln-ims.json @@ -21,7 +21,7 @@ "type": "string", "reader": "urword", "optional": true, - "longname": "solver complexity", + "longname": "print option", "description": "is an optional keyword that defines default non-linear and linear solver parameters. SIMPLE - indicates that default solver input values will be defined that work well for nearly linear models. This would be used for models that do not include nonlinear stress packages and models that are either confined or consist of a single unconfined layer that is thick enough to contain the water table within a single layer. MODERATE - indicates that default solver input values will be defined that work well for moderately nonlinear models. This would be used for models that include nonlinear stress packages and models that consist of one or more unconfined layers. The MODERATE option should be used when the SIMPLE option does not result in successful convergence. COMPLEX - indicates that default solver input values will be defined that work well for highly nonlinear models. This would be used for models that include nonlinear stress packages and models that consist of one or more unconfined layers representing complex geology and surface-water/groundwater interaction. The COMPLEX option should be used when the MODERATE option does not result in successful convergence. Non-linear and linear solver parameters assigned using a specified complexity can be modified in the NONLINEAR and LINEAR blocks. If the COMPLEXITY option is not specified, NONLINEAR and LINEAR variables will be assigned the simple complexity values." }, "csv_output_filerecord": { @@ -385,7 +385,7 @@ "type": "integer", "reader": "urword", "optional": true, - "longname": "number of orthogonalizations", + "longname": "drop tolerance used to drop preconditioner terms", "description": "optional integer value defining the interval used to explicitly recalculate the residual of the flow equation using the solver coefficient matrix, the latest dependent-variable (for example, head) estimates, and the right hand side. For problems that benefit from explicit recalculation of the residual, a number between 4 and 10 is appropriate. By default, NUMBER_ORTHOGONALIZATIONS is zero." }, "scaling_method": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev0/sln-ims.toml b/autotest/dfns/__snapshots__/v2.0.0.dev0/sln-ims.toml index be7ff893..284ff85f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev0/sln-ims.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev0/sln-ims.toml @@ -20,7 +20,7 @@ block = "options" type = "string" reader = "urword" optional = true -longname = "solver complexity" +longname = "print option" description = "is an optional keyword that defines default non-linear and linear solver parameters. SIMPLE - indicates that default solver input values will be defined that work well for nearly linear models. This would be used for models that do not include nonlinear stress packages and models that are either confined or consist of a single unconfined layer that is thick enough to contain the water table within a single layer. MODERATE - indicates that default solver input values will be defined that work well for moderately nonlinear models. This would be used for models that include nonlinear stress packages and models that consist of one or more unconfined layers. The MODERATE option should be used when the SIMPLE option does not result in successful convergence. COMPLEX - indicates that default solver input values will be defined that work well for highly nonlinear models. This would be used for models that include nonlinear stress packages and models that consist of one or more unconfined layers representing complex geology and surface-water/groundwater interaction. The COMPLEX option should be used when the MODERATE option does not result in successful convergence. Non-linear and linear solver parameters assigned using a specified complexity can be modified in the NONLINEAR and LINEAR blocks. If the COMPLEXITY option is not specified, NONLINEAR and LINEAR variables will be assigned the simple complexity values." [options.csv_output_filerecord] @@ -370,7 +370,7 @@ block = "linear" type = "integer" reader = "urword" optional = true -longname = "number of orthogonalizations" +longname = "drop tolerance used to drop preconditioner terms" description = "optional integer value defining the interval used to explicitly recalculate the residual of the flow equation using the solver coefficient matrix, the latest dependent-variable (for example, head) estimates, and the right hand side. For problems that benefit from explicit recalculation of the residual, a number between 4 and 10 is appropriate. By default, NUMBER_ORTHOGONALIZATIONS is zero." [linear.scaling_method] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev0/sln-ims.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev0/sln-ims.yaml index 876403c9..8d27f24a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev0/sln-ims.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev0/sln-ims.yaml @@ -22,7 +22,7 @@ options: type: string reader: urword optional: true - longname: solver complexity + longname: print option description: is an optional keyword that defines default non-linear and linear solver parameters. SIMPLE - indicates that default solver input values will be defined that work well for nearly linear models. This would be used for models that do not include nonlinear stress packages and models that are @@ -509,7 +509,7 @@ linear: type: integer reader: urword optional: true - longname: number of orthogonalizations + longname: drop tolerance used to drop preconditioner terms description: optional integer value defining the interval used to explicitly recalculate the residual of the flow equation using the solver coefficient matrix, the latest dependent-variable (for example, head) estimates, and the right hand side. For problems that benefit from explicit recalculation diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev0/utl-ncf.json b/autotest/dfns/__snapshots__/v2.0.0.dev0/utl-ncf.json index 2baac157..0364ff15 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev0/utl-ncf.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev0/utl-ncf.json @@ -18,7 +18,7 @@ "reader": "urword", "optional": true, "longname": "CRS well-known text (WKT) string", - "description": "is the coordinate reference system (CRS) well-known text (WKT) string. Used to embed CRS metadata in NetCDF output. Ignored if latitude and longitude griddata arrays have been provided for NETCDF_STRUCTURED export type." + "description": "is the coordinate reference system (CRS) well-known text (WKT) string. Ignored if latitude and longitude griddata arrays have been provided for NETCDF_STRUCTURED export type." }, "deflate": { "block": "options", @@ -26,7 +26,7 @@ "reader": "urword", "optional": true, "longname": "variable compression deflate level", - "description": "is the variable deflate level (0=min, 9=max) in the NetCDF file. Defining this parameter activates per-variable compression at the level specified. Use with the SHUFFLE option to also enable the shuffle filter." + "description": "is the variable deflate level (0=min, 9=max) in the NetCDF file. Defining this parameter activates per-variable compression at the level specified." }, "shuffle": { "block": "options", @@ -41,7 +41,7 @@ "reader": "urword", "optional": true, "longname": "chunking parameter for the time dimension", - "description": "is the chunk size for the time dimension in a NETCDF_MESH2D or NETCDF_STRUCTURED output file. Must be used in combination with the chunk_face parameter (NETCDF_MESH2D) or the chunk_z, chunk_y, and chunk_x parameter set (NETCDF_STRUCTURED) to have an effect." + "description": "is the keyword used to provide a data chunk size for the time dimension in a NETCDF_MESH2D or NETCDF_STRUCTURED output file. Must be used in combination with the the chunk_face parameter (NETCDF_MESH2D) or the chunk_z, chunk_y, and chunk_x parameter set (NETCDF_STRUCTURED) to have an effect." }, "chunk_face": { "block": "options", @@ -57,7 +57,7 @@ "reader": "urword", "optional": true, "longname": "chunking parameter for structured z", - "description": "is the chunk size for the z dimension in a NETCDF_STRUCTURED output file. Must be used in combination with the chunk_time, chunk_x, and chunk_y parameters to have an effect." + "description": "is the keyword used to provide a data chunk size for the z dimension in a NETCDF_STRUCTURED output file. Must be used in combination with the the chunk_time, chunk_x and chunk_y parameter set to have an effect." }, "chunk_y": { "block": "options", @@ -65,7 +65,7 @@ "reader": "urword", "optional": true, "longname": "chunking parameter for structured y", - "description": "is the chunk size for the y dimension in a NETCDF_STRUCTURED output file. Must be used in combination with the chunk_time, chunk_x, and chunk_z parameters to have an effect." + "description": "is the keyword used to provide a data chunk size for the y dimension in a NETCDF_STRUCTURED output file. Must be used in combination with the the chunk_time, chunk_x and chunk_z parameter set to have an effect." }, "chunk_x": { "block": "options", @@ -73,7 +73,7 @@ "reader": "urword", "optional": true, "longname": "chunking parameter for structured x", - "description": "is the chunk size for the x dimension in a NETCDF_STRUCTURED output file. Must be used in combination with the chunk_time, chunk_y, and chunk_z parameters to have an effect." + "description": "is the keyword used to provide a data chunk size for the x dimension in a NETCDF_STRUCTURED output file. Must be used in combination with the the chunk_time, chunk_y and chunk_z parameter set to have an effect." }, "modflow6_attr_off": { "block": "options", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev0/utl-ncf.toml b/autotest/dfns/__snapshots__/v2.0.0.dev0/utl-ncf.toml index 94e83648..f063d812 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev0/utl-ncf.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev0/utl-ncf.toml @@ -17,7 +17,7 @@ shape = "lenbigline" reader = "urword" optional = true longname = "CRS well-known text (WKT) string" -description = "is the coordinate reference system (CRS) well-known text (WKT) string. Used to embed CRS metadata in NetCDF output. Ignored if latitude and longitude griddata arrays have been provided for NETCDF_STRUCTURED export type." +description = "is the coordinate reference system (CRS) well-known text (WKT) string. Ignored if latitude and longitude griddata arrays have been provided for NETCDF_STRUCTURED export type." [options.deflate] block = "options" @@ -25,7 +25,7 @@ type = "integer" reader = "urword" optional = true longname = "variable compression deflate level" -description = "is the variable deflate level (0=min, 9=max) in the NetCDF file. Defining this parameter activates per-variable compression at the level specified. Use with the SHUFFLE option to also enable the shuffle filter." +description = "is the variable deflate level (0=min, 9=max) in the NetCDF file. Defining this parameter activates per-variable compression at the level specified." [options.shuffle] block = "options" @@ -40,7 +40,7 @@ type = "integer" reader = "urword" optional = true longname = "chunking parameter for the time dimension" -description = "is the chunk size for the time dimension in a NETCDF_MESH2D or NETCDF_STRUCTURED output file. Must be used in combination with the chunk_face parameter (NETCDF_MESH2D) or the chunk_z, chunk_y, and chunk_x parameter set (NETCDF_STRUCTURED) to have an effect." +description = "is the keyword used to provide a data chunk size for the time dimension in a NETCDF_MESH2D or NETCDF_STRUCTURED output file. Must be used in combination with the the chunk_face parameter (NETCDF_MESH2D) or the chunk_z, chunk_y, and chunk_x parameter set (NETCDF_STRUCTURED) to have an effect." [options.chunk_face] block = "options" @@ -56,7 +56,7 @@ type = "integer" reader = "urword" optional = true longname = "chunking parameter for structured z" -description = "is the chunk size for the z dimension in a NETCDF_STRUCTURED output file. Must be used in combination with the chunk_time, chunk_x, and chunk_y parameters to have an effect." +description = "is the keyword used to provide a data chunk size for the z dimension in a NETCDF_STRUCTURED output file. Must be used in combination with the the chunk_time, chunk_x and chunk_y parameter set to have an effect." [options.chunk_y] block = "options" @@ -64,7 +64,7 @@ type = "integer" reader = "urword" optional = true longname = "chunking parameter for structured y" -description = "is the chunk size for the y dimension in a NETCDF_STRUCTURED output file. Must be used in combination with the chunk_time, chunk_x, and chunk_z parameters to have an effect." +description = "is the keyword used to provide a data chunk size for the y dimension in a NETCDF_STRUCTURED output file. Must be used in combination with the the chunk_time, chunk_x and chunk_z parameter set to have an effect." [options.chunk_x] block = "options" @@ -72,7 +72,7 @@ type = "integer" reader = "urword" optional = true longname = "chunking parameter for structured x" -description = "is the chunk size for the x dimension in a NETCDF_STRUCTURED output file. Must be used in combination with the chunk_time, chunk_y, and chunk_z parameters to have an effect." +description = "is the keyword used to provide a data chunk size for the x dimension in a NETCDF_STRUCTURED output file. Must be used in combination with the the chunk_time, chunk_y and chunk_z parameter set to have an effect." [options.modflow6_attr_off] block = "options" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev0/utl-ncf.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev0/utl-ncf.yaml index 72ccf0be..87536568 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev0/utl-ncf.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev0/utl-ncf.yaml @@ -16,9 +16,8 @@ options: reader: urword optional: true longname: CRS well-known text (WKT) string - description: is the coordinate reference system (CRS) well-known text (WKT) string. Used to embed - CRS metadata in NetCDF output. Ignored if latitude and longitude griddata arrays have been provided - for NETCDF_STRUCTURED export type. + description: is the coordinate reference system (CRS) well-known text (WKT) string. Ignored if latitude + and longitude griddata arrays have been provided for NETCDF_STRUCTURED export type. deflate: block: options type: integer @@ -26,8 +25,7 @@ options: optional: true longname: variable compression deflate level description: is the variable deflate level (0=min, 9=max) in the NetCDF file. Defining this parameter - activates per-variable compression at the level specified. Use with the SHUFFLE option to also enable - the shuffle filter. + activates per-variable compression at the level specified. shuffle: block: options type: keyword @@ -43,9 +41,10 @@ options: reader: urword optional: true longname: chunking parameter for the time dimension - description: is the chunk size for the time dimension in a NETCDF_MESH2D or NETCDF_STRUCTURED output - file. Must be used in combination with the chunk_face parameter (NETCDF_MESH2D) or the chunk_z, - chunk_y, and chunk_x parameter set (NETCDF_STRUCTURED) to have an effect. + description: is the keyword used to provide a data chunk size for the time dimension in a NETCDF_MESH2D + or NETCDF_STRUCTURED output file. Must be used in combination with the the chunk_face parameter + (NETCDF_MESH2D) or the chunk_z, chunk_y, and chunk_x parameter set (NETCDF_STRUCTURED) to have an + effect. chunk_face: block: options type: integer @@ -60,24 +59,27 @@ options: reader: urword optional: true longname: chunking parameter for structured z - description: is the chunk size for the z dimension in a NETCDF_STRUCTURED output file. Must be used - in combination with the chunk_time, chunk_x, and chunk_y parameters to have an effect. + description: is the keyword used to provide a data chunk size for the z dimension in a NETCDF_STRUCTURED + output file. Must be used in combination with the the chunk_time, chunk_x and chunk_y parameter + set to have an effect. chunk_y: block: options type: integer reader: urword optional: true longname: chunking parameter for structured y - description: is the chunk size for the y dimension in a NETCDF_STRUCTURED output file. Must be used - in combination with the chunk_time, chunk_x, and chunk_z parameters to have an effect. + description: is the keyword used to provide a data chunk size for the y dimension in a NETCDF_STRUCTURED + output file. Must be used in combination with the the chunk_time, chunk_x and chunk_z parameter + set to have an effect. chunk_x: block: options type: integer reader: urword optional: true longname: chunking parameter for structured x - description: is the chunk size for the x dimension in a NETCDF_STRUCTURED output file. Must be used - in combination with the chunk_time, chunk_y, and chunk_z parameters to have an effect. + description: is the keyword used to provide a data chunk size for the x dimension in a NETCDF_STRUCTURED + output file. Must be used in combination with the the chunk_time, chunk_y and chunk_z parameter + set to have an effect. modflow6_attr_off: block: options type: keyword diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev0/utl-spca.json b/autotest/dfns/__snapshots__/v2.0.0.dev0/utl-spca.json index fb2e2b94..4f239b80 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev0/utl-spca.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev0/utl-spca.json @@ -55,8 +55,7 @@ "reader": "readarray", "optional": true, "longname": "concentration", - "description": "is the concentration of the associated Recharge or Evapotranspiration stress package. The concentration array may be defined by a time-array series (see the \"Using Time-Array Series in a Package\" section).", - "time_series": true + "description": "is the concentration of the associated Recharge or Evapotranspiration stress package. The concentration array may be defined by a time-array series (see the \"Using Time-Array Series in a Package\" section)." }, "temperature": { "block": "period", @@ -65,8 +64,7 @@ "reader": "readarray", "optional": true, "longname": "temperature", - "description": "is the temperature of the associated Recharge or Evapotranspiration stress package. The temperature array may be defined by a time-array series (see the \"Using Time-Array Series in a Package\" section).", - "time_series": true + "description": "is the temperature of the associated Recharge or Evapotranspiration stress package. The temperature array may be defined by a time-array series (see the \"Using Time-Array Series in a Package\" section)." } } } \ No newline at end of file diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev0/utl-spca.toml b/autotest/dfns/__snapshots__/v2.0.0.dev0/utl-spca.toml index fbe741bc..8e4a61cb 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev0/utl-spca.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev0/utl-spca.toml @@ -53,7 +53,6 @@ reader = "readarray" optional = true longname = "concentration" description = "is the concentration of the associated Recharge or Evapotranspiration stress package. The concentration array may be defined by a time-array series (see the \"Using Time-Array Series in a Package\" section)." -time_series = true [period.temperature] block = "period" @@ -63,4 +62,3 @@ reader = "readarray" optional = true longname = "temperature" description = "is the temperature of the associated Recharge or Evapotranspiration stress package. The temperature array may be defined by a time-array series (see the \"Using Time-Array Series in a Package\" section)." -time_series = true diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev0/utl-spca.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev0/utl-spca.yaml index d81ea027..14cd1003 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev0/utl-spca.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev0/utl-spca.yaml @@ -57,7 +57,6 @@ period: description: is the concentration of the associated Recharge or Evapotranspiration stress package. The concentration array may be defined by a time-array series (see the "Using Time-Array Series in a Package" section). - time_series: true temperature: block: period type: double precision @@ -68,4 +67,3 @@ period: description: is the temperature of the associated Recharge or Evapotranspiration stress package. The temperature array may be defined by a time-array series (see the "Using Time-Array Series in a Package" section). - time_series: true diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev0/utl-tvs.json b/autotest/dfns/__snapshots__/v2.0.0.dev0/utl-tvs.json index 230eec6f..9e79e75e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev0/utl-tvs.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev0/utl-tvs.json @@ -27,8 +27,7 @@ "reader": "urword", "optional": true, "longname": "deactivate storage change integration", - "description": "keyword that deactivates inclusion of storage derivative terms in the STO package matrix formulation. In the absence of this keyword (the default), the groundwater storage formulation will be modified to correctly adjust heads based on transient variations in stored water volumes arising from changes to SS and SY properties.", - "mf6internal": "disable_sc_int" + "description": "keyword that deactivates inclusion of storage derivative terms in the STO package matrix formulation. In the absence of this keyword (the default), the groundwater storage formulation will be modified to correctly adjust heads based on transient variations in stored water volumes arising from changes to SS and SY properties." }, "print_input": { "block": "options", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev0/utl-tvs.toml b/autotest/dfns/__snapshots__/v2.0.0.dev0/utl-tvs.toml index 167b470a..5d310301 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev0/utl-tvs.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev0/utl-tvs.toml @@ -25,7 +25,6 @@ reader = "urword" optional = true longname = "deactivate storage change integration" description = "keyword that deactivates inclusion of storage derivative terms in the STO package matrix formulation. In the absence of this keyword (the default), the groundwater storage formulation will be modified to correctly adjust heads based on transient variations in stored water volumes arising from changes to SS and SY properties." -mf6internal = "disable_sc_int" [options.print_input] block = "options" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev0/utl-tvs.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev0/utl-tvs.yaml index d370ed64..0277cb85 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev0/utl-tvs.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev0/utl-tvs.yaml @@ -27,7 +27,6 @@ options: formulation. In the absence of this keyword (the default), the groundwater storage formulation will be modified to correctly adjust heads based on transient variations in stored water volumes arising from changes to SS and SY properties. - mf6internal: disable_sc_int print_input: block: options type: keyword diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwe-adv.json b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwe-adv.json index 74e2bd9e..42af196c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwe-adv.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwe-adv.json @@ -8,7 +8,7 @@ "options": { "scheme": { "block": "options", - "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", "reader": "urword", "optional": true, diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwe-adv.toml b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwe-adv.toml index b481f172..42755bb4 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwe-adv.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwe-adv.toml @@ -6,7 +6,7 @@ ftype = "ADV" [blocks.options.scheme] block = "options" -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" reader = "urword" optional = true diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwe-adv.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwe-adv.yaml index 8f1ecdfb..9baf77c7 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwe-adv.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwe-adv.yaml @@ -7,8 +7,8 @@ blocks: options: scheme: block: options - 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 reader: urword optional: true diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwe-ctp.json b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwe-ctp.json index 6821e5d1..8e974355 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwe-ctp.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwe-ctp.json @@ -36,7 +36,7 @@ "reader": "urword", "optional": true, "longname": "print input to listing file", - "mf6internal": "iprpak", + "mf6internal": "iprflow", "type": "keyword" }, "print_flows": { @@ -45,7 +45,7 @@ "reader": "urword", "optional": true, "longname": "print calculated flows to listing file", - "mf6internal": "iprflow", + "mf6internal": "ipakcb", "type": "keyword" }, "save_flows": { @@ -54,7 +54,7 @@ "reader": "urword", "optional": true, "longname": "save constant temperature flows to budget file", - "mf6internal": "ipakcb", + "mf6internal": "iprpak", "type": "keyword" }, "ts_filerecord": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwe-ctp.toml b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwe-ctp.toml index 3b2dcf24..e751b424 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwe-ctp.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwe-ctp.toml @@ -34,7 +34,7 @@ description = "keyword to indicate that the list of constant temperature informa reader = "urword" optional = true longname = "print input to listing file" -mf6internal = "iprpak" +mf6internal = "iprflow" type = "keyword" [blocks.options.print_flows] @@ -43,7 +43,7 @@ description = "keyword to indicate that the list of constant temperature flow ra reader = "urword" optional = true longname = "print calculated flows to listing file" -mf6internal = "iprflow" +mf6internal = "ipakcb" type = "keyword" [blocks.options.save_flows] @@ -52,7 +52,7 @@ description = "keyword to indicate that constant temperature flow terms will be reader = "urword" optional = true longname = "save constant temperature flows to budget file" -mf6internal = "ipakcb" +mf6internal = "iprpak" type = "keyword" [blocks.options.ts_filerecord] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwe-ctp.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwe-ctp.yaml index ce20336d..8009462a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwe-ctp.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwe-ctp.yaml @@ -41,7 +41,7 @@ blocks: reader: urword optional: true longname: print input to listing file - mf6internal: iprpak + mf6internal: iprflow type: keyword print_flows: block: options @@ -52,7 +52,7 @@ blocks: reader: urword optional: true longname: print calculated flows to listing file - mf6internal: iprflow + mf6internal: ipakcb type: keyword save_flows: block: options @@ -61,7 +61,7 @@ blocks: reader: urword optional: true longname: save constant temperature flows to budget file - mf6internal: ipakcb + mf6internal: iprpak type: keyword ts_filerecord: block: options diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwe-esl.json b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwe-esl.json index 2e3505a3..ae9d205b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwe-esl.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwe-esl.json @@ -54,7 +54,7 @@ "reader": "urword", "optional": true, "mf6internal": "ipakcb", - "longname": "save ESL flows to budget file", + "longname": "save well flows to budget file", "type": "keyword" }, "ts_filerecord": { @@ -159,7 +159,7 @@ "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.", "reader": "urword", "optional": true, - "longname": "energy source loading name", + "longname": "well name", "type": "string" } } diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwe-esl.toml b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwe-esl.toml index d1b299f3..14804a82 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwe-esl.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwe-esl.toml @@ -52,7 +52,7 @@ description = "keyword to indicate that energy source loading flow terms will be reader = "urword" optional = true mf6internal = "ipakcb" -longname = "save ESL flows to budget file" +longname = "save well flows to budget file" type = "keyword" [blocks.options.ts_filerecord] @@ -149,5 +149,5 @@ block = "period" 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." reader = "urword" optional = true -longname = "energy source loading name" +longname = "well name" type = "string" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwe-esl.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwe-esl.yaml index 9bfde31d..5789c441 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwe-esl.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwe-esl.yaml @@ -61,7 +61,7 @@ blocks: reader: urword optional: true mf6internal: ipakcb - longname: save ESL flows to budget file + longname: save well flows to budget file type: keyword ts_filerecord: block: options @@ -164,5 +164,5 @@ blocks: be enclosed within single quotes. reader: urword optional: true - longname: energy source loading name + longname: well name type: string diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwe-mve.json b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwe-mve.json index 88fd57d0..7f6a6505 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwe-mve.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwe-mve.json @@ -28,7 +28,7 @@ "description": "keyword to indicate that lake flow terms will be written to the file specified with 'BUDGET FILEOUT' in Output Control.", "reader": "urword", "optional": true, - "longname": "save MVE flows to budget file", + "longname": "save lake flows to budget file", "type": "keyword" }, "budget_filerecord": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwe-mve.toml b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwe-mve.toml index 0db18fd8..18e38801 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwe-mve.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwe-mve.toml @@ -26,7 +26,7 @@ block = "options" description = "keyword to indicate that lake flow terms will be written to the file specified with 'BUDGET FILEOUT' in Output Control." reader = "urword" optional = true -longname = "save MVE flows to budget file" +longname = "save lake flows to budget file" type = "keyword" [blocks.options.budget_filerecord] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwe-mve.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwe-mve.yaml index 07f02f69..c246c99e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwe-mve.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwe-mve.yaml @@ -30,7 +30,7 @@ blocks: 'BUDGET FILEOUT' in Output Control. reader: urword optional: true - longname: save MVE flows to budget file + longname: save lake flows to budget file type: keyword budget_filerecord: block: options diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwe-ssm.json b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwe-ssm.json index 4eab0f2e..26c155f6 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwe-ssm.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwe-ssm.json @@ -4,9 +4,6 @@ "advanced": false, "multi": false, "ftype": "SSM", - "subcomponents": [ - "utl-spc" - ], "blocks": { "options": { "print_flows": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwe-ssm.toml b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwe-ssm.toml index b81558bd..b98e7d0f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwe-ssm.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwe-ssm.toml @@ -3,9 +3,6 @@ schema_version = "2.0.0.dev1" advanced = false multi = false ftype = "SSM" -subcomponents = [ - "utl-spc", -] [blocks.options.print_flows] block = "options" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwe-ssm.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwe-ssm.yaml index ed2ba46d..4f1927dd 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwe-ssm.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwe-ssm.yaml @@ -3,8 +3,6 @@ schema_version: 2.0.0.dev1 advanced: false multi: false ftype: SSM -subcomponents: - - utl-spc blocks: options: print_flows: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-csub.json b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-csub.json index 40f670f1..de4f1fba 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-csub.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-csub.json @@ -678,7 +678,7 @@ "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.", "reader": "urword", "optional": true, - "longname": "interbed name", + "longname": "well name", "type": "string" } } @@ -693,7 +693,7 @@ "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.", "reader": "urword", "time_series": true, - "longname": "geostatic stress offset", + "longname": "well stress offset", "type": "double" } } diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-csub.toml b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-csub.toml index 6c477586..cacbe716 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-csub.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-csub.toml @@ -648,7 +648,7 @@ block = "packagedata" 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." reader = "urword" optional = true -longname = "interbed name" +longname = "well name" type = "string" [blocks.period.sig0] @@ -657,5 +657,5 @@ block = "period" 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." reader = "urword" time_series = true -longname = "geostatic stress offset" +longname = "well stress offset" type = "double" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-csub.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-csub.yaml index 183c9ba1..2c40ad4a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-csub.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-csub.yaml @@ -677,7 +677,7 @@ blocks: be enclosed within single quotes. reader: urword optional: true - longname: interbed name + longname: well name type: string period: sig0: @@ -690,5 +690,5 @@ blocks: value. reader: urword time_series: true - longname: geostatic stress offset + longname: well stress offset type: double diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-drn.json b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-drn.json index a0dcd407..29f8e2b8 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-drn.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-drn.json @@ -61,7 +61,7 @@ "description": "keyword to indicate that drain flow terms will be written to the file specified with 'BUDGET FILEOUT' in Output Control.", "reader": "urword", "optional": true, - "longname": "save DRN flows to budget file", + "longname": "save CHD flows to budget file", "mf6internal": "ipakcb", "type": "keyword" }, diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-drn.toml b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-drn.toml index 3d1c5a1e..778478ce 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-drn.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-drn.toml @@ -59,7 +59,7 @@ block = "options" description = "keyword to indicate that drain flow terms will be written to the file specified with 'BUDGET FILEOUT' in Output Control." reader = "urword" optional = true -longname = "save DRN flows to budget file" +longname = "save CHD flows to budget file" mf6internal = "ipakcb" type = "keyword" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-drn.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-drn.yaml index d2306784..5bd38b9d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-drn.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-drn.yaml @@ -74,7 +74,7 @@ blocks: 'BUDGET FILEOUT' in Output Control. reader: urword optional: true - longname: save DRN flows to budget file + longname: save CHD flows to budget file mf6internal: ipakcb type: keyword ts_filerecord: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-evta.json b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-evta.json index eabd2ae8..5dcf2c24 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-evta.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-evta.json @@ -63,7 +63,7 @@ "description": "keyword to indicate that evapotranspiration flow terms will be written to the file specified with 'BUDGET FILEOUT' in Output Control.", "reader": "urword", "optional": true, - "longname": "save EVTA flows to budget file", + "longname": "save CHD flows to budget file", "mf6internal": "ipakcb", "type": "keyword" }, @@ -172,7 +172,7 @@ "reader": "readarray", "time_series": true, "netcdf": true, - "longname": "evapotranspiration rate", + "longname": "evapotranspiration surface", "type": "double" }, "depth": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-evta.toml b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-evta.toml index 8c95a6c1..e0f73b59 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-evta.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-evta.toml @@ -61,7 +61,7 @@ block = "options" description = "keyword to indicate that evapotranspiration flow terms will be written to the file specified with 'BUDGET FILEOUT' in Output Control." reader = "urword" optional = true -longname = "save EVTA flows to budget file" +longname = "save CHD flows to budget file" mf6internal = "ipakcb" type = "keyword" @@ -164,7 +164,7 @@ default = "1.e-3" reader = "readarray" time_series = true netcdf = true -longname = "evapotranspiration rate" +longname = "evapotranspiration surface" type = "double" [blocks.period.depth] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-evta.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-evta.yaml index d97c7ba4..3f50633d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-evta.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-evta.yaml @@ -73,7 +73,7 @@ blocks: specified with 'BUDGET FILEOUT' in Output Control. reader: urword optional: true - longname: save EVTA flows to budget file + longname: save CHD flows to budget file mf6internal: ipakcb type: keyword tas_filerecord: @@ -177,7 +177,7 @@ blocks: reader: readarray time_series: true netcdf: true - longname: evapotranspiration rate + longname: evapotranspiration surface type: double depth: shape: (nper, ncol*nrow; ncpl) diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-ghb.json b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-ghb.json index 2b34c910..52c17c21 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-ghb.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-ghb.json @@ -53,7 +53,7 @@ "description": "keyword to indicate that general-head boundary flow terms will be written to the file specified with 'BUDGET FILEOUT' in Output Control.", "reader": "urword", "optional": true, - "longname": "save GHB flows to budget file", + "longname": "save CHD flows to budget file", "mf6internal": "ipakcb", "type": "keyword" }, diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-ghb.toml b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-ghb.toml index d4abd319..a5eeaead 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-ghb.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-ghb.toml @@ -51,7 +51,7 @@ block = "options" description = "keyword to indicate that general-head boundary flow terms will be written to the file specified with 'BUDGET FILEOUT' in Output Control." reader = "urword" optional = true -longname = "save GHB flows to budget file" +longname = "save CHD flows to budget file" mf6internal = "ipakcb" type = "keyword" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-ghb.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-ghb.yaml index c604edca..90d34faa 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-ghb.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-ghb.yaml @@ -60,7 +60,7 @@ blocks: specified with 'BUDGET FILEOUT' in Output Control. reader: urword optional: true - longname: save GHB flows to budget file + longname: save CHD flows to budget file mf6internal: ipakcb type: keyword ts_filerecord: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-hfb.json b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-hfb.json index 8fc29436..6dce61a7 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-hfb.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-hfb.json @@ -30,7 +30,7 @@ "cellid1": { "shape": "(nper, ncelldim)", "block": "period", - "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.", "reader": "urword", "longname": "first cell adjacent to barrier", "type": "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-hfb.toml b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-hfb.toml index e4cc65bd..e2116e6c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-hfb.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-hfb.toml @@ -24,7 +24,7 @@ type = "integer" [blocks.period.cellid1] shape = "(nper, ncelldim)" block = "period" -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." reader = "urword" longname = "first cell adjacent to barrier" type = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-hfb.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-hfb.yaml index da786540..6ff5a1d4 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-hfb.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-hfb.yaml @@ -31,9 +31,10 @@ blocks: 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. + 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. reader: urword longname: first cell adjacent to barrier type: integer diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-npf.json b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-npf.json index 038afb6f..0835af85 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-npf.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-npf.json @@ -4,9 +4,6 @@ "advanced": false, "multi": false, "ftype": "NPF", - "subcomponents": [ - "utl-tvk" - ], "blocks": { "options": { "save_flows": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-npf.toml b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-npf.toml index 91cee5c5..a5b52a43 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-npf.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-npf.toml @@ -3,9 +3,6 @@ schema_version = "2.0.0.dev1" advanced = false multi = false ftype = "NPF" -subcomponents = [ - "utl-tvk", -] [blocks.options.save_flows] block = "options" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-npf.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-npf.yaml index 39dd26db..1999dcb9 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-npf.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-npf.yaml @@ -3,8 +3,6 @@ schema_version: 2.0.0.dev1 advanced: false multi: false ftype: NPF -subcomponents: - - utl-tvk blocks: options: save_flows: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-rcha.json b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-rcha.json index c3750c21..94ed492c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-rcha.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-rcha.json @@ -63,7 +63,7 @@ "description": "keyword to indicate that recharge flow terms will be written to the file specified with 'BUDGET FILEOUT' in Output Control.", "reader": "urword", "optional": true, - "longname": "save RCHA flows to budget file", + "longname": "save CHD flows to budget file", "mf6internal": "ipakcb", "type": "keyword" }, diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-rcha.toml b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-rcha.toml index 3379fcda..ac180daf 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-rcha.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-rcha.toml @@ -61,7 +61,7 @@ block = "options" description = "keyword to indicate that recharge flow terms will be written to the file specified with 'BUDGET FILEOUT' in Output Control." reader = "urword" optional = true -longname = "save RCHA flows to budget file" +longname = "save CHD flows to budget file" mf6internal = "ipakcb" type = "keyword" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-rcha.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-rcha.yaml index cf79db3f..8e2f0d71 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-rcha.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-rcha.yaml @@ -73,7 +73,7 @@ blocks: with 'BUDGET FILEOUT' in Output Control. reader: urword optional: true - longname: save RCHA flows to budget file + longname: save CHD flows to budget file mf6internal: ipakcb type: keyword tas_filerecord: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-riv.json b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-riv.json index a206b163..63dd0958 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-riv.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-riv.json @@ -53,7 +53,7 @@ "description": "keyword to indicate that river flow terms will be written to the file specified with 'BUDGET FILEOUT' in Output Control.", "reader": "urword", "optional": true, - "longname": "save RIV flows to budget file", + "longname": "save CHD flows to budget file", "mf6internal": "ipakcb", "type": "keyword" }, @@ -184,7 +184,7 @@ "description": "name of the river 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.", "reader": "urword", "optional": true, - "longname": "river name", + "longname": "drain name", "type": "string" } } diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-riv.toml b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-riv.toml index 3a1d3aba..8271b896 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-riv.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-riv.toml @@ -51,7 +51,7 @@ block = "options" description = "keyword to indicate that river flow terms will be written to the file specified with 'BUDGET FILEOUT' in Output Control." reader = "urword" optional = true -longname = "save RIV flows to budget file" +longname = "save CHD flows to budget file" mf6internal = "ipakcb" type = "keyword" @@ -174,5 +174,5 @@ block = "period" description = "name of the river 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." reader = "urword" optional = true -longname = "river name" +longname = "drain name" type = "string" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-riv.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-riv.yaml index 0560e4b5..307dc8f6 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-riv.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-riv.yaml @@ -59,7 +59,7 @@ blocks: 'BUDGET FILEOUT' in Output Control. reader: urword optional: true - longname: save RIV flows to budget file + longname: save CHD flows to budget file mf6internal: ipakcb type: keyword ts_filerecord: @@ -189,5 +189,5 @@ blocks: within single quotes. reader: urword optional: true - longname: river name + longname: drain name type: string diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-rivg.json b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-rivg.json index 6c5e2e11..375e03c7 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-rivg.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-rivg.json @@ -140,7 +140,7 @@ "reader": "readarray", "layered": true, "netcdf": true, - "longname": "river conductance", + "longname": "river conductnace", "type": "double" }, "rbot": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-rivg.toml b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-rivg.toml index fd610fa9..0b68808d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-rivg.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-rivg.toml @@ -132,7 +132,7 @@ default = "3.e30" reader = "readarray" layered = true netcdf = true -longname = "river conductance" +longname = "river conductnace" type = "double" [blocks.period.rbot] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-rivg.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-rivg.yaml index 730b28c9..bdf7041a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-rivg.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-rivg.yaml @@ -146,7 +146,7 @@ blocks: reader: readarray layered: true netcdf: true - longname: river conductance + longname: river conductnace type: double rbot: shape: (nper, nodes) diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-sto.json b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-sto.json index eef22c65..f1a20d01 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-sto.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-sto.json @@ -4,9 +4,6 @@ "advanced": false, "multi": false, "ftype": "STO", - "subcomponents": [ - "utl-tvs" - ], "blocks": { "options": { "save_flows": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-sto.toml b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-sto.toml index ca915c01..d658ed9d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-sto.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-sto.toml @@ -3,9 +3,6 @@ schema_version = "2.0.0.dev1" advanced = false multi = false ftype = "STO" -subcomponents = [ - "utl-tvs", -] [blocks.options.save_flows] block = "options" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-sto.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-sto.yaml index af9711ac..491b3b44 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-sto.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwf-sto.yaml @@ -3,8 +3,6 @@ schema_version: 2.0.0.dev1 advanced: false multi: false ftype: STO -subcomponents: - - utl-tvs blocks: options: save_flows: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwt-cnc.json b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwt-cnc.json index c3a5ed63..86200bf1 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwt-cnc.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwt-cnc.json @@ -36,7 +36,7 @@ "reader": "urword", "optional": true, "longname": "print input to listing file", - "mf6internal": "iprpak", + "mf6internal": "iprflow", "type": "keyword" }, "print_flows": { @@ -45,7 +45,7 @@ "reader": "urword", "optional": true, "longname": "print calculated flows to listing file", - "mf6internal": "iprflow", + "mf6internal": "ipakcb", "type": "keyword" }, "save_flows": { @@ -54,7 +54,7 @@ "reader": "urword", "optional": true, "longname": "save constant concentration flows to budget file", - "mf6internal": "ipakcb", + "mf6internal": "iprpak", "type": "keyword" }, "ts_filerecord": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwt-cnc.toml b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwt-cnc.toml index 91ba6ce1..02c809c5 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwt-cnc.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwt-cnc.toml @@ -34,7 +34,7 @@ description = "keyword to indicate that the list of constant concentration infor reader = "urword" optional = true longname = "print input to listing file" -mf6internal = "iprpak" +mf6internal = "iprflow" type = "keyword" [blocks.options.print_flows] @@ -43,7 +43,7 @@ description = "keyword to indicate that the list of constant concentration flow reader = "urword" optional = true longname = "print calculated flows to listing file" -mf6internal = "iprflow" +mf6internal = "ipakcb" type = "keyword" [blocks.options.save_flows] @@ -52,7 +52,7 @@ description = "keyword to indicate that constant concentration flow terms will b reader = "urword" optional = true longname = "save constant concentration flows to budget file" -mf6internal = "ipakcb" +mf6internal = "iprpak" type = "keyword" [blocks.options.ts_filerecord] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwt-cnc.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwt-cnc.yaml index 5b8eb4bd..39cf1a1d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwt-cnc.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwt-cnc.yaml @@ -41,7 +41,7 @@ blocks: reader: urword optional: true longname: print input to listing file - mf6internal: iprpak + mf6internal: iprflow type: keyword print_flows: block: options @@ -52,7 +52,7 @@ blocks: reader: urword optional: true longname: print calculated flows to listing file - mf6internal: iprflow + mf6internal: ipakcb type: keyword save_flows: block: options @@ -61,7 +61,7 @@ blocks: reader: urword optional: true longname: save constant concentration flows to budget file - mf6internal: ipakcb + mf6internal: iprpak type: keyword ts_filerecord: block: options diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwt-mvt.json b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwt-mvt.json index 9180b89e..ca738520 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwt-mvt.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwt-mvt.json @@ -28,7 +28,7 @@ "description": "keyword to indicate that lake flow terms will be written to the file specified with 'BUDGET FILEOUT' in Output Control.", "reader": "urword", "optional": true, - "longname": "save MVT flows to budget file", + "longname": "save lake flows to budget file", "type": "keyword" }, "budget_filerecord": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwt-mvt.toml b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwt-mvt.toml index e24790e1..41042b34 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwt-mvt.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwt-mvt.toml @@ -26,7 +26,7 @@ block = "options" description = "keyword to indicate that lake flow terms will be written to the file specified with 'BUDGET FILEOUT' in Output Control." reader = "urword" optional = true -longname = "save MVT flows to budget file" +longname = "save lake flows to budget file" type = "keyword" [blocks.options.budget_filerecord] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwt-mvt.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwt-mvt.yaml index 699efa1f..7beeb8b9 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwt-mvt.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwt-mvt.yaml @@ -30,7 +30,7 @@ blocks: 'BUDGET FILEOUT' in Output Control. reader: urword optional: true - longname: save MVT flows to budget file + longname: save lake flows to budget file type: keyword budget_filerecord: block: options diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwt-src.json b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwt-src.json index df32994b..0fb9b48d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwt-src.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwt-src.json @@ -54,7 +54,7 @@ "reader": "urword", "optional": true, "mf6internal": "ipakcb", - "longname": "save SRC flows to budget file", + "longname": "save well flows to budget file", "type": "keyword" }, "ts_filerecord": { @@ -168,7 +168,7 @@ "description": "name of the mass 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.", "reader": "urword", "optional": true, - "longname": "source name", + "longname": "well name", "type": "string" } } diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwt-src.toml b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwt-src.toml index a80c2c60..be5d58e3 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwt-src.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwt-src.toml @@ -52,7 +52,7 @@ description = "keyword to indicate that mass source flow terms will be written t reader = "urword" optional = true mf6internal = "ipakcb" -longname = "save SRC flows to budget file" +longname = "save well flows to budget file" type = "keyword" [blocks.options.ts_filerecord] @@ -158,5 +158,5 @@ block = "period" description = "name of the mass 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." reader = "urword" optional = true -longname = "source name" +longname = "well name" type = "string" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwt-src.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwt-src.yaml index a8c17012..5d29ff18 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwt-src.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwt-src.yaml @@ -61,7 +61,7 @@ blocks: reader: urword optional: true mf6internal: ipakcb - longname: save SRC flows to budget file + longname: save well flows to budget file type: keyword ts_filerecord: block: options @@ -181,5 +181,5 @@ blocks: within single quotes. reader: urword optional: true - longname: source name + longname: well name type: string diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwt-ssm.json b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwt-ssm.json index 6374cd3e..b24d5aad 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwt-ssm.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwt-ssm.json @@ -4,9 +4,6 @@ "advanced": false, "multi": false, "ftype": "SSM", - "subcomponents": [ - "utl-spc" - ], "blocks": { "options": { "print_flows": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwt-ssm.toml b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwt-ssm.toml index 8944114e..b8230ab8 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwt-ssm.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwt-ssm.toml @@ -3,9 +3,6 @@ schema_version = "2.0.0.dev1" advanced = false multi = false ftype = "SSM" -subcomponents = [ - "utl-spc", -] [blocks.options.print_flows] block = "options" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwt-ssm.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwt-ssm.yaml index 3c32b882..67373aa3 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev1/gwt-ssm.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev1/gwt-ssm.yaml @@ -3,8 +3,6 @@ schema_version: 2.0.0.dev1 advanced: false multi: false ftype: SSM -subcomponents: - - utl-spc blocks: options: print_flows: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev1/prt-oc.json b/autotest/dfns/__snapshots__/v2.0.0.dev1/prt-oc.json index 151f0896..5435ec1a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev1/prt-oc.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev1/prt-oc.json @@ -264,14 +264,6 @@ "mf6internal": "dev_dump_evtrace", "longname": "print particle tracking events", "type": "keyword" - }, - "scratch_buffer": { - "block": "options", - "description": "keyword to stage track events in a temporary (scratch) file instead of an in-memory buffer. Particle tracking results calculated during a time step are buffered, and output is deferred, until successful completion of the time step. By default, results are buffered in memory. However, for simulations in which a very large number of track events is generated during a time step, memory limits can be exceeded. In such cases, the SCRATCH_BUFFER option can be invoked to buffer results in a scratch file until successful completion of the time step. Buffering in a scratch file is typically slower than buffering in memory.", - "reader": "urword", - "optional": true, - "longname": "buffer track events in scratch file instead of memory", - "type": "keyword" } }, "dimensions": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev1/prt-oc.toml b/autotest/dfns/__snapshots__/v2.0.0.dev1/prt-oc.toml index 984840b4..1810582f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev1/prt-oc.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev1/prt-oc.toml @@ -251,14 +251,6 @@ mf6internal = "dev_dump_evtrace" longname = "print particle tracking events" type = "keyword" -[blocks.options.scratch_buffer] -block = "options" -description = "keyword to stage track events in a temporary (scratch) file instead of an in-memory buffer. Particle tracking results calculated during a time step are buffered, and output is deferred, until successful completion of the time step. By default, results are buffered in memory. However, for simulations in which a very large number of track events is generated during a time step, memory limits can be exceeded. In such cases, the SCRATCH_BUFFER option can be invoked to buffer results in a scratch file until successful completion of the time step. Buffering in a scratch file is typically slower than buffering in memory." -reader = "urword" -optional = true -longname = "buffer track events in scratch file instead of memory" -type = "keyword" - [blocks.dimensions.ntracktimes] block = "dimensions" description = "is the number of user-specified particle tracking times in the TRACKTIMES block." diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev1/prt-oc.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev1/prt-oc.yaml index 6fe1ef6e..5639d477 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev1/prt-oc.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev1/prt-oc.yaml @@ -240,19 +240,6 @@ blocks: mf6internal: dev_dump_evtrace longname: print particle tracking events type: keyword - scratch_buffer: - block: options - description: keyword to stage track events in a temporary (scratch) file instead of an in-memory - buffer. Particle tracking results calculated during a time step are buffered, and output is deferred, - until successful completion of the time step. By default, results are buffered in memory. However, - for simulations in which a very large number of track events is generated during a time step, - memory limits can be exceeded. In such cases, the SCRATCH_BUFFER option can be invoked to buffer - results in a scratch file until successful completion of the time step. Buffering in a scratch - file is typically slower than buffering in memory. - reader: urword - optional: true - longname: buffer track events in scratch file instead of memory - type: keyword dimensions: ntracktimes: block: dimensions diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev1/sln-ims.json b/autotest/dfns/__snapshots__/v2.0.0.dev1/sln-ims.json index 5e291a6e..1d668dcf 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev1/sln-ims.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev1/sln-ims.json @@ -23,7 +23,7 @@ "description": "is an optional keyword that defines default non-linear and linear solver parameters. SIMPLE - indicates that default solver input values will be defined that work well for nearly linear models. This would be used for models that do not include nonlinear stress packages and models that are either confined or consist of a single unconfined layer that is thick enough to contain the water table within a single layer. MODERATE - indicates that default solver input values will be defined that work well for moderately nonlinear models. This would be used for models that include nonlinear stress packages and models that consist of one or more unconfined layers. The MODERATE option should be used when the SIMPLE option does not result in successful convergence. COMPLEX - indicates that default solver input values will be defined that work well for highly nonlinear models. This would be used for models that include nonlinear stress packages and models that consist of one or more unconfined layers representing complex geology and surface-water/groundwater interaction. The COMPLEX option should be used when the MODERATE option does not result in successful convergence. Non-linear and linear solver parameters assigned using a specified complexity can be modified in the NONLINEAR and LINEAR blocks. If the COMPLEXITY option is not specified, NONLINEAR and LINEAR variables will be assigned the simple complexity values.", "reader": "urword", "optional": true, - "longname": "solver complexity", + "longname": "print option", "type": "string" }, "csv_output_filerecord": { @@ -355,7 +355,7 @@ "description": "optional integer value defining the interval used to explicitly recalculate the residual of the flow equation using the solver coefficient matrix, the latest dependent-variable (for example, head) estimates, and the right hand side. For problems that benefit from explicit recalculation of the residual, a number between 4 and 10 is appropriate. By default, NUMBER_ORTHOGONALIZATIONS is zero.", "reader": "urword", "optional": true, - "longname": "number of orthogonalizations", + "longname": "drop tolerance used to drop preconditioner terms", "type": "integer" }, "scaling_method": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev1/sln-ims.toml b/autotest/dfns/__snapshots__/v2.0.0.dev1/sln-ims.toml index 96690620..8774f5bb 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev1/sln-ims.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev1/sln-ims.toml @@ -21,7 +21,7 @@ block = "options" description = "is an optional keyword that defines default non-linear and linear solver parameters. SIMPLE - indicates that default solver input values will be defined that work well for nearly linear models. This would be used for models that do not include nonlinear stress packages and models that are either confined or consist of a single unconfined layer that is thick enough to contain the water table within a single layer. MODERATE - indicates that default solver input values will be defined that work well for moderately nonlinear models. This would be used for models that include nonlinear stress packages and models that consist of one or more unconfined layers. The MODERATE option should be used when the SIMPLE option does not result in successful convergence. COMPLEX - indicates that default solver input values will be defined that work well for highly nonlinear models. This would be used for models that include nonlinear stress packages and models that consist of one or more unconfined layers representing complex geology and surface-water/groundwater interaction. The COMPLEX option should be used when the MODERATE option does not result in successful convergence. Non-linear and linear solver parameters assigned using a specified complexity can be modified in the NONLINEAR and LINEAR blocks. If the COMPLEXITY option is not specified, NONLINEAR and LINEAR variables will be assigned the simple complexity values." reader = "urword" optional = true -longname = "solver complexity" +longname = "print option" type = "string" [blocks.options.csv_output_filerecord] @@ -339,7 +339,7 @@ block = "linear" description = "optional integer value defining the interval used to explicitly recalculate the residual of the flow equation using the solver coefficient matrix, the latest dependent-variable (for example, head) estimates, and the right hand side. For problems that benefit from explicit recalculation of the residual, a number between 4 and 10 is appropriate. By default, NUMBER_ORTHOGONALIZATIONS is zero." reader = "urword" optional = true -longname = "number of orthogonalizations" +longname = "drop tolerance used to drop preconditioner terms" type = "integer" [blocks.linear.scaling_method] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev1/sln-ims.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev1/sln-ims.yaml index 5564d0c8..37340b13 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev1/sln-ims.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev1/sln-ims.yaml @@ -38,7 +38,7 @@ blocks: be assigned the simple complexity values. reader: urword optional: true - longname: solver complexity + longname: print option type: string csv_output_filerecord: block: options @@ -488,7 +488,7 @@ blocks: is zero. reader: urword optional: true - longname: number of orthogonalizations + longname: drop tolerance used to drop preconditioner terms type: integer scaling_method: block: linear diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev1/utl-ncf.json b/autotest/dfns/__snapshots__/v2.0.0.dev1/utl-ncf.json index bc422d43..6184cae3 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev1/utl-ncf.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev1/utl-ncf.json @@ -10,7 +10,7 @@ "wkt": { "shape": "lenbigline", "block": "options", - "description": "is the coordinate reference system (CRS) well-known text (WKT) string. Used to embed CRS metadata in NetCDF output. Ignored if latitude and longitude griddata arrays have been provided for NETCDF_STRUCTURED export type.", + "description": "is the coordinate reference system (CRS) well-known text (WKT) string. Ignored if latitude and longitude griddata arrays have been provided for NETCDF_STRUCTURED export type.", "reader": "urword", "optional": true, "longname": "CRS well-known text (WKT) string", @@ -18,7 +18,7 @@ }, "deflate": { "block": "options", - "description": "is the variable deflate level (0=min, 9=max) in the NetCDF file. Defining this parameter activates per-variable compression at the level specified. Use with the SHUFFLE option to also enable the shuffle filter.", + "description": "is the variable deflate level (0=min, 9=max) in the NetCDF file. Defining this parameter activates per-variable compression at the level specified.", "reader": "urword", "optional": true, "longname": "variable compression deflate level", @@ -33,7 +33,7 @@ }, "chunk_time": { "block": "options", - "description": "is the chunk size for the time dimension in a NETCDF_MESH2D or NETCDF_STRUCTURED output file. Must be used in combination with the chunk_face parameter (NETCDF_MESH2D) or the chunk_z, chunk_y, and chunk_x parameter set (NETCDF_STRUCTURED) to have an effect.", + "description": "is the keyword used to provide a data chunk size for the time dimension in a NETCDF_MESH2D or NETCDF_STRUCTURED output file. Must be used in combination with the the chunk_face parameter (NETCDF_MESH2D) or the chunk_z, chunk_y, and chunk_x parameter set (NETCDF_STRUCTURED) to have an effect.", "reader": "urword", "optional": true, "longname": "chunking parameter for the time dimension", @@ -49,7 +49,7 @@ }, "chunk_z": { "block": "options", - "description": "is the chunk size for the z dimension in a NETCDF_STRUCTURED output file. Must be used in combination with the chunk_time, chunk_x, and chunk_y parameters to have an effect.", + "description": "is the keyword used to provide a data chunk size for the z dimension in a NETCDF_STRUCTURED output file. Must be used in combination with the the chunk_time, chunk_x and chunk_y parameter set to have an effect.", "reader": "urword", "optional": true, "longname": "chunking parameter for structured z", @@ -57,7 +57,7 @@ }, "chunk_y": { "block": "options", - "description": "is the chunk size for the y dimension in a NETCDF_STRUCTURED output file. Must be used in combination with the chunk_time, chunk_x, and chunk_z parameters to have an effect.", + "description": "is the keyword used to provide a data chunk size for the y dimension in a NETCDF_STRUCTURED output file. Must be used in combination with the the chunk_time, chunk_x and chunk_z parameter set to have an effect.", "reader": "urword", "optional": true, "longname": "chunking parameter for structured y", @@ -65,7 +65,7 @@ }, "chunk_x": { "block": "options", - "description": "is the chunk size for the x dimension in a NETCDF_STRUCTURED output file. Must be used in combination with the chunk_time, chunk_y, and chunk_z parameters to have an effect.", + "description": "is the keyword used to provide a data chunk size for the x dimension in a NETCDF_STRUCTURED output file. Must be used in combination with the the chunk_time, chunk_y and chunk_z parameter set to have an effect.", "reader": "urword", "optional": true, "longname": "chunking parameter for structured x", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev1/utl-ncf.toml b/autotest/dfns/__snapshots__/v2.0.0.dev1/utl-ncf.toml index e35fd24d..069c6f2c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev1/utl-ncf.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev1/utl-ncf.toml @@ -8,7 +8,7 @@ ftype = "NCF" [blocks.options.wkt] shape = "lenbigline" block = "options" -description = "is the coordinate reference system (CRS) well-known text (WKT) string. Used to embed CRS metadata in NetCDF output. Ignored if latitude and longitude griddata arrays have been provided for NETCDF_STRUCTURED export type." +description = "is the coordinate reference system (CRS) well-known text (WKT) string. Ignored if latitude and longitude griddata arrays have been provided for NETCDF_STRUCTURED export type." reader = "urword" optional = true longname = "CRS well-known text (WKT) string" @@ -16,7 +16,7 @@ type = "string" [blocks.options.deflate] block = "options" -description = "is the variable deflate level (0=min, 9=max) in the NetCDF file. Defining this parameter activates per-variable compression at the level specified. Use with the SHUFFLE option to also enable the shuffle filter." +description = "is the variable deflate level (0=min, 9=max) in the NetCDF file. Defining this parameter activates per-variable compression at the level specified." reader = "urword" optional = true longname = "variable compression deflate level" @@ -31,7 +31,7 @@ type = "keyword" [blocks.options.chunk_time] block = "options" -description = "is the chunk size for the time dimension in a NETCDF_MESH2D or NETCDF_STRUCTURED output file. Must be used in combination with the chunk_face parameter (NETCDF_MESH2D) or the chunk_z, chunk_y, and chunk_x parameter set (NETCDF_STRUCTURED) to have an effect." +description = "is the keyword used to provide a data chunk size for the time dimension in a NETCDF_MESH2D or NETCDF_STRUCTURED output file. Must be used in combination with the the chunk_face parameter (NETCDF_MESH2D) or the chunk_z, chunk_y, and chunk_x parameter set (NETCDF_STRUCTURED) to have an effect." reader = "urword" optional = true longname = "chunking parameter for the time dimension" @@ -47,7 +47,7 @@ type = "integer" [blocks.options.chunk_z] block = "options" -description = "is the chunk size for the z dimension in a NETCDF_STRUCTURED output file. Must be used in combination with the chunk_time, chunk_x, and chunk_y parameters to have an effect." +description = "is the keyword used to provide a data chunk size for the z dimension in a NETCDF_STRUCTURED output file. Must be used in combination with the the chunk_time, chunk_x and chunk_y parameter set to have an effect." reader = "urword" optional = true longname = "chunking parameter for structured z" @@ -55,7 +55,7 @@ type = "integer" [blocks.options.chunk_y] block = "options" -description = "is the chunk size for the y dimension in a NETCDF_STRUCTURED output file. Must be used in combination with the chunk_time, chunk_x, and chunk_z parameters to have an effect." +description = "is the keyword used to provide a data chunk size for the y dimension in a NETCDF_STRUCTURED output file. Must be used in combination with the the chunk_time, chunk_x and chunk_z parameter set to have an effect." reader = "urword" optional = true longname = "chunking parameter for structured y" @@ -63,7 +63,7 @@ type = "integer" [blocks.options.chunk_x] block = "options" -description = "is the chunk size for the x dimension in a NETCDF_STRUCTURED output file. Must be used in combination with the chunk_time, chunk_y, and chunk_z parameters to have an effect." +description = "is the keyword used to provide a data chunk size for the x dimension in a NETCDF_STRUCTURED output file. Must be used in combination with the the chunk_time, chunk_y and chunk_z parameter set to have an effect." reader = "urword" optional = true longname = "chunking parameter for structured x" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev1/utl-ncf.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev1/utl-ncf.yaml index e529dd28..35684c89 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev1/utl-ncf.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev1/utl-ncf.yaml @@ -9,9 +9,8 @@ blocks: wkt: shape: lenbigline block: options - description: is the coordinate reference system (CRS) well-known text (WKT) string. Used to embed - CRS metadata in NetCDF output. Ignored if latitude and longitude griddata arrays have been provided - for NETCDF_STRUCTURED export type. + description: is the coordinate reference system (CRS) well-known text (WKT) string. Ignored if latitude + and longitude griddata arrays have been provided for NETCDF_STRUCTURED export type. reader: urword optional: true longname: CRS well-known text (WKT) string @@ -19,8 +18,7 @@ blocks: deflate: block: options description: is the variable deflate level (0=min, 9=max) in the NetCDF file. Defining this parameter - activates per-variable compression at the level specified. Use with the SHUFFLE option to also - enable the shuffle filter. + activates per-variable compression at the level specified. reader: urword optional: true longname: variable compression deflate level @@ -36,9 +34,10 @@ blocks: type: keyword chunk_time: block: options - description: is the chunk size for the time dimension in a NETCDF_MESH2D or NETCDF_STRUCTURED output - file. Must be used in combination with the chunk_face parameter (NETCDF_MESH2D) or the chunk_z, - chunk_y, and chunk_x parameter set (NETCDF_STRUCTURED) to have an effect. + description: is the keyword used to provide a data chunk size for the time dimension in a NETCDF_MESH2D + or NETCDF_STRUCTURED output file. Must be used in combination with the the chunk_face parameter + (NETCDF_MESH2D) or the chunk_z, chunk_y, and chunk_x parameter set (NETCDF_STRUCTURED) to have + an effect. reader: urword optional: true longname: chunking parameter for the time dimension @@ -53,24 +52,27 @@ blocks: type: integer chunk_z: block: options - description: is the chunk size for the z dimension in a NETCDF_STRUCTURED output file. Must be used - in combination with the chunk_time, chunk_x, and chunk_y parameters to have an effect. + description: is the keyword used to provide a data chunk size for the z dimension in a NETCDF_STRUCTURED + output file. Must be used in combination with the the chunk_time, chunk_x and chunk_y parameter + set to have an effect. reader: urword optional: true longname: chunking parameter for structured z type: integer chunk_y: block: options - description: is the chunk size for the y dimension in a NETCDF_STRUCTURED output file. Must be used - in combination with the chunk_time, chunk_x, and chunk_z parameters to have an effect. + description: is the keyword used to provide a data chunk size for the y dimension in a NETCDF_STRUCTURED + output file. Must be used in combination with the the chunk_time, chunk_x and chunk_z parameter + set to have an effect. reader: urword optional: true longname: chunking parameter for structured y type: integer chunk_x: block: options - description: is the chunk size for the x dimension in a NETCDF_STRUCTURED output file. Must be used - in combination with the chunk_time, chunk_y, and chunk_z parameters to have an effect. + description: is the keyword used to provide a data chunk size for the x dimension in a NETCDF_STRUCTURED + output file. Must be used in combination with the the chunk_time, chunk_y and chunk_z parameter + set to have an effect. reader: urword optional: true longname: chunking parameter for structured x diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev1/utl-spca.json b/autotest/dfns/__snapshots__/v2.0.0.dev1/utl-spca.json index f4ee02db..014ed841 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev1/utl-spca.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev1/utl-spca.json @@ -62,7 +62,6 @@ "block": "period", "description": "is the concentration of the associated Recharge or Evapotranspiration stress package. The concentration array may be defined by a time-array series (see the \"Using Time-Array Series in a Package\" section).", "reader": "readarray", - "time_series": true, "optional": true, "longname": "concentration", "type": "double" @@ -72,7 +71,6 @@ "block": "period", "description": "is the temperature of the associated Recharge or Evapotranspiration stress package. The temperature array may be defined by a time-array series (see the \"Using Time-Array Series in a Package\" section).", "reader": "readarray", - "time_series": true, "optional": true, "longname": "temperature", "type": "double" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev1/utl-spca.toml b/autotest/dfns/__snapshots__/v2.0.0.dev1/utl-spca.toml index e225132b..31127443 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev1/utl-spca.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev1/utl-spca.toml @@ -56,7 +56,6 @@ shape = "(nper, ncol*nrow; ncpl)" block = "period" description = "is the concentration of the associated Recharge or Evapotranspiration stress package. The concentration array may be defined by a time-array series (see the \"Using Time-Array Series in a Package\" section)." reader = "readarray" -time_series = true optional = true longname = "concentration" type = "double" @@ -66,7 +65,6 @@ shape = "(nper, ncol*nrow; ncpl)" block = "period" description = "is the temperature of the associated Recharge or Evapotranspiration stress package. The temperature array may be defined by a time-array series (see the \"Using Time-Array Series in a Package\" section)." reader = "readarray" -time_series = true optional = true longname = "temperature" type = "double" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev1/utl-spca.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev1/utl-spca.yaml index c1b6d92b..924c0d20 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev1/utl-spca.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev1/utl-spca.yaml @@ -62,7 +62,6 @@ blocks: concentration array may be defined by a time-array series (see the "Using Time-Array Series in a Package" section). reader: readarray - time_series: true optional: true longname: concentration type: double @@ -73,7 +72,6 @@ blocks: temperature array may be defined by a time-array series (see the "Using Time-Array Series in a Package" section). reader: readarray - time_series: true optional: true longname: temperature type: double diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev1/utl-tvs.json b/autotest/dfns/__snapshots__/v2.0.0.dev1/utl-tvs.json index da04dc0d..83e77d09 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev1/utl-tvs.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev1/utl-tvs.json @@ -10,7 +10,6 @@ "disable_storage_change_integration": { "block": "options", "description": "keyword that deactivates inclusion of storage derivative terms in the STO package matrix formulation. In the absence of this keyword (the default), the groundwater storage formulation will be modified to correctly adjust heads based on transient variations in stored water volumes arising from changes to SS and SY properties.", - "mf6internal": "disable_sc_int", "reader": "urword", "optional": true, "longname": "deactivate storage change integration", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev1/utl-tvs.toml b/autotest/dfns/__snapshots__/v2.0.0.dev1/utl-tvs.toml index e7276d3b..4882b32a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev1/utl-tvs.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev1/utl-tvs.toml @@ -8,7 +8,6 @@ ftype = "TVS" [blocks.options.disable_storage_change_integration] block = "options" description = "keyword that deactivates inclusion of storage derivative terms in the STO package matrix formulation. In the absence of this keyword (the default), the groundwater storage formulation will be modified to correctly adjust heads based on transient variations in stored water volumes arising from changes to SS and SY properties." -mf6internal = "disable_sc_int" reader = "urword" optional = true longname = "deactivate storage change integration" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev1/utl-tvs.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev1/utl-tvs.yaml index ea365d28..444e9ec1 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev1/utl-tvs.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev1/utl-tvs.yaml @@ -12,7 +12,6 @@ blocks: formulation. In the absence of this keyword (the default), the groundwater storage formulation will be modified to correctly adjust heads based on transient variations in stored water volumes arising from changes to SS and SY properties. - mf6internal: disable_sc_int reader: urword optional: true longname: deactivate storage change integration diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-adv.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-adv.json index ee3035ec..811b5ab8 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-adv.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-adv.json @@ -9,7 +9,7 @@ "scheme": { "type": "string", "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.", "optional": true, "valid": [ "central", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-adv.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-adv.toml index 7400699b..9c462b15 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-adv.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-adv.toml @@ -6,7 +6,7 @@ parent = "gwe-nam" [blocks.options.fields.scheme] type = "string" 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." optional = true valid = [ "central", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-adv.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-adv.yaml index 5cab5c2f..34a5601d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-adv.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-adv.yaml @@ -8,8 +8,8 @@ blocks: scheme: type: string 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. optional: true valid: - central diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-esl.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-esl.json index d9fbcc92..7f2a143f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-esl.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-esl.json @@ -49,7 +49,7 @@ }, "save_flows": { "type": "keyword", - "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.", "optional": true }, @@ -124,7 +124,7 @@ }, "boundname": { "type": "string", - "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.", "optional": true, "tagged": false diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-esl.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-esl.toml index 3c2feca0..c70461d4 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-esl.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-esl.toml @@ -44,7 +44,7 @@ optional = true [blocks.options.fields.save_flows] type = "keyword" -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." optional = true @@ -111,7 +111,7 @@ shape = [ [blocks.period.fields.stress_period_data.item.fields.boundname] type = "string" -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." optional = true tagged = false diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-esl.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-esl.yaml index 65e79737..efdd7294 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-esl.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-esl.yaml @@ -52,7 +52,7 @@ blocks: optional: true save_flows: type: keyword - 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. optional: true @@ -124,7 +124,7 @@ blocks: - auxiliary boundname: type: string - 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. diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-mve.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-mve.json index c93e6dea..d5df5c35 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-mve.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-mve.json @@ -20,7 +20,7 @@ }, "save_flows": { "type": "keyword", - "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.", "optional": true }, diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-mve.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-mve.toml index 2d7811b0..01ec1de7 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-mve.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-mve.toml @@ -17,7 +17,7 @@ optional = true [blocks.options.fields.save_flows] type = "keyword" -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." optional = true diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-mve.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-mve.yaml index 59787810..8dc89b3a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-mve.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-mve.yaml @@ -21,7 +21,7 @@ blocks: optional: true save_flows: type: keyword - 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. optional: true diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-csub.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-csub.json index 5a77af82..c4acd683 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-csub.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-csub.json @@ -385,7 +385,7 @@ }, "boundname": { "type": "string", - "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.", "optional": true, "tagged": false @@ -416,7 +416,7 @@ }, "sig0": { "type": "double", - "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, "time_series": true diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-csub.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-csub.toml index 9b8d4c00..a1ae34d0 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-csub.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-csub.toml @@ -350,7 +350,7 @@ tagged = false [blocks.packagedata.fields.packagedata.item.fields.boundname] type = "string" -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." optional = true tagged = false @@ -375,7 +375,7 @@ shape = [ [blocks.period.fields.stress_period_data.item.fields.sig0] type = "double" -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 time_series = true diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-csub.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-csub.yaml index 7157681b..b258511b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-csub.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-csub.yaml @@ -390,7 +390,7 @@ blocks: tagged: false boundname: type: string - 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. @@ -418,7 +418,7 @@ blocks: - ncelldim sig0: type: double - 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 diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drn.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drn.json index 93096715..55d752af 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drn.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drn.json @@ -55,7 +55,7 @@ }, "save_flows": { "type": "keyword", - "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.", "optional": true }, diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drn.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drn.toml index 3fab3bed..9d5d3741 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drn.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drn.toml @@ -50,7 +50,7 @@ optional = true [blocks.options.fields.save_flows] type = "keyword" -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." optional = true diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drn.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drn.yaml index ac91fd2f..f21fec21 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drn.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drn.yaml @@ -64,7 +64,7 @@ blocks: optional: true save_flows: type: keyword - 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. optional: true diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-evta.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-evta.json index 642786a5..617fd69b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-evta.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-evta.json @@ -52,7 +52,7 @@ }, "save_flows": { "type": "keyword", - "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.", "optional": true }, @@ -114,7 +114,7 @@ }, "rate": { "type": "array", - "longname": "evapotranspiration rate", + "longname": "evapotranspiration surface", "description": "is the maximum ET flux rate ($LT^{-1}$).", "default": 0.001, "netcdf": true, diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-evta.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-evta.toml index 6c2d9fa7..81f1a198 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-evta.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-evta.toml @@ -47,7 +47,7 @@ optional = true [blocks.options.fields.save_flows] type = "keyword" -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." optional = true @@ -101,7 +101,7 @@ shape = [ [blocks.period.fields.rate] type = "array" -longname = "evapotranspiration rate" +longname = "evapotranspiration surface" description = "is the maximum ET flux rate ($LT^{-1}$)." default = 0.001 netcdf = true diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-evta.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-evta.yaml index 892213ff..96795e2f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-evta.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-evta.yaml @@ -59,7 +59,7 @@ blocks: optional: true save_flows: type: keyword - 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. optional: true @@ -114,7 +114,7 @@ blocks: - ncpl rate: type: array - longname: evapotranspiration rate + longname: evapotranspiration surface description: is the maximum ET flux rate ($LT^{-1}$). default: 0.001 netcdf: true diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghb.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghb.json index 1aeb0baa..b95cf582 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghb.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghb.json @@ -49,7 +49,7 @@ }, "save_flows": { "type": "keyword", - "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.", "optional": true }, diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghb.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghb.toml index 4d79bf67..3be6e800 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghb.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghb.toml @@ -44,7 +44,7 @@ optional = true [blocks.options.fields.save_flows] type = "keyword" -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." optional = true diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghb.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghb.yaml index 0bb34afc..3fd0ba57 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghb.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghb.yaml @@ -52,7 +52,7 @@ blocks: optional: true save_flows: type: keyword - 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. optional: true diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-hfb.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-hfb.json index f2e01b91..edbddea1 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-hfb.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-hfb.json @@ -40,7 +40,7 @@ "cellid1": { "type": "array", "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.", "dtype": "integer", "shape": [ "ncelldim" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-hfb.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-hfb.toml index 0c4409ad..85e21e26 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-hfb.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-hfb.toml @@ -31,7 +31,7 @@ type = "record" [blocks.period.fields.stress_period_data.item.fields.cellid1] type = "array" 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." dtype = "integer" shape = [ "ncelldim", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-hfb.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-hfb.yaml index a3e69831..6499c5b3 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-hfb.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-hfb.yaml @@ -38,9 +38,10 @@ blocks: 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. + 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. dtype: integer shape: - ncelldim diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rcha.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rcha.json index c0fded11..9c9b6231 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rcha.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rcha.json @@ -52,7 +52,7 @@ }, "save_flows": { "type": "keyword", - "longname": "save RCHA flows to budget file", + "longname": "save CHD flows to budget file", "description": "keyword to indicate that recharge flow terms will be written to the file specified with 'BUDGET FILEOUT' in Output Control.", "optional": true }, diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rcha.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rcha.toml index fba9b844..1179e0ac 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rcha.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rcha.toml @@ -47,7 +47,7 @@ optional = true [blocks.options.fields.save_flows] type = "keyword" -longname = "save RCHA flows to budget file" +longname = "save CHD flows to budget file" description = "keyword to indicate that recharge flow terms will be written to the file specified with 'BUDGET FILEOUT' in Output Control." optional = true diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rcha.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rcha.yaml index b68fb94d..6ada521a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rcha.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rcha.yaml @@ -59,7 +59,7 @@ blocks: optional: true save_flows: type: keyword - longname: save RCHA flows to budget file + longname: save CHD flows to budget file description: keyword to indicate that recharge flow terms will be written to the file specified with 'BUDGET FILEOUT' in Output Control. optional: true diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-riv.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-riv.json index 701f2ef2..15dd5874 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-riv.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-riv.json @@ -49,7 +49,7 @@ }, "save_flows": { "type": "keyword", - "longname": "save RIV flows to budget file", + "longname": "save CHD flows to budget file", "description": "keyword to indicate that river flow terms will be written to the file specified with 'BUDGET FILEOUT' in Output Control.", "optional": true }, @@ -143,7 +143,7 @@ }, "boundname": { "type": "string", - "longname": "river name", + "longname": "drain name", "description": "name of the river 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 diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-riv.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-riv.toml index b8e10a84..a15248b5 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-riv.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-riv.toml @@ -44,7 +44,7 @@ optional = true [blocks.options.fields.save_flows] type = "keyword" -longname = "save RIV flows to budget file" +longname = "save CHD flows to budget file" description = "keyword to indicate that river flow terms will be written to the file specified with 'BUDGET FILEOUT' in Output Control." optional = true @@ -130,7 +130,7 @@ shape = [ [blocks.period.fields.stress_period_data.item.fields.boundname] type = "string" -longname = "river name" +longname = "drain name" description = "name of the river 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 diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-riv.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-riv.yaml index c57552ec..aa5835a1 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-riv.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-riv.yaml @@ -51,7 +51,7 @@ blocks: optional: true save_flows: type: keyword - longname: save RIV flows to budget file + longname: save CHD flows to budget file description: keyword to indicate that river flow terms will be written to the file specified with 'BUDGET FILEOUT' in Output Control. optional: true @@ -144,7 +144,7 @@ blocks: - auxiliary boundname: type: string - longname: river name + longname: drain name description: name of the river 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. diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rivg.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rivg.json index 33bea8ec..d3b3ddaa 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rivg.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rivg.json @@ -105,7 +105,7 @@ }, "cond": { "type": "array", - "longname": "river conductance", + "longname": "river conductnace", "description": "is the riverbed hydraulic conductance.", "default": 3e+30, "netcdf": true, diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rivg.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rivg.toml index c66567c4..b67510a1 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rivg.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rivg.toml @@ -90,7 +90,7 @@ shape = [ [blocks.period.fields.cond] type = "array" -longname = "river conductance" +longname = "river conductnace" description = "is the riverbed hydraulic conductance." default = 3e+30 netcdf = true diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rivg.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rivg.yaml index 2e7e96dd..2b884f5b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rivg.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rivg.yaml @@ -105,7 +105,7 @@ blocks: - nodes cond: type: array - longname: river conductance + longname: river conductnace description: is the riverbed hydraulic conductance. default: 3.0e+30 netcdf: true diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-mvt.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-mvt.json index e967c701..595b8aab 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-mvt.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-mvt.json @@ -20,7 +20,7 @@ }, "save_flows": { "type": "keyword", - "longname": "save MVT 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.", "optional": true }, diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-mvt.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-mvt.toml index 9f0b5b77..a243423e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-mvt.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-mvt.toml @@ -17,7 +17,7 @@ optional = true [blocks.options.fields.save_flows] type = "keyword" -longname = "save MVT 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." optional = true diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-mvt.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-mvt.yaml index a1403622..9075d7bd 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-mvt.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-mvt.yaml @@ -21,7 +21,7 @@ blocks: optional: true save_flows: type: keyword - longname: save MVT 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. optional: true diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-src.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-src.json index 02d25986..b455adb2 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-src.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-src.json @@ -49,7 +49,7 @@ }, "save_flows": { "type": "keyword", - "longname": "save SRC flows to budget file", + "longname": "save well flows to budget file", "description": "keyword to indicate that mass source flow terms will be written to the file specified with 'BUDGET FILEOUT' in Output Control.", "optional": true }, @@ -130,7 +130,7 @@ }, "boundname": { "type": "string", - "longname": "source name", + "longname": "well name", "description": "name of the mass 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.", "optional": true, "tagged": false diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-src.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-src.toml index cdca38ee..e40f19b9 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-src.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-src.toml @@ -44,7 +44,7 @@ optional = true [blocks.options.fields.save_flows] type = "keyword" -longname = "save SRC flows to budget file" +longname = "save well flows to budget file" description = "keyword to indicate that mass source flow terms will be written to the file specified with 'BUDGET FILEOUT' in Output Control." optional = true @@ -117,7 +117,7 @@ shape = [ [blocks.period.fields.stress_period_data.item.fields.boundname] type = "string" -longname = "source name" +longname = "well name" description = "name of the mass 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." optional = true tagged = false diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-src.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-src.yaml index fd49eb4e..7fab4fbe 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-src.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-src.yaml @@ -52,7 +52,7 @@ blocks: optional: true save_flows: type: keyword - longname: save SRC flows to budget file + longname: save well flows to budget file description: keyword to indicate that mass source flow terms will be written to the file specified with 'BUDGET FILEOUT' in Output Control. optional: true @@ -139,7 +139,7 @@ blocks: - auxiliary boundname: type: string - longname: source name + longname: well name description: name of the mass 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. diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-oc.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-oc.json index 36beec04..2828f1fc 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-oc.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-oc.json @@ -147,12 +147,6 @@ "longname": "print particle tracking events", "description": "print a verbose particle tracking event trace to standard output", "optional": true - }, - "scratch_buffer": { - "type": "keyword", - "longname": "buffer track events in scratch file instead of memory", - "description": "keyword to stage track events in a temporary (scratch) file instead of an in-memory buffer. Particle tracking results calculated during a time step are buffered, and output is deferred, until successful completion of the time step. By default, results are buffered in memory. However, for simulations in which a very large number of track events is generated during a time step, memory limits can be exceeded. In such cases, the SCRATCH_BUFFER option can be invoked to buffer results in a scratch file until successful completion of the time step. Buffering in a scratch file is typically slower than buffering in memory.", - "optional": true } } }, diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-oc.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-oc.toml index f36e5214..4aae5be4 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-oc.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-oc.toml @@ -131,12 +131,6 @@ longname = "print particle tracking events" description = "print a verbose particle tracking event trace to standard output" optional = true -[blocks.options.fields.scratch_buffer] -type = "keyword" -longname = "buffer track events in scratch file instead of memory" -description = "keyword to stage track events in a temporary (scratch) file instead of an in-memory buffer. Particle tracking results calculated during a time step are buffered, and output is deferred, until successful completion of the time step. By default, results are buffered in memory. However, for simulations in which a very large number of track events is generated during a time step, memory limits can be exceeded. In such cases, the SCRATCH_BUFFER option can be invoked to buffer results in a scratch file until successful completion of the time step. Buffering in a scratch file is typically slower than buffering in memory." -optional = true - [blocks.dimensions.fields.ntracktimes] type = "integer" longname = "number of particle tracking times" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-oc.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-oc.yaml index 3f1e4310..fd4b39bb 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-oc.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-oc.yaml @@ -128,17 +128,6 @@ blocks: longname: print particle tracking events description: print a verbose particle tracking event trace to standard output optional: true - scratch_buffer: - type: keyword - longname: buffer track events in scratch file instead of memory - description: keyword to stage track events in a temporary (scratch) file instead of an in-memory - buffer. Particle tracking results calculated during a time step are buffered, and output is - deferred, until successful completion of the time step. By default, results are buffered in - memory. However, for simulations in which a very large number of track events is generated during - a time step, memory limits can be exceeded. In such cases, the SCRATCH_BUFFER option can be - invoked to buffer results in a scratch file until successful completion of the time step. Buffering - in a scratch file is typically slower than buffering in memory. - optional: true dimensions: fields: ntracktimes: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/sln-ims.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/sln-ims.json index c9cb1490..8b14c99f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/sln-ims.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/sln-ims.json @@ -15,7 +15,7 @@ }, "complexity": { "type": "string", - "longname": "solver complexity", + "longname": "print option", "description": "is an optional keyword that defines default non-linear and linear solver parameters. SIMPLE - indicates that default solver input values will be defined that work well for nearly linear models. This would be used for models that do not include nonlinear stress packages and models that are either confined or consist of a single unconfined layer that is thick enough to contain the water table within a single layer. MODERATE - indicates that default solver input values will be defined that work well for moderately nonlinear models. This would be used for models that include nonlinear stress packages and models that consist of one or more unconfined layers. The MODERATE option should be used when the SIMPLE option does not result in successful convergence. COMPLEX - indicates that default solver input values will be defined that work well for highly nonlinear models. This would be used for models that include nonlinear stress packages and models that consist of one or more unconfined layers representing complex geology and surface-water/groundwater interaction. The COMPLEX option should be used when the MODERATE option does not result in successful convergence. Non-linear and linear solver parameters assigned using a specified complexity can be modified in the NONLINEAR and LINEAR blocks. If the COMPLEXITY option is not specified, NONLINEAR and LINEAR variables will be assigned the simple complexity values.", "optional": true }, @@ -223,7 +223,7 @@ }, "number_orthogonalizations": { "type": "integer", - "longname": "number of orthogonalizations", + "longname": "drop tolerance used to drop preconditioner terms", "description": "optional integer value defining the interval used to explicitly recalculate the residual of the flow equation using the solver coefficient matrix, the latest dependent-variable (for example, head) estimates, and the right hand side. For problems that benefit from explicit recalculation of the residual, a number between 4 and 10 is appropriate. By default, NUMBER_ORTHOGONALIZATIONS is zero.", "optional": true }, diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/sln-ims.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/sln-ims.toml index 60a5e0be..20d729bf 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/sln-ims.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/sln-ims.toml @@ -12,7 +12,7 @@ optional = true [blocks.options.fields.complexity] type = "string" -longname = "solver complexity" +longname = "print option" description = "is an optional keyword that defines default non-linear and linear solver parameters. SIMPLE - indicates that default solver input values will be defined that work well for nearly linear models. This would be used for models that do not include nonlinear stress packages and models that are either confined or consist of a single unconfined layer that is thick enough to contain the water table within a single layer. MODERATE - indicates that default solver input values will be defined that work well for moderately nonlinear models. This would be used for models that include nonlinear stress packages and models that consist of one or more unconfined layers. The MODERATE option should be used when the SIMPLE option does not result in successful convergence. COMPLEX - indicates that default solver input values will be defined that work well for highly nonlinear models. This would be used for models that include nonlinear stress packages and models that consist of one or more unconfined layers representing complex geology and surface-water/groundwater interaction. The COMPLEX option should be used when the MODERATE option does not result in successful convergence. Non-linear and linear solver parameters assigned using a specified complexity can be modified in the NONLINEAR and LINEAR blocks. If the COMPLEXITY option is not specified, NONLINEAR and LINEAR variables will be assigned the simple complexity values." optional = true @@ -202,7 +202,7 @@ optional = true [blocks.linear.fields.number_orthogonalizations] type = "integer" -longname = "number of orthogonalizations" +longname = "drop tolerance used to drop preconditioner terms" description = "optional integer value defining the interval used to explicitly recalculate the residual of the flow equation using the solver coefficient matrix, the latest dependent-variable (for example, head) estimates, and the right hand side. For problems that benefit from explicit recalculation of the residual, a number between 4 and 10 is appropriate. By default, NUMBER_ORTHOGONALIZATIONS is zero." optional = true diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/sln-ims.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/sln-ims.yaml index 206e076d..a6ca0ca2 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/sln-ims.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/sln-ims.yaml @@ -17,7 +17,7 @@ blocks: optional: true complexity: type: string - longname: solver complexity + longname: print option description: is an optional keyword that defines default non-linear and linear solver parameters. SIMPLE - indicates that default solver input values will be defined that work well for nearly linear models. This would be used for models that do not include nonlinear stress packages and models @@ -351,7 +351,7 @@ blocks: optional: true number_orthogonalizations: type: integer - longname: number of orthogonalizations + longname: drop tolerance used to drop preconditioner terms description: optional integer value defining the interval used to explicitly recalculate the residual of the flow equation using the solver coefficient matrix, the latest dependent-variable (for example, head) estimates, and the right hand side. For problems that benefit from explicit recalculation diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-ncf.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-ncf.json index ed177d97..aac731d2 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-ncf.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-ncf.json @@ -16,13 +16,13 @@ "wkt": { "type": "string", "longname": "CRS well-known text (WKT) string", - "description": "is the coordinate reference system (CRS) well-known text (WKT) string. Used to embed CRS metadata in NetCDF output. Ignored if latitude and longitude griddata arrays have been provided for NETCDF_STRUCTURED export type.", + "description": "is the coordinate reference system (CRS) well-known text (WKT) string. Ignored if latitude and longitude griddata arrays have been provided for NETCDF_STRUCTURED export type.", "optional": true }, "deflate": { "type": "integer", "longname": "variable compression deflate level", - "description": "is the variable deflate level (0=min, 9=max) in the NetCDF file. Defining this parameter activates per-variable compression at the level specified. Use with the SHUFFLE option to also enable the shuffle filter.", + "description": "is the variable deflate level (0=min, 9=max) in the NetCDF file. Defining this parameter activates per-variable compression at the level specified.", "optional": true }, "shuffle": { @@ -33,7 +33,7 @@ "chunk_time": { "type": "integer", "longname": "chunking parameter for the time dimension", - "description": "is the chunk size for the time dimension in a NETCDF_MESH2D or NETCDF_STRUCTURED output file. Must be used in combination with the chunk_face parameter (NETCDF_MESH2D) or the chunk_z, chunk_y, and chunk_x parameter set (NETCDF_STRUCTURED) to have an effect.", + "description": "is the keyword used to provide a data chunk size for the time dimension in a NETCDF_MESH2D or NETCDF_STRUCTURED output file. Must be used in combination with the the chunk_face parameter (NETCDF_MESH2D) or the chunk_z, chunk_y, and chunk_x parameter set (NETCDF_STRUCTURED) to have an effect.", "optional": true }, "chunk_face": { @@ -45,19 +45,19 @@ "chunk_z": { "type": "integer", "longname": "chunking parameter for structured z", - "description": "is the chunk size for the z dimension in a NETCDF_STRUCTURED output file. Must be used in combination with the chunk_time, chunk_x, and chunk_y parameters to have an effect.", + "description": "is the keyword used to provide a data chunk size for the z dimension in a NETCDF_STRUCTURED output file. Must be used in combination with the the chunk_time, chunk_x and chunk_y parameter set to have an effect.", "optional": true }, "chunk_y": { "type": "integer", "longname": "chunking parameter for structured y", - "description": "is the chunk size for the y dimension in a NETCDF_STRUCTURED output file. Must be used in combination with the chunk_time, chunk_x, and chunk_z parameters to have an effect.", + "description": "is the keyword used to provide a data chunk size for the y dimension in a NETCDF_STRUCTURED output file. Must be used in combination with the the chunk_time, chunk_x and chunk_z parameter set to have an effect.", "optional": true }, "chunk_x": { "type": "integer", "longname": "chunking parameter for structured x", - "description": "is the chunk size for the x dimension in a NETCDF_STRUCTURED output file. Must be used in combination with the chunk_time, chunk_y, and chunk_z parameters to have an effect.", + "description": "is the keyword used to provide a data chunk size for the x dimension in a NETCDF_STRUCTURED output file. Must be used in combination with the the chunk_time, chunk_y and chunk_z parameter set to have an effect.", "optional": true }, "modflow6_attr_off": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-ncf.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-ncf.toml index 83aec4ad..c5c74253 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-ncf.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-ncf.toml @@ -11,13 +11,13 @@ scope = "simulation" [blocks.options.fields.wkt] type = "string" longname = "CRS well-known text (WKT) string" -description = "is the coordinate reference system (CRS) well-known text (WKT) string. Used to embed CRS metadata in NetCDF output. Ignored if latitude and longitude griddata arrays have been provided for NETCDF_STRUCTURED export type." +description = "is the coordinate reference system (CRS) well-known text (WKT) string. Ignored if latitude and longitude griddata arrays have been provided for NETCDF_STRUCTURED export type." optional = true [blocks.options.fields.deflate] type = "integer" longname = "variable compression deflate level" -description = "is the variable deflate level (0=min, 9=max) in the NetCDF file. Defining this parameter activates per-variable compression at the level specified. Use with the SHUFFLE option to also enable the shuffle filter." +description = "is the variable deflate level (0=min, 9=max) in the NetCDF file. Defining this parameter activates per-variable compression at the level specified." optional = true [blocks.options.fields.shuffle] @@ -28,7 +28,7 @@ optional = true [blocks.options.fields.chunk_time] type = "integer" longname = "chunking parameter for the time dimension" -description = "is the chunk size for the time dimension in a NETCDF_MESH2D or NETCDF_STRUCTURED output file. Must be used in combination with the chunk_face parameter (NETCDF_MESH2D) or the chunk_z, chunk_y, and chunk_x parameter set (NETCDF_STRUCTURED) to have an effect." +description = "is the keyword used to provide a data chunk size for the time dimension in a NETCDF_MESH2D or NETCDF_STRUCTURED output file. Must be used in combination with the the chunk_face parameter (NETCDF_MESH2D) or the chunk_z, chunk_y, and chunk_x parameter set (NETCDF_STRUCTURED) to have an effect." optional = true [blocks.options.fields.chunk_face] @@ -40,19 +40,19 @@ optional = true [blocks.options.fields.chunk_z] type = "integer" longname = "chunking parameter for structured z" -description = "is the chunk size for the z dimension in a NETCDF_STRUCTURED output file. Must be used in combination with the chunk_time, chunk_x, and chunk_y parameters to have an effect." +description = "is the keyword used to provide a data chunk size for the z dimension in a NETCDF_STRUCTURED output file. Must be used in combination with the the chunk_time, chunk_x and chunk_y parameter set to have an effect." optional = true [blocks.options.fields.chunk_y] type = "integer" longname = "chunking parameter for structured y" -description = "is the chunk size for the y dimension in a NETCDF_STRUCTURED output file. Must be used in combination with the chunk_time, chunk_x, and chunk_z parameters to have an effect." +description = "is the keyword used to provide a data chunk size for the y dimension in a NETCDF_STRUCTURED output file. Must be used in combination with the the chunk_time, chunk_x and chunk_z parameter set to have an effect." optional = true [blocks.options.fields.chunk_x] type = "integer" longname = "chunking parameter for structured x" -description = "is the chunk size for the x dimension in a NETCDF_STRUCTURED output file. Must be used in combination with the chunk_time, chunk_y, and chunk_z parameters to have an effect." +description = "is the keyword used to provide a data chunk size for the x dimension in a NETCDF_STRUCTURED output file. Must be used in combination with the the chunk_time, chunk_y and chunk_z parameter set to have an effect." optional = true [blocks.options.fields.modflow6_attr_off] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-ncf.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-ncf.yaml index 5698b5e4..825dd5ad 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-ncf.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-ncf.yaml @@ -13,16 +13,14 @@ blocks: wkt: type: string longname: CRS well-known text (WKT) string - description: is the coordinate reference system (CRS) well-known text (WKT) string. Used to embed - CRS metadata in NetCDF output. Ignored if latitude and longitude griddata arrays have been provided - for NETCDF_STRUCTURED export type. + description: is the coordinate reference system (CRS) well-known text (WKT) string. Ignored if + latitude and longitude griddata arrays have been provided for NETCDF_STRUCTURED export type. optional: true deflate: type: integer longname: variable compression deflate level description: is the variable deflate level (0=min, 9=max) in the NetCDF file. Defining this parameter - activates per-variable compression at the level specified. Use with the SHUFFLE option to also - enable the shuffle filter. + activates per-variable compression at the level specified. optional: true shuffle: type: keyword @@ -34,9 +32,10 @@ blocks: chunk_time: type: integer longname: chunking parameter for the time dimension - description: is the chunk size for the time dimension in a NETCDF_MESH2D or NETCDF_STRUCTURED - output file. Must be used in combination with the chunk_face parameter (NETCDF_MESH2D) or the - chunk_z, chunk_y, and chunk_x parameter set (NETCDF_STRUCTURED) to have an effect. + description: is the keyword used to provide a data chunk size for the time dimension in a NETCDF_MESH2D + or NETCDF_STRUCTURED output file. Must be used in combination with the the chunk_face parameter + (NETCDF_MESH2D) or the chunk_z, chunk_y, and chunk_x parameter set (NETCDF_STRUCTURED) to have + an effect. optional: true chunk_face: type: integer @@ -47,20 +46,23 @@ blocks: chunk_z: type: integer longname: chunking parameter for structured z - description: is the chunk size for the z dimension in a NETCDF_STRUCTURED output file. Must be - used in combination with the chunk_time, chunk_x, and chunk_y parameters to have an effect. + description: is the keyword used to provide a data chunk size for the z dimension in a NETCDF_STRUCTURED + output file. Must be used in combination with the the chunk_time, chunk_x and chunk_y parameter + set to have an effect. optional: true chunk_y: type: integer longname: chunking parameter for structured y - description: is the chunk size for the y dimension in a NETCDF_STRUCTURED output file. Must be - used in combination with the chunk_time, chunk_x, and chunk_z parameters to have an effect. + description: is the keyword used to provide a data chunk size for the y dimension in a NETCDF_STRUCTURED + output file. Must be used in combination with the the chunk_time, chunk_x and chunk_z parameter + set to have an effect. optional: true chunk_x: type: integer longname: chunking parameter for structured x - description: is the chunk size for the x dimension in a NETCDF_STRUCTURED output file. Must be - used in combination with the chunk_time, chunk_y, and chunk_z parameters to have an effect. + description: is the keyword used to provide a data chunk size for the x dimension in a NETCDF_STRUCTURED + output file. Must be used in combination with the the chunk_time, chunk_y and chunk_z parameter + set to have an effect. optional: true modflow6_attr_off: type: keyword diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-spca.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-spca.json index 489490e5..08df9a0d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-spca.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-spca.json @@ -42,7 +42,6 @@ "description": "is the concentration of the associated Recharge or Evapotranspiration stress package. The concentration array may be defined by a time-array series (see the \"Using Time-Array Series in a Package\" section).", "optional": true, "dtype": "double", - "time_series": true, "shape": [ "ncpl" ] @@ -53,7 +52,6 @@ "description": "is the temperature of the associated Recharge or Evapotranspiration stress package. The temperature array may be defined by a time-array series (see the \"Using Time-Array Series in a Package\" section).", "optional": true, "dtype": "double", - "time_series": true, "shape": [ "ncpl" ] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-spca.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-spca.toml index 571254f2..a0435d96 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-spca.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-spca.toml @@ -33,7 +33,6 @@ longname = "concentration" description = "is the concentration of the associated Recharge or Evapotranspiration stress package. The concentration array may be defined by a time-array series (see the \"Using Time-Array Series in a Package\" section)." optional = true dtype = "double" -time_series = true shape = [ "ncpl", ] @@ -44,7 +43,6 @@ longname = "temperature" description = "is the temperature of the associated Recharge or Evapotranspiration stress package. The temperature array may be defined by a time-array series (see the \"Using Time-Array Series in a Package\" section)." optional = true dtype = "double" -time_series = true shape = [ "ncpl", ] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-spca.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-spca.yaml index a916a284..b93714aa 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-spca.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-spca.yaml @@ -41,7 +41,6 @@ blocks: in a Package" section). optional: true dtype: double - time_series: true shape: - ncpl temperature: @@ -52,6 +51,5 @@ blocks: a Package" section). optional: true dtype: double - time_series: true shape: - ncpl diff --git a/autotest/dfns/conftest.py b/autotest/dfns/conftest.py index 66596e9c..59b77ac9 100644 --- a/autotest/dfns/conftest.py +++ b/autotest/dfns/conftest.py @@ -62,7 +62,7 @@ def snapshot(snapshot): DFNS_REPO = os.getenv("TEST_DFNS_REPO", "MODFLOW-ORG/modflow6") -DFNS_REF = os.getenv("TEST_DFNS_REF", "develop") +DFNS_REF = os.getenv("TEST_DFNS_REF", "6.7.0") @pytest.fixture(scope="module") From 31238d7c0436beb100bd7941c242335ca83f9c9e Mon Sep 17 00:00:00 2001 From: wpbonelli Date: Tue, 23 Jun 2026 08:04:20 -0700 Subject: [PATCH 2/2] fix --- autotest/dfns/test_migrate.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/autotest/dfns/test_migrate.py b/autotest/dfns/test_migrate.py index 80e6f7eb..78c3a9cd 100644 --- a/autotest/dfns/test_migrate.py +++ b/autotest/dfns/test_migrate.py @@ -10,7 +10,7 @@ FORMATS = ["yaml", "toml", "json"] MF6_OWNER = "MODFLOW-ORG" MF6_REPO = "modflow6" -MF6_REF = "develop" +MF6_REF = "6.7.0" def _load(path: Path, fmt: str) -> dict: