From 366fa1ad13bd07d421f33e79f12bcac79966dec3 Mon Sep 17 00:00:00 2001 From: wpbonelli Date: Thu, 22 Oct 2026 09:43:18 -0700 Subject: [PATCH] feat(dfns): name every period list stress_period_data A fill-forward block's single list was named per package in v1 (perioddata, lakeperioddata, reachperioddata, mwtperioddata, ...), and OC's synthesized list was named output. Rename them all to stress_period_data in a final dev2 pass, so the name follows from structure rather than a per-package table. Period blocks with several fields (the grid packages' named arrays) and blocks that don't fill forward (TDIS's and ATS's perioddata) keep their names. Input files are unaffected. Co-Authored-By: Claude Opus 5.5 --- .../__snapshots__/v2.0.0.dev2/chf-oc.json | 2 +- .../__snapshots__/v2.0.0.dev2/chf-oc.toml | 40 ++++----- .../__snapshots__/v2.0.0.dev2/chf-oc.yaml | 2 +- .../__snapshots__/v2.0.0.dev2/gwe-lke.json | 2 +- .../__snapshots__/v2.0.0.dev2/gwe-lke.toml | 28 +++--- .../__snapshots__/v2.0.0.dev2/gwe-lke.yaml | 2 +- .../__snapshots__/v2.0.0.dev2/gwe-mwe.json | 2 +- .../__snapshots__/v2.0.0.dev2/gwe-mwe.toml | 22 ++--- .../__snapshots__/v2.0.0.dev2/gwe-mwe.yaml | 2 +- .../__snapshots__/v2.0.0.dev2/gwe-oc.json | 2 +- .../__snapshots__/v2.0.0.dev2/gwe-oc.toml | 40 ++++----- .../__snapshots__/v2.0.0.dev2/gwe-oc.yaml | 2 +- .../__snapshots__/v2.0.0.dev2/gwe-sfe.json | 2 +- .../__snapshots__/v2.0.0.dev2/gwe-sfe.toml | 28 +++--- .../__snapshots__/v2.0.0.dev2/gwe-sfe.yaml | 2 +- .../__snapshots__/v2.0.0.dev2/gwe-uze.json | 2 +- .../__snapshots__/v2.0.0.dev2/gwe-uze.toml | 24 +++--- .../__snapshots__/v2.0.0.dev2/gwe-uze.yaml | 2 +- .../__snapshots__/v2.0.0.dev2/gwf-lak.json | 2 +- .../__snapshots__/v2.0.0.dev2/gwf-lak.toml | 86 +++++++++---------- .../__snapshots__/v2.0.0.dev2/gwf-lak.yaml | 2 +- .../__snapshots__/v2.0.0.dev2/gwf-maw.json | 2 +- .../__snapshots__/v2.0.0.dev2/gwf-maw.toml | 58 ++++++------- .../__snapshots__/v2.0.0.dev2/gwf-maw.yaml | 2 +- .../__snapshots__/v2.0.0.dev2/gwf-mvr.json | 2 +- .../__snapshots__/v2.0.0.dev2/gwf-mvr.toml | 20 ++--- .../__snapshots__/v2.0.0.dev2/gwf-mvr.yaml | 2 +- .../__snapshots__/v2.0.0.dev2/gwf-oc.json | 2 +- .../__snapshots__/v2.0.0.dev2/gwf-oc.toml | 40 ++++----- .../__snapshots__/v2.0.0.dev2/gwf-oc.yaml | 2 +- .../__snapshots__/v2.0.0.dev2/gwf-sfr.json | 2 +- .../__snapshots__/v2.0.0.dev2/gwf-sfr.toml | 50 +++++------ .../__snapshots__/v2.0.0.dev2/gwf-sfr.yaml | 2 +- .../__snapshots__/v2.0.0.dev2/gwf-uzf.json | 2 +- .../__snapshots__/v2.0.0.dev2/gwf-uzf.toml | 22 ++--- .../__snapshots__/v2.0.0.dev2/gwf-uzf.yaml | 2 +- .../__snapshots__/v2.0.0.dev2/gwt-lkt.json | 2 +- .../__snapshots__/v2.0.0.dev2/gwt-lkt.toml | 28 +++--- .../__snapshots__/v2.0.0.dev2/gwt-lkt.yaml | 2 +- .../__snapshots__/v2.0.0.dev2/gwt-mwt.json | 2 +- .../__snapshots__/v2.0.0.dev2/gwt-mwt.toml | 22 ++--- .../__snapshots__/v2.0.0.dev2/gwt-mwt.yaml | 2 +- .../__snapshots__/v2.0.0.dev2/gwt-oc.json | 2 +- .../__snapshots__/v2.0.0.dev2/gwt-oc.toml | 40 ++++----- .../__snapshots__/v2.0.0.dev2/gwt-oc.yaml | 2 +- .../__snapshots__/v2.0.0.dev2/gwt-sft.json | 2 +- .../__snapshots__/v2.0.0.dev2/gwt-sft.toml | 28 +++--- .../__snapshots__/v2.0.0.dev2/gwt-sft.yaml | 2 +- .../__snapshots__/v2.0.0.dev2/gwt-uzt.json | 2 +- .../__snapshots__/v2.0.0.dev2/gwt-uzt.toml | 24 +++--- .../__snapshots__/v2.0.0.dev2/gwt-uzt.yaml | 2 +- .../__snapshots__/v2.0.0.dev2/olf-oc.json | 2 +- .../__snapshots__/v2.0.0.dev2/olf-oc.toml | 40 ++++----- .../__snapshots__/v2.0.0.dev2/olf-oc.yaml | 2 +- .../__snapshots__/v2.0.0.dev2/prt-oc.json | 2 +- .../__snapshots__/v2.0.0.dev2/prt-oc.toml | 40 ++++----- .../__snapshots__/v2.0.0.dev2/prt-oc.yaml | 2 +- .../__snapshots__/v2.0.0.dev2/prt-prp.json | 2 +- .../__snapshots__/v2.0.0.dev2/prt-prp.toml | 16 ++-- .../__snapshots__/v2.0.0.dev2/prt-prp.yaml | 2 +- .../__snapshots__/v2.0.0.dev2/swf-oc.json | 2 +- .../__snapshots__/v2.0.0.dev2/swf-oc.toml | 40 ++++----- .../__snapshots__/v2.0.0.dev2/swf-oc.yaml | 2 +- .../__snapshots__/v2.0.0.dev2/utl-spc.json | 2 +- .../__snapshots__/v2.0.0.dev2/utl-spc.toml | 12 +-- .../__snapshots__/v2.0.0.dev2/utl-spc.yaml | 2 +- .../__snapshots__/v2.0.0.dev2/utl-tvk.json | 2 +- .../__snapshots__/v2.0.0.dev2/utl-tvk.toml | 14 +-- .../__snapshots__/v2.0.0.dev2/utl-tvk.yaml | 2 +- .../__snapshots__/v2.0.0.dev2/utl-tvs.json | 2 +- .../__snapshots__/v2.0.0.dev2/utl-tvs.toml | 12 +-- .../__snapshots__/v2.0.0.dev2/utl-tvs.yaml | 2 +- .../__snapshots__/v2.0.0.dev3/chf-oc.json | 2 +- .../__snapshots__/v2.0.0.dev3/chf-oc.toml | 40 ++++----- .../__snapshots__/v2.0.0.dev3/chf-oc.yaml | 2 +- .../__snapshots__/v2.0.0.dev3/gwe-lke.json | 2 +- .../__snapshots__/v2.0.0.dev3/gwe-lke.toml | 28 +++--- .../__snapshots__/v2.0.0.dev3/gwe-lke.yaml | 2 +- .../__snapshots__/v2.0.0.dev3/gwe-mwe.json | 2 +- .../__snapshots__/v2.0.0.dev3/gwe-mwe.toml | 22 ++--- .../__snapshots__/v2.0.0.dev3/gwe-mwe.yaml | 2 +- .../__snapshots__/v2.0.0.dev3/gwe-oc.json | 2 +- .../__snapshots__/v2.0.0.dev3/gwe-oc.toml | 40 ++++----- .../__snapshots__/v2.0.0.dev3/gwe-oc.yaml | 2 +- .../__snapshots__/v2.0.0.dev3/gwe-sfe.json | 2 +- .../__snapshots__/v2.0.0.dev3/gwe-sfe.toml | 28 +++--- .../__snapshots__/v2.0.0.dev3/gwe-sfe.yaml | 2 +- .../__snapshots__/v2.0.0.dev3/gwe-uze.json | 2 +- .../__snapshots__/v2.0.0.dev3/gwe-uze.toml | 24 +++--- .../__snapshots__/v2.0.0.dev3/gwe-uze.yaml | 2 +- .../__snapshots__/v2.0.0.dev3/gwf-lak.json | 2 +- .../__snapshots__/v2.0.0.dev3/gwf-lak.toml | 86 +++++++++---------- .../__snapshots__/v2.0.0.dev3/gwf-lak.yaml | 2 +- .../__snapshots__/v2.0.0.dev3/gwf-maw.json | 2 +- .../__snapshots__/v2.0.0.dev3/gwf-maw.toml | 58 ++++++------- .../__snapshots__/v2.0.0.dev3/gwf-maw.yaml | 2 +- .../__snapshots__/v2.0.0.dev3/gwf-mvr.json | 2 +- .../__snapshots__/v2.0.0.dev3/gwf-mvr.toml | 20 ++--- .../__snapshots__/v2.0.0.dev3/gwf-mvr.yaml | 2 +- .../__snapshots__/v2.0.0.dev3/gwf-oc.json | 2 +- .../__snapshots__/v2.0.0.dev3/gwf-oc.toml | 40 ++++----- .../__snapshots__/v2.0.0.dev3/gwf-oc.yaml | 2 +- .../__snapshots__/v2.0.0.dev3/gwf-sfr.json | 2 +- .../__snapshots__/v2.0.0.dev3/gwf-sfr.toml | 50 +++++------ .../__snapshots__/v2.0.0.dev3/gwf-sfr.yaml | 2 +- .../__snapshots__/v2.0.0.dev3/gwf-uzf.json | 2 +- .../__snapshots__/v2.0.0.dev3/gwf-uzf.toml | 22 ++--- .../__snapshots__/v2.0.0.dev3/gwf-uzf.yaml | 2 +- .../__snapshots__/v2.0.0.dev3/gwt-lkt.json | 2 +- .../__snapshots__/v2.0.0.dev3/gwt-lkt.toml | 28 +++--- .../__snapshots__/v2.0.0.dev3/gwt-lkt.yaml | 2 +- .../__snapshots__/v2.0.0.dev3/gwt-mwt.json | 2 +- .../__snapshots__/v2.0.0.dev3/gwt-mwt.toml | 22 ++--- .../__snapshots__/v2.0.0.dev3/gwt-mwt.yaml | 2 +- .../__snapshots__/v2.0.0.dev3/gwt-oc.json | 2 +- .../__snapshots__/v2.0.0.dev3/gwt-oc.toml | 40 ++++----- .../__snapshots__/v2.0.0.dev3/gwt-oc.yaml | 2 +- .../__snapshots__/v2.0.0.dev3/gwt-sft.json | 2 +- .../__snapshots__/v2.0.0.dev3/gwt-sft.toml | 28 +++--- .../__snapshots__/v2.0.0.dev3/gwt-sft.yaml | 2 +- .../__snapshots__/v2.0.0.dev3/gwt-uzt.json | 2 +- .../__snapshots__/v2.0.0.dev3/gwt-uzt.toml | 24 +++--- .../__snapshots__/v2.0.0.dev3/gwt-uzt.yaml | 2 +- .../__snapshots__/v2.0.0.dev3/olf-oc.json | 2 +- .../__snapshots__/v2.0.0.dev3/olf-oc.toml | 40 ++++----- .../__snapshots__/v2.0.0.dev3/olf-oc.yaml | 2 +- .../__snapshots__/v2.0.0.dev3/prt-oc.json | 2 +- .../__snapshots__/v2.0.0.dev3/prt-oc.toml | 40 ++++----- .../__snapshots__/v2.0.0.dev3/prt-oc.yaml | 2 +- .../__snapshots__/v2.0.0.dev3/prt-prp.json | 2 +- .../__snapshots__/v2.0.0.dev3/prt-prp.toml | 16 ++-- .../__snapshots__/v2.0.0.dev3/prt-prp.yaml | 2 +- .../__snapshots__/v2.0.0.dev3/swf-oc.json | 2 +- .../__snapshots__/v2.0.0.dev3/swf-oc.toml | 40 ++++----- .../__snapshots__/v2.0.0.dev3/swf-oc.yaml | 2 +- .../__snapshots__/v2.0.0.dev3/utl-spc.json | 2 +- .../__snapshots__/v2.0.0.dev3/utl-spc.toml | 12 +-- .../__snapshots__/v2.0.0.dev3/utl-spc.yaml | 2 +- .../__snapshots__/v2.0.0.dev3/utl-tvk.json | 2 +- .../__snapshots__/v2.0.0.dev3/utl-tvk.toml | 14 +-- .../__snapshots__/v2.0.0.dev3/utl-tvk.yaml | 2 +- .../__snapshots__/v2.0.0.dev3/utl-tvs.json | 2 +- .../__snapshots__/v2.0.0.dev3/utl-tvs.toml | 12 +-- .../__snapshots__/v2.0.0.dev3/utl-tvs.yaml | 2 +- autotest/dfns/test_migrate.py | 34 +++++++- autotest/dfns/test_schema.py | 2 +- docs/md/dfnspec.md | 2 + .../dfns/migrate_to_v2_0_0_dev2.py | 33 +++++++ 148 files changed, 936 insertions(+), 875 deletions(-) diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-oc.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-oc.json index 783f0d3b..9416476a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-oc.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-oc.json @@ -128,7 +128,7 @@ }, "period": { "fields": { - "output": { + "stress_period_data": { "type": "list", "optional": true, "item": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-oc.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-oc.toml index 6b6f7d0d..02729aab 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-oc.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-oc.toml @@ -109,24 +109,24 @@ longname = "write format" description = "write format can be EXPONENTIAL, FIXED, GENERAL, or SCIENTIFIC." tagged = false -[blocks.period.fields.output] +[blocks.period.fields.stress_period_data] type = "list" optional = true -[blocks.period.fields.output.item] +[blocks.period.fields.stress_period_data.item] name = "output_record" type = "union" -[blocks.period.fields.output.item.arms.saverecord] +[blocks.period.fields.stress_period_data.item.arms.saverecord] type = "record" optional = true -[blocks.period.fields.output.item.arms.saverecord.fields.save] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.save] type = "keyword" longname = "keyword to save" description = "keyword to indicate that information will be saved this stress period." -[blocks.period.fields.output.item.arms.saverecord.fields.rtype] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.rtype] type = "string" longname = "record type" description = "type of information to save or print. Can be BUDGET." @@ -136,27 +136,27 @@ valid = [ "BUDGET", ] -[blocks.period.fields.output.item.arms.saverecord.fields.ocsetting] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.ocsetting] type = "union" description = "specifies the steps for which the data will be saved." -[blocks.period.fields.output.item.arms.saverecord.fields.ocsetting.arms.all] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.all] type = "keyword" description = "keyword to indicate save for all time steps in period." -[blocks.period.fields.output.item.arms.saverecord.fields.ocsetting.arms.first] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.first] type = "keyword" description = "keyword to indicate save for first step in period. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." -[blocks.period.fields.output.item.arms.saverecord.fields.ocsetting.arms.last] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.last] type = "keyword" description = "keyword to indicate save for last step in period. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." -[blocks.period.fields.output.item.arms.saverecord.fields.ocsetting.arms.frequency] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.frequency] type = "integer" description = "save at the specified time step frequency. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." -[blocks.period.fields.output.item.arms.saverecord.fields.ocsetting.arms.steps] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.steps] type = "array" description = "save for each step specified in STEPS. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." dtype = "integer" @@ -164,16 +164,16 @@ shape = [ "<=nstp", ] -[blocks.period.fields.output.item.arms.printrecord] +[blocks.period.fields.stress_period_data.item.arms.printrecord] type = "record" optional = true -[blocks.period.fields.output.item.arms.printrecord.fields.print] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.print] type = "keyword" longname = "keyword to save" description = "keyword to indicate that information will be printed this stress period." -[blocks.period.fields.output.item.arms.printrecord.fields.rtype] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.rtype] type = "string" longname = "record type" description = "type of information to save or print. Can be BUDGET." @@ -183,27 +183,27 @@ valid = [ "BUDGET", ] -[blocks.period.fields.output.item.arms.printrecord.fields.ocsetting] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.ocsetting] type = "union" description = "specifies the steps for which the data will be saved." -[blocks.period.fields.output.item.arms.printrecord.fields.ocsetting.arms.all] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.all] type = "keyword" description = "keyword to indicate save for all time steps in period." -[blocks.period.fields.output.item.arms.printrecord.fields.ocsetting.arms.first] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.first] type = "keyword" description = "keyword to indicate save for first step in period. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." -[blocks.period.fields.output.item.arms.printrecord.fields.ocsetting.arms.last] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.last] type = "keyword" description = "keyword to indicate save for last step in period. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." -[blocks.period.fields.output.item.arms.printrecord.fields.ocsetting.arms.frequency] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.frequency] type = "integer" description = "save at the specified time step frequency. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." -[blocks.period.fields.output.item.arms.printrecord.fields.ocsetting.arms.steps] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.steps] type = "array" description = "save for each step specified in STEPS. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." dtype = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-oc.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-oc.yaml index 2cea40f8..0956ba48 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-oc.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-oc.yaml @@ -100,7 +100,7 @@ blocks: tagged: false period: fields: - output: + stress_period_data: type: list optional: true item: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-lke.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-lke.json index 7e0f5a25..3b642bfa 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-lke.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-lke.json @@ -221,7 +221,7 @@ }, "period": { "fields": { - "lakeperioddata": { + "stress_period_data": { "type": "list", "item": { "name": "lakeperioddata", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-lke.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-lke.toml index 3fcc7fe0..9ef0a0e9 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-lke.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-lke.toml @@ -196,14 +196,14 @@ optional = true when = "boundnames" tagged = false -[blocks.period.fields.lakeperioddata] +[blocks.period.fields.stress_period_data] type = "list" -[blocks.period.fields.lakeperioddata.item] +[blocks.period.fields.stress_period_data.item] name = "lakeperioddata" type = "record" -[blocks.period.fields.lakeperioddata.item.fields.lakeno] +[blocks.period.fields.stress_period_data.item.fields.lakeno] type = "integer" longname = "lake number for this entry" description = "integer value that defines the lake number associated with the specified PERIOD data on the line. LAKENO must be greater than zero and less than or equal to NLAKES." @@ -211,58 +211,58 @@ tagged = false index = true fk = "packagedata.lakeno" -[blocks.period.fields.lakeperioddata.item.fields.laksetting] +[blocks.period.fields.stress_period_data.item.fields.laksetting] type = "union" description = "line of information that is parsed into a keyword and values. Keyword values that can be used to start the LAKSETTING string include: STATUS, TEMPERATURE, RAINFALL, EVAPORATION, RUNOFF, and AUXILIARY. These settings are used to assign the temperature associated with the corresponding flow terms. Temperatures cannot be specified for all flow terms. For example, the Lake Package supports a 'WITHDRAWAL' flow term. If this withdrawal term is active, then water will be withdrawn from the lake at the calculated temperature of the lake." -[blocks.period.fields.lakeperioddata.item.fields.laksetting.arms.status] +[blocks.period.fields.stress_period_data.item.fields.laksetting.arms.status] type = "string" longname = "lake temperature status" description = "keyword option to define lake status. STATUS can be ACTIVE, INACTIVE, or CONSTANT. By default, STATUS is ACTIVE, which means that temperature will be calculated for the lake. If a lake is inactive, then there will be no energy fluxes into or out of the lake and the inactive value will be written for the lake temperature. If a lake is constant, then the temperature for the lake will be fixed at the user specified value." -[blocks.period.fields.lakeperioddata.item.fields.laksetting.arms.temperature] +[blocks.period.fields.stress_period_data.item.fields.laksetting.arms.temperature] type = "string" longname = "lake temperature" description = "real or character value that defines the temperature for the lake. The specified TEMPERATURE is only applied if the lake is a constant temperature lake. 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." time_series = true -[blocks.period.fields.lakeperioddata.item.fields.laksetting.arms.rainfall] +[blocks.period.fields.stress_period_data.item.fields.laksetting.arms.rainfall] type = "string" longname = "rainfall temperature" description = "real or character value that defines the rainfall temperature for the lake. 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." time_series = true -[blocks.period.fields.lakeperioddata.item.fields.laksetting.arms.evaporation] +[blocks.period.fields.stress_period_data.item.fields.laksetting.arms.evaporation] type = "string" longname = "evaporation temperature" description = "use of the EVAPORATION keyword is allowed in the LKE package; however, the specified value is not currently used in LKE calculations. Instead, the latent heat of evaporation is multiplied by the simulated evaporation rate for determining the thermal energy lost from a stream reach." time_series = true -[blocks.period.fields.lakeperioddata.item.fields.laksetting.arms.runoff] +[blocks.period.fields.stress_period_data.item.fields.laksetting.arms.runoff] type = "string" longname = "runoff temperature" description = "real or character value that defines the temperature of runoff for the lake. Users are free to use whatever temperature scale they want, which might include negative temperatures. 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." time_series = true -[blocks.period.fields.lakeperioddata.item.fields.laksetting.arms.ext-inflow] +[blocks.period.fields.stress_period_data.item.fields.laksetting.arms.ext-inflow] type = "string" longname = "ext-inflow temperature" description = "real or character value that defines the temperature of external inflow for the lake. Users are free to use whatever temperature scale they want, which might include negative temperatures. 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." time_series = true -[blocks.period.fields.lakeperioddata.item.fields.laksetting.arms.auxiliaryrecord] +[blocks.period.fields.stress_period_data.item.fields.laksetting.arms.auxiliaryrecord] type = "record" -[blocks.period.fields.lakeperioddata.item.fields.laksetting.arms.auxiliaryrecord.fields.auxiliary] +[blocks.period.fields.stress_period_data.item.fields.laksetting.arms.auxiliaryrecord.fields.auxiliary] type = "keyword" description = "keyword for specifying auxiliary variable." -[blocks.period.fields.lakeperioddata.item.fields.laksetting.arms.auxiliaryrecord.fields.auxname] +[blocks.period.fields.stress_period_data.item.fields.laksetting.arms.auxiliaryrecord.fields.auxname] type = "string" description = "name for the auxiliary variable to be assigned AUXVAL. AUXNAME must match one of the auxiliary variable names defined in the OPTIONS block. If AUXNAME does not match one of the auxiliary variable names defined in the OPTIONS block the data are ignored." tagged = false -[blocks.period.fields.lakeperioddata.item.fields.laksetting.arms.auxiliaryrecord.fields.auxval] +[blocks.period.fields.stress_period_data.item.fields.laksetting.arms.auxiliaryrecord.fields.auxval] type = "double" longname = "auxiliary variable value" description = "value for the auxiliary variable. 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." diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-lke.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-lke.yaml index 53118f39..01d67140 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-lke.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-lke.yaml @@ -214,7 +214,7 @@ blocks: tagged: false period: fields: - lakeperioddata: + stress_period_data: type: list item: name: lakeperioddata diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-mwe.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-mwe.json index 5236c01b..1ac4218b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-mwe.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-mwe.json @@ -221,7 +221,7 @@ }, "period": { "fields": { - "mweperioddata": { + "stress_period_data": { "type": "list", "item": { "name": "mweperioddata", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-mwe.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-mwe.toml index e8e4024b..191c2906 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-mwe.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-mwe.toml @@ -196,14 +196,14 @@ optional = true when = "boundnames" tagged = false -[blocks.period.fields.mweperioddata] +[blocks.period.fields.stress_period_data] type = "list" -[blocks.period.fields.mweperioddata.item] +[blocks.period.fields.stress_period_data.item] name = "mweperioddata" type = "record" -[blocks.period.fields.mweperioddata.item.fields.mawno] +[blocks.period.fields.stress_period_data.item.fields.mawno] type = "integer" longname = "well number for this entry" description = "integer value that defines the well number associated with the specified PERIOD data on the line. MAWNO must be greater than zero and less than or equal to NMAWWELLS." @@ -211,40 +211,40 @@ tagged = false index = true fk = "packagedata.mawno" -[blocks.period.fields.mweperioddata.item.fields.mwesetting] +[blocks.period.fields.stress_period_data.item.fields.mwesetting] type = "union" description = "line of information that is parsed into a keyword and values. Keyword values that can be used to start the MWESETTING string include: STATUS, TEMPERATURE, RAINFALL, EVAPORATION, RUNOFF, and AUXILIARY. These settings are used to assign the temperature of associated with the corresponding flow terms. Temperatures cannot be specified for all flow terms. For example, the Multi-Aquifer Well Package supports a 'WITHDRAWAL' flow term. If this withdrawal term is active, then water will be withdrawn from the well at the calculated temperature of the well." -[blocks.period.fields.mweperioddata.item.fields.mwesetting.arms.status] +[blocks.period.fields.stress_period_data.item.fields.mwesetting.arms.status] type = "string" longname = "well temperature status" description = "keyword option to define well status. STATUS can be ACTIVE, INACTIVE, or CONSTANT. By default, STATUS is ACTIVE, which means that temperature will be calculated for the well. If a well is inactive, then there will be no solute mass fluxes into or out of the well and the inactive value will be written for the well temperature. If a well is constant, then the temperature for the well will be fixed at the user specified value." -[blocks.period.fields.mweperioddata.item.fields.mwesetting.arms.temperature] +[blocks.period.fields.stress_period_data.item.fields.mwesetting.arms.temperature] type = "string" longname = "well temperature" description = "real or character value that defines the temperature for the well. The specified TEMPERATURE is only applied if the well is a constant temperature well. 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." time_series = true -[blocks.period.fields.mweperioddata.item.fields.mwesetting.arms.rate] +[blocks.period.fields.stress_period_data.item.fields.mwesetting.arms.rate] type = "string" longname = "well injection temperature" description = "real or character value that defines the injection temperature $(e.g.,:^{circ}C:or:^{circ}F)$ for the well. 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." time_series = true -[blocks.period.fields.mweperioddata.item.fields.mwesetting.arms.auxiliaryrecord] +[blocks.period.fields.stress_period_data.item.fields.mwesetting.arms.auxiliaryrecord] type = "record" -[blocks.period.fields.mweperioddata.item.fields.mwesetting.arms.auxiliaryrecord.fields.auxiliary] +[blocks.period.fields.stress_period_data.item.fields.mwesetting.arms.auxiliaryrecord.fields.auxiliary] type = "keyword" description = "keyword for specifying auxiliary variable." -[blocks.period.fields.mweperioddata.item.fields.mwesetting.arms.auxiliaryrecord.fields.auxname] +[blocks.period.fields.stress_period_data.item.fields.mwesetting.arms.auxiliaryrecord.fields.auxname] type = "string" description = "name for the auxiliary variable to be assigned AUXVAL. AUXNAME must match one of the auxiliary variable names defined in the OPTIONS block. If AUXNAME does not match one of the auxiliary variable names defined in the OPTIONS block the data are ignored." tagged = false -[blocks.period.fields.mweperioddata.item.fields.mwesetting.arms.auxiliaryrecord.fields.auxval] +[blocks.period.fields.stress_period_data.item.fields.mwesetting.arms.auxiliaryrecord.fields.auxval] type = "double" longname = "auxiliary variable value" description = "value for the auxiliary variable. 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." diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-mwe.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-mwe.yaml index e29264d2..0a6afecf 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-mwe.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-mwe.yaml @@ -214,7 +214,7 @@ blocks: tagged: false period: fields: - mweperioddata: + stress_period_data: type: list item: name: mweperioddata diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-oc.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-oc.json index 7d2f43c2..73359408 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-oc.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-oc.json @@ -110,7 +110,7 @@ }, "period": { "fields": { - "output": { + "stress_period_data": { "type": "list", "optional": true, "item": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-oc.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-oc.toml index a0c00ed9..9b256bb9 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-oc.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-oc.toml @@ -93,24 +93,24 @@ longname = "write format" description = "write format can be EXPONENTIAL, FIXED, GENERAL, or SCIENTIFIC." tagged = false -[blocks.period.fields.output] +[blocks.period.fields.stress_period_data] type = "list" optional = true -[blocks.period.fields.output.item] +[blocks.period.fields.stress_period_data.item] name = "output_record" type = "union" -[blocks.period.fields.output.item.arms.saverecord] +[blocks.period.fields.stress_period_data.item.arms.saverecord] type = "record" optional = true -[blocks.period.fields.output.item.arms.saverecord.fields.save] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.save] type = "keyword" longname = "keyword to save" description = "keyword to indicate that information will be saved this stress period." -[blocks.period.fields.output.item.arms.saverecord.fields.rtype] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.rtype] type = "string" longname = "record type" description = "type of information to save or print. Can be BUDGET or TEMPERATURE." @@ -120,27 +120,27 @@ valid = [ "BUDGET", ] -[blocks.period.fields.output.item.arms.saverecord.fields.ocsetting] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.ocsetting] type = "union" description = "specifies the steps for which the data will be saved." -[blocks.period.fields.output.item.arms.saverecord.fields.ocsetting.arms.all] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.all] type = "keyword" description = "keyword to indicate save for all time steps in period." -[blocks.period.fields.output.item.arms.saverecord.fields.ocsetting.arms.first] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.first] type = "keyword" description = "keyword to indicate save for first step in period. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." -[blocks.period.fields.output.item.arms.saverecord.fields.ocsetting.arms.last] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.last] type = "keyword" description = "keyword to indicate save for last step in period. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." -[blocks.period.fields.output.item.arms.saverecord.fields.ocsetting.arms.frequency] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.frequency] type = "integer" description = "save at the specified time step frequency. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." -[blocks.period.fields.output.item.arms.saverecord.fields.ocsetting.arms.steps] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.steps] type = "array" description = "save for each step specified in STEPS. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." dtype = "integer" @@ -148,16 +148,16 @@ shape = [ "<=nstp", ] -[blocks.period.fields.output.item.arms.printrecord] +[blocks.period.fields.stress_period_data.item.arms.printrecord] type = "record" optional = true -[blocks.period.fields.output.item.arms.printrecord.fields.print] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.print] type = "keyword" longname = "keyword to save" description = "keyword to indicate that information will be printed this stress period." -[blocks.period.fields.output.item.arms.printrecord.fields.rtype] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.rtype] type = "string" longname = "record type" description = "type of information to save or print. Can be BUDGET or TEMPERATURE." @@ -167,27 +167,27 @@ valid = [ "BUDGET", ] -[blocks.period.fields.output.item.arms.printrecord.fields.ocsetting] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.ocsetting] type = "union" description = "specifies the steps for which the data will be saved." -[blocks.period.fields.output.item.arms.printrecord.fields.ocsetting.arms.all] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.all] type = "keyword" description = "keyword to indicate save for all time steps in period." -[blocks.period.fields.output.item.arms.printrecord.fields.ocsetting.arms.first] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.first] type = "keyword" description = "keyword to indicate save for first step in period. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." -[blocks.period.fields.output.item.arms.printrecord.fields.ocsetting.arms.last] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.last] type = "keyword" description = "keyword to indicate save for last step in period. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." -[blocks.period.fields.output.item.arms.printrecord.fields.ocsetting.arms.frequency] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.frequency] type = "integer" description = "save at the specified time step frequency. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." -[blocks.period.fields.output.item.arms.printrecord.fields.ocsetting.arms.steps] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.steps] type = "array" description = "save for each step specified in STEPS. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." dtype = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-oc.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-oc.yaml index 17024c31..df6fff4d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-oc.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-oc.yaml @@ -86,7 +86,7 @@ blocks: tagged: false period: fields: - output: + stress_period_data: type: list optional: true item: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-sfe.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-sfe.json index 5e1a6587..40e287e3 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-sfe.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-sfe.json @@ -221,7 +221,7 @@ }, "period": { "fields": { - "reachperioddata": { + "stress_period_data": { "type": "list", "item": { "name": "reachperioddata", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-sfe.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-sfe.toml index e8f067a4..7e999213 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-sfe.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-sfe.toml @@ -196,14 +196,14 @@ optional = true when = "boundnames" tagged = false -[blocks.period.fields.reachperioddata] +[blocks.period.fields.stress_period_data] type = "list" -[blocks.period.fields.reachperioddata.item] +[blocks.period.fields.stress_period_data.item] name = "reachperioddata" type = "record" -[blocks.period.fields.reachperioddata.item.fields.rno] +[blocks.period.fields.stress_period_data.item.fields.rno] type = "integer" longname = "reach number for this entry" description = "integer value that defines the reach number associated with the specified PERIOD data on the line. RNO must be greater than zero and less than or equal to NREACHES." @@ -211,58 +211,58 @@ tagged = false index = true fk = "packagedata.rno" -[blocks.period.fields.reachperioddata.item.fields.reachsetting] +[blocks.period.fields.stress_period_data.item.fields.reachsetting] type = "union" description = "line of information that is parsed into a keyword and values. Keyword values that can be used to start the REACHSETTING string include: STATUS, TEMPERATURE, RAINFALL, EVAPORATION, RUNOFF, and AUXILIARY. These settings are used to assign the temperature of associated with the corresponding flow terms. Temperatures cannot be specified for all flow terms. For example, the Streamflow Package supports a 'DIVERSION' flow term. Diversion water will be routed using the calculated temperature of the reach." -[blocks.period.fields.reachperioddata.item.fields.reachsetting.arms.status] +[blocks.period.fields.stress_period_data.item.fields.reachsetting.arms.status] type = "string" longname = "reach temperature status" description = "keyword option to define reach status. STATUS can be ACTIVE, INACTIVE, or CONSTANT. By default, STATUS is ACTIVE, which means that temperature will be calculated for the reach. If a reach is inactive, then there will be no energy fluxes into or out of the reach and the inactive value will be written for the reach temperature. If a reach is constant, then the temperature for the reach will be fixed at the user specified value." -[blocks.period.fields.reachperioddata.item.fields.reachsetting.arms.temperature] +[blocks.period.fields.stress_period_data.item.fields.reachsetting.arms.temperature] type = "string" longname = "reach temperature" description = "real or character value that defines the temperature for the reach. The specified TEMPERATURE is only applied if the reach is a constant temperature reach. 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." time_series = true -[blocks.period.fields.reachperioddata.item.fields.reachsetting.arms.rainfall] +[blocks.period.fields.stress_period_data.item.fields.reachsetting.arms.rainfall] type = "string" longname = "rainfall temperature" description = "real or character value that defines the rainfall temperature $(e.g.,:^{circ}C:or:^{circ}F)$ for the reach. 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." time_series = true -[blocks.period.fields.reachperioddata.item.fields.reachsetting.arms.evaporation] +[blocks.period.fields.stress_period_data.item.fields.reachsetting.arms.evaporation] type = "string" longname = "evaporation temperature" description = "use of the EVAPORATION keyword is allowed in the SFE package; however, the specified value is not currently used in SFE calculations. Instead, the latent heat of evaporation is multiplied by the simulated evaporation rate for determining the thermal energy lost from a stream reach." time_series = true -[blocks.period.fields.reachperioddata.item.fields.reachsetting.arms.runoff] +[blocks.period.fields.stress_period_data.item.fields.reachsetting.arms.runoff] type = "string" longname = "runoff temperature" description = "real or character value that defines the temperature of runoff $(e.g.,:^{circ}C:or:^{circ}F)$ for the reach. Users are free to use whatever temperature scale they want, which might include negative temperatures. 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." time_series = true -[blocks.period.fields.reachperioddata.item.fields.reachsetting.arms.inflow] +[blocks.period.fields.stress_period_data.item.fields.reachsetting.arms.inflow] type = "string" longname = "inflow temperature" description = "real or character value that defines the temperature of inflow $(e.g.,:^{circ}C:or:^{circ}F)$ for the reach. Users are free to use whatever temperature scale they want, which might include negative temperatures. 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." time_series = true -[blocks.period.fields.reachperioddata.item.fields.reachsetting.arms.auxiliaryrecord] +[blocks.period.fields.stress_period_data.item.fields.reachsetting.arms.auxiliaryrecord] type = "record" -[blocks.period.fields.reachperioddata.item.fields.reachsetting.arms.auxiliaryrecord.fields.auxiliary] +[blocks.period.fields.stress_period_data.item.fields.reachsetting.arms.auxiliaryrecord.fields.auxiliary] type = "keyword" description = "keyword for specifying auxiliary variable." -[blocks.period.fields.reachperioddata.item.fields.reachsetting.arms.auxiliaryrecord.fields.auxname] +[blocks.period.fields.stress_period_data.item.fields.reachsetting.arms.auxiliaryrecord.fields.auxname] type = "string" description = "name for the auxiliary variable to be assigned AUXVAL. AUXNAME must match one of the auxiliary variable names defined in the OPTIONS block. If AUXNAME does not match one of the auxiliary variable names defined in the OPTIONS block the data are ignored." tagged = false -[blocks.period.fields.reachperioddata.item.fields.reachsetting.arms.auxiliaryrecord.fields.auxval] +[blocks.period.fields.stress_period_data.item.fields.reachsetting.arms.auxiliaryrecord.fields.auxval] type = "double" longname = "auxiliary variable value" description = "value for the auxiliary variable. 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." diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-sfe.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-sfe.yaml index d99680a0..f4ce619c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-sfe.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-sfe.yaml @@ -215,7 +215,7 @@ blocks: tagged: false period: fields: - reachperioddata: + stress_period_data: type: list item: name: reachperioddata diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-uze.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-uze.json index d52df40a..49a68236 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-uze.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-uze.json @@ -209,7 +209,7 @@ }, "period": { "fields": { - "uzeperioddata": { + "stress_period_data": { "type": "list", "item": { "name": "uzeperioddata", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-uze.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-uze.toml index 9f6fe472..24d92982 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-uze.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-uze.toml @@ -184,14 +184,14 @@ optional = true when = "boundnames" tagged = false -[blocks.period.fields.uzeperioddata] +[blocks.period.fields.stress_period_data] type = "list" -[blocks.period.fields.uzeperioddata.item] +[blocks.period.fields.stress_period_data.item] name = "uzeperioddata" type = "record" -[blocks.period.fields.uzeperioddata.item.fields.uzfno] +[blocks.period.fields.stress_period_data.item.fields.uzfno] type = "integer" longname = "unsaturated zone flow cell number for this entry" description = "integer value that defines the UZF cell number associated with the specified PERIOD data on the line. UZFNO must be greater than zero and less than or equal to NUZFCELLS." @@ -199,46 +199,46 @@ tagged = false index = true fk = "packagedata.uzfno" -[blocks.period.fields.uzeperioddata.item.fields.uzesetting] +[blocks.period.fields.stress_period_data.item.fields.uzesetting] type = "union" description = "line of information that is parsed into a keyword and values. Keyword values that can be used to start the UZESETTING string include: STATUS, TEMPERATURE, INFILTRATION, UZET, and AUXILIARY. These settings are used to assign the temperature associated with the corresponding flow terms. Temperatures cannot be specified for all flow terms." -[blocks.period.fields.uzeperioddata.item.fields.uzesetting.arms.status] +[blocks.period.fields.stress_period_data.item.fields.uzesetting.arms.status] type = "string" longname = "unsaturated zone flow cell temperature status" description = "keyword option to define UZF cell status. STATUS can be ACTIVE, INACTIVE, or CONSTANT. By default, STATUS is ACTIVE, which means that temperature will be calculated for the UZF cell. If a UZF cell is inactive, then there will be no energy fluxes into or out of the UZF cell and the inactive value will be written for the UZF cell temperature. If a UZF cell is constant, then the temperature for the UZF cell will be fixed at the user specified value." -[blocks.period.fields.uzeperioddata.item.fields.uzesetting.arms.temperature] +[blocks.period.fields.stress_period_data.item.fields.uzesetting.arms.temperature] type = "string" longname = "unsaturated zone flow cell temperature" description = "real or character value that defines the temperature for the unsaturated zone flow cell. The specified TEMPERATURE is only applied if the unsaturated zone flow cell is a constant temperature cell. 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." time_series = true -[blocks.period.fields.uzeperioddata.item.fields.uzesetting.arms.infiltration] +[blocks.period.fields.stress_period_data.item.fields.uzesetting.arms.infiltration] type = "string" longname = "infiltration temperature" description = "real or character value that defines the temperature of the infiltration $(e.g.,:^{circ}C:or:^{circ}F)$ for the UZF cell. 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." time_series = true -[blocks.period.fields.uzeperioddata.item.fields.uzesetting.arms.uzet] +[blocks.period.fields.stress_period_data.item.fields.uzesetting.arms.uzet] type = "string" longname = "unsaturated zone et temperature" description = "real or character value that states what fraction of the simulated unsaturated zone evapotranspiration is associated with evaporation. The evaporative losses from the unsaturated zone moisture content will have an evaporative cooling effect on the GWE cell from which the evaporation originated. If this value is larger than 1, then it will be reset to 1. 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." time_series = true -[blocks.period.fields.uzeperioddata.item.fields.uzesetting.arms.auxiliaryrecord] +[blocks.period.fields.stress_period_data.item.fields.uzesetting.arms.auxiliaryrecord] type = "record" -[blocks.period.fields.uzeperioddata.item.fields.uzesetting.arms.auxiliaryrecord.fields.auxiliary] +[blocks.period.fields.stress_period_data.item.fields.uzesetting.arms.auxiliaryrecord.fields.auxiliary] type = "keyword" description = "keyword for specifying auxiliary variable." -[blocks.period.fields.uzeperioddata.item.fields.uzesetting.arms.auxiliaryrecord.fields.auxname] +[blocks.period.fields.stress_period_data.item.fields.uzesetting.arms.auxiliaryrecord.fields.auxname] type = "string" description = "name for the auxiliary variable to be assigned AUXVAL. AUXNAME must match one of the auxiliary variable names defined in the OPTIONS block. If AUXNAME does not match one of the auxiliary variable names defined in the OPTIONS block the data are ignored." tagged = false -[blocks.period.fields.uzeperioddata.item.fields.uzesetting.arms.auxiliaryrecord.fields.auxval] +[blocks.period.fields.stress_period_data.item.fields.uzesetting.arms.auxiliaryrecord.fields.auxval] type = "double" longname = "auxiliary variable value" description = "value for the auxiliary variable. 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." diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-uze.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-uze.yaml index 76fe088f..d6a6e887 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-uze.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-uze.yaml @@ -204,7 +204,7 @@ blocks: tagged: false period: fields: - uzeperioddata: + stress_period_data: type: list item: name: uzeperioddata diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-lak.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-lak.json index 663406dd..9fc42865 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-lak.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-lak.json @@ -483,7 +483,7 @@ }, "period": { "fields": { - "perioddata": { + "stress_period_data": { "type": "list", "item": { "name": "laksetting", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-lak.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-lak.toml index bba0e619..61dfccaa 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-lak.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-lak.toml @@ -432,18 +432,18 @@ description = "real value that defines the bed slope for the lake outlet. Any va tagged = false time_series = true -[blocks.period.fields.perioddata] +[blocks.period.fields.stress_period_data] type = "list" -[blocks.period.fields.perioddata.item] +[blocks.period.fields.stress_period_data.item] name = "laksetting" type = "union" description = "line of information that is parsed into a keyword and values. Keyword values that can be used to start the LAKSETTING string include both keywords for lake settings and keywords for outlet settings. Keywords for lake settings include: STATUS, STAGE, RAINFALL, EVAPORATION, RUNOFF, INFLOW, WITHDRAWAL, and AUXILIARY. Keywords for outlet settings include RATE, INVERT, WIDTH, SLOPE, and ROUGH." -[blocks.period.fields.perioddata.item.arms.status] +[blocks.period.fields.stress_period_data.item.arms.status] type = "record" -[blocks.period.fields.perioddata.item.arms.status.fields.lakeno] +[blocks.period.fields.stress_period_data.item.arms.status.fields.lakeno] type = "integer" longname = "lake or outlet number for this entry" description = "integer value that defines the lake or outlet number associated with the specified PERIOD data on the line. NUMBER must be greater than zero and less than or equal to NLAKES for a lake number and less than or equal to NOUTLETS for an outlet number." @@ -451,15 +451,15 @@ tagged = false index = true fk = "packagedata.ifno" -[blocks.period.fields.perioddata.item.arms.status.fields.status] +[blocks.period.fields.stress_period_data.item.arms.status.fields.status] type = "string" longname = "lake status" description = "keyword option to define lake status. STATUS can be ACTIVE, INACTIVE, or CONSTANT. By default, STATUS is ACTIVE." -[blocks.period.fields.perioddata.item.arms.stage] +[blocks.period.fields.stress_period_data.item.arms.stage] type = "record" -[blocks.period.fields.perioddata.item.arms.stage.fields.lakeno] +[blocks.period.fields.stress_period_data.item.arms.stage.fields.lakeno] type = "integer" longname = "lake or outlet number for this entry" description = "integer value that defines the lake or outlet number associated with the specified PERIOD data on the line. NUMBER must be greater than zero and less than or equal to NLAKES for a lake number and less than or equal to NOUTLETS for an outlet number." @@ -467,16 +467,16 @@ tagged = false index = true fk = "packagedata.ifno" -[blocks.period.fields.perioddata.item.arms.stage.fields.stage] +[blocks.period.fields.stress_period_data.item.arms.stage.fields.stage] type = "string" longname = "lake stage" description = "real or character value that defines the stage for the lake. The specified STAGE is only applied if the lake is a constant stage lake. 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." time_series = true -[blocks.period.fields.perioddata.item.arms.rainfall] +[blocks.period.fields.stress_period_data.item.arms.rainfall] type = "record" -[blocks.period.fields.perioddata.item.arms.rainfall.fields.lakeno] +[blocks.period.fields.stress_period_data.item.arms.rainfall.fields.lakeno] type = "integer" longname = "lake or outlet number for this entry" description = "integer value that defines the lake or outlet number associated with the specified PERIOD data on the line. NUMBER must be greater than zero and less than or equal to NLAKES for a lake number and less than or equal to NOUTLETS for an outlet number." @@ -484,16 +484,16 @@ tagged = false index = true fk = "packagedata.ifno" -[blocks.period.fields.perioddata.item.arms.rainfall.fields.rainfall] +[blocks.period.fields.stress_period_data.item.arms.rainfall.fields.rainfall] type = "string" longname = "rainfall rate" description = "real or character value that defines the rainfall rate $(LT^{-1})$ for the lake. Value must be greater than or equal to zero. 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." time_series = true -[blocks.period.fields.perioddata.item.arms.evaporation] +[blocks.period.fields.stress_period_data.item.arms.evaporation] type = "record" -[blocks.period.fields.perioddata.item.arms.evaporation.fields.lakeno] +[blocks.period.fields.stress_period_data.item.arms.evaporation.fields.lakeno] type = "integer" longname = "lake or outlet number for this entry" description = "integer value that defines the lake or outlet number associated with the specified PERIOD data on the line. NUMBER must be greater than zero and less than or equal to NLAKES for a lake number and less than or equal to NOUTLETS for an outlet number." @@ -501,16 +501,16 @@ tagged = false index = true fk = "packagedata.ifno" -[blocks.period.fields.perioddata.item.arms.evaporation.fields.evaporation] +[blocks.period.fields.stress_period_data.item.arms.evaporation.fields.evaporation] type = "string" longname = "evaporation rate" description = "real or character value that defines the maximum evaporation rate $(LT^{-1})$ for the lake. Value must be greater than or equal to zero. 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." time_series = true -[blocks.period.fields.perioddata.item.arms.runoff] +[blocks.period.fields.stress_period_data.item.arms.runoff] type = "record" -[blocks.period.fields.perioddata.item.arms.runoff.fields.lakeno] +[blocks.period.fields.stress_period_data.item.arms.runoff.fields.lakeno] type = "integer" longname = "lake or outlet number for this entry" description = "integer value that defines the lake or outlet number associated with the specified PERIOD data on the line. NUMBER must be greater than zero and less than or equal to NLAKES for a lake number and less than or equal to NOUTLETS for an outlet number." @@ -518,16 +518,16 @@ tagged = false index = true fk = "packagedata.ifno" -[blocks.period.fields.perioddata.item.arms.runoff.fields.runoff] +[blocks.period.fields.stress_period_data.item.arms.runoff.fields.runoff] type = "string" longname = "runoff rate" description = "real or character value that defines the runoff rate $(L^3 T^{-1})$ for the lake. Value must be greater than or equal to zero. 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." time_series = true -[blocks.period.fields.perioddata.item.arms.inflow] +[blocks.period.fields.stress_period_data.item.arms.inflow] type = "record" -[blocks.period.fields.perioddata.item.arms.inflow.fields.lakeno] +[blocks.period.fields.stress_period_data.item.arms.inflow.fields.lakeno] type = "integer" longname = "lake or outlet number for this entry" description = "integer value that defines the lake or outlet number associated with the specified PERIOD data on the line. NUMBER must be greater than zero and less than or equal to NLAKES for a lake number and less than or equal to NOUTLETS for an outlet number." @@ -535,16 +535,16 @@ tagged = false index = true fk = "packagedata.ifno" -[blocks.period.fields.perioddata.item.arms.inflow.fields.inflow] +[blocks.period.fields.stress_period_data.item.arms.inflow.fields.inflow] type = "string" longname = "inflow rate" description = "real or character value that defines the volumetric inflow rate $(L^3 T^{-1})$ for the lake. Value must be greater than or equal to zero. 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. By default, inflow rates are zero for each lake." time_series = true -[blocks.period.fields.perioddata.item.arms.withdrawal] +[blocks.period.fields.stress_period_data.item.arms.withdrawal] type = "record" -[blocks.period.fields.perioddata.item.arms.withdrawal.fields.lakeno] +[blocks.period.fields.stress_period_data.item.arms.withdrawal.fields.lakeno] type = "integer" longname = "lake or outlet number for this entry" description = "integer value that defines the lake or outlet number associated with the specified PERIOD data on the line. NUMBER must be greater than zero and less than or equal to NLAKES for a lake number and less than or equal to NOUTLETS for an outlet number." @@ -552,16 +552,16 @@ tagged = false index = true fk = "packagedata.ifno" -[blocks.period.fields.perioddata.item.arms.withdrawal.fields.withdrawal] +[blocks.period.fields.stress_period_data.item.arms.withdrawal.fields.withdrawal] type = "string" longname = "maximum withdrawal rate" description = "real or character value that defines the maximum withdrawal rate $(L^3 T^{-1})$ for the lake. Value must be greater than or equal to zero. 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." time_series = true -[blocks.period.fields.perioddata.item.arms.rate] +[blocks.period.fields.stress_period_data.item.arms.rate] type = "record" -[blocks.period.fields.perioddata.item.arms.rate.fields.outletno] +[blocks.period.fields.stress_period_data.item.arms.rate.fields.outletno] type = "integer" longname = "lake or outlet number for this entry" description = "integer value that defines the lake or outlet number associated with the specified PERIOD data on the line. NUMBER must be greater than zero and less than or equal to NLAKES for a lake number and less than or equal to NOUTLETS for an outlet number." @@ -569,16 +569,16 @@ tagged = false index = true fk = "outlets.outletno" -[blocks.period.fields.perioddata.item.arms.rate.fields.rate] +[blocks.period.fields.stress_period_data.item.arms.rate.fields.rate] type = "string" longname = "extraction rate" description = "real or character value that defines the extraction rate for the lake outflow. A positive value indicates inflow and a negative value indicates outflow from the lake. RATE only applies to outlets associated with active lakes (STATUS is ACTIVE). A specified RATE is only applied if COUTTYPE for the OUTLETNO is SPECIFIED. 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. By default, the RATE for each SPECIFIED lake outlet is zero." time_series = true -[blocks.period.fields.perioddata.item.arms.invert] +[blocks.period.fields.stress_period_data.item.arms.invert] type = "record" -[blocks.period.fields.perioddata.item.arms.invert.fields.outletno] +[blocks.period.fields.stress_period_data.item.arms.invert.fields.outletno] type = "integer" longname = "lake or outlet number for this entry" description = "integer value that defines the lake or outlet number associated with the specified PERIOD data on the line. NUMBER must be greater than zero and less than or equal to NLAKES for a lake number and less than or equal to NOUTLETS for an outlet number." @@ -586,16 +586,16 @@ tagged = false index = true fk = "outlets.outletno" -[blocks.period.fields.perioddata.item.arms.invert.fields.invert] +[blocks.period.fields.stress_period_data.item.arms.invert.fields.invert] type = "string" longname = "invert elevation" description = "real or character value that defines the invert elevation for the lake outlet. A specified INVERT value is only used for active lakes if COUTTYPE for lake outlet OUTLETNO is not SPECIFIED. 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." time_series = true -[blocks.period.fields.perioddata.item.arms.width] +[blocks.period.fields.stress_period_data.item.arms.width] type = "record" -[blocks.period.fields.perioddata.item.arms.width.fields.outletno] +[blocks.period.fields.stress_period_data.item.arms.width.fields.outletno] type = "integer" longname = "lake or outlet number for this entry" description = "integer value that defines the lake or outlet number associated with the specified PERIOD data on the line. NUMBER must be greater than zero and less than or equal to NLAKES for a lake number and less than or equal to NOUTLETS for an outlet number." @@ -603,16 +603,16 @@ tagged = false index = true fk = "outlets.outletno" -[blocks.period.fields.perioddata.item.arms.width.fields.width] +[blocks.period.fields.stress_period_data.item.arms.width.fields.width] type = "string" longname = "outlet width" description = "real or character value that defines the width of the lake outlet. A specified WIDTH value is only used for active lakes if COUTTYPE for lake outlet OUTLETNO is not SPECIFIED. 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." time_series = true -[blocks.period.fields.perioddata.item.arms.slope] +[blocks.period.fields.stress_period_data.item.arms.slope] type = "record" -[blocks.period.fields.perioddata.item.arms.slope.fields.outletno] +[blocks.period.fields.stress_period_data.item.arms.slope.fields.outletno] type = "integer" longname = "lake or outlet number for this entry" description = "integer value that defines the lake or outlet number associated with the specified PERIOD data on the line. NUMBER must be greater than zero and less than or equal to NLAKES for a lake number and less than or equal to NOUTLETS for an outlet number." @@ -620,16 +620,16 @@ tagged = false index = true fk = "outlets.outletno" -[blocks.period.fields.perioddata.item.arms.slope.fields.slope] +[blocks.period.fields.stress_period_data.item.arms.slope.fields.slope] type = "string" longname = "bed slope" description = "real or character value that defines the bed slope for the lake outlet. A specified SLOPE value is only used for active lakes if COUTTYPE for lake outlet OUTLETNO is MANNING. 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." time_series = true -[blocks.period.fields.perioddata.item.arms.rough] +[blocks.period.fields.stress_period_data.item.arms.rough] type = "record" -[blocks.period.fields.perioddata.item.arms.rough.fields.outletno] +[blocks.period.fields.stress_period_data.item.arms.rough.fields.outletno] type = "integer" longname = "lake or outlet number for this entry" description = "integer value that defines the lake or outlet number associated with the specified PERIOD data on the line. NUMBER must be greater than zero and less than or equal to NLAKES for a lake number and less than or equal to NOUTLETS for an outlet number." @@ -637,16 +637,16 @@ tagged = false index = true fk = "outlets.outletno" -[blocks.period.fields.perioddata.item.arms.rough.fields.rough] +[blocks.period.fields.stress_period_data.item.arms.rough.fields.rough] type = "string" longname = "roughness coefficient" description = "real value that defines the roughness coefficient for the lake outlet. Any value can be specified if COUTTYPE is not MANNING. 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." time_series = true -[blocks.period.fields.perioddata.item.arms.auxiliaryrecord] +[blocks.period.fields.stress_period_data.item.arms.auxiliaryrecord] type = "record" -[blocks.period.fields.perioddata.item.arms.auxiliaryrecord.fields.lakeno] +[blocks.period.fields.stress_period_data.item.arms.auxiliaryrecord.fields.lakeno] type = "integer" longname = "lake or outlet number for this entry" description = "integer value that defines the lake or outlet number associated with the specified PERIOD data on the line. NUMBER must be greater than zero and less than or equal to NLAKES for a lake number and less than or equal to NOUTLETS for an outlet number." @@ -654,16 +654,16 @@ tagged = false index = true fk = "packagedata.ifno" -[blocks.period.fields.perioddata.item.arms.auxiliaryrecord.fields.auxiliary] +[blocks.period.fields.stress_period_data.item.arms.auxiliaryrecord.fields.auxiliary] type = "keyword" description = "keyword for specifying auxiliary variable." -[blocks.period.fields.perioddata.item.arms.auxiliaryrecord.fields.auxname] +[blocks.period.fields.stress_period_data.item.arms.auxiliaryrecord.fields.auxname] type = "string" description = "name for the auxiliary variable to be assigned AUXVAL. AUXNAME must match one of the auxiliary variable names defined in the OPTIONS block. If AUXNAME does not match one of the auxiliary variable names defined in the OPTIONS block the data are ignored." tagged = false -[blocks.period.fields.perioddata.item.arms.auxiliaryrecord.fields.auxval] +[blocks.period.fields.stress_period_data.item.arms.auxiliaryrecord.fields.auxval] type = "double" longname = "auxiliary variable value" description = "value for the auxiliary variable. 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." diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-lak.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-lak.yaml index ee8c86e0..906b19c9 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-lak.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-lak.yaml @@ -509,7 +509,7 @@ blocks: - noutlets period: fields: - perioddata: + stress_period_data: type: list item: name: laksetting diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-maw.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-maw.json index c6af1fff..0ba8542e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-maw.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-maw.json @@ -347,7 +347,7 @@ }, "period": { "fields": { - "perioddata": { + "stress_period_data": { "type": "list", "item": { "name": "perioddata", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-maw.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-maw.toml index b101d320..0c60705d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-maw.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-maw.toml @@ -310,14 +310,14 @@ longname = "skin radius" description = "real value that defines the skin radius (filter pack radius) for the multi-aquifer well. RADIUS_SKIN can be any value if CONDEQN is SPECIFIED or THIEM. If CONDEQN is SKIN, CUMULATIVE, or MEAN, the program will terminate with an error if RADIUS_SKIN is less than or equal to the RADIUS for the multi-aquifer well." tagged = false -[blocks.period.fields.perioddata] +[blocks.period.fields.stress_period_data] type = "list" -[blocks.period.fields.perioddata.item] +[blocks.period.fields.stress_period_data.item] name = "perioddata" type = "record" -[blocks.period.fields.perioddata.item.fields.ifno] +[blocks.period.fields.stress_period_data.item.fields.ifno] type = "integer" longname = "well number for this entry" description = "integer value that defines the well number associated with the specified PERIOD data on the line. IFNO must be greater than zero and less than or equal to NMAWWELLS." @@ -325,123 +325,123 @@ tagged = false index = true fk = "packagedata.ifno" -[blocks.period.fields.perioddata.item.fields.mawsetting] +[blocks.period.fields.stress_period_data.item.fields.mawsetting] type = "union" description = "line of information that is parsed into a keyword and values. Keyword values that can be used to start the MAWSETTING string include: STATUS, FLOWING_WELL, RATE, WELL_HEAD, HEAD_LIMIT, SHUT_OFF, RATE_SCALING, and AUXILIARY." -[blocks.period.fields.perioddata.item.fields.mawsetting.arms.status] +[blocks.period.fields.stress_period_data.item.fields.mawsetting.arms.status] type = "string" longname = "well status" description = "keyword option to define well status. STATUS can be ACTIVE, INACTIVE, or CONSTANT. By default, STATUS is ACTIVE." -[blocks.period.fields.perioddata.item.fields.mawsetting.arms.flowing_wellrecord] +[blocks.period.fields.stress_period_data.item.fields.mawsetting.arms.flowing_wellrecord] type = "record" -[blocks.period.fields.perioddata.item.fields.mawsetting.arms.flowing_wellrecord.fields.flowing_well] +[blocks.period.fields.stress_period_data.item.fields.mawsetting.arms.flowing_wellrecord.fields.flowing_well] type = "keyword" longname = "well is a flowing well" description = "keyword to indicate the well is a flowing well. The FLOWING_WELL option can be used to simulate flowing wells when the simulated well head exceeds the specified drainage elevation." -[blocks.period.fields.perioddata.item.fields.mawsetting.arms.flowing_wellrecord.fields.fwelev] +[blocks.period.fields.stress_period_data.item.fields.mawsetting.arms.flowing_wellrecord.fields.fwelev] type = "double" longname = "flowing well elevation" description = "elevation used to determine whether or not the well is flowing." tagged = false -[blocks.period.fields.perioddata.item.fields.mawsetting.arms.flowing_wellrecord.fields.fwcond] +[blocks.period.fields.stress_period_data.item.fields.mawsetting.arms.flowing_wellrecord.fields.fwcond] type = "double" longname = "well flowing well conductance" description = "conductance used to calculate the discharge of a free flowing well. Flow occurs when the head in the well is above the well top elevation (FWELEV)." tagged = false -[blocks.period.fields.perioddata.item.fields.mawsetting.arms.flowing_wellrecord.fields.fwrlen] +[blocks.period.fields.stress_period_data.item.fields.mawsetting.arms.flowing_wellrecord.fields.fwrlen] type = "double" longname = "flowing well reduction length" description = "length used to reduce the conductance of the flowing well. When the head in the well drops below the well top plus the reduction length, then the conductance is reduced. This reduction length can be used to improve the stability of simulations with flowing wells so that there is not an abrupt change in flowing well rates." tagged = false -[blocks.period.fields.perioddata.item.fields.mawsetting.arms.rate] +[blocks.period.fields.stress_period_data.item.fields.mawsetting.arms.rate] type = "double" longname = "well pumping rate" description = "is the volumetric pumping rate for the multi-aquifer well. A positive value indicates recharge and a negative value indicates discharge (pumping). RATE only applies to active (STATUS is ACTIVE) multi-aquifer wells. 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. By default, the RATE for each multi-aquifer well is zero." time_series = true -[blocks.period.fields.perioddata.item.fields.mawsetting.arms.well_head] +[blocks.period.fields.stress_period_data.item.fields.mawsetting.arms.well_head] type = "double" longname = "well head" description = "is the head in the multi-aquifer well. WELL_HEAD is only applied to constant head (STATUS is CONSTANT) and inactive (STATUS is INACTIVE) multi-aquifer wells. 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. The program will terminate with an error if WELL_HEAD is less than the bottom of the well." time_series = true -[blocks.period.fields.perioddata.item.fields.mawsetting.arms.head_limitrecord] +[blocks.period.fields.stress_period_data.item.fields.mawsetting.arms.head_limitrecord] type = "record" -[blocks.period.fields.perioddata.item.fields.mawsetting.arms.head_limitrecord.fields.head_limit] +[blocks.period.fields.stress_period_data.item.fields.mawsetting.arms.head_limitrecord.fields.head_limit] type = "keyword" -[blocks.period.fields.perioddata.item.fields.mawsetting.arms.head_limitrecord.fields.head_limit_value] +[blocks.period.fields.stress_period_data.item.fields.mawsetting.arms.head_limitrecord.fields.head_limit_value] type = "union" longname = "head limit" description = "is the limiting water level (head) in the well, which is the minimum of the well RATE or the well inflow rate from the aquifer. HEAD_LIMIT can be applied to extraction wells (RATE $<$ 0) or injection wells (RATE $>$ 0). HEAD_LIMIT can be deactivated by specifying the text string `OFF'. The HEAD_LIMIT option is based on the HEAD_LIMIT functionality available in the MNW2~citep{konikow2009} package for MODFLOW-2005. The HEAD_LIMIT option has been included to facilitate backward compatibility with previous versions of MODFLOW but use of the RATE_SCALING option instead of the HEAD_LIMIT option is recommended. By default, HEAD_LIMIT is `OFF'." -[blocks.period.fields.perioddata.item.fields.mawsetting.arms.head_limitrecord.fields.head_limit_value.arms.off] +[blocks.period.fields.stress_period_data.item.fields.mawsetting.arms.head_limitrecord.fields.head_limit_value.arms.off] type = "keyword" -[blocks.period.fields.perioddata.item.fields.mawsetting.arms.head_limitrecord.fields.head_limit_value.arms.value] +[blocks.period.fields.stress_period_data.item.fields.mawsetting.arms.head_limitrecord.fields.head_limit_value.arms.value] type = "double" tagged = false -[blocks.period.fields.perioddata.item.fields.mawsetting.arms.shutoffrecord] +[blocks.period.fields.stress_period_data.item.fields.mawsetting.arms.shutoffrecord] type = "record" -[blocks.period.fields.perioddata.item.fields.mawsetting.arms.shutoffrecord.fields.shut_off] +[blocks.period.fields.stress_period_data.item.fields.mawsetting.arms.shutoffrecord.fields.shut_off] type = "keyword" longname = "shut off well" description = "keyword for activating well shut off capability. Subsequent values define the minimum and maximum pumping rate that a well must exceed to shutoff or reactivate a well, respectively, during a stress period. SHUT_OFF is only applied to injection wells (RATE$<0$) and if HEAD_LIMIT is specified (not set to `OFF'). If HEAD_LIMIT is specified, SHUT_OFF can be deactivated by specifying a minimum value equal to zero. The SHUT_OFF option is based on the SHUT_OFF functionality available in the MNW2~citep{konikow2009} package for MODFLOW-2005. The SHUT_OFF option has been included to facilitate backward compatibility with previous versions of MODFLOW but use of the RATE_SCALING option instead of the SHUT_OFF option is recommended. By default, SHUT_OFF is not used." -[blocks.period.fields.perioddata.item.fields.mawsetting.arms.shutoffrecord.fields.minrate] +[blocks.period.fields.stress_period_data.item.fields.mawsetting.arms.shutoffrecord.fields.minrate] type = "double" longname = "minimum shutoff rate" description = "is the minimum rate that a well must exceed to shutoff a well during a stress period. The well will shut down during a time step if the flow rate to the well from the aquifer is less than MINRATE. If a well is shut down during a time step, reactivation of the well cannot occur until the next time step to reduce oscillations. MINRATE must be less than maxrate." tagged = false -[blocks.period.fields.perioddata.item.fields.mawsetting.arms.shutoffrecord.fields.maxrate] +[blocks.period.fields.stress_period_data.item.fields.mawsetting.arms.shutoffrecord.fields.maxrate] type = "double" longname = "maximum shutoff rate" description = "is the maximum rate that a well must exceed to reactivate a well during a stress period. The well will reactivate during a timestep if the well was shutdown during the previous time step and the flow rate to the well from the aquifer exceeds maxrate. Reactivation of the well cannot occur until the next time step if a well is shutdown to reduce oscillations. maxrate must be greater than MINRATE." tagged = false -[blocks.period.fields.perioddata.item.fields.mawsetting.arms.rate_scalingrecord] +[blocks.period.fields.stress_period_data.item.fields.mawsetting.arms.rate_scalingrecord] type = "record" -[blocks.period.fields.perioddata.item.fields.mawsetting.arms.rate_scalingrecord.fields.rate_scaling] +[blocks.period.fields.stress_period_data.item.fields.mawsetting.arms.rate_scalingrecord.fields.rate_scaling] type = "keyword" longname = "rate scaling" description = "activate rate scaling. If RATE_SCALING is specified, both PUMP_ELEVATION and SCALING_LENGTH must be specified. RATE_SCALING cannot be used with HEAD_LIMIT. RATE_SCALING can be used for extraction or injection wells. For extraction wells, the extraction rate will start to decrease once the head in the well lowers to a level equal to the pump elevation plus the scaling length. If the head in the well drops below the pump elevation, then the extraction rate is calculated to be zero. For an injection well, the injection rate will begin to decrease once the head in the well rises above the specified pump elevation. If the head in the well rises above the pump elevation plus the scaling length, then the injection rate will be set to zero." -[blocks.period.fields.perioddata.item.fields.mawsetting.arms.rate_scalingrecord.fields.pump_elevation] +[blocks.period.fields.stress_period_data.item.fields.mawsetting.arms.rate_scalingrecord.fields.pump_elevation] type = "double" longname = "pump elevation" description = "is the elevation of the multi-aquifer well pump (PUMP_ELEVATION). PUMP_ELEVATION should not be less than the bottom elevation (BOTTOM) of the multi-aquifer well." tagged = false -[blocks.period.fields.perioddata.item.fields.mawsetting.arms.rate_scalingrecord.fields.scaling_length] +[blocks.period.fields.stress_period_data.item.fields.mawsetting.arms.rate_scalingrecord.fields.scaling_length] type = "double" description = "height above the pump elevation (SCALING_LENGTH). If the simulated well head is below this elevation (pump elevation plus the scaling length), then the pumping rate is reduced." tagged = false -[blocks.period.fields.perioddata.item.fields.mawsetting.arms.auxiliaryrecord] +[blocks.period.fields.stress_period_data.item.fields.mawsetting.arms.auxiliaryrecord] type = "record" -[blocks.period.fields.perioddata.item.fields.mawsetting.arms.auxiliaryrecord.fields.auxiliary] +[blocks.period.fields.stress_period_data.item.fields.mawsetting.arms.auxiliaryrecord.fields.auxiliary] type = "keyword" description = "keyword for specifying auxiliary variable." -[blocks.period.fields.perioddata.item.fields.mawsetting.arms.auxiliaryrecord.fields.auxname] +[blocks.period.fields.stress_period_data.item.fields.mawsetting.arms.auxiliaryrecord.fields.auxname] type = "string" description = "name for the auxiliary variable to be assigned AUXVAL. AUXNAME must match one of the auxiliary variable names defined in the OPTIONS block. If AUXNAME does not match one of the auxiliary variable names defined in the OPTIONS block the data are ignored." tagged = false -[blocks.period.fields.perioddata.item.fields.mawsetting.arms.auxiliaryrecord.fields.auxval] +[blocks.period.fields.stress_period_data.item.fields.mawsetting.arms.auxiliaryrecord.fields.auxval] type = "double" longname = "auxiliary variable value" description = "value for the auxiliary variable. 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." diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-maw.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-maw.yaml index 3b2e46be..72e4696a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-maw.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-maw.yaml @@ -394,7 +394,7 @@ blocks: tagged: false period: fields: - perioddata: + stress_period_data: type: list item: name: perioddata diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-mvr.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-mvr.json index 6fd7558c..dc101321 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-mvr.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-mvr.json @@ -118,7 +118,7 @@ }, "period": { "fields": { - "perioddata": { + "stress_period_data": { "type": "list", "item": { "name": "perioddata", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-mvr.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-mvr.toml index 3a5445f6..abf526cd 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-mvr.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-mvr.toml @@ -95,60 +95,60 @@ description = "is the name of a package that may be included in a subsequent str tagged = false pk = true -[blocks.period.fields.perioddata] +[blocks.period.fields.stress_period_data] type = "list" -[blocks.period.fields.perioddata.item] +[blocks.period.fields.stress_period_data.item] name = "perioddata" type = "record" -[blocks.period.fields.perioddata.item.fields.mname1] +[blocks.period.fields.stress_period_data.item.fields.mname1] type = "string" description = "name of model containing the package, PNAME1." optional = true tagged = false -[blocks.period.fields.perioddata.item.fields.pname1] +[blocks.period.fields.stress_period_data.item.fields.pname1] type = "string" longname = "provider package name" description = "is the package name for the provider. The package PNAME1 must be designated to provide water through the MVR Package by specifying the keyword 'MOVER' in its OPTIONS block." tagged = false fk = "packages.pname" -[blocks.period.fields.perioddata.item.fields.id1] +[blocks.period.fields.stress_period_data.item.fields.id1] type = "integer" longname = "provider reach" description = "is the identifier for the provider. For the standard boundary packages, the provider identifier is the number of the boundary as it is listed in the package input file. (Note that the order of these boundaries may change by stress period, which must be accounted for in the Mover Package.) So the first well has an identifier of one. The second is two, and so forth. For the advanced packages, the identifier is the reach number (SFR Package), well number (MAW Package), or UZF cell number. For the Lake Package, ID1 is the lake outlet number. Thus, outflows from a single lake can be routed to different streams, for example." tagged = false index = true -[blocks.period.fields.perioddata.item.fields.mname2] +[blocks.period.fields.stress_period_data.item.fields.mname2] type = "string" description = "name of model containing the package, PNAME2." optional = true tagged = false -[blocks.period.fields.perioddata.item.fields.pname2] +[blocks.period.fields.stress_period_data.item.fields.pname2] type = "string" longname = "receiver package name" description = "is the package name for the receiver. The package PNAME2 must be designated to receive water from the MVR Package by specifying the keyword 'MOVER' in its OPTIONS block." tagged = false fk = "packages.pname" -[blocks.period.fields.perioddata.item.fields.id2] +[blocks.period.fields.stress_period_data.item.fields.id2] type = "integer" longname = "receiver reach" description = "is the identifier for the receiver. The receiver identifier is the reach number (SFR Package), Lake number (LAK Package), well number (MAW Package), or UZF cell number." tagged = false index = true -[blocks.period.fields.perioddata.item.fields.mvrtype] +[blocks.period.fields.stress_period_data.item.fields.mvrtype] type = "string" longname = "mover type" description = "is the character string signifying the method for determining how much water will be moved. Supported values are 'FACTOR' 'EXCESS' 'THRESHOLD' and 'UPTO'. These four options determine how the receiver flow rate, $Q_R$, is calculated. These options mirror the options defined for the cprior variable in the SFR package, with the term 'FACTOR' being functionally equivalent to the 'FRACTION' option for cprior." tagged = false -[blocks.period.fields.perioddata.item.fields.value] +[blocks.period.fields.stress_period_data.item.fields.value] type = "double" longname = "mover value" description = "is the value to be used in the equation for calculating the amount of water to move. For the 'FACTOR' option, VALUE is the $alpha$ factor. For the remaining options, VALUE is the specified flow rate, $Q_S$." diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-mvr.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-mvr.yaml index e4aae62c..854482cc 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-mvr.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-mvr.yaml @@ -103,7 +103,7 @@ blocks: - maxpackages period: fields: - perioddata: + stress_period_data: type: list item: name: perioddata diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-oc.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-oc.json index 470633d7..e2d8e28a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-oc.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-oc.json @@ -110,7 +110,7 @@ }, "period": { "fields": { - "output": { + "stress_period_data": { "type": "list", "optional": true, "item": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-oc.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-oc.toml index 7f904d44..785b2033 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-oc.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-oc.toml @@ -93,24 +93,24 @@ longname = "write format" description = "write format can be EXPONENTIAL, FIXED, GENERAL, or SCIENTIFIC." tagged = false -[blocks.period.fields.output] +[blocks.period.fields.stress_period_data] type = "list" optional = true -[blocks.period.fields.output.item] +[blocks.period.fields.stress_period_data.item] name = "output_record" type = "union" -[blocks.period.fields.output.item.arms.saverecord] +[blocks.period.fields.stress_period_data.item.arms.saverecord] type = "record" optional = true -[blocks.period.fields.output.item.arms.saverecord.fields.save] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.save] type = "keyword" longname = "keyword to save" description = "keyword to indicate that information will be saved this stress period." -[blocks.period.fields.output.item.arms.saverecord.fields.rtype] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.rtype] type = "string" longname = "record type" description = "type of information to save or print. Can be BUDGET or HEAD." @@ -120,27 +120,27 @@ valid = [ "BUDGET", ] -[blocks.period.fields.output.item.arms.saverecord.fields.ocsetting] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.ocsetting] type = "union" description = "specifies the steps for which the data will be saved." -[blocks.period.fields.output.item.arms.saverecord.fields.ocsetting.arms.all] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.all] type = "keyword" description = "keyword to indicate save for all time steps in period." -[blocks.period.fields.output.item.arms.saverecord.fields.ocsetting.arms.first] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.first] type = "keyword" description = "keyword to indicate save for first step in period. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." -[blocks.period.fields.output.item.arms.saverecord.fields.ocsetting.arms.last] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.last] type = "keyword" description = "keyword to indicate save for last step in period. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." -[blocks.period.fields.output.item.arms.saverecord.fields.ocsetting.arms.frequency] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.frequency] type = "integer" description = "save at the specified time step frequency. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." -[blocks.period.fields.output.item.arms.saverecord.fields.ocsetting.arms.steps] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.steps] type = "array" description = "save for each step specified in STEPS. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." dtype = "integer" @@ -148,16 +148,16 @@ shape = [ "<=nstp", ] -[blocks.period.fields.output.item.arms.printrecord] +[blocks.period.fields.stress_period_data.item.arms.printrecord] type = "record" optional = true -[blocks.period.fields.output.item.arms.printrecord.fields.print] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.print] type = "keyword" longname = "keyword to save" description = "keyword to indicate that information will be printed this stress period." -[blocks.period.fields.output.item.arms.printrecord.fields.rtype] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.rtype] type = "string" longname = "record type" description = "type of information to save or print. Can be BUDGET or HEAD." @@ -167,27 +167,27 @@ valid = [ "BUDGET", ] -[blocks.period.fields.output.item.arms.printrecord.fields.ocsetting] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.ocsetting] type = "union" description = "specifies the steps for which the data will be saved." -[blocks.period.fields.output.item.arms.printrecord.fields.ocsetting.arms.all] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.all] type = "keyword" description = "keyword to indicate save for all time steps in period." -[blocks.period.fields.output.item.arms.printrecord.fields.ocsetting.arms.first] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.first] type = "keyword" description = "keyword to indicate save for first step in period. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." -[blocks.period.fields.output.item.arms.printrecord.fields.ocsetting.arms.last] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.last] type = "keyword" description = "keyword to indicate save for last step in period. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." -[blocks.period.fields.output.item.arms.printrecord.fields.ocsetting.arms.frequency] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.frequency] type = "integer" description = "save at the specified time step frequency. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." -[blocks.period.fields.output.item.arms.printrecord.fields.ocsetting.arms.steps] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.steps] type = "array" description = "save for each step specified in STEPS. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." dtype = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-oc.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-oc.yaml index 471bf010..d53e08d7 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-oc.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-oc.yaml @@ -86,7 +86,7 @@ blocks: tagged: false period: fields: - output: + stress_period_data: type: list optional: true item: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sfr.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sfr.json index db1fed40..ad03f62c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sfr.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sfr.json @@ -489,7 +489,7 @@ }, "period": { "fields": { - "perioddata": { + "stress_period_data": { "type": "list", "item": { "name": "perioddata", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sfr.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sfr.toml index 999a183a..974f9134 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sfr.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sfr.toml @@ -434,14 +434,14 @@ longname = "initial reach stage" description = "real value that defines the initial stage for the reach. The program will terminate with an error if INITIALSTAGE is less than the RTP value for reach IFNO defined in the PACKAGEDATA block. INITIALSTAGE data are used only if STORAGE is specified in the Options block and the first stress period is transient or for reaches defined to use the SIMPLE STATUS in the Period block." tagged = false -[blocks.period.fields.perioddata] +[blocks.period.fields.stress_period_data] type = "list" -[blocks.period.fields.perioddata.item] +[blocks.period.fields.stress_period_data.item] name = "perioddata" type = "record" -[blocks.period.fields.perioddata.item.fields.ifno] +[blocks.period.fields.stress_period_data.item.fields.ifno] type = "integer" longname = "reach number for this entry" description = "integer value that defines the feature (reach) number associated with the specified PERIOD data on the line. IFNO must be greater than zero and less than or equal to NREACHES." @@ -449,98 +449,98 @@ tagged = false index = true fk = "packagedata.ifno" -[blocks.period.fields.perioddata.item.fields.sfrsetting] +[blocks.period.fields.stress_period_data.item.fields.sfrsetting] type = "union" description = "line of information that is parsed into a keyword and values. Keyword values that can be used to start the SFRSETTING string include: STATUS, BEDK, MANNING, STAGE, INFLOW, RAINFALL, EVAPORATION, RUNOFF, DIVERSION, UPSTREAM_FRACTION, and AUXILIARY." -[blocks.period.fields.perioddata.item.fields.sfrsetting.arms.status] +[blocks.period.fields.stress_period_data.item.fields.sfrsetting.arms.status] type = "string" longname = "reach status" description = "keyword option to define stream reach status. STATUS can be ACTIVE, INACTIVE, or SIMPLE. The SIMPLE STATUS option simulates streamflow using a user-specified stage for a reach or a stage set to the top of the reach (depth = 0). In cases where the simulated leakage calculated using the specified stage exceeds the sum of inflows to the reach, the stage is set to the top of the reach and leakage is set equal to the sum of inflows. Upstream fractions should be changed using the UPSTREAM_FRACTION SFRSETTING if the status for one or more reaches is changed to ACTIVE or INACTIVE. For example, if one of two downstream connections for a reach is inactivated, the upstream fraction for the active and inactive downstream reach should be changed to 1.0 and 0.0, respectively, to ensure that the active reach receives all of the downstream outflow from the upstream reach. By default, STATUS is ACTIVE." -[blocks.period.fields.perioddata.item.fields.sfrsetting.arms.bedk] +[blocks.period.fields.stress_period_data.item.fields.sfrsetting.arms.bedk] type = "string" longname = "reach bed hydraulic conductivity" description = "real or character value that defines the hydraulic conductivity of the reach streambed. BEDK can be any positive value if the reach is not connected to an underlying GWF cell. Otherwise, BEDK must be greater than zero. 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." time_series = true -[blocks.period.fields.perioddata.item.fields.sfrsetting.arms.manning] +[blocks.period.fields.stress_period_data.item.fields.sfrsetting.arms.manning] type = "string" longname = "reach Manning's roughness coefficient" description = "real or character value that defines the Manning's roughness coefficient for the reach. MANNING must be greater than zero. 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." time_series = true -[blocks.period.fields.perioddata.item.fields.sfrsetting.arms.stage] +[blocks.period.fields.stress_period_data.item.fields.sfrsetting.arms.stage] type = "string" longname = "reach stage" description = "real or character value that defines the stage for the reach. The specified STAGE is only applied if the reach uses the simple routing option. If STAGE is not specified for reaches that use the simple routing option, the specified stage is set to the top of the reach. 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." time_series = true -[blocks.period.fields.perioddata.item.fields.sfrsetting.arms.inflow] +[blocks.period.fields.stress_period_data.item.fields.sfrsetting.arms.inflow] type = "string" longname = "inflow rate" description = "real or character value that defines the volumetric inflow rate for the streamflow routing reach. 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. By default, inflow rates are zero for each reach." time_series = true -[blocks.period.fields.perioddata.item.fields.sfrsetting.arms.rainfall] +[blocks.period.fields.stress_period_data.item.fields.sfrsetting.arms.rainfall] type = "string" longname = "rainfall rate" description = "real or character value that defines the volumetric rate per unit area of water added by precipitation directly on the streamflow routing reach. 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. By default, rainfall rates are zero for each reach." time_series = true -[blocks.period.fields.perioddata.item.fields.sfrsetting.arms.evaporation] +[blocks.period.fields.stress_period_data.item.fields.sfrsetting.arms.evaporation] type = "string" longname = "evaporation rate" description = "real or character value that defines the volumetric rate per unit area of water subtracted by evaporation from the streamflow routing reach. A positive evaporation rate should be provided. 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. If the volumetric evaporation rate for a reach exceeds the sources of water to the reach (upstream and specified inflows, rainfall, and runoff but excluding groundwater leakage into the reach) the volumetric evaporation rate is limited to the sources of water to the reach. By default, evaporation rates are zero for each reach." time_series = true -[blocks.period.fields.perioddata.item.fields.sfrsetting.arms.runoff] +[blocks.period.fields.stress_period_data.item.fields.sfrsetting.arms.runoff] type = "string" longname = "runoff rate" description = "real or character value that defines the volumetric rate of diffuse overland runoff that enters the streamflow routing reach. 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. If the volumetric runoff rate for a reach is negative and exceeds inflows to the reach (upstream and specified inflows, and rainfall but excluding groundwater leakage into the reach) the volumetric runoff rate is limited to inflows to the reach and the volumetric evaporation rate for the reach is set to zero. By default, runoff rates are zero for each reach." time_series = true -[blocks.period.fields.perioddata.item.fields.sfrsetting.arms.diversionrecord] +[blocks.period.fields.stress_period_data.item.fields.sfrsetting.arms.diversionrecord] type = "record" -[blocks.period.fields.perioddata.item.fields.sfrsetting.arms.diversionrecord.fields.diversion] +[blocks.period.fields.stress_period_data.item.fields.sfrsetting.arms.diversionrecord.fields.diversion] type = "keyword" longname = "diversion keyword" description = "keyword to indicate diversion record." -[blocks.period.fields.perioddata.item.fields.sfrsetting.arms.diversionrecord.fields.idv] +[blocks.period.fields.stress_period_data.item.fields.sfrsetting.arms.diversionrecord.fields.idv] type = "integer" longname = "diversion number" description = "an integer value specifying which diversion of reach IFNO that DIVFLOW is being specified for. Must be less or equal to ndv for the current reach (IFNO)." tagged = false index = true -[blocks.period.fields.perioddata.item.fields.sfrsetting.arms.diversionrecord.fields.divflow] +[blocks.period.fields.stress_period_data.item.fields.sfrsetting.arms.diversionrecord.fields.divflow] type = "double" longname = "volumetric diversion flow rate" description = "real or character value that defines the volumetric diversion (DIVFLOW) rate for the streamflow routing reach. 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 -[blocks.period.fields.perioddata.item.fields.sfrsetting.arms.upstream_fraction] +[blocks.period.fields.stress_period_data.item.fields.sfrsetting.arms.upstream_fraction] type = "double" longname = "fraction of upstream flow" description = "real value that defines the fraction of upstream flow (USTRF) from each upstream reach that is applied as upstream inflow to the reach. The sum of all USTRF values for all reaches connected to the same upstream reach must be equal to one." -[blocks.period.fields.perioddata.item.fields.sfrsetting.arms.cross_sectionrecord] +[blocks.period.fields.stress_period_data.item.fields.sfrsetting.arms.cross_sectionrecord] type = "record" -[blocks.period.fields.perioddata.item.fields.sfrsetting.arms.cross_sectionrecord.fields.cross_section] +[blocks.period.fields.stress_period_data.item.fields.sfrsetting.arms.cross_sectionrecord.fields.cross_section] type = "keyword" longname = "cross_section keyword" description = "keyword to specify that record corresponds to a reach cross-section." -[blocks.period.fields.perioddata.item.fields.sfrsetting.arms.cross_sectionrecord.fields.tab6] +[blocks.period.fields.stress_period_data.item.fields.sfrsetting.arms.cross_sectionrecord.fields.tab6] type = "keyword" longname = "head keyword" description = "keyword to specify that record corresponds to a cross-section table file." -[blocks.period.fields.perioddata.item.fields.sfrsetting.arms.cross_sectionrecord.fields.tab6_filename] +[blocks.period.fields.stress_period_data.item.fields.sfrsetting.arms.cross_sectionrecord.fields.tab6_filename] type = "file" longname = "table file name" description = "character string that defines the path and filename for the file containing cross-section table data for the reach. The TAB6_FILENAME file includes the number of entries in the file and the station elevation data in terms of the fractional width and the reach depth. Instructions for creating the TAB6_FILENAME input file are provided in SFR Reach Cross-Section Table Input File section." @@ -548,19 +548,19 @@ tagged = false direction = "in" component = "utl-sfrtab" -[blocks.period.fields.perioddata.item.fields.sfrsetting.arms.auxiliaryrecord] +[blocks.period.fields.stress_period_data.item.fields.sfrsetting.arms.auxiliaryrecord] type = "record" -[blocks.period.fields.perioddata.item.fields.sfrsetting.arms.auxiliaryrecord.fields.auxiliary] +[blocks.period.fields.stress_period_data.item.fields.sfrsetting.arms.auxiliaryrecord.fields.auxiliary] type = "keyword" description = "keyword for specifying auxiliary variable." -[blocks.period.fields.perioddata.item.fields.sfrsetting.arms.auxiliaryrecord.fields.auxname] +[blocks.period.fields.stress_period_data.item.fields.sfrsetting.arms.auxiliaryrecord.fields.auxname] type = "string" description = "name for the auxiliary variable to be assigned AUXVAL. AUXNAME must match one of the auxiliary variable names defined in the OPTIONS block. If AUXNAME does not match one of the auxiliary variable names defined in the OPTIONS block the data are ignored." tagged = false -[blocks.period.fields.perioddata.item.fields.sfrsetting.arms.auxiliaryrecord.fields.auxval] +[blocks.period.fields.stress_period_data.item.fields.sfrsetting.arms.auxiliaryrecord.fields.auxval] type = "double" longname = "auxiliary variable value" description = "value for the auxiliary variable. 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." diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sfr.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sfr.yaml index a4abcdb7..bceece90 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sfr.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sfr.yaml @@ -524,7 +524,7 @@ blocks: tagged: false period: fields: - perioddata: + stress_period_data: type: list item: name: perioddata diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-uzf.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-uzf.json index 61910a2e..56eadff2 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-uzf.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-uzf.json @@ -327,7 +327,7 @@ }, "period": { "fields": { - "perioddata": { + "stress_period_data": { "type": "list", "item": { "name": "perioddata", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-uzf.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-uzf.toml index 54acdb1b..ac9c0f7d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-uzf.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-uzf.toml @@ -296,14 +296,14 @@ optional = true when = "boundnames" tagged = false -[blocks.period.fields.perioddata] +[blocks.period.fields.stress_period_data] type = "list" -[blocks.period.fields.perioddata.item] +[blocks.period.fields.stress_period_data.item] name = "perioddata" type = "record" -[blocks.period.fields.perioddata.item.fields.ifno] +[blocks.period.fields.stress_period_data.item.fields.ifno] type = "integer" longname = "UZF id number" description = "integer value that defines the feature (UZF object) number associated with the specified PERIOD data on the line." @@ -311,56 +311,56 @@ tagged = false index = true fk = "packagedata.ifno" -[blocks.period.fields.perioddata.item.fields.finf] +[blocks.period.fields.stress_period_data.item.fields.finf] type = "double" longname = "infiltration rate" description = "real or character value that defines the applied infiltration rate of the UZF cell ($LT^{-1}$). 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 -[blocks.period.fields.perioddata.item.fields.pet] +[blocks.period.fields.stress_period_data.item.fields.pet] type = "double" longname = "potential ET rate" description = "real or character value that defines the potential evapotranspiration rate of the UZF cell and specified GWF cell. Evapotranspiration is first removed from the unsaturated zone and any remaining potential evapotranspiration is applied to the saturated zone. If IVERTCON is greater than zero then residual potential evapotranspiration not satisfied in the UZF cell is applied to the underlying UZF and GWF cells. PET is always specified, but is only used if SIMULATE_ET is specified in the OPTIONS 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 -[blocks.period.fields.perioddata.item.fields.extdp] +[blocks.period.fields.stress_period_data.item.fields.extdp] type = "double" longname = "extinction depth" description = "real or character value that defines the evapotranspiration extinction depth of the UZF cell. If IVERTCON is greater than zero and EXTDP extends below the GWF cell bottom then remaining potential evapotranspiration is applied to the underlying UZF and GWF cells. EXTDP is always specified, but is only used if SIMULATE_ET is specified in the OPTIONS 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 -[blocks.period.fields.perioddata.item.fields.extwc] +[blocks.period.fields.stress_period_data.item.fields.extwc] type = "double" longname = "extinction water content" description = "real or character value that defines the evapotranspiration extinction water content of the UZF cell. EXTWC is always specified, but is only used if SIMULATE_ET and UNSAT_ETWC are specified in the OPTIONS block. The evapotranspiration rate from the unsaturated zone will be set to zero when the calculated water content is at or less than this value. The value for EXTWC cannot be less than the residual water content, and if it is specified as being less than the residual water content it is set to the residual water content. 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 -[blocks.period.fields.perioddata.item.fields.ha] +[blocks.period.fields.stress_period_data.item.fields.ha] type = "double" longname = "air entry potential" description = "real or character value that defines the air entry potential (head) of the UZF cell. HA is always specified, but is only used if SIMULATE_ET and UNSAT_ETAE are specified in the OPTIONS 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 -[blocks.period.fields.perioddata.item.fields.hroot] +[blocks.period.fields.stress_period_data.item.fields.hroot] type = "double" longname = "root potential" description = "real or character value that defines the root potential (head) of the UZF cell. HROOT is always specified, but is only used if SIMULATE_ET and UNSAT_ETAE are specified in the OPTIONS 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 -[blocks.period.fields.perioddata.item.fields.rootact] +[blocks.period.fields.stress_period_data.item.fields.rootact] type = "double" longname = "root activity function" description = "real or character value that defines the root activity function of the UZF cell. ROOTACT is the length of roots in a given volume of soil divided by that volume. Values range from 0 to about 3 $cm^{-2}$, depending on the plant community and its stage of development. ROOTACT is always specified, but is only used if SIMULATE_ET and UNSAT_ETAE are specified in the OPTIONS 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 -[blocks.period.fields.perioddata.item.fields.aux] +[blocks.period.fields.stress_period_data.item.fields.aux] type = "array" longname = "auxiliary variables" description = "represents the values of the auxiliary variables for each UZF. The values of auxiliary variables must be present for each UZF. The values must be specified in the order of the auxiliary variables specified in the OPTIONS block. If the package supports time series and the Options block includes a TIMESERIESFILE entry (see the 'Time-Variable Input' section), values can be obtained from a time series by entering the time-series name in place of a numeric value." diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-uzf.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-uzf.yaml index e2bf16c2..7229f80d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-uzf.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-uzf.yaml @@ -324,7 +324,7 @@ blocks: - nuzfcells period: fields: - perioddata: + stress_period_data: type: list item: name: perioddata diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-lkt.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-lkt.json index 05ff07ba..547d5d3d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-lkt.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-lkt.json @@ -209,7 +209,7 @@ }, "period": { "fields": { - "lakeperioddata": { + "stress_period_data": { "type": "list", "item": { "name": "lakeperioddata", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-lkt.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-lkt.toml index a3ee3e6b..0b95c10d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-lkt.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-lkt.toml @@ -184,14 +184,14 @@ optional = true when = "boundnames" tagged = false -[blocks.period.fields.lakeperioddata] +[blocks.period.fields.stress_period_data] type = "list" -[blocks.period.fields.lakeperioddata.item] +[blocks.period.fields.stress_period_data.item] name = "lakeperioddata" type = "record" -[blocks.period.fields.lakeperioddata.item.fields.ifno] +[blocks.period.fields.stress_period_data.item.fields.ifno] type = "integer" longname = "lake number for this entry" description = "integer value that defines the feature (lake) number associated with the specified PERIOD data on the line. IFNO must be greater than zero and less than or equal to NLAKES." @@ -199,58 +199,58 @@ tagged = false index = true fk = "packagedata.ifno" -[blocks.period.fields.lakeperioddata.item.fields.laksetting] +[blocks.period.fields.stress_period_data.item.fields.laksetting] type = "union" description = "line of information that is parsed into a keyword and values. Keyword values that can be used to start the LAKSETTING string include: STATUS, CONCENTRATION, RAINFALL, EVAPORATION, RUNOFF, EXT-INFLOW, and AUXILIARY. These settings are used to assign the concentration of associated with the corresponding flow terms. Concentrations cannot be specified for all flow terms. For example, the Lake Package supports a 'WITHDRAWAL' flow term. If this withdrawal term is active, then water will be withdrawn from the lake at the calculated concentration of the lake." -[blocks.period.fields.lakeperioddata.item.fields.laksetting.arms.status] +[blocks.period.fields.stress_period_data.item.fields.laksetting.arms.status] type = "string" longname = "lake concentration status" description = "keyword option to define lake status. STATUS can be ACTIVE, INACTIVE, or CONSTANT. By default, STATUS is ACTIVE, which means that concentration will be calculated for the lake. If a lake is inactive, then there will be no solute mass fluxes into or out of the lake and the inactive value will be written for the lake concentration. If a lake is constant, then the concentration for the lake will be fixed at the user specified value." -[blocks.period.fields.lakeperioddata.item.fields.laksetting.arms.concentration] +[blocks.period.fields.stress_period_data.item.fields.laksetting.arms.concentration] type = "string" longname = "lake concentration" description = "real or character value that defines the concentration for the lake. The specified CONCENTRATION is only applied if the lake is a constant concentration lake. 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." time_series = true -[blocks.period.fields.lakeperioddata.item.fields.laksetting.arms.rainfall] +[blocks.period.fields.stress_period_data.item.fields.laksetting.arms.rainfall] type = "string" longname = "rainfall concentration" description = "real or character value that defines the rainfall solute concentration $(ML^{-3})$ for the lake. 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." time_series = true -[blocks.period.fields.lakeperioddata.item.fields.laksetting.arms.evaporation] +[blocks.period.fields.stress_period_data.item.fields.laksetting.arms.evaporation] type = "string" longname = "evaporation concentration" description = "real or character value that defines the concentration of evaporated water $(ML^{-3})$ for the lake. If this concentration value is larger than the simulated concentration in the lake, then the evaporated water will be removed at the same concentration as the lake. 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." time_series = true -[blocks.period.fields.lakeperioddata.item.fields.laksetting.arms.runoff] +[blocks.period.fields.stress_period_data.item.fields.laksetting.arms.runoff] type = "string" longname = "runoff concentration" description = "real or character value that defines the concentration of runoff $(ML^{-3})$ for the lake. Value must be greater than or equal to zero. 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." time_series = true -[blocks.period.fields.lakeperioddata.item.fields.laksetting.arms.ext-inflow] +[blocks.period.fields.stress_period_data.item.fields.laksetting.arms.ext-inflow] type = "string" longname = "ext-inflow concentration" description = "real or character value that defines the concentration of external inflow $(ML^{-3})$ for the lake. Value must be greater than or equal to zero. 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." time_series = true -[blocks.period.fields.lakeperioddata.item.fields.laksetting.arms.auxiliaryrecord] +[blocks.period.fields.stress_period_data.item.fields.laksetting.arms.auxiliaryrecord] type = "record" -[blocks.period.fields.lakeperioddata.item.fields.laksetting.arms.auxiliaryrecord.fields.auxiliary] +[blocks.period.fields.stress_period_data.item.fields.laksetting.arms.auxiliaryrecord.fields.auxiliary] type = "keyword" description = "keyword for specifying auxiliary variable." -[blocks.period.fields.lakeperioddata.item.fields.laksetting.arms.auxiliaryrecord.fields.auxname] +[blocks.period.fields.stress_period_data.item.fields.laksetting.arms.auxiliaryrecord.fields.auxname] type = "string" description = "name for the auxiliary variable to be assigned AUXVAL. AUXNAME must match one of the auxiliary variable names defined in the OPTIONS block. If AUXNAME does not match one of the auxiliary variable names defined in the OPTIONS block the data are ignored." tagged = false -[blocks.period.fields.lakeperioddata.item.fields.laksetting.arms.auxiliaryrecord.fields.auxval] +[blocks.period.fields.stress_period_data.item.fields.laksetting.arms.auxiliaryrecord.fields.auxval] type = "double" longname = "auxiliary variable value" description = "value for the auxiliary variable. 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." diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-lkt.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-lkt.yaml index c255197f..670d0428 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-lkt.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-lkt.yaml @@ -202,7 +202,7 @@ blocks: tagged: false period: fields: - lakeperioddata: + stress_period_data: type: list item: name: lakeperioddata diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-mwt.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-mwt.json index ec8f9c51..16ecdf1a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-mwt.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-mwt.json @@ -209,7 +209,7 @@ }, "period": { "fields": { - "mwtperioddata": { + "stress_period_data": { "type": "list", "item": { "name": "mwtperioddata", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-mwt.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-mwt.toml index f6194bd4..54c79775 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-mwt.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-mwt.toml @@ -184,14 +184,14 @@ optional = true when = "boundnames" tagged = false -[blocks.period.fields.mwtperioddata] +[blocks.period.fields.stress_period_data] type = "list" -[blocks.period.fields.mwtperioddata.item] +[blocks.period.fields.stress_period_data.item] name = "mwtperioddata" type = "record" -[blocks.period.fields.mwtperioddata.item.fields.ifno] +[blocks.period.fields.stress_period_data.item.fields.ifno] type = "integer" longname = "well number for this entry" description = "integer value that defines the feature (well) number associated with the specified PERIOD data on the line. IFNO must be greater than zero and less than or equal to NMAWWELLS." @@ -199,40 +199,40 @@ tagged = false index = true fk = "packagedata.ifno" -[blocks.period.fields.mwtperioddata.item.fields.mwtsetting] +[blocks.period.fields.stress_period_data.item.fields.mwtsetting] type = "union" description = "line of information that is parsed into a keyword and values. Keyword values that can be used to start the MWTSETTING string include: STATUS, CONCENTRATION, RATE, and AUXILIARY. These settings are used to assign the concentration associated with the corresponding flow terms. Concentrations cannot be specified for all flow terms. For example, the Multi-Aquifer Well Package supports a 'WITHDRAWAL' flow term. If this withdrawal term is active, then water will be withdrawn from the well at the calculated concentration of the well." -[blocks.period.fields.mwtperioddata.item.fields.mwtsetting.arms.status] +[blocks.period.fields.stress_period_data.item.fields.mwtsetting.arms.status] type = "string" longname = "well concentration status" description = "keyword option to define well status. STATUS can be ACTIVE, INACTIVE, or CONSTANT. By default, STATUS is ACTIVE, which means that concentration will be calculated for the well. If a well is inactive, then there will be no solute mass fluxes into or out of the well and the inactive value will be written for the well concentration. If a well is constant, then the concentration for the well will be fixed at the user specified value." -[blocks.period.fields.mwtperioddata.item.fields.mwtsetting.arms.concentration] +[blocks.period.fields.stress_period_data.item.fields.mwtsetting.arms.concentration] type = "string" longname = "well concentration" description = "real or character value that defines the concentration for the well. The specified CONCENTRATION is only applied if the well is a constant concentration well. 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." time_series = true -[blocks.period.fields.mwtperioddata.item.fields.mwtsetting.arms.rate] +[blocks.period.fields.stress_period_data.item.fields.mwtsetting.arms.rate] type = "string" longname = "well injection concentration" description = "real or character value that defines the injection solute concentration $(ML^{-3})$ for the well. 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." time_series = true -[blocks.period.fields.mwtperioddata.item.fields.mwtsetting.arms.auxiliaryrecord] +[blocks.period.fields.stress_period_data.item.fields.mwtsetting.arms.auxiliaryrecord] type = "record" -[blocks.period.fields.mwtperioddata.item.fields.mwtsetting.arms.auxiliaryrecord.fields.auxiliary] +[blocks.period.fields.stress_period_data.item.fields.mwtsetting.arms.auxiliaryrecord.fields.auxiliary] type = "keyword" description = "keyword for specifying auxiliary variable." -[blocks.period.fields.mwtperioddata.item.fields.mwtsetting.arms.auxiliaryrecord.fields.auxname] +[blocks.period.fields.stress_period_data.item.fields.mwtsetting.arms.auxiliaryrecord.fields.auxname] type = "string" description = "name for the auxiliary variable to be assigned AUXVAL. AUXNAME must match one of the auxiliary variable names defined in the OPTIONS block. If AUXNAME does not match one of the auxiliary variable names defined in the OPTIONS block the data are ignored." tagged = false -[blocks.period.fields.mwtperioddata.item.fields.mwtsetting.arms.auxiliaryrecord.fields.auxval] +[blocks.period.fields.stress_period_data.item.fields.mwtsetting.arms.auxiliaryrecord.fields.auxval] type = "double" longname = "auxiliary variable value" description = "value for the auxiliary variable. 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." diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-mwt.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-mwt.yaml index 41a295f9..c5844927 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-mwt.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-mwt.yaml @@ -202,7 +202,7 @@ blocks: tagged: false period: fields: - mwtperioddata: + stress_period_data: type: list item: name: mwtperioddata diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-oc.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-oc.json index 6d8578f3..c22b099d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-oc.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-oc.json @@ -110,7 +110,7 @@ }, "period": { "fields": { - "output": { + "stress_period_data": { "type": "list", "optional": true, "item": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-oc.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-oc.toml index 8cf47858..b911925c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-oc.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-oc.toml @@ -93,24 +93,24 @@ longname = "write format" description = "write format can be EXPONENTIAL, FIXED, GENERAL, or SCIENTIFIC." tagged = false -[blocks.period.fields.output] +[blocks.period.fields.stress_period_data] type = "list" optional = true -[blocks.period.fields.output.item] +[blocks.period.fields.stress_period_data.item] name = "output_record" type = "union" -[blocks.period.fields.output.item.arms.saverecord] +[blocks.period.fields.stress_period_data.item.arms.saverecord] type = "record" optional = true -[blocks.period.fields.output.item.arms.saverecord.fields.save] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.save] type = "keyword" longname = "keyword to save" description = "keyword to indicate that information will be saved this stress period." -[blocks.period.fields.output.item.arms.saverecord.fields.rtype] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.rtype] type = "string" longname = "record type" description = "type of information to save or print. Can be BUDGET or CONCENTRATION." @@ -120,27 +120,27 @@ valid = [ "BUDGET", ] -[blocks.period.fields.output.item.arms.saverecord.fields.ocsetting] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.ocsetting] type = "union" description = "specifies the steps for which the data will be saved." -[blocks.period.fields.output.item.arms.saverecord.fields.ocsetting.arms.all] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.all] type = "keyword" description = "keyword to indicate save for all time steps in period." -[blocks.period.fields.output.item.arms.saverecord.fields.ocsetting.arms.first] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.first] type = "keyword" description = "keyword to indicate save for first step in period. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." -[blocks.period.fields.output.item.arms.saverecord.fields.ocsetting.arms.last] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.last] type = "keyword" description = "keyword to indicate save for last step in period. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." -[blocks.period.fields.output.item.arms.saverecord.fields.ocsetting.arms.frequency] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.frequency] type = "integer" description = "save at the specified time step frequency. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." -[blocks.period.fields.output.item.arms.saverecord.fields.ocsetting.arms.steps] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.steps] type = "array" description = "save for each step specified in STEPS. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." dtype = "integer" @@ -148,16 +148,16 @@ shape = [ "<=nstp", ] -[blocks.period.fields.output.item.arms.printrecord] +[blocks.period.fields.stress_period_data.item.arms.printrecord] type = "record" optional = true -[blocks.period.fields.output.item.arms.printrecord.fields.print] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.print] type = "keyword" longname = "keyword to save" description = "keyword to indicate that information will be printed this stress period." -[blocks.period.fields.output.item.arms.printrecord.fields.rtype] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.rtype] type = "string" longname = "record type" description = "type of information to save or print. Can be BUDGET or CONCENTRATION." @@ -167,27 +167,27 @@ valid = [ "BUDGET", ] -[blocks.period.fields.output.item.arms.printrecord.fields.ocsetting] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.ocsetting] type = "union" description = "specifies the steps for which the data will be saved." -[blocks.period.fields.output.item.arms.printrecord.fields.ocsetting.arms.all] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.all] type = "keyword" description = "keyword to indicate save for all time steps in period." -[blocks.period.fields.output.item.arms.printrecord.fields.ocsetting.arms.first] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.first] type = "keyword" description = "keyword to indicate save for first step in period. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." -[blocks.period.fields.output.item.arms.printrecord.fields.ocsetting.arms.last] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.last] type = "keyword" description = "keyword to indicate save for last step in period. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." -[blocks.period.fields.output.item.arms.printrecord.fields.ocsetting.arms.frequency] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.frequency] type = "integer" description = "save at the specified time step frequency. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." -[blocks.period.fields.output.item.arms.printrecord.fields.ocsetting.arms.steps] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.steps] type = "array" description = "save for each step specified in STEPS. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." dtype = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-oc.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-oc.yaml index eae2dcdc..cac78692 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-oc.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-oc.yaml @@ -86,7 +86,7 @@ blocks: tagged: false period: fields: - output: + stress_period_data: type: list optional: true item: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-sft.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-sft.json index 40b0bb06..ecc7a283 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-sft.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-sft.json @@ -209,7 +209,7 @@ }, "period": { "fields": { - "reachperioddata": { + "stress_period_data": { "type": "list", "item": { "name": "reachperioddata", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-sft.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-sft.toml index e29e83ee..ce2535ea 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-sft.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-sft.toml @@ -184,14 +184,14 @@ optional = true when = "boundnames" tagged = false -[blocks.period.fields.reachperioddata] +[blocks.period.fields.stress_period_data] type = "list" -[blocks.period.fields.reachperioddata.item] +[blocks.period.fields.stress_period_data.item] name = "reachperioddata" type = "record" -[blocks.period.fields.reachperioddata.item.fields.ifno] +[blocks.period.fields.stress_period_data.item.fields.ifno] type = "integer" longname = "reach number for this entry" description = "integer value that defines the feature (reach) number associated with the specified PERIOD data on the line. IFNO must be greater than zero and less than or equal to NREACHES." @@ -199,58 +199,58 @@ tagged = false index = true fk = "packagedata.ifno" -[blocks.period.fields.reachperioddata.item.fields.reachsetting] +[blocks.period.fields.stress_period_data.item.fields.reachsetting] type = "union" description = "line of information that is parsed into a keyword and values. Keyword values that can be used to start the REACHSETTING string include: STATUS, CONCENTRATION, RAINFALL, EVAPORATION, RUNOFF, and AUXILIARY. These settings are used to assign the concentration of associated with the corresponding flow terms. Concentrations cannot be specified for all flow terms. For example, the Streamflow Package supports a 'DIVERSION' flow term. Diversion water will be routed using the calculated concentration of the reach." -[blocks.period.fields.reachperioddata.item.fields.reachsetting.arms.status] +[blocks.period.fields.stress_period_data.item.fields.reachsetting.arms.status] type = "string" longname = "reach concentration status" description = "keyword option to define reach status. STATUS can be ACTIVE, INACTIVE, or CONSTANT. By default, STATUS is ACTIVE, which means that concentration will be calculated for the reach. If a reach is inactive, then there will be no solute mass fluxes into or out of the reach and the inactive value will be written for the reach concentration. If a reach is constant, then the concentration for the reach will be fixed at the user specified value." -[blocks.period.fields.reachperioddata.item.fields.reachsetting.arms.concentration] +[blocks.period.fields.stress_period_data.item.fields.reachsetting.arms.concentration] type = "string" longname = "reach concentration" description = "real or character value that defines the concentration for the reach. The specified CONCENTRATION is only applied if the reach is a constant concentration reach. 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." time_series = true -[blocks.period.fields.reachperioddata.item.fields.reachsetting.arms.rainfall] +[blocks.period.fields.stress_period_data.item.fields.reachsetting.arms.rainfall] type = "string" longname = "rainfall concentration" description = "real or character value that defines the rainfall solute concentration $(ML^{-3})$ for the reach. 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." time_series = true -[blocks.period.fields.reachperioddata.item.fields.reachsetting.arms.evaporation] +[blocks.period.fields.stress_period_data.item.fields.reachsetting.arms.evaporation] type = "string" longname = "evaporation concentration" description = "real or character value that defines the concentration of evaporated water $(ML^{-3})$ for the reach. If this concentration value is larger than the simulated concentration in the reach, then the evaporated water will be removed at the same concentration as the reach. 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." time_series = true -[blocks.period.fields.reachperioddata.item.fields.reachsetting.arms.runoff] +[blocks.period.fields.stress_period_data.item.fields.reachsetting.arms.runoff] type = "string" longname = "runoff concentration" description = "real or character value that defines the concentration of runoff $(ML^{-3})$ for the reach. Value must be greater than or equal to zero. 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." time_series = true -[blocks.period.fields.reachperioddata.item.fields.reachsetting.arms.inflow] +[blocks.period.fields.stress_period_data.item.fields.reachsetting.arms.inflow] type = "string" longname = "inflow concentration" description = "real or character value that defines the concentration of inflow $(ML^{-3})$ for the reach. Value must be greater than or equal to zero. 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." time_series = true -[blocks.period.fields.reachperioddata.item.fields.reachsetting.arms.auxiliaryrecord] +[blocks.period.fields.stress_period_data.item.fields.reachsetting.arms.auxiliaryrecord] type = "record" -[blocks.period.fields.reachperioddata.item.fields.reachsetting.arms.auxiliaryrecord.fields.auxiliary] +[blocks.period.fields.stress_period_data.item.fields.reachsetting.arms.auxiliaryrecord.fields.auxiliary] type = "keyword" description = "keyword for specifying auxiliary variable." -[blocks.period.fields.reachperioddata.item.fields.reachsetting.arms.auxiliaryrecord.fields.auxname] +[blocks.period.fields.stress_period_data.item.fields.reachsetting.arms.auxiliaryrecord.fields.auxname] type = "string" description = "name for the auxiliary variable to be assigned AUXVAL. AUXNAME must match one of the auxiliary variable names defined in the OPTIONS block. If AUXNAME does not match one of the auxiliary variable names defined in the OPTIONS block the data are ignored." tagged = false -[blocks.period.fields.reachperioddata.item.fields.reachsetting.arms.auxiliaryrecord.fields.auxval] +[blocks.period.fields.stress_period_data.item.fields.reachsetting.arms.auxiliaryrecord.fields.auxval] type = "double" longname = "auxiliary variable value" description = "value for the auxiliary variable. 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." diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-sft.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-sft.yaml index 9f939005..52236ec6 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-sft.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-sft.yaml @@ -202,7 +202,7 @@ blocks: tagged: false period: fields: - reachperioddata: + stress_period_data: type: list item: name: reachperioddata diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-uzt.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-uzt.json index 5abc6bb3..3e3253e6 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-uzt.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-uzt.json @@ -209,7 +209,7 @@ }, "period": { "fields": { - "uztperioddata": { + "stress_period_data": { "type": "list", "item": { "name": "uztperioddata", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-uzt.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-uzt.toml index dcc3890a..bc3b2fa0 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-uzt.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-uzt.toml @@ -184,14 +184,14 @@ optional = true when = "boundnames" tagged = false -[blocks.period.fields.uztperioddata] +[blocks.period.fields.stress_period_data] type = "list" -[blocks.period.fields.uztperioddata.item] +[blocks.period.fields.stress_period_data.item] name = "uztperioddata" type = "record" -[blocks.period.fields.uztperioddata.item.fields.ifno] +[blocks.period.fields.stress_period_data.item.fields.ifno] type = "integer" longname = "unsaturated zone flow cell number for this entry" description = "integer value that defines the feature (UZF object) number associated with the specified PERIOD data on the line. IFNO must be greater than zero and less than or equal to NUZFCELLS." @@ -199,46 +199,46 @@ tagged = false index = true fk = "packagedata.ifno" -[blocks.period.fields.uztperioddata.item.fields.uztsetting] +[blocks.period.fields.stress_period_data.item.fields.uztsetting] type = "union" description = "line of information that is parsed into a keyword and values. Keyword values that can be used to start the UZTSETTING string include: STATUS, CONCENTRATION, INFILTRATION, UZET, and AUXILIARY. These settings are used to assign the concentration of associated with the corresponding flow terms. Concentrations cannot be specified for all flow terms." -[blocks.period.fields.uztperioddata.item.fields.uztsetting.arms.status] +[blocks.period.fields.stress_period_data.item.fields.uztsetting.arms.status] type = "string" longname = "unsaturated zone flow cell concentration status" description = "keyword option to define UZF cell status. STATUS can be ACTIVE, INACTIVE, or CONSTANT. By default, STATUS is ACTIVE, which means that concentration will be calculated for the UZF cell. If a UZF cell is inactive, then there will be no solute mass fluxes into or out of the UZF cell and the inactive value will be written for the UZF cell concentration. If a UZF cell is constant, then the concentration for the UZF cell will be fixed at the user specified value." -[blocks.period.fields.uztperioddata.item.fields.uztsetting.arms.concentration] +[blocks.period.fields.stress_period_data.item.fields.uztsetting.arms.concentration] type = "string" longname = "unsaturated zone flow cell concentration" description = "real or character value that defines the concentration for the unsaturated zone flow cell. The specified CONCENTRATION is only applied if the unsaturated zone flow cell is a constant concentration cell. 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." time_series = true -[blocks.period.fields.uztperioddata.item.fields.uztsetting.arms.infiltration] +[blocks.period.fields.stress_period_data.item.fields.uztsetting.arms.infiltration] type = "string" longname = "infiltration concentration" description = "real or character value that defines the infiltration solute concentration $(ML^{-3})$ for the UZF cell. 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." time_series = true -[blocks.period.fields.uztperioddata.item.fields.uztsetting.arms.uzet] +[blocks.period.fields.stress_period_data.item.fields.uztsetting.arms.uzet] type = "string" longname = "unsaturated zone et concentration" description = "real or character value that defines the concentration of unsaturated zone evapotranspiration water $(ML^{-3})$ for the UZF cell. If this concentration value is larger than the simulated concentration in the UZF cell, then the unsaturated zone ET water will be removed at the same concentration as the UZF cell. 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." time_series = true -[blocks.period.fields.uztperioddata.item.fields.uztsetting.arms.auxiliaryrecord] +[blocks.period.fields.stress_period_data.item.fields.uztsetting.arms.auxiliaryrecord] type = "record" -[blocks.period.fields.uztperioddata.item.fields.uztsetting.arms.auxiliaryrecord.fields.auxiliary] +[blocks.period.fields.stress_period_data.item.fields.uztsetting.arms.auxiliaryrecord.fields.auxiliary] type = "keyword" description = "keyword for specifying auxiliary variable." -[blocks.period.fields.uztperioddata.item.fields.uztsetting.arms.auxiliaryrecord.fields.auxname] +[blocks.period.fields.stress_period_data.item.fields.uztsetting.arms.auxiliaryrecord.fields.auxname] type = "string" description = "name for the auxiliary variable to be assigned AUXVAL. AUXNAME must match one of the auxiliary variable names defined in the OPTIONS block. If AUXNAME does not match one of the auxiliary variable names defined in the OPTIONS block the data are ignored." tagged = false -[blocks.period.fields.uztperioddata.item.fields.uztsetting.arms.auxiliaryrecord.fields.auxval] +[blocks.period.fields.stress_period_data.item.fields.uztsetting.arms.auxiliaryrecord.fields.auxval] type = "double" longname = "auxiliary variable value" description = "value for the auxiliary variable. 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." diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-uzt.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-uzt.yaml index 76c00585..b5444434 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-uzt.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-uzt.yaml @@ -204,7 +204,7 @@ blocks: tagged: false period: fields: - uztperioddata: + stress_period_data: type: list item: name: uztperioddata diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-oc.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-oc.json index 322129aa..4fd4ed94 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-oc.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-oc.json @@ -128,7 +128,7 @@ }, "period": { "fields": { - "output": { + "stress_period_data": { "type": "list", "optional": true, "item": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-oc.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-oc.toml index a6771d46..7596a7c4 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-oc.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-oc.toml @@ -109,24 +109,24 @@ longname = "write format" description = "write format can be EXPONENTIAL, FIXED, GENERAL, or SCIENTIFIC." tagged = false -[blocks.period.fields.output] +[blocks.period.fields.stress_period_data] type = "list" optional = true -[blocks.period.fields.output.item] +[blocks.period.fields.stress_period_data.item] name = "output_record" type = "union" -[blocks.period.fields.output.item.arms.saverecord] +[blocks.period.fields.stress_period_data.item.arms.saverecord] type = "record" optional = true -[blocks.period.fields.output.item.arms.saverecord.fields.save] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.save] type = "keyword" longname = "keyword to save" description = "keyword to indicate that information will be saved this stress period." -[blocks.period.fields.output.item.arms.saverecord.fields.rtype] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.rtype] type = "string" longname = "record type" description = "type of information to save or print. Can be BUDGET." @@ -136,27 +136,27 @@ valid = [ "BUDGET", ] -[blocks.period.fields.output.item.arms.saverecord.fields.ocsetting] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.ocsetting] type = "union" description = "specifies the steps for which the data will be saved." -[blocks.period.fields.output.item.arms.saverecord.fields.ocsetting.arms.all] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.all] type = "keyword" description = "keyword to indicate save for all time steps in period." -[blocks.period.fields.output.item.arms.saverecord.fields.ocsetting.arms.first] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.first] type = "keyword" description = "keyword to indicate save for first step in period. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." -[blocks.period.fields.output.item.arms.saverecord.fields.ocsetting.arms.last] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.last] type = "keyword" description = "keyword to indicate save for last step in period. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." -[blocks.period.fields.output.item.arms.saverecord.fields.ocsetting.arms.frequency] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.frequency] type = "integer" description = "save at the specified time step frequency. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." -[blocks.period.fields.output.item.arms.saverecord.fields.ocsetting.arms.steps] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.steps] type = "array" description = "save for each step specified in STEPS. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." dtype = "integer" @@ -164,16 +164,16 @@ shape = [ "<=nstp", ] -[blocks.period.fields.output.item.arms.printrecord] +[blocks.period.fields.stress_period_data.item.arms.printrecord] type = "record" optional = true -[blocks.period.fields.output.item.arms.printrecord.fields.print] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.print] type = "keyword" longname = "keyword to save" description = "keyword to indicate that information will be printed this stress period." -[blocks.period.fields.output.item.arms.printrecord.fields.rtype] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.rtype] type = "string" longname = "record type" description = "type of information to save or print. Can be BUDGET." @@ -183,27 +183,27 @@ valid = [ "BUDGET", ] -[blocks.period.fields.output.item.arms.printrecord.fields.ocsetting] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.ocsetting] type = "union" description = "specifies the steps for which the data will be saved." -[blocks.period.fields.output.item.arms.printrecord.fields.ocsetting.arms.all] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.all] type = "keyword" description = "keyword to indicate save for all time steps in period." -[blocks.period.fields.output.item.arms.printrecord.fields.ocsetting.arms.first] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.first] type = "keyword" description = "keyword to indicate save for first step in period. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." -[blocks.period.fields.output.item.arms.printrecord.fields.ocsetting.arms.last] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.last] type = "keyword" description = "keyword to indicate save for last step in period. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." -[blocks.period.fields.output.item.arms.printrecord.fields.ocsetting.arms.frequency] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.frequency] type = "integer" description = "save at the specified time step frequency. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." -[blocks.period.fields.output.item.arms.printrecord.fields.ocsetting.arms.steps] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.steps] type = "array" description = "save for each step specified in STEPS. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." dtype = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-oc.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-oc.yaml index 4f623b7b..18d19a6d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-oc.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-oc.yaml @@ -100,7 +100,7 @@ blocks: tagged: false period: fields: - output: + stress_period_data: type: list optional: true item: 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 d3410712..630615e6 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-oc.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-oc.json @@ -216,7 +216,7 @@ }, "period": { "fields": { - "output": { + "stress_period_data": { "type": "list", "optional": true, "item": { 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 76d6c45a..55c81b51 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-oc.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-oc.toml @@ -185,24 +185,24 @@ longname = "release time" description = "real value that defines the tracking time with respect to the simulation start time." tagged = false -[blocks.period.fields.output] +[blocks.period.fields.stress_period_data] type = "list" optional = true -[blocks.period.fields.output.item] +[blocks.period.fields.stress_period_data.item] name = "output_record" type = "union" -[blocks.period.fields.output.item.arms.saverecord] +[blocks.period.fields.stress_period_data.item.arms.saverecord] type = "record" optional = true -[blocks.period.fields.output.item.arms.saverecord.fields.save] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.save] type = "keyword" longname = "keyword to save" description = "keyword to indicate that information will be saved this stress period." -[blocks.period.fields.output.item.arms.saverecord.fields.rtype] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.rtype] type = "string" longname = "record type" description = "type of information to save or print. Can only be BUDGET." @@ -211,27 +211,27 @@ valid = [ "BUDGET", ] -[blocks.period.fields.output.item.arms.saverecord.fields.ocsetting] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.ocsetting] type = "union" description = "specifies the steps for which the data will be saved." -[blocks.period.fields.output.item.arms.saverecord.fields.ocsetting.arms.all] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.all] type = "keyword" description = "keyword to indicate save for all time steps in period." -[blocks.period.fields.output.item.arms.saverecord.fields.ocsetting.arms.first] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.first] type = "keyword" description = "keyword to indicate save for first step in period. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." -[blocks.period.fields.output.item.arms.saverecord.fields.ocsetting.arms.last] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.last] type = "keyword" description = "keyword to indicate save for last step in period. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." -[blocks.period.fields.output.item.arms.saverecord.fields.ocsetting.arms.frequency] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.frequency] type = "integer" description = "save at the specified time step frequency. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." -[blocks.period.fields.output.item.arms.saverecord.fields.ocsetting.arms.steps] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.steps] type = "array" description = "save for each step specified in STEPS. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." dtype = "integer" @@ -239,16 +239,16 @@ shape = [ "<=nstp", ] -[blocks.period.fields.output.item.arms.printrecord] +[blocks.period.fields.stress_period_data.item.arms.printrecord] type = "record" optional = true -[blocks.period.fields.output.item.arms.printrecord.fields.print] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.print] type = "keyword" longname = "keyword to save" description = "keyword to indicate that information will be printed this stress period." -[blocks.period.fields.output.item.arms.printrecord.fields.rtype] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.rtype] type = "string" longname = "record type" description = "type of information to save or print. Can only be BUDGET." @@ -257,27 +257,27 @@ valid = [ "BUDGET", ] -[blocks.period.fields.output.item.arms.printrecord.fields.ocsetting] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.ocsetting] type = "union" description = "specifies the steps for which the data will be saved." -[blocks.period.fields.output.item.arms.printrecord.fields.ocsetting.arms.all] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.all] type = "keyword" description = "keyword to indicate save for all time steps in period." -[blocks.period.fields.output.item.arms.printrecord.fields.ocsetting.arms.first] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.first] type = "keyword" description = "keyword to indicate save for first step in period. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." -[blocks.period.fields.output.item.arms.printrecord.fields.ocsetting.arms.last] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.last] type = "keyword" description = "keyword to indicate save for last step in period. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." -[blocks.period.fields.output.item.arms.printrecord.fields.ocsetting.arms.frequency] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.frequency] type = "integer" description = "save at the specified time step frequency. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." -[blocks.period.fields.output.item.arms.printrecord.fields.ocsetting.arms.steps] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.steps] type = "array" description = "save for each step specified in STEPS. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." dtype = "integer" 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 78b41520..a86a7991 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-oc.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-oc.yaml @@ -182,7 +182,7 @@ blocks: - ntracktimes period: fields: - output: + stress_period_data: type: list optional: true item: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-prp.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-prp.json index 6745f17f..044eb218 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-prp.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-prp.json @@ -304,7 +304,7 @@ }, "period": { "fields": { - "perioddata": { + "stress_period_data": { "type": "list", "item": { "name": "releasesetting", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-prp.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-prp.toml index 085f5a71..9c076aaa 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-prp.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-prp.toml @@ -271,31 +271,31 @@ longname = "release time" description = "real value that defines the release time with respect to the simulation start time." tagged = false -[blocks.period.fields.perioddata] +[blocks.period.fields.stress_period_data] type = "list" -[blocks.period.fields.perioddata.item] +[blocks.period.fields.stress_period_data.item] name = "releasesetting" type = "union" description = "specifies time steps at which to release a particle. A particle is released at the beginning of each specified time step. For fine control over release timing, specify times explicitly using the RELEASETIMES block. If the beginning of a specified time step coincides with a release time specified in the RELEASETIMES block or configured via RELEASE_TIME_FREQUENCY, only one particle is released at that time. Coincidence is evaluated up to the tolerance specified in RELEASE_TIME_TOLERANCE, or $epsilon times 10^{11}$ by default, where $epsilon$ is machine precision. If no release times are configured via this setting, the RELEASETIMES block, or the RELEASE_TIME_FREQUENCY option, a single release time is configured at the beginning of the first time step of the simulation's first stress period." -[blocks.period.fields.perioddata.item.arms.all] +[blocks.period.fields.stress_period_data.item.arms.all] type = "keyword" description = "keyword to indicate release at the start of all time steps in the period." -[blocks.period.fields.perioddata.item.arms.first] +[blocks.period.fields.stress_period_data.item.arms.first] type = "keyword" description = "keyword to indicate release at the start of the first time step in the period. This keyword may be used in conjunction with other RELEASESETTING options." -[blocks.period.fields.perioddata.item.arms.last] +[blocks.period.fields.stress_period_data.item.arms.last] type = "keyword" description = "keyword to indicate release at the start of the last time step in the period. This keyword may be used in conjunction with other RELEASESETTING options." -[blocks.period.fields.perioddata.item.arms.frequency] +[blocks.period.fields.stress_period_data.item.arms.frequency] type = "integer" description = "release at the specified time step frequency. This keyword may be used in conjunction with other RELEASESETTING options." -[blocks.period.fields.perioddata.item.arms.steps] +[blocks.period.fields.stress_period_data.item.arms.steps] type = "array" description = "release at the start of each step specified in STEPS. This option may be used in conjunction with other RELEASESETTING options." dtype = "integer" @@ -303,7 +303,7 @@ shape = [ "<=nstp", ] -[blocks.period.fields.perioddata.item.arms.fraction] +[blocks.period.fields.stress_period_data.item.arms.fraction] type = "array" description = "release particles after the specified fraction of the time step has elapsed. If FRACTION is not set, particles are released at the start of the specified time step(s). FRACTION must be a single value when used with ALL, FIRST, or FREQUENCY. When used with STEPS, FRACTION may be a single value or an array of the same length as STEPS. If a single FRACTION value is provided with STEPS, the fraction applies to all steps. NOTE: The FRACTION option has been removed. For fine control over release timing, specify times explicitly using the RELEASETIMES block." optional = true diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-prp.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-prp.yaml index d11fea73..212e2de5 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-prp.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-prp.yaml @@ -316,7 +316,7 @@ blocks: - nreleasetimes period: fields: - perioddata: + stress_period_data: type: list item: name: releasesetting diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-oc.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-oc.json index 07816ee2..2377b7f9 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-oc.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-oc.json @@ -128,7 +128,7 @@ }, "period": { "fields": { - "output": { + "stress_period_data": { "type": "list", "optional": true, "item": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-oc.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-oc.toml index 5b5aedcc..054b75b9 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-oc.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-oc.toml @@ -109,24 +109,24 @@ longname = "write format" description = "write format can be EXPONENTIAL, FIXED, GENERAL, or SCIENTIFIC." tagged = false -[blocks.period.fields.output] +[blocks.period.fields.stress_period_data] type = "list" optional = true -[blocks.period.fields.output.item] +[blocks.period.fields.stress_period_data.item] name = "output_record" type = "union" -[blocks.period.fields.output.item.arms.saverecord] +[blocks.period.fields.stress_period_data.item.arms.saverecord] type = "record" optional = true -[blocks.period.fields.output.item.arms.saverecord.fields.save] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.save] type = "keyword" longname = "keyword to save" description = "keyword to indicate that information will be saved this stress period." -[blocks.period.fields.output.item.arms.saverecord.fields.rtype] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.rtype] type = "string" longname = "record type" description = "type of information to save or print. Can be BUDGET." @@ -136,27 +136,27 @@ valid = [ "BUDGET", ] -[blocks.period.fields.output.item.arms.saverecord.fields.ocsetting] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.ocsetting] type = "union" description = "specifies the steps for which the data will be saved." -[blocks.period.fields.output.item.arms.saverecord.fields.ocsetting.arms.all] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.all] type = "keyword" description = "keyword to indicate save for all time steps in period." -[blocks.period.fields.output.item.arms.saverecord.fields.ocsetting.arms.first] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.first] type = "keyword" description = "keyword to indicate save for first step in period. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." -[blocks.period.fields.output.item.arms.saverecord.fields.ocsetting.arms.last] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.last] type = "keyword" description = "keyword to indicate save for last step in period. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." -[blocks.period.fields.output.item.arms.saverecord.fields.ocsetting.arms.frequency] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.frequency] type = "integer" description = "save at the specified time step frequency. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." -[blocks.period.fields.output.item.arms.saverecord.fields.ocsetting.arms.steps] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.steps] type = "array" description = "save for each step specified in STEPS. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." dtype = "integer" @@ -164,16 +164,16 @@ shape = [ "<=nstp", ] -[blocks.period.fields.output.item.arms.printrecord] +[blocks.period.fields.stress_period_data.item.arms.printrecord] type = "record" optional = true -[blocks.period.fields.output.item.arms.printrecord.fields.print] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.print] type = "keyword" longname = "keyword to save" description = "keyword to indicate that information will be printed this stress period." -[blocks.period.fields.output.item.arms.printrecord.fields.rtype] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.rtype] type = "string" longname = "record type" description = "type of information to save or print. Can be BUDGET." @@ -183,27 +183,27 @@ valid = [ "BUDGET", ] -[blocks.period.fields.output.item.arms.printrecord.fields.ocsetting] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.ocsetting] type = "union" description = "specifies the steps for which the data will be saved." -[blocks.period.fields.output.item.arms.printrecord.fields.ocsetting.arms.all] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.all] type = "keyword" description = "keyword to indicate save for all time steps in period." -[blocks.period.fields.output.item.arms.printrecord.fields.ocsetting.arms.first] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.first] type = "keyword" description = "keyword to indicate save for first step in period. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." -[blocks.period.fields.output.item.arms.printrecord.fields.ocsetting.arms.last] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.last] type = "keyword" description = "keyword to indicate save for last step in period. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." -[blocks.period.fields.output.item.arms.printrecord.fields.ocsetting.arms.frequency] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.frequency] type = "integer" description = "save at the specified time step frequency. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." -[blocks.period.fields.output.item.arms.printrecord.fields.ocsetting.arms.steps] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.steps] type = "array" description = "save for each step specified in STEPS. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." dtype = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-oc.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-oc.yaml index 983bef2a..6bb6ca92 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-oc.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-oc.yaml @@ -100,7 +100,7 @@ blocks: tagged: false period: fields: - output: + stress_period_data: type: list optional: true item: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-spc.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-spc.json index 94a31ff7..7252c9ad 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-spc.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-spc.json @@ -59,7 +59,7 @@ }, "period": { "fields": { - "perioddata": { + "stress_period_data": { "type": "list", "item": { "name": "perioddata", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-spc.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-spc.toml index 40ea1009..dd683751 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-spc.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-spc.toml @@ -44,17 +44,17 @@ type = "integer" longname = "maximum number of ssm entries" description = "integer value specifying the maximum number of spc cells that will be specified for use during any stress period." -[blocks.period.fields.perioddata] +[blocks.period.fields.stress_period_data] type = "list" shape = [ "<=maxbound", ] -[blocks.period.fields.perioddata.item] +[blocks.period.fields.stress_period_data.item] name = "perioddata" type = "record" -[blocks.period.fields.perioddata.item.fields.bndno] +[blocks.period.fields.stress_period_data.item.fields.bndno] type = "integer" longname = "bound number for this entry" description = "integer value that defines the boundary package feature number associated with the specified PERIOD data on the line. BNDNO must be greater than zero and less than or equal to MAXBOUND." @@ -62,17 +62,17 @@ tagged = false index = true pk = true -[blocks.period.fields.perioddata.item.fields.spcsetting] +[blocks.period.fields.stress_period_data.item.fields.spcsetting] type = "union" description = "line of information that is parsed into a keyword and values. Keyword values that can be used to start the SPCSETTING string include: CONCENTRATION and TEMPERATURE." -[blocks.period.fields.perioddata.item.fields.spcsetting.arms.concentration] +[blocks.period.fields.stress_period_data.item.fields.spcsetting.arms.concentration] type = "double" longname = "boundary concentration" description = "is the boundary concentration. 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. By default, the CONCENTRATION for each boundary feature is zero." time_series = true -[blocks.period.fields.perioddata.item.fields.spcsetting.arms.temperature] +[blocks.period.fields.stress_period_data.item.fields.spcsetting.arms.temperature] type = "double" longname = "boundary temperature" description = "is the user-supplied boundary temperature. 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. By default, the TEMPERATURE for each boundary feature is zero." diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-spc.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-spc.yaml index 005a29eb..e1f00d91 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-spc.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-spc.yaml @@ -48,7 +48,7 @@ blocks: use during any stress period. period: fields: - perioddata: + stress_period_data: type: list item: name: perioddata diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tvk.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tvk.json index cbc85d3c..d9180c7e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tvk.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tvk.json @@ -41,7 +41,7 @@ }, "period": { "fields": { - "perioddata": { + "stress_period_data": { "type": "list", "item": { "name": "perioddata", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tvk.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tvk.toml index de162141..c0ec07ed 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tvk.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tvk.toml @@ -32,36 +32,36 @@ tagged = false direction = "in" component = "utl-ts" -[blocks.period.fields.perioddata] +[blocks.period.fields.stress_period_data] type = "list" -[blocks.period.fields.perioddata.item] +[blocks.period.fields.stress_period_data.item] name = "perioddata" type = "record" -[blocks.period.fields.perioddata.item.fields.cellid] +[blocks.period.fields.stress_period_data.item.fields.cellid] type = "cellid" longname = "cell identifier" description = "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell." tagged = false -[blocks.period.fields.perioddata.item.fields.tvksetting] +[blocks.period.fields.stress_period_data.item.fields.tvksetting] type = "union" description = "line of information that is parsed into a property name keyword and values. Property name keywords that can be used to start the TVKSETTING string include: K, K22, and K33." -[blocks.period.fields.perioddata.item.fields.tvksetting.arms.k] +[blocks.period.fields.stress_period_data.item.fields.tvksetting.arms.k] type = "double" longname = "hydraulic conductivity (L/T)" description = "is the new value to be assigned as the cell's hydraulic conductivity from the start of the specified stress period, as per K in the NPF package. If the OPTIONS block includes a TS6 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." time_series = true -[blocks.period.fields.perioddata.item.fields.tvksetting.arms.k22] +[blocks.period.fields.stress_period_data.item.fields.tvksetting.arms.k22] type = "double" longname = "hydraulic conductivity of second ellipsoid axis (L/T)" description = "is the new value to be assigned as the cell's hydraulic conductivity of the second ellipsoid axis (or the ratio of K22/K if the K22OVERK NPF package option is specified) from the start of the specified stress period, as per K22 in the NPF package. For an unrotated case this is the hydraulic conductivity in the y direction. If the OPTIONS block includes a TS6 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." time_series = true -[blocks.period.fields.perioddata.item.fields.tvksetting.arms.k33] +[blocks.period.fields.stress_period_data.item.fields.tvksetting.arms.k33] type = "double" longname = "hydraulic conductivity of third ellipsoid axis (L/T)" description = "is the new value to be assigned as the cell's hydraulic conductivity of the third ellipsoid axis (or the ratio of K33/K if the K33OVERK NPF package option is specified) from the start of the specified stress period, as per K33 in the NPF package. For an unrotated case, this is the vertical hydraulic conductivity. If the OPTIONS block includes a TS6 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." diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tvk.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tvk.yaml index 1b10588f..5206fc02 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tvk.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tvk.yaml @@ -35,7 +35,7 @@ blocks: component: utl-ts period: fields: - perioddata: + stress_period_data: type: list item: name: perioddata diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tvs.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tvs.json index e25c0b81..9cb99b67 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tvs.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tvs.json @@ -47,7 +47,7 @@ }, "period": { "fields": { - "perioddata": { + "stress_period_data": { "type": "list", "item": { "name": "perioddata", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tvs.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tvs.toml index 396ab896..eed43465 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tvs.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tvs.toml @@ -38,30 +38,30 @@ tagged = false direction = "in" component = "utl-ts" -[blocks.period.fields.perioddata] +[blocks.period.fields.stress_period_data] type = "list" -[blocks.period.fields.perioddata.item] +[blocks.period.fields.stress_period_data.item] name = "perioddata" type = "record" -[blocks.period.fields.perioddata.item.fields.cellid] +[blocks.period.fields.stress_period_data.item.fields.cellid] type = "cellid" longname = "cell identifier" description = "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell." tagged = false -[blocks.period.fields.perioddata.item.fields.tvssetting] +[blocks.period.fields.stress_period_data.item.fields.tvssetting] type = "union" description = "line of information that is parsed into a property name keyword and values. Property name keywords that can be used to start the TVSSETTING string include: SS and SY." -[blocks.period.fields.perioddata.item.fields.tvssetting.arms.ss] +[blocks.period.fields.stress_period_data.item.fields.tvssetting.arms.ss] type = "double" longname = "specific storage" description = "is the new value to be assigned as the cell's specific storage (or storage coefficient if the STORAGECOEFFICIENT STO package option is specified) from the start of the specified stress period, as per SS in the STO package. Specific storage values must be greater than or equal to 0. If the OPTIONS block includes a TS6 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." time_series = true -[blocks.period.fields.perioddata.item.fields.tvssetting.arms.sy] +[blocks.period.fields.stress_period_data.item.fields.tvssetting.arms.sy] type = "double" longname = "specific yield" description = "is the new value to be assigned as the cell's specific yield from the start of the specified stress period, as per SY in the STO package. Specific yield values must be greater than or equal to 0. If the OPTIONS block includes a TS6 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." diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tvs.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tvs.yaml index 782c4ca5..f1b285ac 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tvs.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tvs.yaml @@ -43,7 +43,7 @@ blocks: component: utl-ts period: fields: - perioddata: + stress_period_data: type: list item: name: perioddata diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-oc.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-oc.json index e22a7e18..89e5b420 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-oc.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-oc.json @@ -128,7 +128,7 @@ }, "period": { "fields": { - "output": { + "stress_period_data": { "type": "list", "optional": true, "item": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-oc.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-oc.toml index 271c9e3e..f6223455 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-oc.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-oc.toml @@ -109,24 +109,24 @@ longname = "write format" description = "write format can be EXPONENTIAL, FIXED, GENERAL, or SCIENTIFIC." tagged = false -[blocks.period.fields.output] +[blocks.period.fields.stress_period_data] type = "list" optional = true -[blocks.period.fields.output.item] +[blocks.period.fields.stress_period_data.item] name = "output_record" type = "union" -[blocks.period.fields.output.item.arms.saverecord] +[blocks.period.fields.stress_period_data.item.arms.saverecord] type = "record" optional = true -[blocks.period.fields.output.item.arms.saverecord.fields.save] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.save] type = "keyword" longname = "keyword to save" description = "keyword to indicate that information will be saved this stress period." -[blocks.period.fields.output.item.arms.saverecord.fields.rtype] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.rtype] type = "string" longname = "record type" description = "type of information to save or print. Can be BUDGET." @@ -136,27 +136,27 @@ valid = [ "BUDGET", ] -[blocks.period.fields.output.item.arms.saverecord.fields.ocsetting] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.ocsetting] type = "union" description = "specifies the steps for which the data will be saved." -[blocks.period.fields.output.item.arms.saverecord.fields.ocsetting.arms.all] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.all] type = "keyword" description = "keyword to indicate save for all time steps in period." -[blocks.period.fields.output.item.arms.saverecord.fields.ocsetting.arms.first] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.first] type = "keyword" description = "keyword to indicate save for first step in period. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." -[blocks.period.fields.output.item.arms.saverecord.fields.ocsetting.arms.last] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.last] type = "keyword" description = "keyword to indicate save for last step in period. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." -[blocks.period.fields.output.item.arms.saverecord.fields.ocsetting.arms.frequency] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.frequency] type = "integer" description = "save at the specified time step frequency. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." -[blocks.period.fields.output.item.arms.saverecord.fields.ocsetting.arms.steps] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.steps] type = "array" description = "save for each step specified in STEPS. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." dtype = "integer" @@ -164,16 +164,16 @@ shape = [ "<=nstp", ] -[blocks.period.fields.output.item.arms.printrecord] +[blocks.period.fields.stress_period_data.item.arms.printrecord] type = "record" optional = true -[blocks.period.fields.output.item.arms.printrecord.fields.print] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.print] type = "keyword" longname = "keyword to save" description = "keyword to indicate that information will be printed this stress period." -[blocks.period.fields.output.item.arms.printrecord.fields.rtype] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.rtype] type = "string" longname = "record type" description = "type of information to save or print. Can be BUDGET." @@ -183,27 +183,27 @@ valid = [ "BUDGET", ] -[blocks.period.fields.output.item.arms.printrecord.fields.ocsetting] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.ocsetting] type = "union" description = "specifies the steps for which the data will be saved." -[blocks.period.fields.output.item.arms.printrecord.fields.ocsetting.arms.all] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.all] type = "keyword" description = "keyword to indicate save for all time steps in period." -[blocks.period.fields.output.item.arms.printrecord.fields.ocsetting.arms.first] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.first] type = "keyword" description = "keyword to indicate save for first step in period. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." -[blocks.period.fields.output.item.arms.printrecord.fields.ocsetting.arms.last] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.last] type = "keyword" description = "keyword to indicate save for last step in period. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." -[blocks.period.fields.output.item.arms.printrecord.fields.ocsetting.arms.frequency] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.frequency] type = "integer" description = "save at the specified time step frequency. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." -[blocks.period.fields.output.item.arms.printrecord.fields.ocsetting.arms.steps] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.steps] type = "array" description = "save for each step specified in STEPS. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." dtype = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-oc.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-oc.yaml index c39555bd..6dba0bf3 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-oc.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-oc.yaml @@ -100,7 +100,7 @@ blocks: tagged: false period: fields: - output: + stress_period_data: type: list optional: true item: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-lke.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-lke.json index e9b2c8c5..eec15a69 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-lke.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-lke.json @@ -226,7 +226,7 @@ }, "period": { "fields": { - "lakeperioddata": { + "stress_period_data": { "type": "list", "item": { "name": "lakeperioddata", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-lke.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-lke.toml index ffc75e54..81e3b6e1 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-lke.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-lke.toml @@ -199,14 +199,14 @@ optional = true when = "boundnames" tagged = false -[blocks.period.fields.lakeperioddata] +[blocks.period.fields.stress_period_data] type = "list" -[blocks.period.fields.lakeperioddata.item] +[blocks.period.fields.stress_period_data.item] name = "lakeperioddata" type = "record" -[blocks.period.fields.lakeperioddata.item.fields.lakeno] +[blocks.period.fields.stress_period_data.item.fields.lakeno] type = "integer" longname = "lake number for this entry" description = "integer value that defines the lake number associated with the specified PERIOD data on the line. LAKENO must be greater than zero and less than or equal to NLAKES." @@ -214,58 +214,58 @@ tagged = false index = true fk = "packagedata.lakeno" -[blocks.period.fields.lakeperioddata.item.fields.laksetting] +[blocks.period.fields.stress_period_data.item.fields.laksetting] type = "union" description = "line of information that is parsed into a keyword and values. Keyword values that can be used to start the LAKSETTING string include: STATUS, TEMPERATURE, RAINFALL, EVAPORATION, RUNOFF, and AUXILIARY. These settings are used to assign the temperature associated with the corresponding flow terms. Temperatures cannot be specified for all flow terms. For example, the Lake Package supports a 'WITHDRAWAL' flow term. If this withdrawal term is active, then water will be withdrawn from the lake at the calculated temperature of the lake." -[blocks.period.fields.lakeperioddata.item.fields.laksetting.arms.status] +[blocks.period.fields.stress_period_data.item.fields.laksetting.arms.status] type = "string" longname = "lake temperature status" description = "keyword option to define lake status. STATUS can be ACTIVE, INACTIVE, or CONSTANT. By default, STATUS is ACTIVE, which means that temperature will be calculated for the lake. If a lake is inactive, then there will be no energy fluxes into or out of the lake and the inactive value will be written for the lake temperature. If a lake is constant, then the temperature for the lake will be fixed at the user specified value." -[blocks.period.fields.lakeperioddata.item.fields.laksetting.arms.temperature] +[blocks.period.fields.stress_period_data.item.fields.laksetting.arms.temperature] type = "string" longname = "lake temperature" description = "real or character value that defines the temperature for the lake. The specified TEMPERATURE is only applied if the lake is a constant temperature lake. 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." time_series = true -[blocks.period.fields.lakeperioddata.item.fields.laksetting.arms.rainfall] +[blocks.period.fields.stress_period_data.item.fields.laksetting.arms.rainfall] type = "string" longname = "rainfall temperature" description = "real or character value that defines the rainfall temperature for the lake. 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." time_series = true -[blocks.period.fields.lakeperioddata.item.fields.laksetting.arms.evaporation] +[blocks.period.fields.stress_period_data.item.fields.laksetting.arms.evaporation] type = "string" longname = "evaporation temperature" description = "use of the EVAPORATION keyword is allowed in the LKE package; however, the specified value is not currently used in LKE calculations. Instead, the latent heat of evaporation is multiplied by the simulated evaporation rate for determining the thermal energy lost from a stream reach." time_series = true -[blocks.period.fields.lakeperioddata.item.fields.laksetting.arms.runoff] +[blocks.period.fields.stress_period_data.item.fields.laksetting.arms.runoff] type = "string" longname = "runoff temperature" description = "real or character value that defines the temperature of runoff for the lake. Users are free to use whatever temperature scale they want, which might include negative temperatures. 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." time_series = true -[blocks.period.fields.lakeperioddata.item.fields.laksetting.arms.ext-inflow] +[blocks.period.fields.stress_period_data.item.fields.laksetting.arms.ext-inflow] type = "string" longname = "ext-inflow temperature" description = "real or character value that defines the temperature of external inflow for the lake. Users are free to use whatever temperature scale they want, which might include negative temperatures. 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." time_series = true -[blocks.period.fields.lakeperioddata.item.fields.laksetting.arms.auxiliaryrecord] +[blocks.period.fields.stress_period_data.item.fields.laksetting.arms.auxiliaryrecord] type = "record" -[blocks.period.fields.lakeperioddata.item.fields.laksetting.arms.auxiliaryrecord.fields.auxiliary] +[blocks.period.fields.stress_period_data.item.fields.laksetting.arms.auxiliaryrecord.fields.auxiliary] type = "keyword" description = "keyword for specifying auxiliary variable." -[blocks.period.fields.lakeperioddata.item.fields.laksetting.arms.auxiliaryrecord.fields.auxname] +[blocks.period.fields.stress_period_data.item.fields.laksetting.arms.auxiliaryrecord.fields.auxname] type = "string" description = "name for the auxiliary variable to be assigned AUXVAL. AUXNAME must match one of the auxiliary variable names defined in the OPTIONS block. If AUXNAME does not match one of the auxiliary variable names defined in the OPTIONS block the data are ignored." tagged = false -[blocks.period.fields.lakeperioddata.item.fields.laksetting.arms.auxiliaryrecord.fields.auxval] +[blocks.period.fields.stress_period_data.item.fields.laksetting.arms.auxiliaryrecord.fields.auxval] type = "double" longname = "auxiliary variable value" description = "value for the auxiliary variable. 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." diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-lke.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-lke.yaml index 32702d00..78364236 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-lke.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-lke.yaml @@ -217,7 +217,7 @@ blocks: tagged: false period: fields: - lakeperioddata: + stress_period_data: type: list item: name: lakeperioddata diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-mwe.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-mwe.json index 85e6c481..7a3113ee 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-mwe.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-mwe.json @@ -226,7 +226,7 @@ }, "period": { "fields": { - "mweperioddata": { + "stress_period_data": { "type": "list", "item": { "name": "mweperioddata", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-mwe.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-mwe.toml index 8ae9006d..ed3c0441 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-mwe.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-mwe.toml @@ -199,14 +199,14 @@ optional = true when = "boundnames" tagged = false -[blocks.period.fields.mweperioddata] +[blocks.period.fields.stress_period_data] type = "list" -[blocks.period.fields.mweperioddata.item] +[blocks.period.fields.stress_period_data.item] name = "mweperioddata" type = "record" -[blocks.period.fields.mweperioddata.item.fields.mawno] +[blocks.period.fields.stress_period_data.item.fields.mawno] type = "integer" longname = "well number for this entry" description = "integer value that defines the well number associated with the specified PERIOD data on the line. MAWNO must be greater than zero and less than or equal to NMAWWELLS." @@ -214,40 +214,40 @@ tagged = false index = true fk = "packagedata.mawno" -[blocks.period.fields.mweperioddata.item.fields.mwesetting] +[blocks.period.fields.stress_period_data.item.fields.mwesetting] type = "union" description = "line of information that is parsed into a keyword and values. Keyword values that can be used to start the MWESETTING string include: STATUS, TEMPERATURE, RAINFALL, EVAPORATION, RUNOFF, and AUXILIARY. These settings are used to assign the temperature of associated with the corresponding flow terms. Temperatures cannot be specified for all flow terms. For example, the Multi-Aquifer Well Package supports a 'WITHDRAWAL' flow term. If this withdrawal term is active, then water will be withdrawn from the well at the calculated temperature of the well." -[blocks.period.fields.mweperioddata.item.fields.mwesetting.arms.status] +[blocks.period.fields.stress_period_data.item.fields.mwesetting.arms.status] type = "string" longname = "well temperature status" description = "keyword option to define well status. STATUS can be ACTIVE, INACTIVE, or CONSTANT. By default, STATUS is ACTIVE, which means that temperature will be calculated for the well. If a well is inactive, then there will be no solute mass fluxes into or out of the well and the inactive value will be written for the well temperature. If a well is constant, then the temperature for the well will be fixed at the user specified value." -[blocks.period.fields.mweperioddata.item.fields.mwesetting.arms.temperature] +[blocks.period.fields.stress_period_data.item.fields.mwesetting.arms.temperature] type = "string" longname = "well temperature" description = "real or character value that defines the temperature for the well. The specified TEMPERATURE is only applied if the well is a constant temperature well. 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." time_series = true -[blocks.period.fields.mweperioddata.item.fields.mwesetting.arms.rate] +[blocks.period.fields.stress_period_data.item.fields.mwesetting.arms.rate] type = "string" longname = "well injection temperature" description = "real or character value that defines the injection temperature $(e.g.,:^{circ}C:or:^{circ}F)$ for the well. 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." time_series = true -[blocks.period.fields.mweperioddata.item.fields.mwesetting.arms.auxiliaryrecord] +[blocks.period.fields.stress_period_data.item.fields.mwesetting.arms.auxiliaryrecord] type = "record" -[blocks.period.fields.mweperioddata.item.fields.mwesetting.arms.auxiliaryrecord.fields.auxiliary] +[blocks.period.fields.stress_period_data.item.fields.mwesetting.arms.auxiliaryrecord.fields.auxiliary] type = "keyword" description = "keyword for specifying auxiliary variable." -[blocks.period.fields.mweperioddata.item.fields.mwesetting.arms.auxiliaryrecord.fields.auxname] +[blocks.period.fields.stress_period_data.item.fields.mwesetting.arms.auxiliaryrecord.fields.auxname] type = "string" description = "name for the auxiliary variable to be assigned AUXVAL. AUXNAME must match one of the auxiliary variable names defined in the OPTIONS block. If AUXNAME does not match one of the auxiliary variable names defined in the OPTIONS block the data are ignored." tagged = false -[blocks.period.fields.mweperioddata.item.fields.mwesetting.arms.auxiliaryrecord.fields.auxval] +[blocks.period.fields.stress_period_data.item.fields.mwesetting.arms.auxiliaryrecord.fields.auxval] type = "double" longname = "auxiliary variable value" description = "value for the auxiliary variable. 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." diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-mwe.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-mwe.yaml index 4b2c3081..aa8a469f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-mwe.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-mwe.yaml @@ -217,7 +217,7 @@ blocks: tagged: false period: fields: - mweperioddata: + stress_period_data: type: list item: name: mweperioddata diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-oc.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-oc.json index 9929c8d5..726e0a6c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-oc.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-oc.json @@ -110,7 +110,7 @@ }, "period": { "fields": { - "output": { + "stress_period_data": { "type": "list", "optional": true, "item": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-oc.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-oc.toml index 2f631e06..6ccc9c8f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-oc.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-oc.toml @@ -93,24 +93,24 @@ longname = "write format" description = "write format can be EXPONENTIAL, FIXED, GENERAL, or SCIENTIFIC." tagged = false -[blocks.period.fields.output] +[blocks.period.fields.stress_period_data] type = "list" optional = true -[blocks.period.fields.output.item] +[blocks.period.fields.stress_period_data.item] name = "output_record" type = "union" -[blocks.period.fields.output.item.arms.saverecord] +[blocks.period.fields.stress_period_data.item.arms.saverecord] type = "record" optional = true -[blocks.period.fields.output.item.arms.saverecord.fields.save] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.save] type = "keyword" longname = "keyword to save" description = "keyword to indicate that information will be saved this stress period." -[blocks.period.fields.output.item.arms.saverecord.fields.rtype] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.rtype] type = "string" longname = "record type" description = "type of information to save or print. Can be BUDGET or TEMPERATURE." @@ -120,27 +120,27 @@ valid = [ "BUDGET", ] -[blocks.period.fields.output.item.arms.saverecord.fields.ocsetting] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.ocsetting] type = "union" description = "specifies the steps for which the data will be saved." -[blocks.period.fields.output.item.arms.saverecord.fields.ocsetting.arms.all] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.all] type = "keyword" description = "keyword to indicate save for all time steps in period." -[blocks.period.fields.output.item.arms.saverecord.fields.ocsetting.arms.first] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.first] type = "keyword" description = "keyword to indicate save for first step in period. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." -[blocks.period.fields.output.item.arms.saverecord.fields.ocsetting.arms.last] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.last] type = "keyword" description = "keyword to indicate save for last step in period. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." -[blocks.period.fields.output.item.arms.saverecord.fields.ocsetting.arms.frequency] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.frequency] type = "integer" description = "save at the specified time step frequency. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." -[blocks.period.fields.output.item.arms.saverecord.fields.ocsetting.arms.steps] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.steps] type = "array" description = "save for each step specified in STEPS. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." dtype = "integer" @@ -148,16 +148,16 @@ shape = [ "<=nstp", ] -[blocks.period.fields.output.item.arms.printrecord] +[blocks.period.fields.stress_period_data.item.arms.printrecord] type = "record" optional = true -[blocks.period.fields.output.item.arms.printrecord.fields.print] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.print] type = "keyword" longname = "keyword to save" description = "keyword to indicate that information will be printed this stress period." -[blocks.period.fields.output.item.arms.printrecord.fields.rtype] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.rtype] type = "string" longname = "record type" description = "type of information to save or print. Can be BUDGET or TEMPERATURE." @@ -167,27 +167,27 @@ valid = [ "BUDGET", ] -[blocks.period.fields.output.item.arms.printrecord.fields.ocsetting] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.ocsetting] type = "union" description = "specifies the steps for which the data will be saved." -[blocks.period.fields.output.item.arms.printrecord.fields.ocsetting.arms.all] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.all] type = "keyword" description = "keyword to indicate save for all time steps in period." -[blocks.period.fields.output.item.arms.printrecord.fields.ocsetting.arms.first] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.first] type = "keyword" description = "keyword to indicate save for first step in period. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." -[blocks.period.fields.output.item.arms.printrecord.fields.ocsetting.arms.last] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.last] type = "keyword" description = "keyword to indicate save for last step in period. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." -[blocks.period.fields.output.item.arms.printrecord.fields.ocsetting.arms.frequency] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.frequency] type = "integer" description = "save at the specified time step frequency. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." -[blocks.period.fields.output.item.arms.printrecord.fields.ocsetting.arms.steps] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.steps] type = "array" description = "save for each step specified in STEPS. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." dtype = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-oc.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-oc.yaml index 14022f49..cd1dbc26 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-oc.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-oc.yaml @@ -86,7 +86,7 @@ blocks: tagged: false period: fields: - output: + stress_period_data: type: list optional: true item: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-sfe.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-sfe.json index d0c3c2fc..20da9051 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-sfe.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-sfe.json @@ -226,7 +226,7 @@ }, "period": { "fields": { - "reachperioddata": { + "stress_period_data": { "type": "list", "item": { "name": "reachperioddata", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-sfe.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-sfe.toml index 18d41846..61acfc22 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-sfe.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-sfe.toml @@ -199,14 +199,14 @@ optional = true when = "boundnames" tagged = false -[blocks.period.fields.reachperioddata] +[blocks.period.fields.stress_period_data] type = "list" -[blocks.period.fields.reachperioddata.item] +[blocks.period.fields.stress_period_data.item] name = "reachperioddata" type = "record" -[blocks.period.fields.reachperioddata.item.fields.rno] +[blocks.period.fields.stress_period_data.item.fields.rno] type = "integer" longname = "reach number for this entry" description = "integer value that defines the reach number associated with the specified PERIOD data on the line. RNO must be greater than zero and less than or equal to NREACHES." @@ -214,58 +214,58 @@ tagged = false index = true fk = "packagedata.rno" -[blocks.period.fields.reachperioddata.item.fields.reachsetting] +[blocks.period.fields.stress_period_data.item.fields.reachsetting] type = "union" description = "line of information that is parsed into a keyword and values. Keyword values that can be used to start the REACHSETTING string include: STATUS, TEMPERATURE, RAINFALL, EVAPORATION, RUNOFF, and AUXILIARY. These settings are used to assign the temperature of associated with the corresponding flow terms. Temperatures cannot be specified for all flow terms. For example, the Streamflow Package supports a 'DIVERSION' flow term. Diversion water will be routed using the calculated temperature of the reach." -[blocks.period.fields.reachperioddata.item.fields.reachsetting.arms.status] +[blocks.period.fields.stress_period_data.item.fields.reachsetting.arms.status] type = "string" longname = "reach temperature status" description = "keyword option to define reach status. STATUS can be ACTIVE, INACTIVE, or CONSTANT. By default, STATUS is ACTIVE, which means that temperature will be calculated for the reach. If a reach is inactive, then there will be no energy fluxes into or out of the reach and the inactive value will be written for the reach temperature. If a reach is constant, then the temperature for the reach will be fixed at the user specified value." -[blocks.period.fields.reachperioddata.item.fields.reachsetting.arms.temperature] +[blocks.period.fields.stress_period_data.item.fields.reachsetting.arms.temperature] type = "string" longname = "reach temperature" description = "real or character value that defines the temperature for the reach. The specified TEMPERATURE is only applied if the reach is a constant temperature reach. 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." time_series = true -[blocks.period.fields.reachperioddata.item.fields.reachsetting.arms.rainfall] +[blocks.period.fields.stress_period_data.item.fields.reachsetting.arms.rainfall] type = "string" longname = "rainfall temperature" description = "real or character value that defines the rainfall temperature $(e.g.,:^{circ}C:or:^{circ}F)$ for the reach. 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." time_series = true -[blocks.period.fields.reachperioddata.item.fields.reachsetting.arms.evaporation] +[blocks.period.fields.stress_period_data.item.fields.reachsetting.arms.evaporation] type = "string" longname = "evaporation temperature" description = "use of the EVAPORATION keyword is allowed in the SFE package; however, the specified value is not currently used in SFE calculations. Instead, the latent heat of evaporation is multiplied by the simulated evaporation rate for determining the thermal energy lost from a stream reach." time_series = true -[blocks.period.fields.reachperioddata.item.fields.reachsetting.arms.runoff] +[blocks.period.fields.stress_period_data.item.fields.reachsetting.arms.runoff] type = "string" longname = "runoff temperature" description = "real or character value that defines the temperature of runoff $(e.g.,:^{circ}C:or:^{circ}F)$ for the reach. Users are free to use whatever temperature scale they want, which might include negative temperatures. 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." time_series = true -[blocks.period.fields.reachperioddata.item.fields.reachsetting.arms.inflow] +[blocks.period.fields.stress_period_data.item.fields.reachsetting.arms.inflow] type = "string" longname = "inflow temperature" description = "real or character value that defines the temperature of inflow $(e.g.,:^{circ}C:or:^{circ}F)$ for the reach. Users are free to use whatever temperature scale they want, which might include negative temperatures. 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." time_series = true -[blocks.period.fields.reachperioddata.item.fields.reachsetting.arms.auxiliaryrecord] +[blocks.period.fields.stress_period_data.item.fields.reachsetting.arms.auxiliaryrecord] type = "record" -[blocks.period.fields.reachperioddata.item.fields.reachsetting.arms.auxiliaryrecord.fields.auxiliary] +[blocks.period.fields.stress_period_data.item.fields.reachsetting.arms.auxiliaryrecord.fields.auxiliary] type = "keyword" description = "keyword for specifying auxiliary variable." -[blocks.period.fields.reachperioddata.item.fields.reachsetting.arms.auxiliaryrecord.fields.auxname] +[blocks.period.fields.stress_period_data.item.fields.reachsetting.arms.auxiliaryrecord.fields.auxname] type = "string" description = "name for the auxiliary variable to be assigned AUXVAL. AUXNAME must match one of the auxiliary variable names defined in the OPTIONS block. If AUXNAME does not match one of the auxiliary variable names defined in the OPTIONS block the data are ignored." tagged = false -[blocks.period.fields.reachperioddata.item.fields.reachsetting.arms.auxiliaryrecord.fields.auxval] +[blocks.period.fields.stress_period_data.item.fields.reachsetting.arms.auxiliaryrecord.fields.auxval] type = "double" longname = "auxiliary variable value" description = "value for the auxiliary variable. 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." diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-sfe.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-sfe.yaml index 39d00b24..0a2aa74c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-sfe.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-sfe.yaml @@ -218,7 +218,7 @@ blocks: tagged: false period: fields: - reachperioddata: + stress_period_data: type: list item: name: reachperioddata diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-uze.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-uze.json index 6ed9824e..d5258f2f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-uze.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-uze.json @@ -214,7 +214,7 @@ }, "period": { "fields": { - "uzeperioddata": { + "stress_period_data": { "type": "list", "item": { "name": "uzeperioddata", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-uze.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-uze.toml index 127614b3..bb5ebbe4 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-uze.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-uze.toml @@ -187,14 +187,14 @@ optional = true when = "boundnames" tagged = false -[blocks.period.fields.uzeperioddata] +[blocks.period.fields.stress_period_data] type = "list" -[blocks.period.fields.uzeperioddata.item] +[blocks.period.fields.stress_period_data.item] name = "uzeperioddata" type = "record" -[blocks.period.fields.uzeperioddata.item.fields.uzfno] +[blocks.period.fields.stress_period_data.item.fields.uzfno] type = "integer" longname = "unsaturated zone flow cell number for this entry" description = "integer value that defines the UZF cell number associated with the specified PERIOD data on the line. UZFNO must be greater than zero and less than or equal to NUZFCELLS." @@ -202,46 +202,46 @@ tagged = false index = true fk = "packagedata.uzfno" -[blocks.period.fields.uzeperioddata.item.fields.uzesetting] +[blocks.period.fields.stress_period_data.item.fields.uzesetting] type = "union" description = "line of information that is parsed into a keyword and values. Keyword values that can be used to start the UZESETTING string include: STATUS, TEMPERATURE, INFILTRATION, UZET, and AUXILIARY. These settings are used to assign the temperature associated with the corresponding flow terms. Temperatures cannot be specified for all flow terms." -[blocks.period.fields.uzeperioddata.item.fields.uzesetting.arms.status] +[blocks.period.fields.stress_period_data.item.fields.uzesetting.arms.status] type = "string" longname = "unsaturated zone flow cell temperature status" description = "keyword option to define UZF cell status. STATUS can be ACTIVE, INACTIVE, or CONSTANT. By default, STATUS is ACTIVE, which means that temperature will be calculated for the UZF cell. If a UZF cell is inactive, then there will be no energy fluxes into or out of the UZF cell and the inactive value will be written for the UZF cell temperature. If a UZF cell is constant, then the temperature for the UZF cell will be fixed at the user specified value." -[blocks.period.fields.uzeperioddata.item.fields.uzesetting.arms.temperature] +[blocks.period.fields.stress_period_data.item.fields.uzesetting.arms.temperature] type = "string" longname = "unsaturated zone flow cell temperature" description = "real or character value that defines the temperature for the unsaturated zone flow cell. The specified TEMPERATURE is only applied if the unsaturated zone flow cell is a constant temperature cell. 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." time_series = true -[blocks.period.fields.uzeperioddata.item.fields.uzesetting.arms.infiltration] +[blocks.period.fields.stress_period_data.item.fields.uzesetting.arms.infiltration] type = "string" longname = "infiltration temperature" description = "real or character value that defines the temperature of the infiltration $(e.g.,:^{circ}C:or:^{circ}F)$ for the UZF cell. 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." time_series = true -[blocks.period.fields.uzeperioddata.item.fields.uzesetting.arms.uzet] +[blocks.period.fields.stress_period_data.item.fields.uzesetting.arms.uzet] type = "string" longname = "unsaturated zone et temperature" description = "real or character value that states what fraction of the simulated unsaturated zone evapotranspiration is associated with evaporation. The evaporative losses from the unsaturated zone moisture content will have an evaporative cooling effect on the GWE cell from which the evaporation originated. If this value is larger than 1, then it will be reset to 1. 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." time_series = true -[blocks.period.fields.uzeperioddata.item.fields.uzesetting.arms.auxiliaryrecord] +[blocks.period.fields.stress_period_data.item.fields.uzesetting.arms.auxiliaryrecord] type = "record" -[blocks.period.fields.uzeperioddata.item.fields.uzesetting.arms.auxiliaryrecord.fields.auxiliary] +[blocks.period.fields.stress_period_data.item.fields.uzesetting.arms.auxiliaryrecord.fields.auxiliary] type = "keyword" description = "keyword for specifying auxiliary variable." -[blocks.period.fields.uzeperioddata.item.fields.uzesetting.arms.auxiliaryrecord.fields.auxname] +[blocks.period.fields.stress_period_data.item.fields.uzesetting.arms.auxiliaryrecord.fields.auxname] type = "string" description = "name for the auxiliary variable to be assigned AUXVAL. AUXNAME must match one of the auxiliary variable names defined in the OPTIONS block. If AUXNAME does not match one of the auxiliary variable names defined in the OPTIONS block the data are ignored." tagged = false -[blocks.period.fields.uzeperioddata.item.fields.uzesetting.arms.auxiliaryrecord.fields.auxval] +[blocks.period.fields.stress_period_data.item.fields.uzesetting.arms.auxiliaryrecord.fields.auxval] type = "double" longname = "auxiliary variable value" description = "value for the auxiliary variable. 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." diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-uze.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-uze.yaml index 71123b12..d08ca03a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-uze.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-uze.yaml @@ -207,7 +207,7 @@ blocks: tagged: false period: fields: - uzeperioddata: + stress_period_data: type: list item: name: uzeperioddata diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-lak.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-lak.json index 0a26336e..f40168a6 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-lak.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-lak.json @@ -483,7 +483,7 @@ }, "period": { "fields": { - "perioddata": { + "stress_period_data": { "type": "list", "item": { "name": "laksetting", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-lak.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-lak.toml index 2e5ccb94..73f4172e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-lak.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-lak.toml @@ -432,18 +432,18 @@ description = "real value that defines the bed slope for the lake outlet. Any va tagged = false time_series = true -[blocks.period.fields.perioddata] +[blocks.period.fields.stress_period_data] type = "list" -[blocks.period.fields.perioddata.item] +[blocks.period.fields.stress_period_data.item] name = "laksetting" type = "union" description = "line of information that is parsed into a keyword and values. Keyword values that can be used to start the LAKSETTING string include both keywords for lake settings and keywords for outlet settings. Keywords for lake settings include: STATUS, STAGE, RAINFALL, EVAPORATION, RUNOFF, INFLOW, WITHDRAWAL, and AUXILIARY. Keywords for outlet settings include RATE, INVERT, WIDTH, SLOPE, and ROUGH." -[blocks.period.fields.perioddata.item.arms.status] +[blocks.period.fields.stress_period_data.item.arms.status] type = "record" -[blocks.period.fields.perioddata.item.arms.status.fields.lakeno] +[blocks.period.fields.stress_period_data.item.arms.status.fields.lakeno] type = "integer" longname = "lake or outlet number for this entry" description = "integer value that defines the lake or outlet number associated with the specified PERIOD data on the line. NUMBER must be greater than zero and less than or equal to NLAKES for a lake number and less than or equal to NOUTLETS for an outlet number." @@ -451,15 +451,15 @@ tagged = false index = true fk = "packagedata.ifno" -[blocks.period.fields.perioddata.item.arms.status.fields.status] +[blocks.period.fields.stress_period_data.item.arms.status.fields.status] type = "string" longname = "lake status" description = "keyword option to define lake status. STATUS can be ACTIVE, INACTIVE, or CONSTANT. By default, STATUS is ACTIVE." -[blocks.period.fields.perioddata.item.arms.stage] +[blocks.period.fields.stress_period_data.item.arms.stage] type = "record" -[blocks.period.fields.perioddata.item.arms.stage.fields.lakeno] +[blocks.period.fields.stress_period_data.item.arms.stage.fields.lakeno] type = "integer" longname = "lake or outlet number for this entry" description = "integer value that defines the lake or outlet number associated with the specified PERIOD data on the line. NUMBER must be greater than zero and less than or equal to NLAKES for a lake number and less than or equal to NOUTLETS for an outlet number." @@ -467,16 +467,16 @@ tagged = false index = true fk = "packagedata.ifno" -[blocks.period.fields.perioddata.item.arms.stage.fields.stage] +[blocks.period.fields.stress_period_data.item.arms.stage.fields.stage] type = "string" longname = "lake stage" description = "real or character value that defines the stage for the lake. The specified STAGE is only applied if the lake is a constant stage lake. 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." time_series = true -[blocks.period.fields.perioddata.item.arms.rainfall] +[blocks.period.fields.stress_period_data.item.arms.rainfall] type = "record" -[blocks.period.fields.perioddata.item.arms.rainfall.fields.lakeno] +[blocks.period.fields.stress_period_data.item.arms.rainfall.fields.lakeno] type = "integer" longname = "lake or outlet number for this entry" description = "integer value that defines the lake or outlet number associated with the specified PERIOD data on the line. NUMBER must be greater than zero and less than or equal to NLAKES for a lake number and less than or equal to NOUTLETS for an outlet number." @@ -484,16 +484,16 @@ tagged = false index = true fk = "packagedata.ifno" -[blocks.period.fields.perioddata.item.arms.rainfall.fields.rainfall] +[blocks.period.fields.stress_period_data.item.arms.rainfall.fields.rainfall] type = "string" longname = "rainfall rate" description = "real or character value that defines the rainfall rate $(LT^{-1})$ for the lake. Value must be greater than or equal to zero. 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." time_series = true -[blocks.period.fields.perioddata.item.arms.evaporation] +[blocks.period.fields.stress_period_data.item.arms.evaporation] type = "record" -[blocks.period.fields.perioddata.item.arms.evaporation.fields.lakeno] +[blocks.period.fields.stress_period_data.item.arms.evaporation.fields.lakeno] type = "integer" longname = "lake or outlet number for this entry" description = "integer value that defines the lake or outlet number associated with the specified PERIOD data on the line. NUMBER must be greater than zero and less than or equal to NLAKES for a lake number and less than or equal to NOUTLETS for an outlet number." @@ -501,16 +501,16 @@ tagged = false index = true fk = "packagedata.ifno" -[blocks.period.fields.perioddata.item.arms.evaporation.fields.evaporation] +[blocks.period.fields.stress_period_data.item.arms.evaporation.fields.evaporation] type = "string" longname = "evaporation rate" description = "real or character value that defines the maximum evaporation rate $(LT^{-1})$ for the lake. Value must be greater than or equal to zero. 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." time_series = true -[blocks.period.fields.perioddata.item.arms.runoff] +[blocks.period.fields.stress_period_data.item.arms.runoff] type = "record" -[blocks.period.fields.perioddata.item.arms.runoff.fields.lakeno] +[blocks.period.fields.stress_period_data.item.arms.runoff.fields.lakeno] type = "integer" longname = "lake or outlet number for this entry" description = "integer value that defines the lake or outlet number associated with the specified PERIOD data on the line. NUMBER must be greater than zero and less than or equal to NLAKES for a lake number and less than or equal to NOUTLETS for an outlet number." @@ -518,16 +518,16 @@ tagged = false index = true fk = "packagedata.ifno" -[blocks.period.fields.perioddata.item.arms.runoff.fields.runoff] +[blocks.period.fields.stress_period_data.item.arms.runoff.fields.runoff] type = "string" longname = "runoff rate" description = "real or character value that defines the runoff rate $(L^3 T^{-1})$ for the lake. Value must be greater than or equal to zero. 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." time_series = true -[blocks.period.fields.perioddata.item.arms.inflow] +[blocks.period.fields.stress_period_data.item.arms.inflow] type = "record" -[blocks.period.fields.perioddata.item.arms.inflow.fields.lakeno] +[blocks.period.fields.stress_period_data.item.arms.inflow.fields.lakeno] type = "integer" longname = "lake or outlet number for this entry" description = "integer value that defines the lake or outlet number associated with the specified PERIOD data on the line. NUMBER must be greater than zero and less than or equal to NLAKES for a lake number and less than or equal to NOUTLETS for an outlet number." @@ -535,16 +535,16 @@ tagged = false index = true fk = "packagedata.ifno" -[blocks.period.fields.perioddata.item.arms.inflow.fields.inflow] +[blocks.period.fields.stress_period_data.item.arms.inflow.fields.inflow] type = "string" longname = "inflow rate" description = "real or character value that defines the volumetric inflow rate $(L^3 T^{-1})$ for the lake. Value must be greater than or equal to zero. 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. By default, inflow rates are zero for each lake." time_series = true -[blocks.period.fields.perioddata.item.arms.withdrawal] +[blocks.period.fields.stress_period_data.item.arms.withdrawal] type = "record" -[blocks.period.fields.perioddata.item.arms.withdrawal.fields.lakeno] +[blocks.period.fields.stress_period_data.item.arms.withdrawal.fields.lakeno] type = "integer" longname = "lake or outlet number for this entry" description = "integer value that defines the lake or outlet number associated with the specified PERIOD data on the line. NUMBER must be greater than zero and less than or equal to NLAKES for a lake number and less than or equal to NOUTLETS for an outlet number." @@ -552,16 +552,16 @@ tagged = false index = true fk = "packagedata.ifno" -[blocks.period.fields.perioddata.item.arms.withdrawal.fields.withdrawal] +[blocks.period.fields.stress_period_data.item.arms.withdrawal.fields.withdrawal] type = "string" longname = "maximum withdrawal rate" description = "real or character value that defines the maximum withdrawal rate $(L^3 T^{-1})$ for the lake. Value must be greater than or equal to zero. 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." time_series = true -[blocks.period.fields.perioddata.item.arms.rate] +[blocks.period.fields.stress_period_data.item.arms.rate] type = "record" -[blocks.period.fields.perioddata.item.arms.rate.fields.outletno] +[blocks.period.fields.stress_period_data.item.arms.rate.fields.outletno] type = "integer" longname = "lake or outlet number for this entry" description = "integer value that defines the lake or outlet number associated with the specified PERIOD data on the line. NUMBER must be greater than zero and less than or equal to NLAKES for a lake number and less than or equal to NOUTLETS for an outlet number." @@ -569,16 +569,16 @@ tagged = false index = true fk = "outlets.outletno" -[blocks.period.fields.perioddata.item.arms.rate.fields.rate] +[blocks.period.fields.stress_period_data.item.arms.rate.fields.rate] type = "string" longname = "extraction rate" description = "real or character value that defines the extraction rate for the lake outflow. A positive value indicates inflow and a negative value indicates outflow from the lake. RATE only applies to outlets associated with active lakes (STATUS is ACTIVE). A specified RATE is only applied if COUTTYPE for the OUTLETNO is SPECIFIED. 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. By default, the RATE for each SPECIFIED lake outlet is zero." time_series = true -[blocks.period.fields.perioddata.item.arms.invert] +[blocks.period.fields.stress_period_data.item.arms.invert] type = "record" -[blocks.period.fields.perioddata.item.arms.invert.fields.outletno] +[blocks.period.fields.stress_period_data.item.arms.invert.fields.outletno] type = "integer" longname = "lake or outlet number for this entry" description = "integer value that defines the lake or outlet number associated with the specified PERIOD data on the line. NUMBER must be greater than zero and less than or equal to NLAKES for a lake number and less than or equal to NOUTLETS for an outlet number." @@ -586,16 +586,16 @@ tagged = false index = true fk = "outlets.outletno" -[blocks.period.fields.perioddata.item.arms.invert.fields.invert] +[blocks.period.fields.stress_period_data.item.arms.invert.fields.invert] type = "string" longname = "invert elevation" description = "real or character value that defines the invert elevation for the lake outlet. A specified INVERT value is only used for active lakes if COUTTYPE for lake outlet OUTLETNO is not SPECIFIED. 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." time_series = true -[blocks.period.fields.perioddata.item.arms.width] +[blocks.period.fields.stress_period_data.item.arms.width] type = "record" -[blocks.period.fields.perioddata.item.arms.width.fields.outletno] +[blocks.period.fields.stress_period_data.item.arms.width.fields.outletno] type = "integer" longname = "lake or outlet number for this entry" description = "integer value that defines the lake or outlet number associated with the specified PERIOD data on the line. NUMBER must be greater than zero and less than or equal to NLAKES for a lake number and less than or equal to NOUTLETS for an outlet number." @@ -603,16 +603,16 @@ tagged = false index = true fk = "outlets.outletno" -[blocks.period.fields.perioddata.item.arms.width.fields.width] +[blocks.period.fields.stress_period_data.item.arms.width.fields.width] type = "string" longname = "outlet width" description = "real or character value that defines the width of the lake outlet. A specified WIDTH value is only used for active lakes if COUTTYPE for lake outlet OUTLETNO is not SPECIFIED. 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." time_series = true -[blocks.period.fields.perioddata.item.arms.slope] +[blocks.period.fields.stress_period_data.item.arms.slope] type = "record" -[blocks.period.fields.perioddata.item.arms.slope.fields.outletno] +[blocks.period.fields.stress_period_data.item.arms.slope.fields.outletno] type = "integer" longname = "lake or outlet number for this entry" description = "integer value that defines the lake or outlet number associated with the specified PERIOD data on the line. NUMBER must be greater than zero and less than or equal to NLAKES for a lake number and less than or equal to NOUTLETS for an outlet number." @@ -620,16 +620,16 @@ tagged = false index = true fk = "outlets.outletno" -[blocks.period.fields.perioddata.item.arms.slope.fields.slope] +[blocks.period.fields.stress_period_data.item.arms.slope.fields.slope] type = "string" longname = "bed slope" description = "real or character value that defines the bed slope for the lake outlet. A specified SLOPE value is only used for active lakes if COUTTYPE for lake outlet OUTLETNO is MANNING. 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." time_series = true -[blocks.period.fields.perioddata.item.arms.rough] +[blocks.period.fields.stress_period_data.item.arms.rough] type = "record" -[blocks.period.fields.perioddata.item.arms.rough.fields.outletno] +[blocks.period.fields.stress_period_data.item.arms.rough.fields.outletno] type = "integer" longname = "lake or outlet number for this entry" description = "integer value that defines the lake or outlet number associated with the specified PERIOD data on the line. NUMBER must be greater than zero and less than or equal to NLAKES for a lake number and less than or equal to NOUTLETS for an outlet number." @@ -637,16 +637,16 @@ tagged = false index = true fk = "outlets.outletno" -[blocks.period.fields.perioddata.item.arms.rough.fields.rough] +[blocks.period.fields.stress_period_data.item.arms.rough.fields.rough] type = "string" longname = "roughness coefficient" description = "real value that defines the roughness coefficient for the lake outlet. Any value can be specified if COUTTYPE is not MANNING. 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." time_series = true -[blocks.period.fields.perioddata.item.arms.auxiliaryrecord] +[blocks.period.fields.stress_period_data.item.arms.auxiliaryrecord] type = "record" -[blocks.period.fields.perioddata.item.arms.auxiliaryrecord.fields.lakeno] +[blocks.period.fields.stress_period_data.item.arms.auxiliaryrecord.fields.lakeno] type = "integer" longname = "lake or outlet number for this entry" description = "integer value that defines the lake or outlet number associated with the specified PERIOD data on the line. NUMBER must be greater than zero and less than or equal to NLAKES for a lake number and less than or equal to NOUTLETS for an outlet number." @@ -654,16 +654,16 @@ tagged = false index = true fk = "packagedata.ifno" -[blocks.period.fields.perioddata.item.arms.auxiliaryrecord.fields.auxiliary] +[blocks.period.fields.stress_period_data.item.arms.auxiliaryrecord.fields.auxiliary] type = "keyword" description = "keyword for specifying auxiliary variable." -[blocks.period.fields.perioddata.item.arms.auxiliaryrecord.fields.auxname] +[blocks.period.fields.stress_period_data.item.arms.auxiliaryrecord.fields.auxname] type = "string" description = "name for the auxiliary variable to be assigned AUXVAL. AUXNAME must match one of the auxiliary variable names defined in the OPTIONS block. If AUXNAME does not match one of the auxiliary variable names defined in the OPTIONS block the data are ignored." tagged = false -[blocks.period.fields.perioddata.item.arms.auxiliaryrecord.fields.auxval] +[blocks.period.fields.stress_period_data.item.arms.auxiliaryrecord.fields.auxval] type = "double" longname = "auxiliary variable value" description = "value for the auxiliary variable. 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." diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-lak.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-lak.yaml index 8155919c..630827e7 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-lak.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-lak.yaml @@ -509,7 +509,7 @@ blocks: - noutlets period: fields: - perioddata: + stress_period_data: type: list item: name: laksetting diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-maw.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-maw.json index cbb3cd01..48f50c4e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-maw.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-maw.json @@ -347,7 +347,7 @@ }, "period": { "fields": { - "perioddata": { + "stress_period_data": { "type": "list", "item": { "name": "perioddata", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-maw.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-maw.toml index 02531729..f2e26500 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-maw.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-maw.toml @@ -310,14 +310,14 @@ longname = "skin radius" description = "real value that defines the skin radius (filter pack radius) for the multi-aquifer well. RADIUS_SKIN can be any value if CONDEQN is SPECIFIED or THIEM. If CONDEQN is SKIN, CUMULATIVE, or MEAN, the program will terminate with an error if RADIUS_SKIN is less than or equal to the RADIUS for the multi-aquifer well." tagged = false -[blocks.period.fields.perioddata] +[blocks.period.fields.stress_period_data] type = "list" -[blocks.period.fields.perioddata.item] +[blocks.period.fields.stress_period_data.item] name = "perioddata" type = "record" -[blocks.period.fields.perioddata.item.fields.ifno] +[blocks.period.fields.stress_period_data.item.fields.ifno] type = "integer" longname = "well number for this entry" description = "integer value that defines the well number associated with the specified PERIOD data on the line. IFNO must be greater than zero and less than or equal to NMAWWELLS." @@ -325,123 +325,123 @@ tagged = false index = true fk = "packagedata.ifno" -[blocks.period.fields.perioddata.item.fields.mawsetting] +[blocks.period.fields.stress_period_data.item.fields.mawsetting] type = "union" description = "line of information that is parsed into a keyword and values. Keyword values that can be used to start the MAWSETTING string include: STATUS, FLOWING_WELL, RATE, WELL_HEAD, HEAD_LIMIT, SHUT_OFF, RATE_SCALING, and AUXILIARY." -[blocks.period.fields.perioddata.item.fields.mawsetting.arms.status] +[blocks.period.fields.stress_period_data.item.fields.mawsetting.arms.status] type = "string" longname = "well status" description = "keyword option to define well status. STATUS can be ACTIVE, INACTIVE, or CONSTANT. By default, STATUS is ACTIVE." -[blocks.period.fields.perioddata.item.fields.mawsetting.arms.flowing_wellrecord] +[blocks.period.fields.stress_period_data.item.fields.mawsetting.arms.flowing_wellrecord] type = "record" -[blocks.period.fields.perioddata.item.fields.mawsetting.arms.flowing_wellrecord.fields.flowing_well] +[blocks.period.fields.stress_period_data.item.fields.mawsetting.arms.flowing_wellrecord.fields.flowing_well] type = "keyword" longname = "well is a flowing well" description = "keyword to indicate the well is a flowing well. The FLOWING_WELL option can be used to simulate flowing wells when the simulated well head exceeds the specified drainage elevation." -[blocks.period.fields.perioddata.item.fields.mawsetting.arms.flowing_wellrecord.fields.fwelev] +[blocks.period.fields.stress_period_data.item.fields.mawsetting.arms.flowing_wellrecord.fields.fwelev] type = "double" longname = "flowing well elevation" description = "elevation used to determine whether or not the well is flowing." tagged = false -[blocks.period.fields.perioddata.item.fields.mawsetting.arms.flowing_wellrecord.fields.fwcond] +[blocks.period.fields.stress_period_data.item.fields.mawsetting.arms.flowing_wellrecord.fields.fwcond] type = "double" longname = "well flowing well conductance" description = "conductance used to calculate the discharge of a free flowing well. Flow occurs when the head in the well is above the well top elevation (FWELEV)." tagged = false -[blocks.period.fields.perioddata.item.fields.mawsetting.arms.flowing_wellrecord.fields.fwrlen] +[blocks.period.fields.stress_period_data.item.fields.mawsetting.arms.flowing_wellrecord.fields.fwrlen] type = "double" longname = "flowing well reduction length" description = "length used to reduce the conductance of the flowing well. When the head in the well drops below the well top plus the reduction length, then the conductance is reduced. This reduction length can be used to improve the stability of simulations with flowing wells so that there is not an abrupt change in flowing well rates." tagged = false -[blocks.period.fields.perioddata.item.fields.mawsetting.arms.rate] +[blocks.period.fields.stress_period_data.item.fields.mawsetting.arms.rate] type = "double" longname = "well pumping rate" description = "is the volumetric pumping rate for the multi-aquifer well. A positive value indicates recharge and a negative value indicates discharge (pumping). RATE only applies to active (STATUS is ACTIVE) multi-aquifer wells. 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. By default, the RATE for each multi-aquifer well is zero." time_series = true -[blocks.period.fields.perioddata.item.fields.mawsetting.arms.well_head] +[blocks.period.fields.stress_period_data.item.fields.mawsetting.arms.well_head] type = "double" longname = "well head" description = "is the head in the multi-aquifer well. WELL_HEAD is only applied to constant head (STATUS is CONSTANT) and inactive (STATUS is INACTIVE) multi-aquifer wells. 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. The program will terminate with an error if WELL_HEAD is less than the bottom of the well." time_series = true -[blocks.period.fields.perioddata.item.fields.mawsetting.arms.head_limitrecord] +[blocks.period.fields.stress_period_data.item.fields.mawsetting.arms.head_limitrecord] type = "record" -[blocks.period.fields.perioddata.item.fields.mawsetting.arms.head_limitrecord.fields.head_limit] +[blocks.period.fields.stress_period_data.item.fields.mawsetting.arms.head_limitrecord.fields.head_limit] type = "keyword" -[blocks.period.fields.perioddata.item.fields.mawsetting.arms.head_limitrecord.fields.head_limit_value] +[blocks.period.fields.stress_period_data.item.fields.mawsetting.arms.head_limitrecord.fields.head_limit_value] type = "union" longname = "head limit" description = "is the limiting water level (head) in the well, which is the minimum of the well RATE or the well inflow rate from the aquifer. HEAD_LIMIT can be applied to extraction wells (RATE $<$ 0) or injection wells (RATE $>$ 0). HEAD_LIMIT can be deactivated by specifying the text string `OFF'. The HEAD_LIMIT option is based on the HEAD_LIMIT functionality available in the MNW2~citep{konikow2009} package for MODFLOW-2005. The HEAD_LIMIT option has been included to facilitate backward compatibility with previous versions of MODFLOW but use of the RATE_SCALING option instead of the HEAD_LIMIT option is recommended. By default, HEAD_LIMIT is `OFF'." -[blocks.period.fields.perioddata.item.fields.mawsetting.arms.head_limitrecord.fields.head_limit_value.arms.off] +[blocks.period.fields.stress_period_data.item.fields.mawsetting.arms.head_limitrecord.fields.head_limit_value.arms.off] type = "keyword" -[blocks.period.fields.perioddata.item.fields.mawsetting.arms.head_limitrecord.fields.head_limit_value.arms.value] +[blocks.period.fields.stress_period_data.item.fields.mawsetting.arms.head_limitrecord.fields.head_limit_value.arms.value] type = "double" tagged = false -[blocks.period.fields.perioddata.item.fields.mawsetting.arms.shutoffrecord] +[blocks.period.fields.stress_period_data.item.fields.mawsetting.arms.shutoffrecord] type = "record" -[blocks.period.fields.perioddata.item.fields.mawsetting.arms.shutoffrecord.fields.shut_off] +[blocks.period.fields.stress_period_data.item.fields.mawsetting.arms.shutoffrecord.fields.shut_off] type = "keyword" longname = "shut off well" description = "keyword for activating well shut off capability. Subsequent values define the minimum and maximum pumping rate that a well must exceed to shutoff or reactivate a well, respectively, during a stress period. SHUT_OFF is only applied to injection wells (RATE$<0$) and if HEAD_LIMIT is specified (not set to `OFF'). If HEAD_LIMIT is specified, SHUT_OFF can be deactivated by specifying a minimum value equal to zero. The SHUT_OFF option is based on the SHUT_OFF functionality available in the MNW2~citep{konikow2009} package for MODFLOW-2005. The SHUT_OFF option has been included to facilitate backward compatibility with previous versions of MODFLOW but use of the RATE_SCALING option instead of the SHUT_OFF option is recommended. By default, SHUT_OFF is not used." -[blocks.period.fields.perioddata.item.fields.mawsetting.arms.shutoffrecord.fields.minrate] +[blocks.period.fields.stress_period_data.item.fields.mawsetting.arms.shutoffrecord.fields.minrate] type = "double" longname = "minimum shutoff rate" description = "is the minimum rate that a well must exceed to shutoff a well during a stress period. The well will shut down during a time step if the flow rate to the well from the aquifer is less than MINRATE. If a well is shut down during a time step, reactivation of the well cannot occur until the next time step to reduce oscillations. MINRATE must be less than maxrate." tagged = false -[blocks.period.fields.perioddata.item.fields.mawsetting.arms.shutoffrecord.fields.maxrate] +[blocks.period.fields.stress_period_data.item.fields.mawsetting.arms.shutoffrecord.fields.maxrate] type = "double" longname = "maximum shutoff rate" description = "is the maximum rate that a well must exceed to reactivate a well during a stress period. The well will reactivate during a timestep if the well was shutdown during the previous time step and the flow rate to the well from the aquifer exceeds maxrate. Reactivation of the well cannot occur until the next time step if a well is shutdown to reduce oscillations. maxrate must be greater than MINRATE." tagged = false -[blocks.period.fields.perioddata.item.fields.mawsetting.arms.rate_scalingrecord] +[blocks.period.fields.stress_period_data.item.fields.mawsetting.arms.rate_scalingrecord] type = "record" -[blocks.period.fields.perioddata.item.fields.mawsetting.arms.rate_scalingrecord.fields.rate_scaling] +[blocks.period.fields.stress_period_data.item.fields.mawsetting.arms.rate_scalingrecord.fields.rate_scaling] type = "keyword" longname = "rate scaling" description = "activate rate scaling. If RATE_SCALING is specified, both PUMP_ELEVATION and SCALING_LENGTH must be specified. RATE_SCALING cannot be used with HEAD_LIMIT. RATE_SCALING can be used for extraction or injection wells. For extraction wells, the extraction rate will start to decrease once the head in the well lowers to a level equal to the pump elevation plus the scaling length. If the head in the well drops below the pump elevation, then the extraction rate is calculated to be zero. For an injection well, the injection rate will begin to decrease once the head in the well rises above the specified pump elevation. If the head in the well rises above the pump elevation plus the scaling length, then the injection rate will be set to zero." -[blocks.period.fields.perioddata.item.fields.mawsetting.arms.rate_scalingrecord.fields.pump_elevation] +[blocks.period.fields.stress_period_data.item.fields.mawsetting.arms.rate_scalingrecord.fields.pump_elevation] type = "double" longname = "pump elevation" description = "is the elevation of the multi-aquifer well pump (PUMP_ELEVATION). PUMP_ELEVATION should not be less than the bottom elevation (BOTTOM) of the multi-aquifer well." tagged = false -[blocks.period.fields.perioddata.item.fields.mawsetting.arms.rate_scalingrecord.fields.scaling_length] +[blocks.period.fields.stress_period_data.item.fields.mawsetting.arms.rate_scalingrecord.fields.scaling_length] type = "double" description = "height above the pump elevation (SCALING_LENGTH). If the simulated well head is below this elevation (pump elevation plus the scaling length), then the pumping rate is reduced." tagged = false -[blocks.period.fields.perioddata.item.fields.mawsetting.arms.auxiliaryrecord] +[blocks.period.fields.stress_period_data.item.fields.mawsetting.arms.auxiliaryrecord] type = "record" -[blocks.period.fields.perioddata.item.fields.mawsetting.arms.auxiliaryrecord.fields.auxiliary] +[blocks.period.fields.stress_period_data.item.fields.mawsetting.arms.auxiliaryrecord.fields.auxiliary] type = "keyword" description = "keyword for specifying auxiliary variable." -[blocks.period.fields.perioddata.item.fields.mawsetting.arms.auxiliaryrecord.fields.auxname] +[blocks.period.fields.stress_period_data.item.fields.mawsetting.arms.auxiliaryrecord.fields.auxname] type = "string" description = "name for the auxiliary variable to be assigned AUXVAL. AUXNAME must match one of the auxiliary variable names defined in the OPTIONS block. If AUXNAME does not match one of the auxiliary variable names defined in the OPTIONS block the data are ignored." tagged = false -[blocks.period.fields.perioddata.item.fields.mawsetting.arms.auxiliaryrecord.fields.auxval] +[blocks.period.fields.stress_period_data.item.fields.mawsetting.arms.auxiliaryrecord.fields.auxval] type = "double" longname = "auxiliary variable value" description = "value for the auxiliary variable. 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." diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-maw.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-maw.yaml index 480bf5a0..62da2db6 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-maw.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-maw.yaml @@ -394,7 +394,7 @@ blocks: tagged: false period: fields: - perioddata: + stress_period_data: type: list item: name: perioddata diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-mvr.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-mvr.json index 46ad4d9f..db980210 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-mvr.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-mvr.json @@ -118,7 +118,7 @@ }, "period": { "fields": { - "perioddata": { + "stress_period_data": { "type": "list", "item": { "name": "perioddata", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-mvr.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-mvr.toml index f8d01f6b..6fd00d7a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-mvr.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-mvr.toml @@ -95,60 +95,60 @@ description = "is the name of a package that may be included in a subsequent str tagged = false pk = true -[blocks.period.fields.perioddata] +[blocks.period.fields.stress_period_data] type = "list" -[blocks.period.fields.perioddata.item] +[blocks.period.fields.stress_period_data.item] name = "perioddata" type = "record" -[blocks.period.fields.perioddata.item.fields.mname1] +[blocks.period.fields.stress_period_data.item.fields.mname1] type = "string" description = "name of model containing the package, PNAME1." optional = true tagged = false -[blocks.period.fields.perioddata.item.fields.pname1] +[blocks.period.fields.stress_period_data.item.fields.pname1] type = "string" longname = "provider package name" description = "is the package name for the provider. The package PNAME1 must be designated to provide water through the MVR Package by specifying the keyword 'MOVER' in its OPTIONS block." tagged = false fk = "packages.pname" -[blocks.period.fields.perioddata.item.fields.id1] +[blocks.period.fields.stress_period_data.item.fields.id1] type = "integer" longname = "provider reach" description = "is the identifier for the provider. For the standard boundary packages, the provider identifier is the number of the boundary as it is listed in the package input file. (Note that the order of these boundaries may change by stress period, which must be accounted for in the Mover Package.) So the first well has an identifier of one. The second is two, and so forth. For the advanced packages, the identifier is the reach number (SFR Package), well number (MAW Package), or UZF cell number. For the Lake Package, ID1 is the lake outlet number. Thus, outflows from a single lake can be routed to different streams, for example." tagged = false index = true -[blocks.period.fields.perioddata.item.fields.mname2] +[blocks.period.fields.stress_period_data.item.fields.mname2] type = "string" description = "name of model containing the package, PNAME2." optional = true tagged = false -[blocks.period.fields.perioddata.item.fields.pname2] +[blocks.period.fields.stress_period_data.item.fields.pname2] type = "string" longname = "receiver package name" description = "is the package name for the receiver. The package PNAME2 must be designated to receive water from the MVR Package by specifying the keyword 'MOVER' in its OPTIONS block." tagged = false fk = "packages.pname" -[blocks.period.fields.perioddata.item.fields.id2] +[blocks.period.fields.stress_period_data.item.fields.id2] type = "integer" longname = "receiver reach" description = "is the identifier for the receiver. The receiver identifier is the reach number (SFR Package), Lake number (LAK Package), well number (MAW Package), or UZF cell number." tagged = false index = true -[blocks.period.fields.perioddata.item.fields.mvrtype] +[blocks.period.fields.stress_period_data.item.fields.mvrtype] type = "string" longname = "mover type" description = "is the character string signifying the method for determining how much water will be moved. Supported values are 'FACTOR' 'EXCESS' 'THRESHOLD' and 'UPTO'. These four options determine how the receiver flow rate, $Q_R$, is calculated. These options mirror the options defined for the cprior variable in the SFR package, with the term 'FACTOR' being functionally equivalent to the 'FRACTION' option for cprior." tagged = false -[blocks.period.fields.perioddata.item.fields.value] +[blocks.period.fields.stress_period_data.item.fields.value] type = "double" longname = "mover value" description = "is the value to be used in the equation for calculating the amount of water to move. For the 'FACTOR' option, VALUE is the $alpha$ factor. For the remaining options, VALUE is the specified flow rate, $Q_S$." diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-mvr.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-mvr.yaml index 85ce90a3..63f802bd 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-mvr.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-mvr.yaml @@ -103,7 +103,7 @@ blocks: - maxpackages period: fields: - perioddata: + stress_period_data: type: list item: name: perioddata diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-oc.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-oc.json index 884c0cb4..3de603b3 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-oc.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-oc.json @@ -110,7 +110,7 @@ }, "period": { "fields": { - "output": { + "stress_period_data": { "type": "list", "optional": true, "item": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-oc.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-oc.toml index a1c43ea8..7fcb02a3 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-oc.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-oc.toml @@ -93,24 +93,24 @@ longname = "write format" description = "write format can be EXPONENTIAL, FIXED, GENERAL, or SCIENTIFIC." tagged = false -[blocks.period.fields.output] +[blocks.period.fields.stress_period_data] type = "list" optional = true -[blocks.period.fields.output.item] +[blocks.period.fields.stress_period_data.item] name = "output_record" type = "union" -[blocks.period.fields.output.item.arms.saverecord] +[blocks.period.fields.stress_period_data.item.arms.saverecord] type = "record" optional = true -[blocks.period.fields.output.item.arms.saverecord.fields.save] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.save] type = "keyword" longname = "keyword to save" description = "keyword to indicate that information will be saved this stress period." -[blocks.period.fields.output.item.arms.saverecord.fields.rtype] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.rtype] type = "string" longname = "record type" description = "type of information to save or print. Can be BUDGET or HEAD." @@ -120,27 +120,27 @@ valid = [ "BUDGET", ] -[blocks.period.fields.output.item.arms.saverecord.fields.ocsetting] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.ocsetting] type = "union" description = "specifies the steps for which the data will be saved." -[blocks.period.fields.output.item.arms.saverecord.fields.ocsetting.arms.all] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.all] type = "keyword" description = "keyword to indicate save for all time steps in period." -[blocks.period.fields.output.item.arms.saverecord.fields.ocsetting.arms.first] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.first] type = "keyword" description = "keyword to indicate save for first step in period. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." -[blocks.period.fields.output.item.arms.saverecord.fields.ocsetting.arms.last] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.last] type = "keyword" description = "keyword to indicate save for last step in period. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." -[blocks.period.fields.output.item.arms.saverecord.fields.ocsetting.arms.frequency] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.frequency] type = "integer" description = "save at the specified time step frequency. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." -[blocks.period.fields.output.item.arms.saverecord.fields.ocsetting.arms.steps] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.steps] type = "array" description = "save for each step specified in STEPS. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." dtype = "integer" @@ -148,16 +148,16 @@ shape = [ "<=nstp", ] -[blocks.period.fields.output.item.arms.printrecord] +[blocks.period.fields.stress_period_data.item.arms.printrecord] type = "record" optional = true -[blocks.period.fields.output.item.arms.printrecord.fields.print] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.print] type = "keyword" longname = "keyword to save" description = "keyword to indicate that information will be printed this stress period." -[blocks.period.fields.output.item.arms.printrecord.fields.rtype] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.rtype] type = "string" longname = "record type" description = "type of information to save or print. Can be BUDGET or HEAD." @@ -167,27 +167,27 @@ valid = [ "BUDGET", ] -[blocks.period.fields.output.item.arms.printrecord.fields.ocsetting] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.ocsetting] type = "union" description = "specifies the steps for which the data will be saved." -[blocks.period.fields.output.item.arms.printrecord.fields.ocsetting.arms.all] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.all] type = "keyword" description = "keyword to indicate save for all time steps in period." -[blocks.period.fields.output.item.arms.printrecord.fields.ocsetting.arms.first] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.first] type = "keyword" description = "keyword to indicate save for first step in period. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." -[blocks.period.fields.output.item.arms.printrecord.fields.ocsetting.arms.last] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.last] type = "keyword" description = "keyword to indicate save for last step in period. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." -[blocks.period.fields.output.item.arms.printrecord.fields.ocsetting.arms.frequency] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.frequency] type = "integer" description = "save at the specified time step frequency. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." -[blocks.period.fields.output.item.arms.printrecord.fields.ocsetting.arms.steps] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.steps] type = "array" description = "save for each step specified in STEPS. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." dtype = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-oc.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-oc.yaml index aa8e445b..0fcf4f5f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-oc.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-oc.yaml @@ -86,7 +86,7 @@ blocks: tagged: false period: fields: - output: + stress_period_data: type: list optional: true item: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sfr.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sfr.json index 8aa2357a..9b307bef 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sfr.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sfr.json @@ -494,7 +494,7 @@ }, "period": { "fields": { - "perioddata": { + "stress_period_data": { "type": "list", "item": { "name": "perioddata", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sfr.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sfr.toml index 777061e6..70a5037a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sfr.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sfr.toml @@ -437,14 +437,14 @@ longname = "initial reach stage" description = "real value that defines the initial stage for the reach. The program will terminate with an error if INITIALSTAGE is less than the RTP value for reach IFNO defined in the PACKAGEDATA block. INITIALSTAGE data are used only if STORAGE is specified in the Options block and the first stress period is transient or for reaches defined to use the SIMPLE STATUS in the Period block." tagged = false -[blocks.period.fields.perioddata] +[blocks.period.fields.stress_period_data] type = "list" -[blocks.period.fields.perioddata.item] +[blocks.period.fields.stress_period_data.item] name = "perioddata" type = "record" -[blocks.period.fields.perioddata.item.fields.ifno] +[blocks.period.fields.stress_period_data.item.fields.ifno] type = "integer" longname = "reach number for this entry" description = "integer value that defines the feature (reach) number associated with the specified PERIOD data on the line. IFNO must be greater than zero and less than or equal to NREACHES." @@ -452,98 +452,98 @@ tagged = false index = true fk = "packagedata.ifno" -[blocks.period.fields.perioddata.item.fields.sfrsetting] +[blocks.period.fields.stress_period_data.item.fields.sfrsetting] type = "union" description = "line of information that is parsed into a keyword and values. Keyword values that can be used to start the SFRSETTING string include: STATUS, BEDK, MANNING, STAGE, INFLOW, RAINFALL, EVAPORATION, RUNOFF, DIVERSION, UPSTREAM_FRACTION, and AUXILIARY." -[blocks.period.fields.perioddata.item.fields.sfrsetting.arms.status] +[blocks.period.fields.stress_period_data.item.fields.sfrsetting.arms.status] type = "string" longname = "reach status" description = "keyword option to define stream reach status. STATUS can be ACTIVE, INACTIVE, or SIMPLE. The SIMPLE STATUS option simulates streamflow using a user-specified stage for a reach or a stage set to the top of the reach (depth = 0). In cases where the simulated leakage calculated using the specified stage exceeds the sum of inflows to the reach, the stage is set to the top of the reach and leakage is set equal to the sum of inflows. Upstream fractions should be changed using the UPSTREAM_FRACTION SFRSETTING if the status for one or more reaches is changed to ACTIVE or INACTIVE. For example, if one of two downstream connections for a reach is inactivated, the upstream fraction for the active and inactive downstream reach should be changed to 1.0 and 0.0, respectively, to ensure that the active reach receives all of the downstream outflow from the upstream reach. By default, STATUS is ACTIVE." -[blocks.period.fields.perioddata.item.fields.sfrsetting.arms.bedk] +[blocks.period.fields.stress_period_data.item.fields.sfrsetting.arms.bedk] type = "string" longname = "reach bed hydraulic conductivity" description = "real or character value that defines the hydraulic conductivity of the reach streambed. BEDK can be any positive value if the reach is not connected to an underlying GWF cell. Otherwise, BEDK must be greater than zero. 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." time_series = true -[blocks.period.fields.perioddata.item.fields.sfrsetting.arms.manning] +[blocks.period.fields.stress_period_data.item.fields.sfrsetting.arms.manning] type = "string" longname = "reach Manning's roughness coefficient" description = "real or character value that defines the Manning's roughness coefficient for the reach. MANNING must be greater than zero. 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." time_series = true -[blocks.period.fields.perioddata.item.fields.sfrsetting.arms.stage] +[blocks.period.fields.stress_period_data.item.fields.sfrsetting.arms.stage] type = "string" longname = "reach stage" description = "real or character value that defines the stage for the reach. The specified STAGE is only applied if the reach uses the simple routing option. If STAGE is not specified for reaches that use the simple routing option, the specified stage is set to the top of the reach. 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." time_series = true -[blocks.period.fields.perioddata.item.fields.sfrsetting.arms.inflow] +[blocks.period.fields.stress_period_data.item.fields.sfrsetting.arms.inflow] type = "string" longname = "inflow rate" description = "real or character value that defines the volumetric inflow rate for the streamflow routing reach. 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. By default, inflow rates are zero for each reach." time_series = true -[blocks.period.fields.perioddata.item.fields.sfrsetting.arms.rainfall] +[blocks.period.fields.stress_period_data.item.fields.sfrsetting.arms.rainfall] type = "string" longname = "rainfall rate" description = "real or character value that defines the volumetric rate per unit area of water added by precipitation directly on the streamflow routing reach. 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. By default, rainfall rates are zero for each reach." time_series = true -[blocks.period.fields.perioddata.item.fields.sfrsetting.arms.evaporation] +[blocks.period.fields.stress_period_data.item.fields.sfrsetting.arms.evaporation] type = "string" longname = "evaporation rate" description = "real or character value that defines the volumetric rate per unit area of water subtracted by evaporation from the streamflow routing reach. A positive evaporation rate should be provided. 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. If the volumetric evaporation rate for a reach exceeds the sources of water to the reach (upstream and specified inflows, rainfall, and runoff but excluding groundwater leakage into the reach) the volumetric evaporation rate is limited to the sources of water to the reach. By default, evaporation rates are zero for each reach." time_series = true -[blocks.period.fields.perioddata.item.fields.sfrsetting.arms.runoff] +[blocks.period.fields.stress_period_data.item.fields.sfrsetting.arms.runoff] type = "string" longname = "runoff rate" description = "real or character value that defines the volumetric rate of diffuse overland runoff that enters the streamflow routing reach. 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. If the volumetric runoff rate for a reach is negative and exceeds inflows to the reach (upstream and specified inflows, and rainfall but excluding groundwater leakage into the reach) the volumetric runoff rate is limited to inflows to the reach and the volumetric evaporation rate for the reach is set to zero. By default, runoff rates are zero for each reach." time_series = true -[blocks.period.fields.perioddata.item.fields.sfrsetting.arms.diversionrecord] +[blocks.period.fields.stress_period_data.item.fields.sfrsetting.arms.diversionrecord] type = "record" -[blocks.period.fields.perioddata.item.fields.sfrsetting.arms.diversionrecord.fields.diversion] +[blocks.period.fields.stress_period_data.item.fields.sfrsetting.arms.diversionrecord.fields.diversion] type = "keyword" longname = "diversion keyword" description = "keyword to indicate diversion record." -[blocks.period.fields.perioddata.item.fields.sfrsetting.arms.diversionrecord.fields.idv] +[blocks.period.fields.stress_period_data.item.fields.sfrsetting.arms.diversionrecord.fields.idv] type = "integer" longname = "diversion number" description = "an integer value specifying which diversion of reach IFNO that DIVFLOW is being specified for. Must be less or equal to ndv for the current reach (IFNO)." tagged = false index = true -[blocks.period.fields.perioddata.item.fields.sfrsetting.arms.diversionrecord.fields.divflow] +[blocks.period.fields.stress_period_data.item.fields.sfrsetting.arms.diversionrecord.fields.divflow] type = "double" longname = "volumetric diversion flow rate" description = "real or character value that defines the volumetric diversion (DIVFLOW) rate for the streamflow routing reach. 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 -[blocks.period.fields.perioddata.item.fields.sfrsetting.arms.upstream_fraction] +[blocks.period.fields.stress_period_data.item.fields.sfrsetting.arms.upstream_fraction] type = "double" longname = "fraction of upstream flow" description = "real value that defines the fraction of upstream flow (USTRF) from each upstream reach that is applied as upstream inflow to the reach. The sum of all USTRF values for all reaches connected to the same upstream reach must be equal to one." -[blocks.period.fields.perioddata.item.fields.sfrsetting.arms.cross_sectionrecord] +[blocks.period.fields.stress_period_data.item.fields.sfrsetting.arms.cross_sectionrecord] type = "record" -[blocks.period.fields.perioddata.item.fields.sfrsetting.arms.cross_sectionrecord.fields.cross_section] +[blocks.period.fields.stress_period_data.item.fields.sfrsetting.arms.cross_sectionrecord.fields.cross_section] type = "keyword" longname = "cross_section keyword" description = "keyword to specify that record corresponds to a reach cross-section." -[blocks.period.fields.perioddata.item.fields.sfrsetting.arms.cross_sectionrecord.fields.tab6] +[blocks.period.fields.stress_period_data.item.fields.sfrsetting.arms.cross_sectionrecord.fields.tab6] type = "keyword" longname = "head keyword" description = "keyword to specify that record corresponds to a cross-section table file." -[blocks.period.fields.perioddata.item.fields.sfrsetting.arms.cross_sectionrecord.fields.tab6_filename] +[blocks.period.fields.stress_period_data.item.fields.sfrsetting.arms.cross_sectionrecord.fields.tab6_filename] type = "file" longname = "table file name" description = "character string that defines the path and filename for the file containing cross-section table data for the reach. The TAB6_FILENAME file includes the number of entries in the file and the station elevation data in terms of the fractional width and the reach depth. Instructions for creating the TAB6_FILENAME input file are provided in SFR Reach Cross-Section Table Input File section." @@ -551,19 +551,19 @@ tagged = false direction = "in" component = "utl-sfrtab" -[blocks.period.fields.perioddata.item.fields.sfrsetting.arms.auxiliaryrecord] +[blocks.period.fields.stress_period_data.item.fields.sfrsetting.arms.auxiliaryrecord] type = "record" -[blocks.period.fields.perioddata.item.fields.sfrsetting.arms.auxiliaryrecord.fields.auxiliary] +[blocks.period.fields.stress_period_data.item.fields.sfrsetting.arms.auxiliaryrecord.fields.auxiliary] type = "keyword" description = "keyword for specifying auxiliary variable." -[blocks.period.fields.perioddata.item.fields.sfrsetting.arms.auxiliaryrecord.fields.auxname] +[blocks.period.fields.stress_period_data.item.fields.sfrsetting.arms.auxiliaryrecord.fields.auxname] type = "string" description = "name for the auxiliary variable to be assigned AUXVAL. AUXNAME must match one of the auxiliary variable names defined in the OPTIONS block. If AUXNAME does not match one of the auxiliary variable names defined in the OPTIONS block the data are ignored." tagged = false -[blocks.period.fields.perioddata.item.fields.sfrsetting.arms.auxiliaryrecord.fields.auxval] +[blocks.period.fields.stress_period_data.item.fields.sfrsetting.arms.auxiliaryrecord.fields.auxval] type = "double" longname = "auxiliary variable value" description = "value for the auxiliary variable. 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." diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sfr.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sfr.yaml index dc8d83f2..fd900d22 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sfr.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sfr.yaml @@ -527,7 +527,7 @@ blocks: tagged: false period: fields: - perioddata: + stress_period_data: type: list item: name: perioddata diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-uzf.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-uzf.json index c31f479f..4baa225c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-uzf.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-uzf.json @@ -327,7 +327,7 @@ }, "period": { "fields": { - "perioddata": { + "stress_period_data": { "type": "list", "item": { "name": "perioddata", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-uzf.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-uzf.toml index ebdbd356..ebb17834 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-uzf.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-uzf.toml @@ -296,14 +296,14 @@ optional = true when = "boundnames" tagged = false -[blocks.period.fields.perioddata] +[blocks.period.fields.stress_period_data] type = "list" -[blocks.period.fields.perioddata.item] +[blocks.period.fields.stress_period_data.item] name = "perioddata" type = "record" -[blocks.period.fields.perioddata.item.fields.ifno] +[blocks.period.fields.stress_period_data.item.fields.ifno] type = "integer" longname = "UZF id number" description = "integer value that defines the feature (UZF object) number associated with the specified PERIOD data on the line." @@ -311,56 +311,56 @@ tagged = false index = true fk = "packagedata.ifno" -[blocks.period.fields.perioddata.item.fields.finf] +[blocks.period.fields.stress_period_data.item.fields.finf] type = "double" longname = "infiltration rate" description = "real or character value that defines the applied infiltration rate of the UZF cell ($LT^{-1}$). 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 -[blocks.period.fields.perioddata.item.fields.pet] +[blocks.period.fields.stress_period_data.item.fields.pet] type = "double" longname = "potential ET rate" description = "real or character value that defines the potential evapotranspiration rate of the UZF cell and specified GWF cell. Evapotranspiration is first removed from the unsaturated zone and any remaining potential evapotranspiration is applied to the saturated zone. If IVERTCON is greater than zero then residual potential evapotranspiration not satisfied in the UZF cell is applied to the underlying UZF and GWF cells. PET is always specified, but is only used if SIMULATE_ET is specified in the OPTIONS 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 -[blocks.period.fields.perioddata.item.fields.extdp] +[blocks.period.fields.stress_period_data.item.fields.extdp] type = "double" longname = "extinction depth" description = "real or character value that defines the evapotranspiration extinction depth of the UZF cell. If IVERTCON is greater than zero and EXTDP extends below the GWF cell bottom then remaining potential evapotranspiration is applied to the underlying UZF and GWF cells. EXTDP is always specified, but is only used if SIMULATE_ET is specified in the OPTIONS 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 -[blocks.period.fields.perioddata.item.fields.extwc] +[blocks.period.fields.stress_period_data.item.fields.extwc] type = "double" longname = "extinction water content" description = "real or character value that defines the evapotranspiration extinction water content of the UZF cell. EXTWC is always specified, but is only used if SIMULATE_ET and UNSAT_ETWC are specified in the OPTIONS block. The evapotranspiration rate from the unsaturated zone will be set to zero when the calculated water content is at or less than this value. The value for EXTWC cannot be less than the residual water content, and if it is specified as being less than the residual water content it is set to the residual water content. 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 -[blocks.period.fields.perioddata.item.fields.ha] +[blocks.period.fields.stress_period_data.item.fields.ha] type = "double" longname = "air entry potential" description = "real or character value that defines the air entry potential (head) of the UZF cell. HA is always specified, but is only used if SIMULATE_ET and UNSAT_ETAE are specified in the OPTIONS 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 -[blocks.period.fields.perioddata.item.fields.hroot] +[blocks.period.fields.stress_period_data.item.fields.hroot] type = "double" longname = "root potential" description = "real or character value that defines the root potential (head) of the UZF cell. HROOT is always specified, but is only used if SIMULATE_ET and UNSAT_ETAE are specified in the OPTIONS 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 -[blocks.period.fields.perioddata.item.fields.rootact] +[blocks.period.fields.stress_period_data.item.fields.rootact] type = "double" longname = "root activity function" description = "real or character value that defines the root activity function of the UZF cell. ROOTACT is the length of roots in a given volume of soil divided by that volume. Values range from 0 to about 3 $cm^{-2}$, depending on the plant community and its stage of development. ROOTACT is always specified, but is only used if SIMULATE_ET and UNSAT_ETAE are specified in the OPTIONS 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 -[blocks.period.fields.perioddata.item.fields.aux] +[blocks.period.fields.stress_period_data.item.fields.aux] type = "array" longname = "auxiliary variables" description = "represents the values of the auxiliary variables for each UZF. The values of auxiliary variables must be present for each UZF. The values must be specified in the order of the auxiliary variables specified in the OPTIONS block. If the package supports time series and the Options block includes a TIMESERIESFILE entry (see the 'Time-Variable Input' section), values can be obtained from a time series by entering the time-series name in place of a numeric value." diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-uzf.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-uzf.yaml index 84a98609..656d71dd 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-uzf.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-uzf.yaml @@ -324,7 +324,7 @@ blocks: - nuzfcells period: fields: - perioddata: + stress_period_data: type: list item: name: perioddata diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-lkt.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-lkt.json index a64c63ea..0a09970c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-lkt.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-lkt.json @@ -214,7 +214,7 @@ }, "period": { "fields": { - "lakeperioddata": { + "stress_period_data": { "type": "list", "item": { "name": "lakeperioddata", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-lkt.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-lkt.toml index 4e153da5..3a16518a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-lkt.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-lkt.toml @@ -187,14 +187,14 @@ optional = true when = "boundnames" tagged = false -[blocks.period.fields.lakeperioddata] +[blocks.period.fields.stress_period_data] type = "list" -[blocks.period.fields.lakeperioddata.item] +[blocks.period.fields.stress_period_data.item] name = "lakeperioddata" type = "record" -[blocks.period.fields.lakeperioddata.item.fields.ifno] +[blocks.period.fields.stress_period_data.item.fields.ifno] type = "integer" longname = "lake number for this entry" description = "integer value that defines the feature (lake) number associated with the specified PERIOD data on the line. IFNO must be greater than zero and less than or equal to NLAKES." @@ -202,58 +202,58 @@ tagged = false index = true fk = "packagedata.ifno" -[blocks.period.fields.lakeperioddata.item.fields.laksetting] +[blocks.period.fields.stress_period_data.item.fields.laksetting] type = "union" description = "line of information that is parsed into a keyword and values. Keyword values that can be used to start the LAKSETTING string include: STATUS, CONCENTRATION, RAINFALL, EVAPORATION, RUNOFF, EXT-INFLOW, and AUXILIARY. These settings are used to assign the concentration of associated with the corresponding flow terms. Concentrations cannot be specified for all flow terms. For example, the Lake Package supports a 'WITHDRAWAL' flow term. If this withdrawal term is active, then water will be withdrawn from the lake at the calculated concentration of the lake." -[blocks.period.fields.lakeperioddata.item.fields.laksetting.arms.status] +[blocks.period.fields.stress_period_data.item.fields.laksetting.arms.status] type = "string" longname = "lake concentration status" description = "keyword option to define lake status. STATUS can be ACTIVE, INACTIVE, or CONSTANT. By default, STATUS is ACTIVE, which means that concentration will be calculated for the lake. If a lake is inactive, then there will be no solute mass fluxes into or out of the lake and the inactive value will be written for the lake concentration. If a lake is constant, then the concentration for the lake will be fixed at the user specified value." -[blocks.period.fields.lakeperioddata.item.fields.laksetting.arms.concentration] +[blocks.period.fields.stress_period_data.item.fields.laksetting.arms.concentration] type = "string" longname = "lake concentration" description = "real or character value that defines the concentration for the lake. The specified CONCENTRATION is only applied if the lake is a constant concentration lake. 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." time_series = true -[blocks.period.fields.lakeperioddata.item.fields.laksetting.arms.rainfall] +[blocks.period.fields.stress_period_data.item.fields.laksetting.arms.rainfall] type = "string" longname = "rainfall concentration" description = "real or character value that defines the rainfall solute concentration $(ML^{-3})$ for the lake. 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." time_series = true -[blocks.period.fields.lakeperioddata.item.fields.laksetting.arms.evaporation] +[blocks.period.fields.stress_period_data.item.fields.laksetting.arms.evaporation] type = "string" longname = "evaporation concentration" description = "real or character value that defines the concentration of evaporated water $(ML^{-3})$ for the lake. If this concentration value is larger than the simulated concentration in the lake, then the evaporated water will be removed at the same concentration as the lake. 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." time_series = true -[blocks.period.fields.lakeperioddata.item.fields.laksetting.arms.runoff] +[blocks.period.fields.stress_period_data.item.fields.laksetting.arms.runoff] type = "string" longname = "runoff concentration" description = "real or character value that defines the concentration of runoff $(ML^{-3})$ for the lake. Value must be greater than or equal to zero. 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." time_series = true -[blocks.period.fields.lakeperioddata.item.fields.laksetting.arms.ext-inflow] +[blocks.period.fields.stress_period_data.item.fields.laksetting.arms.ext-inflow] type = "string" longname = "ext-inflow concentration" description = "real or character value that defines the concentration of external inflow $(ML^{-3})$ for the lake. Value must be greater than or equal to zero. 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." time_series = true -[blocks.period.fields.lakeperioddata.item.fields.laksetting.arms.auxiliaryrecord] +[blocks.period.fields.stress_period_data.item.fields.laksetting.arms.auxiliaryrecord] type = "record" -[blocks.period.fields.lakeperioddata.item.fields.laksetting.arms.auxiliaryrecord.fields.auxiliary] +[blocks.period.fields.stress_period_data.item.fields.laksetting.arms.auxiliaryrecord.fields.auxiliary] type = "keyword" description = "keyword for specifying auxiliary variable." -[blocks.period.fields.lakeperioddata.item.fields.laksetting.arms.auxiliaryrecord.fields.auxname] +[blocks.period.fields.stress_period_data.item.fields.laksetting.arms.auxiliaryrecord.fields.auxname] type = "string" description = "name for the auxiliary variable to be assigned AUXVAL. AUXNAME must match one of the auxiliary variable names defined in the OPTIONS block. If AUXNAME does not match one of the auxiliary variable names defined in the OPTIONS block the data are ignored." tagged = false -[blocks.period.fields.lakeperioddata.item.fields.laksetting.arms.auxiliaryrecord.fields.auxval] +[blocks.period.fields.stress_period_data.item.fields.laksetting.arms.auxiliaryrecord.fields.auxval] type = "double" longname = "auxiliary variable value" description = "value for the auxiliary variable. 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." diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-lkt.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-lkt.yaml index cb62ac4a..4b94c636 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-lkt.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-lkt.yaml @@ -205,7 +205,7 @@ blocks: tagged: false period: fields: - lakeperioddata: + stress_period_data: type: list item: name: lakeperioddata diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-mwt.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-mwt.json index f540daa0..4d96befe 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-mwt.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-mwt.json @@ -214,7 +214,7 @@ }, "period": { "fields": { - "mwtperioddata": { + "stress_period_data": { "type": "list", "item": { "name": "mwtperioddata", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-mwt.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-mwt.toml index f5792e13..49a65b01 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-mwt.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-mwt.toml @@ -187,14 +187,14 @@ optional = true when = "boundnames" tagged = false -[blocks.period.fields.mwtperioddata] +[blocks.period.fields.stress_period_data] type = "list" -[blocks.period.fields.mwtperioddata.item] +[blocks.period.fields.stress_period_data.item] name = "mwtperioddata" type = "record" -[blocks.period.fields.mwtperioddata.item.fields.ifno] +[blocks.period.fields.stress_period_data.item.fields.ifno] type = "integer" longname = "well number for this entry" description = "integer value that defines the feature (well) number associated with the specified PERIOD data on the line. IFNO must be greater than zero and less than or equal to NMAWWELLS." @@ -202,40 +202,40 @@ tagged = false index = true fk = "packagedata.ifno" -[blocks.period.fields.mwtperioddata.item.fields.mwtsetting] +[blocks.period.fields.stress_period_data.item.fields.mwtsetting] type = "union" description = "line of information that is parsed into a keyword and values. Keyword values that can be used to start the MWTSETTING string include: STATUS, CONCENTRATION, RATE, and AUXILIARY. These settings are used to assign the concentration associated with the corresponding flow terms. Concentrations cannot be specified for all flow terms. For example, the Multi-Aquifer Well Package supports a 'WITHDRAWAL' flow term. If this withdrawal term is active, then water will be withdrawn from the well at the calculated concentration of the well." -[blocks.period.fields.mwtperioddata.item.fields.mwtsetting.arms.status] +[blocks.period.fields.stress_period_data.item.fields.mwtsetting.arms.status] type = "string" longname = "well concentration status" description = "keyword option to define well status. STATUS can be ACTIVE, INACTIVE, or CONSTANT. By default, STATUS is ACTIVE, which means that concentration will be calculated for the well. If a well is inactive, then there will be no solute mass fluxes into or out of the well and the inactive value will be written for the well concentration. If a well is constant, then the concentration for the well will be fixed at the user specified value." -[blocks.period.fields.mwtperioddata.item.fields.mwtsetting.arms.concentration] +[blocks.period.fields.stress_period_data.item.fields.mwtsetting.arms.concentration] type = "string" longname = "well concentration" description = "real or character value that defines the concentration for the well. The specified CONCENTRATION is only applied if the well is a constant concentration well. 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." time_series = true -[blocks.period.fields.mwtperioddata.item.fields.mwtsetting.arms.rate] +[blocks.period.fields.stress_period_data.item.fields.mwtsetting.arms.rate] type = "string" longname = "well injection concentration" description = "real or character value that defines the injection solute concentration $(ML^{-3})$ for the well. 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." time_series = true -[blocks.period.fields.mwtperioddata.item.fields.mwtsetting.arms.auxiliaryrecord] +[blocks.period.fields.stress_period_data.item.fields.mwtsetting.arms.auxiliaryrecord] type = "record" -[blocks.period.fields.mwtperioddata.item.fields.mwtsetting.arms.auxiliaryrecord.fields.auxiliary] +[blocks.period.fields.stress_period_data.item.fields.mwtsetting.arms.auxiliaryrecord.fields.auxiliary] type = "keyword" description = "keyword for specifying auxiliary variable." -[blocks.period.fields.mwtperioddata.item.fields.mwtsetting.arms.auxiliaryrecord.fields.auxname] +[blocks.period.fields.stress_period_data.item.fields.mwtsetting.arms.auxiliaryrecord.fields.auxname] type = "string" description = "name for the auxiliary variable to be assigned AUXVAL. AUXNAME must match one of the auxiliary variable names defined in the OPTIONS block. If AUXNAME does not match one of the auxiliary variable names defined in the OPTIONS block the data are ignored." tagged = false -[blocks.period.fields.mwtperioddata.item.fields.mwtsetting.arms.auxiliaryrecord.fields.auxval] +[blocks.period.fields.stress_period_data.item.fields.mwtsetting.arms.auxiliaryrecord.fields.auxval] type = "double" longname = "auxiliary variable value" description = "value for the auxiliary variable. 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." diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-mwt.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-mwt.yaml index 280737c8..d161149b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-mwt.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-mwt.yaml @@ -205,7 +205,7 @@ blocks: tagged: false period: fields: - mwtperioddata: + stress_period_data: type: list item: name: mwtperioddata diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-oc.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-oc.json index 54a1eca9..86b1aeb9 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-oc.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-oc.json @@ -110,7 +110,7 @@ }, "period": { "fields": { - "output": { + "stress_period_data": { "type": "list", "optional": true, "item": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-oc.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-oc.toml index 43b70fbf..40ddeef1 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-oc.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-oc.toml @@ -93,24 +93,24 @@ longname = "write format" description = "write format can be EXPONENTIAL, FIXED, GENERAL, or SCIENTIFIC." tagged = false -[blocks.period.fields.output] +[blocks.period.fields.stress_period_data] type = "list" optional = true -[blocks.period.fields.output.item] +[blocks.period.fields.stress_period_data.item] name = "output_record" type = "union" -[blocks.period.fields.output.item.arms.saverecord] +[blocks.period.fields.stress_period_data.item.arms.saverecord] type = "record" optional = true -[blocks.period.fields.output.item.arms.saverecord.fields.save] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.save] type = "keyword" longname = "keyword to save" description = "keyword to indicate that information will be saved this stress period." -[blocks.period.fields.output.item.arms.saverecord.fields.rtype] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.rtype] type = "string" longname = "record type" description = "type of information to save or print. Can be BUDGET or CONCENTRATION." @@ -120,27 +120,27 @@ valid = [ "BUDGET", ] -[blocks.period.fields.output.item.arms.saverecord.fields.ocsetting] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.ocsetting] type = "union" description = "specifies the steps for which the data will be saved." -[blocks.period.fields.output.item.arms.saverecord.fields.ocsetting.arms.all] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.all] type = "keyword" description = "keyword to indicate save for all time steps in period." -[blocks.period.fields.output.item.arms.saverecord.fields.ocsetting.arms.first] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.first] type = "keyword" description = "keyword to indicate save for first step in period. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." -[blocks.period.fields.output.item.arms.saverecord.fields.ocsetting.arms.last] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.last] type = "keyword" description = "keyword to indicate save for last step in period. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." -[blocks.period.fields.output.item.arms.saverecord.fields.ocsetting.arms.frequency] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.frequency] type = "integer" description = "save at the specified time step frequency. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." -[blocks.period.fields.output.item.arms.saverecord.fields.ocsetting.arms.steps] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.steps] type = "array" description = "save for each step specified in STEPS. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." dtype = "integer" @@ -148,16 +148,16 @@ shape = [ "<=nstp", ] -[blocks.period.fields.output.item.arms.printrecord] +[blocks.period.fields.stress_period_data.item.arms.printrecord] type = "record" optional = true -[blocks.period.fields.output.item.arms.printrecord.fields.print] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.print] type = "keyword" longname = "keyword to save" description = "keyword to indicate that information will be printed this stress period." -[blocks.period.fields.output.item.arms.printrecord.fields.rtype] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.rtype] type = "string" longname = "record type" description = "type of information to save or print. Can be BUDGET or CONCENTRATION." @@ -167,27 +167,27 @@ valid = [ "BUDGET", ] -[blocks.period.fields.output.item.arms.printrecord.fields.ocsetting] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.ocsetting] type = "union" description = "specifies the steps for which the data will be saved." -[blocks.period.fields.output.item.arms.printrecord.fields.ocsetting.arms.all] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.all] type = "keyword" description = "keyword to indicate save for all time steps in period." -[blocks.period.fields.output.item.arms.printrecord.fields.ocsetting.arms.first] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.first] type = "keyword" description = "keyword to indicate save for first step in period. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." -[blocks.period.fields.output.item.arms.printrecord.fields.ocsetting.arms.last] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.last] type = "keyword" description = "keyword to indicate save for last step in period. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." -[blocks.period.fields.output.item.arms.printrecord.fields.ocsetting.arms.frequency] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.frequency] type = "integer" description = "save at the specified time step frequency. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." -[blocks.period.fields.output.item.arms.printrecord.fields.ocsetting.arms.steps] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.steps] type = "array" description = "save for each step specified in STEPS. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." dtype = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-oc.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-oc.yaml index b3b1642d..3e0fb0db 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-oc.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-oc.yaml @@ -86,7 +86,7 @@ blocks: tagged: false period: fields: - output: + stress_period_data: type: list optional: true item: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-sft.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-sft.json index 11d4d449..a599f530 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-sft.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-sft.json @@ -214,7 +214,7 @@ }, "period": { "fields": { - "reachperioddata": { + "stress_period_data": { "type": "list", "item": { "name": "reachperioddata", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-sft.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-sft.toml index e7b4ebe2..5290ebf3 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-sft.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-sft.toml @@ -187,14 +187,14 @@ optional = true when = "boundnames" tagged = false -[blocks.period.fields.reachperioddata] +[blocks.period.fields.stress_period_data] type = "list" -[blocks.period.fields.reachperioddata.item] +[blocks.period.fields.stress_period_data.item] name = "reachperioddata" type = "record" -[blocks.period.fields.reachperioddata.item.fields.ifno] +[blocks.period.fields.stress_period_data.item.fields.ifno] type = "integer" longname = "reach number for this entry" description = "integer value that defines the feature (reach) number associated with the specified PERIOD data on the line. IFNO must be greater than zero and less than or equal to NREACHES." @@ -202,58 +202,58 @@ tagged = false index = true fk = "packagedata.ifno" -[blocks.period.fields.reachperioddata.item.fields.reachsetting] +[blocks.period.fields.stress_period_data.item.fields.reachsetting] type = "union" description = "line of information that is parsed into a keyword and values. Keyword values that can be used to start the REACHSETTING string include: STATUS, CONCENTRATION, RAINFALL, EVAPORATION, RUNOFF, and AUXILIARY. These settings are used to assign the concentration of associated with the corresponding flow terms. Concentrations cannot be specified for all flow terms. For example, the Streamflow Package supports a 'DIVERSION' flow term. Diversion water will be routed using the calculated concentration of the reach." -[blocks.period.fields.reachperioddata.item.fields.reachsetting.arms.status] +[blocks.period.fields.stress_period_data.item.fields.reachsetting.arms.status] type = "string" longname = "reach concentration status" description = "keyword option to define reach status. STATUS can be ACTIVE, INACTIVE, or CONSTANT. By default, STATUS is ACTIVE, which means that concentration will be calculated for the reach. If a reach is inactive, then there will be no solute mass fluxes into or out of the reach and the inactive value will be written for the reach concentration. If a reach is constant, then the concentration for the reach will be fixed at the user specified value." -[blocks.period.fields.reachperioddata.item.fields.reachsetting.arms.concentration] +[blocks.period.fields.stress_period_data.item.fields.reachsetting.arms.concentration] type = "string" longname = "reach concentration" description = "real or character value that defines the concentration for the reach. The specified CONCENTRATION is only applied if the reach is a constant concentration reach. 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." time_series = true -[blocks.period.fields.reachperioddata.item.fields.reachsetting.arms.rainfall] +[blocks.period.fields.stress_period_data.item.fields.reachsetting.arms.rainfall] type = "string" longname = "rainfall concentration" description = "real or character value that defines the rainfall solute concentration $(ML^{-3})$ for the reach. 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." time_series = true -[blocks.period.fields.reachperioddata.item.fields.reachsetting.arms.evaporation] +[blocks.period.fields.stress_period_data.item.fields.reachsetting.arms.evaporation] type = "string" longname = "evaporation concentration" description = "real or character value that defines the concentration of evaporated water $(ML^{-3})$ for the reach. If this concentration value is larger than the simulated concentration in the reach, then the evaporated water will be removed at the same concentration as the reach. 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." time_series = true -[blocks.period.fields.reachperioddata.item.fields.reachsetting.arms.runoff] +[blocks.period.fields.stress_period_data.item.fields.reachsetting.arms.runoff] type = "string" longname = "runoff concentration" description = "real or character value that defines the concentration of runoff $(ML^{-3})$ for the reach. Value must be greater than or equal to zero. 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." time_series = true -[blocks.period.fields.reachperioddata.item.fields.reachsetting.arms.inflow] +[blocks.period.fields.stress_period_data.item.fields.reachsetting.arms.inflow] type = "string" longname = "inflow concentration" description = "real or character value that defines the concentration of inflow $(ML^{-3})$ for the reach. Value must be greater than or equal to zero. 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." time_series = true -[blocks.period.fields.reachperioddata.item.fields.reachsetting.arms.auxiliaryrecord] +[blocks.period.fields.stress_period_data.item.fields.reachsetting.arms.auxiliaryrecord] type = "record" -[blocks.period.fields.reachperioddata.item.fields.reachsetting.arms.auxiliaryrecord.fields.auxiliary] +[blocks.period.fields.stress_period_data.item.fields.reachsetting.arms.auxiliaryrecord.fields.auxiliary] type = "keyword" description = "keyword for specifying auxiliary variable." -[blocks.period.fields.reachperioddata.item.fields.reachsetting.arms.auxiliaryrecord.fields.auxname] +[blocks.period.fields.stress_period_data.item.fields.reachsetting.arms.auxiliaryrecord.fields.auxname] type = "string" description = "name for the auxiliary variable to be assigned AUXVAL. AUXNAME must match one of the auxiliary variable names defined in the OPTIONS block. If AUXNAME does not match one of the auxiliary variable names defined in the OPTIONS block the data are ignored." tagged = false -[blocks.period.fields.reachperioddata.item.fields.reachsetting.arms.auxiliaryrecord.fields.auxval] +[blocks.period.fields.stress_period_data.item.fields.reachsetting.arms.auxiliaryrecord.fields.auxval] type = "double" longname = "auxiliary variable value" description = "value for the auxiliary variable. 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." diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-sft.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-sft.yaml index 4022d91a..94cc769c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-sft.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-sft.yaml @@ -205,7 +205,7 @@ blocks: tagged: false period: fields: - reachperioddata: + stress_period_data: type: list item: name: reachperioddata diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-uzt.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-uzt.json index 95fe791b..d7010929 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-uzt.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-uzt.json @@ -214,7 +214,7 @@ }, "period": { "fields": { - "uztperioddata": { + "stress_period_data": { "type": "list", "item": { "name": "uztperioddata", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-uzt.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-uzt.toml index e30206b0..81fa4317 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-uzt.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-uzt.toml @@ -187,14 +187,14 @@ optional = true when = "boundnames" tagged = false -[blocks.period.fields.uztperioddata] +[blocks.period.fields.stress_period_data] type = "list" -[blocks.period.fields.uztperioddata.item] +[blocks.period.fields.stress_period_data.item] name = "uztperioddata" type = "record" -[blocks.period.fields.uztperioddata.item.fields.ifno] +[blocks.period.fields.stress_period_data.item.fields.ifno] type = "integer" longname = "unsaturated zone flow cell number for this entry" description = "integer value that defines the feature (UZF object) number associated with the specified PERIOD data on the line. IFNO must be greater than zero and less than or equal to NUZFCELLS." @@ -202,46 +202,46 @@ tagged = false index = true fk = "packagedata.ifno" -[blocks.period.fields.uztperioddata.item.fields.uztsetting] +[blocks.period.fields.stress_period_data.item.fields.uztsetting] type = "union" description = "line of information that is parsed into a keyword and values. Keyword values that can be used to start the UZTSETTING string include: STATUS, CONCENTRATION, INFILTRATION, UZET, and AUXILIARY. These settings are used to assign the concentration of associated with the corresponding flow terms. Concentrations cannot be specified for all flow terms." -[blocks.period.fields.uztperioddata.item.fields.uztsetting.arms.status] +[blocks.period.fields.stress_period_data.item.fields.uztsetting.arms.status] type = "string" longname = "unsaturated zone flow cell concentration status" description = "keyword option to define UZF cell status. STATUS can be ACTIVE, INACTIVE, or CONSTANT. By default, STATUS is ACTIVE, which means that concentration will be calculated for the UZF cell. If a UZF cell is inactive, then there will be no solute mass fluxes into or out of the UZF cell and the inactive value will be written for the UZF cell concentration. If a UZF cell is constant, then the concentration for the UZF cell will be fixed at the user specified value." -[blocks.period.fields.uztperioddata.item.fields.uztsetting.arms.concentration] +[blocks.period.fields.stress_period_data.item.fields.uztsetting.arms.concentration] type = "string" longname = "unsaturated zone flow cell concentration" description = "real or character value that defines the concentration for the unsaturated zone flow cell. The specified CONCENTRATION is only applied if the unsaturated zone flow cell is a constant concentration cell. 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." time_series = true -[blocks.period.fields.uztperioddata.item.fields.uztsetting.arms.infiltration] +[blocks.period.fields.stress_period_data.item.fields.uztsetting.arms.infiltration] type = "string" longname = "infiltration concentration" description = "real or character value that defines the infiltration solute concentration $(ML^{-3})$ for the UZF cell. 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." time_series = true -[blocks.period.fields.uztperioddata.item.fields.uztsetting.arms.uzet] +[blocks.period.fields.stress_period_data.item.fields.uztsetting.arms.uzet] type = "string" longname = "unsaturated zone et concentration" description = "real or character value that defines the concentration of unsaturated zone evapotranspiration water $(ML^{-3})$ for the UZF cell. If this concentration value is larger than the simulated concentration in the UZF cell, then the unsaturated zone ET water will be removed at the same concentration as the UZF cell. 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." time_series = true -[blocks.period.fields.uztperioddata.item.fields.uztsetting.arms.auxiliaryrecord] +[blocks.period.fields.stress_period_data.item.fields.uztsetting.arms.auxiliaryrecord] type = "record" -[blocks.period.fields.uztperioddata.item.fields.uztsetting.arms.auxiliaryrecord.fields.auxiliary] +[blocks.period.fields.stress_period_data.item.fields.uztsetting.arms.auxiliaryrecord.fields.auxiliary] type = "keyword" description = "keyword for specifying auxiliary variable." -[blocks.period.fields.uztperioddata.item.fields.uztsetting.arms.auxiliaryrecord.fields.auxname] +[blocks.period.fields.stress_period_data.item.fields.uztsetting.arms.auxiliaryrecord.fields.auxname] type = "string" description = "name for the auxiliary variable to be assigned AUXVAL. AUXNAME must match one of the auxiliary variable names defined in the OPTIONS block. If AUXNAME does not match one of the auxiliary variable names defined in the OPTIONS block the data are ignored." tagged = false -[blocks.period.fields.uztperioddata.item.fields.uztsetting.arms.auxiliaryrecord.fields.auxval] +[blocks.period.fields.stress_period_data.item.fields.uztsetting.arms.auxiliaryrecord.fields.auxval] type = "double" longname = "auxiliary variable value" description = "value for the auxiliary variable. 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." diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-uzt.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-uzt.yaml index ca3ec8f0..eddadfe9 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-uzt.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-uzt.yaml @@ -207,7 +207,7 @@ blocks: tagged: false period: fields: - uztperioddata: + stress_period_data: type: list item: name: uztperioddata diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-oc.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-oc.json index 9d80d090..48582e51 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-oc.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-oc.json @@ -128,7 +128,7 @@ }, "period": { "fields": { - "output": { + "stress_period_data": { "type": "list", "optional": true, "item": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-oc.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-oc.toml index 0a0fc9de..e1901f31 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-oc.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-oc.toml @@ -109,24 +109,24 @@ longname = "write format" description = "write format can be EXPONENTIAL, FIXED, GENERAL, or SCIENTIFIC." tagged = false -[blocks.period.fields.output] +[blocks.period.fields.stress_period_data] type = "list" optional = true -[blocks.period.fields.output.item] +[blocks.period.fields.stress_period_data.item] name = "output_record" type = "union" -[blocks.period.fields.output.item.arms.saverecord] +[blocks.period.fields.stress_period_data.item.arms.saverecord] type = "record" optional = true -[blocks.period.fields.output.item.arms.saverecord.fields.save] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.save] type = "keyword" longname = "keyword to save" description = "keyword to indicate that information will be saved this stress period." -[blocks.period.fields.output.item.arms.saverecord.fields.rtype] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.rtype] type = "string" longname = "record type" description = "type of information to save or print. Can be BUDGET." @@ -136,27 +136,27 @@ valid = [ "BUDGET", ] -[blocks.period.fields.output.item.arms.saverecord.fields.ocsetting] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.ocsetting] type = "union" description = "specifies the steps for which the data will be saved." -[blocks.period.fields.output.item.arms.saverecord.fields.ocsetting.arms.all] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.all] type = "keyword" description = "keyword to indicate save for all time steps in period." -[blocks.period.fields.output.item.arms.saverecord.fields.ocsetting.arms.first] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.first] type = "keyword" description = "keyword to indicate save for first step in period. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." -[blocks.period.fields.output.item.arms.saverecord.fields.ocsetting.arms.last] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.last] type = "keyword" description = "keyword to indicate save for last step in period. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." -[blocks.period.fields.output.item.arms.saverecord.fields.ocsetting.arms.frequency] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.frequency] type = "integer" description = "save at the specified time step frequency. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." -[blocks.period.fields.output.item.arms.saverecord.fields.ocsetting.arms.steps] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.steps] type = "array" description = "save for each step specified in STEPS. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." dtype = "integer" @@ -164,16 +164,16 @@ shape = [ "<=nstp", ] -[blocks.period.fields.output.item.arms.printrecord] +[blocks.period.fields.stress_period_data.item.arms.printrecord] type = "record" optional = true -[blocks.period.fields.output.item.arms.printrecord.fields.print] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.print] type = "keyword" longname = "keyword to save" description = "keyword to indicate that information will be printed this stress period." -[blocks.period.fields.output.item.arms.printrecord.fields.rtype] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.rtype] type = "string" longname = "record type" description = "type of information to save or print. Can be BUDGET." @@ -183,27 +183,27 @@ valid = [ "BUDGET", ] -[blocks.period.fields.output.item.arms.printrecord.fields.ocsetting] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.ocsetting] type = "union" description = "specifies the steps for which the data will be saved." -[blocks.period.fields.output.item.arms.printrecord.fields.ocsetting.arms.all] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.all] type = "keyword" description = "keyword to indicate save for all time steps in period." -[blocks.period.fields.output.item.arms.printrecord.fields.ocsetting.arms.first] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.first] type = "keyword" description = "keyword to indicate save for first step in period. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." -[blocks.period.fields.output.item.arms.printrecord.fields.ocsetting.arms.last] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.last] type = "keyword" description = "keyword to indicate save for last step in period. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." -[blocks.period.fields.output.item.arms.printrecord.fields.ocsetting.arms.frequency] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.frequency] type = "integer" description = "save at the specified time step frequency. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." -[blocks.period.fields.output.item.arms.printrecord.fields.ocsetting.arms.steps] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.steps] type = "array" description = "save for each step specified in STEPS. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." dtype = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-oc.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-oc.yaml index d1867e26..5a5d1cc5 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-oc.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-oc.yaml @@ -100,7 +100,7 @@ blocks: tagged: false period: fields: - output: + stress_period_data: type: list optional: true item: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-oc.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-oc.json index 2c6d7dbd..84093cc0 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-oc.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-oc.json @@ -216,7 +216,7 @@ }, "period": { "fields": { - "output": { + "stress_period_data": { "type": "list", "optional": true, "item": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-oc.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-oc.toml index cc39d893..724ac5c0 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-oc.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-oc.toml @@ -185,24 +185,24 @@ longname = "release time" description = "real value that defines the tracking time with respect to the simulation start time." tagged = false -[blocks.period.fields.output] +[blocks.period.fields.stress_period_data] type = "list" optional = true -[blocks.period.fields.output.item] +[blocks.period.fields.stress_period_data.item] name = "output_record" type = "union" -[blocks.period.fields.output.item.arms.saverecord] +[blocks.period.fields.stress_period_data.item.arms.saverecord] type = "record" optional = true -[blocks.period.fields.output.item.arms.saverecord.fields.save] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.save] type = "keyword" longname = "keyword to save" description = "keyword to indicate that information will be saved this stress period." -[blocks.period.fields.output.item.arms.saverecord.fields.rtype] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.rtype] type = "string" longname = "record type" description = "type of information to save or print. Can only be BUDGET." @@ -211,27 +211,27 @@ valid = [ "BUDGET", ] -[blocks.period.fields.output.item.arms.saverecord.fields.ocsetting] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.ocsetting] type = "union" description = "specifies the steps for which the data will be saved." -[blocks.period.fields.output.item.arms.saverecord.fields.ocsetting.arms.all] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.all] type = "keyword" description = "keyword to indicate save for all time steps in period." -[blocks.period.fields.output.item.arms.saverecord.fields.ocsetting.arms.first] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.first] type = "keyword" description = "keyword to indicate save for first step in period. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." -[blocks.period.fields.output.item.arms.saverecord.fields.ocsetting.arms.last] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.last] type = "keyword" description = "keyword to indicate save for last step in period. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." -[blocks.period.fields.output.item.arms.saverecord.fields.ocsetting.arms.frequency] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.frequency] type = "integer" description = "save at the specified time step frequency. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." -[blocks.period.fields.output.item.arms.saverecord.fields.ocsetting.arms.steps] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.steps] type = "array" description = "save for each step specified in STEPS. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." dtype = "integer" @@ -239,16 +239,16 @@ shape = [ "<=nstp", ] -[blocks.period.fields.output.item.arms.printrecord] +[blocks.period.fields.stress_period_data.item.arms.printrecord] type = "record" optional = true -[blocks.period.fields.output.item.arms.printrecord.fields.print] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.print] type = "keyword" longname = "keyword to save" description = "keyword to indicate that information will be printed this stress period." -[blocks.period.fields.output.item.arms.printrecord.fields.rtype] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.rtype] type = "string" longname = "record type" description = "type of information to save or print. Can only be BUDGET." @@ -257,27 +257,27 @@ valid = [ "BUDGET", ] -[blocks.period.fields.output.item.arms.printrecord.fields.ocsetting] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.ocsetting] type = "union" description = "specifies the steps for which the data will be saved." -[blocks.period.fields.output.item.arms.printrecord.fields.ocsetting.arms.all] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.all] type = "keyword" description = "keyword to indicate save for all time steps in period." -[blocks.period.fields.output.item.arms.printrecord.fields.ocsetting.arms.first] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.first] type = "keyword" description = "keyword to indicate save for first step in period. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." -[blocks.period.fields.output.item.arms.printrecord.fields.ocsetting.arms.last] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.last] type = "keyword" description = "keyword to indicate save for last step in period. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." -[blocks.period.fields.output.item.arms.printrecord.fields.ocsetting.arms.frequency] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.frequency] type = "integer" description = "save at the specified time step frequency. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." -[blocks.period.fields.output.item.arms.printrecord.fields.ocsetting.arms.steps] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.steps] type = "array" description = "save for each step specified in STEPS. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." dtype = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-oc.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-oc.yaml index 4fe29de4..a45c822a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-oc.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-oc.yaml @@ -182,7 +182,7 @@ blocks: - ntracktimes period: fields: - output: + stress_period_data: type: list optional: true item: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-prp.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-prp.json index 2c6aacd7..a39905cc 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-prp.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-prp.json @@ -315,7 +315,7 @@ }, "period": { "fields": { - "perioddata": { + "stress_period_data": { "type": "list", "item": { "name": "releasesetting", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-prp.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-prp.toml index 801e93c9..f179eb64 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-prp.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-prp.toml @@ -280,31 +280,31 @@ longname = "release time" description = "real value that defines the release time with respect to the simulation start time." tagged = false -[blocks.period.fields.perioddata] +[blocks.period.fields.stress_period_data] type = "list" -[blocks.period.fields.perioddata.item] +[blocks.period.fields.stress_period_data.item] name = "releasesetting" type = "union" description = "specifies time steps at which to release a particle. A particle is released at the beginning of each specified time step. For fine control over release timing, specify times explicitly using the RELEASETIMES block. If the beginning of a specified time step coincides with a release time specified in the RELEASETIMES block or configured via RELEASE_TIME_FREQUENCY, only one particle is released at that time. Coincidence is evaluated up to the tolerance specified in RELEASE_TIME_TOLERANCE, or $epsilon times 10^{11}$ by default, where $epsilon$ is machine precision. If no release times are configured via this setting, the RELEASETIMES block, or the RELEASE_TIME_FREQUENCY option, a single release time is configured at the beginning of the first time step of the simulation's first stress period." -[blocks.period.fields.perioddata.item.arms.all] +[blocks.period.fields.stress_period_data.item.arms.all] type = "keyword" description = "keyword to indicate release at the start of all time steps in the period." -[blocks.period.fields.perioddata.item.arms.first] +[blocks.period.fields.stress_period_data.item.arms.first] type = "keyword" description = "keyword to indicate release at the start of the first time step in the period. This keyword may be used in conjunction with other RELEASESETTING options." -[blocks.period.fields.perioddata.item.arms.last] +[blocks.period.fields.stress_period_data.item.arms.last] type = "keyword" description = "keyword to indicate release at the start of the last time step in the period. This keyword may be used in conjunction with other RELEASESETTING options." -[blocks.period.fields.perioddata.item.arms.frequency] +[blocks.period.fields.stress_period_data.item.arms.frequency] type = "integer" description = "release at the specified time step frequency. This keyword may be used in conjunction with other RELEASESETTING options." -[blocks.period.fields.perioddata.item.arms.steps] +[blocks.period.fields.stress_period_data.item.arms.steps] type = "array" description = "release at the start of each step specified in STEPS. This option may be used in conjunction with other RELEASESETTING options." dtype = "integer" @@ -312,7 +312,7 @@ shape = [ "<=nstp", ] -[blocks.period.fields.perioddata.item.arms.fraction] +[blocks.period.fields.stress_period_data.item.arms.fraction] type = "array" description = "release particles after the specified fraction of the time step has elapsed. If FRACTION is not set, particles are released at the start of the specified time step(s). FRACTION must be a single value when used with ALL, FIRST, or FREQUENCY. When used with STEPS, FRACTION may be a single value or an array of the same length as STEPS. If a single FRACTION value is provided with STEPS, the fraction applies to all steps. NOTE: The FRACTION option has been removed. For fine control over release timing, specify times explicitly using the RELEASETIMES block." optional = true diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-prp.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-prp.yaml index a8bb722e..7326243d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-prp.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-prp.yaml @@ -323,7 +323,7 @@ blocks: - nreleasetimes period: fields: - perioddata: + stress_period_data: type: list item: name: releasesetting diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-oc.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-oc.json index febd7517..54c2988f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-oc.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-oc.json @@ -128,7 +128,7 @@ }, "period": { "fields": { - "output": { + "stress_period_data": { "type": "list", "optional": true, "item": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-oc.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-oc.toml index 5e9ac713..18e4a569 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-oc.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-oc.toml @@ -109,24 +109,24 @@ longname = "write format" description = "write format can be EXPONENTIAL, FIXED, GENERAL, or SCIENTIFIC." tagged = false -[blocks.period.fields.output] +[blocks.period.fields.stress_period_data] type = "list" optional = true -[blocks.period.fields.output.item] +[blocks.period.fields.stress_period_data.item] name = "output_record" type = "union" -[blocks.period.fields.output.item.arms.saverecord] +[blocks.period.fields.stress_period_data.item.arms.saverecord] type = "record" optional = true -[blocks.period.fields.output.item.arms.saverecord.fields.save] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.save] type = "keyword" longname = "keyword to save" description = "keyword to indicate that information will be saved this stress period." -[blocks.period.fields.output.item.arms.saverecord.fields.rtype] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.rtype] type = "string" longname = "record type" description = "type of information to save or print. Can be BUDGET." @@ -136,27 +136,27 @@ valid = [ "BUDGET", ] -[blocks.period.fields.output.item.arms.saverecord.fields.ocsetting] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.ocsetting] type = "union" description = "specifies the steps for which the data will be saved." -[blocks.period.fields.output.item.arms.saverecord.fields.ocsetting.arms.all] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.all] type = "keyword" description = "keyword to indicate save for all time steps in period." -[blocks.period.fields.output.item.arms.saverecord.fields.ocsetting.arms.first] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.first] type = "keyword" description = "keyword to indicate save for first step in period. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." -[blocks.period.fields.output.item.arms.saverecord.fields.ocsetting.arms.last] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.last] type = "keyword" description = "keyword to indicate save for last step in period. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." -[blocks.period.fields.output.item.arms.saverecord.fields.ocsetting.arms.frequency] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.frequency] type = "integer" description = "save at the specified time step frequency. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." -[blocks.period.fields.output.item.arms.saverecord.fields.ocsetting.arms.steps] +[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.steps] type = "array" description = "save for each step specified in STEPS. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." dtype = "integer" @@ -164,16 +164,16 @@ shape = [ "<=nstp", ] -[blocks.period.fields.output.item.arms.printrecord] +[blocks.period.fields.stress_period_data.item.arms.printrecord] type = "record" optional = true -[blocks.period.fields.output.item.arms.printrecord.fields.print] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.print] type = "keyword" longname = "keyword to save" description = "keyword to indicate that information will be printed this stress period." -[blocks.period.fields.output.item.arms.printrecord.fields.rtype] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.rtype] type = "string" longname = "record type" description = "type of information to save or print. Can be BUDGET." @@ -183,27 +183,27 @@ valid = [ "BUDGET", ] -[blocks.period.fields.output.item.arms.printrecord.fields.ocsetting] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.ocsetting] type = "union" description = "specifies the steps for which the data will be saved." -[blocks.period.fields.output.item.arms.printrecord.fields.ocsetting.arms.all] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.all] type = "keyword" description = "keyword to indicate save for all time steps in period." -[blocks.period.fields.output.item.arms.printrecord.fields.ocsetting.arms.first] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.first] type = "keyword" description = "keyword to indicate save for first step in period. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." -[blocks.period.fields.output.item.arms.printrecord.fields.ocsetting.arms.last] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.last] type = "keyword" description = "keyword to indicate save for last step in period. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." -[blocks.period.fields.output.item.arms.printrecord.fields.ocsetting.arms.frequency] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.frequency] type = "integer" description = "save at the specified time step frequency. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." -[blocks.period.fields.output.item.arms.printrecord.fields.ocsetting.arms.steps] +[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.steps] type = "array" description = "save for each step specified in STEPS. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps." dtype = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-oc.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-oc.yaml index 1b63ab6b..296a118b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-oc.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-oc.yaml @@ -100,7 +100,7 @@ blocks: tagged: false period: fields: - output: + stress_period_data: type: list optional: true item: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-spc.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-spc.json index 164e7c83..d83ed836 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-spc.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-spc.json @@ -59,7 +59,7 @@ }, "period": { "fields": { - "perioddata": { + "stress_period_data": { "type": "list", "item": { "name": "perioddata", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-spc.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-spc.toml index 5fb59e78..50835cd4 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-spc.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-spc.toml @@ -44,17 +44,17 @@ type = "integer" longname = "maximum number of ssm entries" description = "integer value specifying the maximum number of spc cells that will be specified for use during any stress period." -[blocks.period.fields.perioddata] +[blocks.period.fields.stress_period_data] type = "list" shape = [ "<=maxbound", ] -[blocks.period.fields.perioddata.item] +[blocks.period.fields.stress_period_data.item] name = "perioddata" type = "record" -[blocks.period.fields.perioddata.item.fields.bndno] +[blocks.period.fields.stress_period_data.item.fields.bndno] type = "integer" longname = "bound number for this entry" description = "integer value that defines the boundary package feature number associated with the specified PERIOD data on the line. BNDNO must be greater than zero and less than or equal to MAXBOUND." @@ -62,17 +62,17 @@ tagged = false index = true pk = true -[blocks.period.fields.perioddata.item.fields.spcsetting] +[blocks.period.fields.stress_period_data.item.fields.spcsetting] type = "union" description = "line of information that is parsed into a keyword and values. Keyword values that can be used to start the SPCSETTING string include: CONCENTRATION and TEMPERATURE." -[blocks.period.fields.perioddata.item.fields.spcsetting.arms.concentration] +[blocks.period.fields.stress_period_data.item.fields.spcsetting.arms.concentration] type = "double" longname = "boundary concentration" description = "is the boundary concentration. 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. By default, the CONCENTRATION for each boundary feature is zero." time_series = true -[blocks.period.fields.perioddata.item.fields.spcsetting.arms.temperature] +[blocks.period.fields.stress_period_data.item.fields.spcsetting.arms.temperature] type = "double" longname = "boundary temperature" description = "is the user-supplied boundary temperature. 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. By default, the TEMPERATURE for each boundary feature is zero." diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-spc.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-spc.yaml index ebaa578f..03783f33 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-spc.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-spc.yaml @@ -48,7 +48,7 @@ blocks: use during any stress period. period: fields: - perioddata: + stress_period_data: type: list item: name: perioddata diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tvk.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tvk.json index ef7f68b1..d6ad4290 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tvk.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tvk.json @@ -41,7 +41,7 @@ }, "period": { "fields": { - "perioddata": { + "stress_period_data": { "type": "list", "item": { "name": "perioddata", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tvk.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tvk.toml index 5d86452a..a98f39dc 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tvk.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tvk.toml @@ -32,36 +32,36 @@ tagged = false direction = "in" component = "utl-ts" -[blocks.period.fields.perioddata] +[blocks.period.fields.stress_period_data] type = "list" -[blocks.period.fields.perioddata.item] +[blocks.period.fields.stress_period_data.item] name = "perioddata" type = "record" -[blocks.period.fields.perioddata.item.fields.cellid] +[blocks.period.fields.stress_period_data.item.fields.cellid] type = "cellid" longname = "cell identifier" description = "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell." tagged = false -[blocks.period.fields.perioddata.item.fields.tvksetting] +[blocks.period.fields.stress_period_data.item.fields.tvksetting] type = "union" description = "line of information that is parsed into a property name keyword and values. Property name keywords that can be used to start the TVKSETTING string include: K, K22, and K33." -[blocks.period.fields.perioddata.item.fields.tvksetting.arms.k] +[blocks.period.fields.stress_period_data.item.fields.tvksetting.arms.k] type = "double" longname = "hydraulic conductivity (L/T)" description = "is the new value to be assigned as the cell's hydraulic conductivity from the start of the specified stress period, as per K in the NPF package. If the OPTIONS block includes a TS6 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." time_series = true -[blocks.period.fields.perioddata.item.fields.tvksetting.arms.k22] +[blocks.period.fields.stress_period_data.item.fields.tvksetting.arms.k22] type = "double" longname = "hydraulic conductivity of second ellipsoid axis (L/T)" description = "is the new value to be assigned as the cell's hydraulic conductivity of the second ellipsoid axis (or the ratio of K22/K if the K22OVERK NPF package option is specified) from the start of the specified stress period, as per K22 in the NPF package. For an unrotated case this is the hydraulic conductivity in the y direction. If the OPTIONS block includes a TS6 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." time_series = true -[blocks.period.fields.perioddata.item.fields.tvksetting.arms.k33] +[blocks.period.fields.stress_period_data.item.fields.tvksetting.arms.k33] type = "double" longname = "hydraulic conductivity of third ellipsoid axis (L/T)" description = "is the new value to be assigned as the cell's hydraulic conductivity of the third ellipsoid axis (or the ratio of K33/K if the K33OVERK NPF package option is specified) from the start of the specified stress period, as per K33 in the NPF package. For an unrotated case, this is the vertical hydraulic conductivity. If the OPTIONS block includes a TS6 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." diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tvk.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tvk.yaml index cbcdfd61..8ea7ba2b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tvk.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tvk.yaml @@ -35,7 +35,7 @@ blocks: component: utl-ts period: fields: - perioddata: + stress_period_data: type: list item: name: perioddata diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tvs.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tvs.json index f1a55f27..133c7c09 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tvs.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tvs.json @@ -47,7 +47,7 @@ }, "period": { "fields": { - "perioddata": { + "stress_period_data": { "type": "list", "item": { "name": "perioddata", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tvs.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tvs.toml index d450078c..5f2ad057 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tvs.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tvs.toml @@ -38,30 +38,30 @@ tagged = false direction = "in" component = "utl-ts" -[blocks.period.fields.perioddata] +[blocks.period.fields.stress_period_data] type = "list" -[blocks.period.fields.perioddata.item] +[blocks.period.fields.stress_period_data.item] name = "perioddata" type = "record" -[blocks.period.fields.perioddata.item.fields.cellid] +[blocks.period.fields.stress_period_data.item.fields.cellid] type = "cellid" longname = "cell identifier" description = "is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell." tagged = false -[blocks.period.fields.perioddata.item.fields.tvssetting] +[blocks.period.fields.stress_period_data.item.fields.tvssetting] type = "union" description = "line of information that is parsed into a property name keyword and values. Property name keywords that can be used to start the TVSSETTING string include: SS and SY." -[blocks.period.fields.perioddata.item.fields.tvssetting.arms.ss] +[blocks.period.fields.stress_period_data.item.fields.tvssetting.arms.ss] type = "double" longname = "specific storage" description = "is the new value to be assigned as the cell's specific storage (or storage coefficient if the STORAGECOEFFICIENT STO package option is specified) from the start of the specified stress period, as per SS in the STO package. Specific storage values must be greater than or equal to 0. If the OPTIONS block includes a TS6 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." time_series = true -[blocks.period.fields.perioddata.item.fields.tvssetting.arms.sy] +[blocks.period.fields.stress_period_data.item.fields.tvssetting.arms.sy] type = "double" longname = "specific yield" description = "is the new value to be assigned as the cell's specific yield from the start of the specified stress period, as per SY in the STO package. Specific yield values must be greater than or equal to 0. If the OPTIONS block includes a TS6 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." diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tvs.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tvs.yaml index 4f2a53d6..da50e25d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tvs.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tvs.yaml @@ -43,7 +43,7 @@ blocks: component: utl-ts period: fields: - perioddata: + stress_period_data: type: list item: name: perioddata diff --git a/autotest/dfns/test_migrate.py b/autotest/dfns/test_migrate.py index c819fa45..1277db0d 100644 --- a/autotest/dfns/test_migrate.py +++ b/autotest/dfns/test_migrate.py @@ -326,7 +326,7 @@ def test_migrate_period_union_element(dfn_dir, name, setting): """A period list of only a union is a list of the union: PRP's, and LAK's once its lake or outlet number moves into the arms.""" component = _migrate_dev3(dfn_dir, name) - item = component.blocks["period"].fields["perioddata"].item + item = component.blocks["period"].fields["stress_period_data"].item assert isinstance(item, v2.Union) and item.name == setting if name == "gwf-lak": assert item.arms["stage"].fields["lakeno"].fk == "packagedata.ifno" @@ -484,7 +484,7 @@ def test_migrate_lak_bedleak_number_or_none(dfn_dir): def test_migrate_maw_head_limit_number_or_off(dfn_dir): component = _migrate_dev3(dfn_dir, "gwf-maw") - item = component.blocks["period"].fields["perioddata"].item + item = component.blocks["period"].fields["stress_period_data"].item arms = item.fields["mawsetting"].arms assert "head_limit" not in arms record = arms["head_limitrecord"] @@ -499,7 +499,7 @@ def test_migrate_maw_head_limit_number_or_off(dfn_dir): def test_migrate_uzf_time_series_are_doubles(dfn_dir): component = _migrate_dev3(dfn_dir, "gwf-uzf") - item = component.blocks["period"].fields["perioddata"].item + item = component.blocks["period"].fields["stress_period_data"].item for name in ("finf", "pet", "extdp", "extwc", "ha", "hroot", "rootact"): field = item.fields[name] assert isinstance(field, v2.Double), name @@ -522,7 +522,7 @@ def test_migrate_number_or_word_round_trip(dev3): components = v2.Dfns.load(out).components lak = components["gwf-lak"].blocks["connectiondata"].fields["connectiondata"].item _number_or_word(lak.fields["bedleak"], "none") - maw = components["gwf-maw"].blocks["period"].fields["perioddata"].item + maw = components["gwf-maw"].blocks["period"].fields["stress_period_data"].item arm = maw.fields["mawsetting"].arms["head_limitrecord"] _number_or_word(arm.fields["head_limit_value"], "off") @@ -954,3 +954,29 @@ def test_migrate_ftypes_unique_among_name_file_children(linked_spec): for ftype, children in by_ftype.items(): base = min(children, key=len) assert all(n in (base, f"{base}a", f"{base}g") for n in children), (name, children) + + +def test_migrate_period_lists_named_stress_period_data(dev3): + """A fill-forward block's single list is named `stress_period_data`, + whatever v1 called it (`perioddata`, `lakeperioddata`, OC's synthesized + `output`, ...). Named arrays in the grid packages' period blocks, and + lists in blocks that don't fill forward, keep their names.""" + out, _ = dev3 + components = v2.Dfns.load(out).components + renamed = set() + for name, component in components.items(): + for bname, block in (component.blocks or {}).items(): + if block.header is None or not block.header.fill_forward: + continue + fields = block.fields + if len(fields) == 1 and isinstance(next(iter(fields.values())), v2.List): + assert list(fields) == ["stress_period_data"], (name, bname) + assert fields["stress_period_data"].name == "stress_period_data" + renamed.add(name) + for fname in fields: + assert not fname.endswith("perioddata"), (name, bname, fname) + assert fname != "output", (name, bname) + assert {"gwf-chd", "gwf-lak", "gwt-lkt", "gwe-sfe", "gwf-oc", "prt-oc"} <= renamed + assert "perioddata" in components["sim-tdis"].blocks["perioddata"].fields + assert "perioddata" in components["utl-ats"].blocks["perioddata"].fields + assert {"recharge", "irch"} <= set(components["gwf-rcha"].blocks["period"].fields) diff --git a/autotest/dfns/test_schema.py b/autotest/dfns/test_schema.py index aa83f377..688e7bee 100644 --- a/autotest/dfns/test_schema.py +++ b/autotest/dfns/test_schema.py @@ -895,7 +895,7 @@ def test_file_filerecord_multiword_tag_not_collapsed(dev3_spec): """A multi-word v1 tag (e.g. `CROSS_SECTION TAB6`) becomes two sibling Keyword fields, not a single synthetic File.tag string.""" period = dev3_spec.components["gwf-sfr"].blocks["period"] - item = period.fields["perioddata"].item + item = period.fields["stress_period_data"].item union = item.children["sfrsetting"] xsrecord = union.arms["cross_sectionrecord"] assert isinstance(xsrecord, Record) diff --git a/docs/md/dfnspec.md b/docs/md/dfnspec.md index 476f7f31..ebe11efb 100644 --- a/docs/md/dfnspec.md +++ b/docs/md/dfnspec.md @@ -277,6 +277,8 @@ Unlike `fields`, which is a `{string: InputField}` mapping keyed by field name, An `Integer` header is inherently a sequential key: `group_num` and `iper` are both documented as monotonically increasing across occurrences, whether or not they fill forward. Only the meaning of a *gap* in that sequence varies — which is what `fill_forward` distinguishes. +When a fill-forward block holds a single field and that field is a list, the list is named `stress_period_data`, in every component. v1 names it per package (`perioddata`, `lakeperioddata`, `reachperioddata`, ...); OC's is synthesized from sibling records. The name never appears in an input file. A fill-forward block with several fields, such as the grid-based packages' named arrays (`recharge`, `irch`, ...), keeps its field names, and so do blocks that don't fill forward (e.g. TDIS's and ATS's `perioddata`). + A block has no explicit `optional` attribute. Its optionality is derived from its fields: a block is optional if and only if all of its fields are optional (vacuously true for an empty block). ### Field ordering diff --git a/modflow_devtools/dfns/migrate_to_v2_0_0_dev2.py b/modflow_devtools/dfns/migrate_to_v2_0_0_dev2.py index 6e306b3c..0bf9dd0a 100644 --- a/modflow_devtools/dfns/migrate_to_v2_0_0_dev2.py +++ b/modflow_devtools/dfns/migrate_to_v2_0_0_dev2.py @@ -1779,6 +1779,38 @@ def _fix_ts_sfac(name: str, blocks: dict[str, v2.Block]) -> dict[str, v2.Block]: return {**blocks, "attributes": block.model_copy(update={"fields": fields})} +_PERIOD_LIST_NAME = "stress_period_data" + + +def _name_period_lists(blocks: dict[str, v2.Block]) -> dict[str, v2.Block]: + """ + Name a fill-forward block's single list `stress_period_data`. v1 names it + per package (`perioddata`, `lakeperioddata`, `reachperioddata`, ...), and + `_wrap_oc_period_records` synthesizes OC's as `output`. The name never + appears in an input file, so this is purely a naming convention. + + Period blocks holding more than one field (the grid-based packages' named + arrays) keep their names, as do blocks without a fill-forward header + (TDIS's and ATS's `perioddata`), which aren't stress periods. + + Must run after every pass that looks a period list up by its v1 name + (`_mark_lonely_pk`, `_fix_lak_relations`, `_fix_mvr_relations`). + """ + result = {} + for bname, block in blocks.items(): + header = block.header + if header is None or not header.fill_forward or len(block.fields) != 1: + result[bname] = block + continue + (field,) = block.fields.values() + if not isinstance(field, v2.List): + result[bname] = block + continue + field = field.model_copy(update={"name": _PERIOD_LIST_NAME}) + result[bname] = block.model_copy(update={"fields": {_PERIOD_LIST_NAME: field}}) + return result + + def _wrap_grid_aux(blocks: dict[str, v2.Block], fields: OMD) -> dict[str, v2.Block]: """ Make an array-based package's period ``aux`` field a list of @@ -2431,6 +2463,7 @@ def _lookup(rname: str) -> dict | None: blocks = _apply_fk_backfill(name, blocks) blocks = _apply_array_fk_backfill(name, blocks) blocks = _link_namefile_fields(name, blocks) + blocks = _name_period_lists(blocks) dims = {**explicit_dims, **array_dims, **derived_dims} or None d: dict[str, Any] = {