diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-cdb.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-cdb.json index 59b22ea8..37ff9b57 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-cdb.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-cdb.json @@ -79,7 +79,7 @@ }, "period": { "fields": { - "stress_period_data": { + "period_data": { "type": "list", "item": { "name": "stress_period_data", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-cdb.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-cdb.toml index 1cec61e8..20d60330 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-cdb.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-cdb.toml @@ -64,23 +64,23 @@ type = "integer" longname = "maximum number of critical depth boundaries" description = "integer value specifying the maximum number of critical depth boundary cells that will be specified for use during any stress period." -[blocks.period.fields.stress_period_data] +[blocks.period.fields.period_data] type = "list" shape = [ "<=maxbound", ] -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.period_data.item] name = "stress_period_data" type = "record" -[blocks.period.fields.stress_period_data.item.fields.cellid] +[blocks.period.fields.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.stress_period_data.item.fields.idcxs] +[blocks.period.fields.period_data.item.fields.idcxs] type = "integer" longname = "cross section identifier" description = "is the identifier for the cross section specified in the CXS Package. A value of zero indicates the zero-depth-gradient calculation will use parameters for a hydraulically wide channel." @@ -88,14 +88,14 @@ tagged = false index = true fk = "chf-cxs.packagedata.idcxs" -[blocks.period.fields.stress_period_data.item.fields.width] +[blocks.period.fields.period_data.item.fields.width] type = "double" longname = "width of the zero-depth gradient boundary" description = "is the channel width of the zero-depth gradient boundary. If a cross section is associated with this boundary, the width will be scaled by the cross section information. 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.stress_period_data.item.fields.aux] +[blocks.period.fields.period_data.item.fields.aux] type = "array" longname = "auxiliary variables" description = "represents the values of the auxiliary variables for each zero-depth-gradient boundary. The values of auxiliary variables must be present for each zero-depth-gradient boundary. The values must be specified in the order of the auxiliary variables specified in the OPTIONS block. If the package supports time series and the Options block includes a TIMESERIESFILE entry (see the 'Time-Variable Input' section), values can be obtained from a time series by entering the time-series name in place of a numeric value." @@ -107,7 +107,7 @@ shape = [ "auxiliary", ] -[blocks.period.fields.stress_period_data.item.fields.boundname] +[blocks.period.fields.period_data.item.fields.boundname] type = "string" longname = "zero-depth-gradient boundary name" description = "name of the zero-depth-gradient boundary cell. BOUNDNAME is an ASCII character variable that can contain as many as 40 characters. If BOUNDNAME contains spaces in it, then the entire name must be enclosed within single quotes." diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-cdb.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-cdb.yaml index 590481cb..7228b09c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-cdb.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-cdb.yaml @@ -77,7 +77,7 @@ blocks: will be specified for use during any stress period. period: fields: - stress_period_data: + period_data: type: list item: name: stress_period_data diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-chd.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-chd.json index c1c2d6ca..cb981121 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-chd.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-chd.json @@ -108,7 +108,7 @@ }, "period": { "fields": { - "stress_period_data": { + "period_data": { "type": "list", "item": { "name": "stress_period_data", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-chd.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-chd.toml index 53f63bd7..ee53a138 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-chd.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-chd.toml @@ -91,30 +91,30 @@ type = "integer" longname = "maximum number of constant heads" description = "integer value specifying the maximum number of constant-head cells that will be specified for use during any stress period." -[blocks.period.fields.stress_period_data] +[blocks.period.fields.period_data] type = "list" shape = [ "<=maxbound", ] -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.period_data.item] name = "stress_period_data" type = "record" -[blocks.period.fields.stress_period_data.item.fields.cellid] +[blocks.period.fields.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.stress_period_data.item.fields.head] +[blocks.period.fields.period_data.item.fields.head] type = "double" longname = "head value assigned to constant head" description = "is the head at the boundary. 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.stress_period_data.item.fields.aux] +[blocks.period.fields.period_data.item.fields.aux] type = "array" longname = "auxiliary variables" description = "represents the values of the auxiliary variables for each constant head. The values of auxiliary variables must be present for each constant head. The values must be specified in the order of the auxiliary variables specified in the OPTIONS block. If the package supports time series and the Options block includes a TIMESERIESFILE entry (see the 'Time-Variable Input' section), values can be obtained from a time series by entering the time-series name in place of a numeric value." @@ -126,7 +126,7 @@ shape = [ "auxiliary", ] -[blocks.period.fields.stress_period_data.item.fields.boundname] +[blocks.period.fields.period_data.item.fields.boundname] type = "string" longname = "constant head boundary name" description = "name of the constant head boundary cell. BOUNDNAME is an ASCII character variable that can contain as many as 40 characters. If BOUNDNAME contains spaces in it, then the entire name must be enclosed within single quotes." diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-chd.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-chd.yaml index e83ca92e..ef58dcb6 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-chd.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-chd.yaml @@ -102,7 +102,7 @@ blocks: for use during any stress period. period: fields: - stress_period_data: + period_data: type: list item: name: stress_period_data diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-evp.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-evp.json index 4441ef36..a0198c89 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-evp.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-evp.json @@ -108,7 +108,7 @@ }, "period": { "fields": { - "stress_period_data": { + "period_data": { "type": "list", "item": { "name": "stress_period_data", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-evp.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-evp.toml index 7d4cd365..516332b3 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-evp.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-evp.toml @@ -91,30 +91,30 @@ type = "integer" longname = "maximum number of evaporation cells" description = "integer value specifying the maximum number of evaporation cells that will be specified for use during any stress period." -[blocks.period.fields.stress_period_data] +[blocks.period.fields.period_data] type = "list" shape = [ "<=maxbound", ] -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.period_data.item] name = "stress_period_data" type = "record" -[blocks.period.fields.stress_period_data.item.fields.cellid] +[blocks.period.fields.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.stress_period_data.item.fields.evaporation] +[blocks.period.fields.period_data.item.fields.evaporation] type = "double" longname = "evaporation rate" description = "is the evaporation flux rate ($LT^{-1}$). This rate is multiplied inside the program by the water surface area of the cell to calculate the volumetric evaporation rate. 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.stress_period_data.item.fields.aux] +[blocks.period.fields.period_data.item.fields.aux] type = "array" longname = "auxiliary variables" description = "represents the values of the auxiliary variables for each evaporation. The values of auxiliary variables must be present for each evaporation. 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." @@ -126,7 +126,7 @@ shape = [ "auxiliary", ] -[blocks.period.fields.stress_period_data.item.fields.boundname] +[blocks.period.fields.period_data.item.fields.boundname] type = "string" longname = "evaporation name" description = "name of the evaporation cell. BOUNDNAME is an ASCII character variable that can contain as many as 40 characters. If BOUNDNAME contains spaces in it, then the entire name must be enclosed within single quotes." diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-evp.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-evp.yaml index 02a8fc34..03237400 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-evp.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-evp.yaml @@ -102,7 +102,7 @@ blocks: for use during any stress period. period: fields: - stress_period_data: + period_data: type: list item: name: stress_period_data diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-flw.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-flw.json index 1c61fdc7..f8b7a0da 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-flw.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-flw.json @@ -108,7 +108,7 @@ }, "period": { "fields": { - "stress_period_data": { + "period_data": { "type": "list", "item": { "name": "stress_period_data", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-flw.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-flw.toml index d1491ebc..018ab65b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-flw.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-flw.toml @@ -91,30 +91,30 @@ type = "integer" longname = "maximum number of inflow" description = "integer value specifying the maximum number of inflow cells that will be specified for use during any stress period." -[blocks.period.fields.stress_period_data] +[blocks.period.fields.period_data] type = "list" shape = [ "<=maxbound", ] -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.period_data.item] name = "stress_period_data" type = "record" -[blocks.period.fields.stress_period_data.item.fields.cellid] +[blocks.period.fields.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.stress_period_data.item.fields.q] +[blocks.period.fields.period_data.item.fields.q] type = "double" longname = "well rate" description = "is the volumetric inflow rate. A positive value indicates inflow to the stream. Negative values are not allows. 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.stress_period_data.item.fields.aux] +[blocks.period.fields.period_data.item.fields.aux] type = "array" longname = "auxiliary variables" description = "represents the values of the auxiliary variables for each inflow. The values of auxiliary variables must be present for each inflow. 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." @@ -126,7 +126,7 @@ shape = [ "auxiliary", ] -[blocks.period.fields.stress_period_data.item.fields.boundname] +[blocks.period.fields.period_data.item.fields.boundname] type = "string" longname = "inflow name" description = "name of the inflow cell. BOUNDNAME is an ASCII character variable that can contain as many as 40 characters. If BOUNDNAME contains spaces in it, then the entire name must be enclosed within single quotes." diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-flw.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-flw.yaml index 15463d81..764a7bb0 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-flw.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-flw.yaml @@ -101,7 +101,7 @@ blocks: for use during any stress period. period: fields: - stress_period_data: + period_data: type: list item: name: stress_period_data 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 28961801..dd032423 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": { - "stress_period_data": { + "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 34c58e45..fb18ebb1 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.stress_period_data] +[blocks.period.fields.period_data] type = "list" optional = true -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.period_data.item] name = "output_record" type = "union" -[blocks.period.fields.stress_period_data.item.arms.saverecord] +[blocks.period.fields.period_data.item.arms.saverecord] type = "record" optional = true -[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.save] +[blocks.period.fields.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.stress_period_data.item.arms.saverecord.fields.rtype] +[blocks.period.fields.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.stress_period_data.item.arms.saverecord.fields.ocsetting] +[blocks.period.fields.period_data.item.arms.saverecord.fields.ocsetting] type = "union" description = "specifies the steps for which the data will be saved." -[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.all] +[blocks.period.fields.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.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.first] +[blocks.period.fields.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.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.last] +[blocks.period.fields.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.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.frequency] +[blocks.period.fields.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.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.steps] +[blocks.period.fields.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.stress_period_data.item.arms.printrecord] +[blocks.period.fields.period_data.item.arms.printrecord] type = "record" optional = true -[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.print] +[blocks.period.fields.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.stress_period_data.item.arms.printrecord.fields.rtype] +[blocks.period.fields.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.stress_period_data.item.arms.printrecord.fields.ocsetting] +[blocks.period.fields.period_data.item.arms.printrecord.fields.ocsetting] type = "union" description = "specifies the steps for which the data will be saved." -[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.all] +[blocks.period.fields.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.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.first] +[blocks.period.fields.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.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.last] +[blocks.period.fields.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.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.frequency] +[blocks.period.fields.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.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.steps] +[blocks.period.fields.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 1cf8af5c..f5524613 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: - stress_period_data: + period_data: type: list optional: true item: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-pcp.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-pcp.json index aa76361e..3ae09e89 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-pcp.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-pcp.json @@ -108,7 +108,7 @@ }, "period": { "fields": { - "stress_period_data": { + "period_data": { "type": "list", "item": { "name": "stress_period_data", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-pcp.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-pcp.toml index 09086e22..44788f9c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-pcp.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-pcp.toml @@ -91,30 +91,30 @@ type = "integer" longname = "maximum number of precipitation cells" description = "integer value specifying the maximum number of precipitation cells that will be specified for use during any stress period." -[blocks.period.fields.stress_period_data] +[blocks.period.fields.period_data] type = "list" shape = [ "<=maxbound", ] -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.period_data.item] name = "stress_period_data" type = "record" -[blocks.period.fields.stress_period_data.item.fields.cellid] +[blocks.period.fields.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.stress_period_data.item.fields.precipitation] +[blocks.period.fields.period_data.item.fields.precipitation] type = "double" longname = "precipitation rate" description = "is the precipitation flux rate ($LT^{-1}$). This rate is multiplied inside the program by the surface area of the cell to calculate the volumetric precipitation rate. 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.stress_period_data.item.fields.aux] +[blocks.period.fields.period_data.item.fields.aux] type = "array" longname = "auxiliary variables" description = "represents the values of the auxiliary variables for each precipitation. The values of auxiliary variables must be present for each precipitation. 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." @@ -126,7 +126,7 @@ shape = [ "auxiliary", ] -[blocks.period.fields.stress_period_data.item.fields.boundname] +[blocks.period.fields.period_data.item.fields.boundname] type = "string" longname = "precipitation name" description = "name of the precipitation cell. BOUNDNAME is an ASCII character variable that can contain as many as 40 characters. If BOUNDNAME contains spaces in it, then the entire name must be enclosed within single quotes." diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-pcp.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-pcp.yaml index c3a96953..452b16fd 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-pcp.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-pcp.yaml @@ -102,7 +102,7 @@ blocks: for use during any stress period. period: fields: - stress_period_data: + period_data: type: list item: name: stress_period_data diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-sto.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-sto.json index 5d69bba6..e56c2445 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-sto.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-sto.json @@ -23,7 +23,7 @@ }, "period": { "fields": { - "stress_period_data": { + "period_data": { "type": "string", "longname": "storage state", "description": "keyword to indicate that stress period IPER is steady-state. Steady-state conditions will apply until the TRANSIENT keyword is specified in a subsequent BEGIN PERIOD block.", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-sto.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-sto.toml index 5c10121f..6caf36e0 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-sto.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-sto.toml @@ -16,7 +16,7 @@ longname = "export array variables to layered ascii files." description = "keyword that specifies input grid arrays, which already support the layered keyword, should be written to layered ascii output files." optional = true -[blocks.period.fields.stress_period_data] +[blocks.period.fields.period_data] type = "string" longname = "storage state" description = "keyword to indicate that stress period IPER is steady-state. Steady-state conditions will apply until the TRANSIENT keyword is specified in a subsequent BEGIN PERIOD block." diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-sto.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-sto.yaml index f05368b8..6abc86fc 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-sto.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-sto.yaml @@ -20,7 +20,7 @@ blocks: optional: true period: fields: - stress_period_data: + period_data: type: string longname: storage state description: keyword to indicate that stress period IPER is steady-state. Steady-state conditions diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-zdg.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-zdg.json index cfdcf7e1..2cd9608b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-zdg.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-zdg.json @@ -102,7 +102,7 @@ }, "period": { "fields": { - "stress_period_data": { + "period_data": { "type": "list", "item": { "name": "stress_period_data", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-zdg.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-zdg.toml index 818466e5..c695f73f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-zdg.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-zdg.toml @@ -85,23 +85,23 @@ type = "integer" longname = "maximum number of zero-depth-gradient boundaries" description = "integer value specifying the maximum number of zero-depth-gradient boundary cells that will be specified for use during any stress period." -[blocks.period.fields.stress_period_data] +[blocks.period.fields.period_data] type = "list" shape = [ "<=maxbound", ] -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.period_data.item] name = "stress_period_data" type = "record" -[blocks.period.fields.stress_period_data.item.fields.cellid] +[blocks.period.fields.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.stress_period_data.item.fields.idcxs] +[blocks.period.fields.period_data.item.fields.idcxs] type = "integer" longname = "cross section identifier" description = "is the identifier for the cross section specified in the CXS Package. A value of zero indicates the zero-depth-gradient calculation will use parameters for a hydraulically wide channel." @@ -109,28 +109,28 @@ tagged = false index = true fk = "chf-cxs.packagedata.idcxs" -[blocks.period.fields.stress_period_data.item.fields.width] +[blocks.period.fields.period_data.item.fields.width] type = "double" longname = "width of the zero-depth gradient boundary" description = "is the channel width of the zero-depth gradient boundary. If a cross section is associated with this boundary, the width will be scaled by the cross section information. 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.stress_period_data.item.fields.slope] +[blocks.period.fields.period_data.item.fields.slope] type = "double" longname = "channel slope" description = "is the channel slope used to calculate flow to the zero-depth-gradient boundary. 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.stress_period_data.item.fields.rough] +[blocks.period.fields.period_data.item.fields.rough] type = "double" longname = "channel roughness" description = "is the Manning channel roughness value used to calculate flow to the zero-depth-gradient boundary. If a cross section is associated with this boundary, the roughness value will be multiplied by the roughness fraction for each part of the cross section. 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.stress_period_data.item.fields.aux] +[blocks.period.fields.period_data.item.fields.aux] type = "array" longname = "auxiliary variables" description = "represents the values of the auxiliary variables for each zero-depth-gradient boundary. The values of auxiliary variables must be present for each zero-depth-gradient boundary. The values must be specified in the order of the auxiliary variables specified in the OPTIONS block. If the package supports time series and the Options block includes a TIMESERIESFILE entry (see the 'Time-Variable Input' section), values can be obtained from a time series by entering the time-series name in place of a numeric value." @@ -142,7 +142,7 @@ shape = [ "auxiliary", ] -[blocks.period.fields.stress_period_data.item.fields.boundname] +[blocks.period.fields.period_data.item.fields.boundname] type = "string" longname = "zero-depth-gradient boundary name" description = "name of the zero-depth-gradient boundary cell. BOUNDNAME is an ASCII character variable that can contain as many as 40 characters. If BOUNDNAME contains spaces in it, then the entire name must be enclosed within single quotes." diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-zdg.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-zdg.yaml index 55023aa2..af5d3bb5 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-zdg.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-zdg.yaml @@ -97,7 +97,7 @@ blocks: that will be specified for use during any stress period. period: fields: - stress_period_data: + period_data: type: list item: name: stress_period_data diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-ctp.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-ctp.json index 1793b017..a129c0b0 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-ctp.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-ctp.json @@ -108,7 +108,7 @@ }, "period": { "fields": { - "stress_period_data": { + "period_data": { "type": "list", "item": { "name": "stress_period_data", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-ctp.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-ctp.toml index 21f5241f..965320e1 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-ctp.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-ctp.toml @@ -91,30 +91,30 @@ type = "integer" longname = "maximum number of constant temperatures" description = "integer value specifying the maximum number of constant temperature cells that will be specified for use during any stress period." -[blocks.period.fields.stress_period_data] +[blocks.period.fields.period_data] type = "list" shape = [ "<=maxbound", ] -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.period_data.item] name = "stress_period_data" type = "record" -[blocks.period.fields.stress_period_data.item.fields.cellid] +[blocks.period.fields.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.stress_period_data.item.fields.temp] +[blocks.period.fields.period_data.item.fields.temp] type = "double" longname = "constant temperature value" description = "is the constant temperature value. 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.stress_period_data.item.fields.aux] +[blocks.period.fields.period_data.item.fields.aux] type = "array" longname = "auxiliary variables" description = "represents the values of the auxiliary variables for each constant temperature. The values of auxiliary variables must be present for each constant temperature. 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." @@ -126,7 +126,7 @@ shape = [ "auxiliary", ] -[blocks.period.fields.stress_period_data.item.fields.boundname] +[blocks.period.fields.period_data.item.fields.boundname] type = "string" longname = "constant temperature name" description = "name of the constant temperature cell. BOUNDNAME is an ASCII character variable that can contain as many as 40 characters. If BOUNDNAME contains spaces in it, then the entire name must be enclosed within single quotes." diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-ctp.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-ctp.yaml index 3861492a..ea641b86 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-ctp.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-ctp.yaml @@ -102,7 +102,7 @@ blocks: be specified for use during any stress period. period: fields: - stress_period_data: + period_data: type: list item: name: stress_period_data diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-esl.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-esl.json index 33ac4785..9108eef7 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-esl.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-esl.json @@ -108,7 +108,7 @@ }, "period": { "fields": { - "stress_period_data": { + "period_data": { "type": "list", "item": { "name": "stress_period_data", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-esl.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-esl.toml index 4d82e097..cbbcb440 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-esl.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-esl.toml @@ -91,30 +91,30 @@ type = "integer" longname = "maximum number of sources" description = "integer value specifying the maximum number of source cells that will be specified for use during any stress period." -[blocks.period.fields.stress_period_data] +[blocks.period.fields.period_data] type = "list" shape = [ "<=maxbound", ] -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.period_data.item] name = "stress_period_data" type = "record" -[blocks.period.fields.stress_period_data.item.fields.cellid] +[blocks.period.fields.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.stress_period_data.item.fields.senerrate] +[blocks.period.fields.period_data.item.fields.senerrate] type = "double" longname = "energy source loading rate" description = "is the energy source loading rate. A positive value indicates addition of energy and a negative value indicates removal of energy. 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.stress_period_data.item.fields.aux] +[blocks.period.fields.period_data.item.fields.aux] type = "array" longname = "auxiliary variables" description = "represents the values of the auxiliary variables for each energy source. The values of auxiliary variables must be present for each energy source. 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." @@ -126,7 +126,7 @@ shape = [ "auxiliary", ] -[blocks.period.fields.stress_period_data.item.fields.boundname] +[blocks.period.fields.period_data.item.fields.boundname] type = "string" longname = "well name" description = "name of the energy source cell. BOUNDNAME is an ASCII character variable that can contain as many as 40 characters. If BOUNDNAME contains spaces in it, then the entire name must be enclosed within single quotes." diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-esl.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-esl.yaml index 2bac15f7..42d7d52e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-esl.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-esl.yaml @@ -102,7 +102,7 @@ blocks: for use during any stress period. period: fields: - stress_period_data: + period_data: type: list item: name: stress_period_data 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 36d63e29..50d9d51e 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": { - "stress_period_data": { + "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 5558db09..a3a23cd2 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.stress_period_data] +[blocks.period.fields.period_data] type = "list" -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.period_data.item] name = "lakeperioddata" type = "record" -[blocks.period.fields.stress_period_data.item.fields.lakeno] +[blocks.period.fields.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.stress_period_data.item.fields.laksetting] +[blocks.period.fields.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.stress_period_data.item.fields.laksetting.arms.status] +[blocks.period.fields.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.stress_period_data.item.fields.laksetting.arms.temperature] +[blocks.period.fields.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.stress_period_data.item.fields.laksetting.arms.rainfall] +[blocks.period.fields.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.stress_period_data.item.fields.laksetting.arms.evaporation] +[blocks.period.fields.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.stress_period_data.item.fields.laksetting.arms.runoff] +[blocks.period.fields.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.stress_period_data.item.fields.laksetting.arms.ext-inflow] +[blocks.period.fields.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.stress_period_data.item.fields.laksetting.arms.auxiliaryrecord] +[blocks.period.fields.period_data.item.fields.laksetting.arms.auxiliaryrecord] type = "record" -[blocks.period.fields.stress_period_data.item.fields.laksetting.arms.auxiliaryrecord.fields.auxiliary] +[blocks.period.fields.period_data.item.fields.laksetting.arms.auxiliaryrecord.fields.auxiliary] type = "keyword" description = "keyword for specifying auxiliary variable." -[blocks.period.fields.stress_period_data.item.fields.laksetting.arms.auxiliaryrecord.fields.auxname] +[blocks.period.fields.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.stress_period_data.item.fields.laksetting.arms.auxiliaryrecord.fields.auxval] +[blocks.period.fields.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 aa6ff800..813c569b 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: - stress_period_data: + 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 300d6c88..f8977531 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": { - "stress_period_data": { + "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 6dd68eb5..5b3d02ff 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.stress_period_data] +[blocks.period.fields.period_data] type = "list" -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.period_data.item] name = "mweperioddata" type = "record" -[blocks.period.fields.stress_period_data.item.fields.mawno] +[blocks.period.fields.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.stress_period_data.item.fields.mwesetting] +[blocks.period.fields.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.stress_period_data.item.fields.mwesetting.arms.status] +[blocks.period.fields.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.stress_period_data.item.fields.mwesetting.arms.temperature] +[blocks.period.fields.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.stress_period_data.item.fields.mwesetting.arms.rate] +[blocks.period.fields.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.stress_period_data.item.fields.mwesetting.arms.auxiliaryrecord] +[blocks.period.fields.period_data.item.fields.mwesetting.arms.auxiliaryrecord] type = "record" -[blocks.period.fields.stress_period_data.item.fields.mwesetting.arms.auxiliaryrecord.fields.auxiliary] +[blocks.period.fields.period_data.item.fields.mwesetting.arms.auxiliaryrecord.fields.auxiliary] type = "keyword" description = "keyword for specifying auxiliary variable." -[blocks.period.fields.stress_period_data.item.fields.mwesetting.arms.auxiliaryrecord.fields.auxname] +[blocks.period.fields.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.stress_period_data.item.fields.mwesetting.arms.auxiliaryrecord.fields.auxval] +[blocks.period.fields.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 92aa186f..d2826385 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: - stress_period_data: + 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 ce3368c3..4af8dd21 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": { - "stress_period_data": { + "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 803565bf..fd2d1dee 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.stress_period_data] +[blocks.period.fields.period_data] type = "list" optional = true -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.period_data.item] name = "output_record" type = "union" -[blocks.period.fields.stress_period_data.item.arms.saverecord] +[blocks.period.fields.period_data.item.arms.saverecord] type = "record" optional = true -[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.save] +[blocks.period.fields.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.stress_period_data.item.arms.saverecord.fields.rtype] +[blocks.period.fields.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.stress_period_data.item.arms.saverecord.fields.ocsetting] +[blocks.period.fields.period_data.item.arms.saverecord.fields.ocsetting] type = "union" description = "specifies the steps for which the data will be saved." -[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.all] +[blocks.period.fields.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.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.first] +[blocks.period.fields.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.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.last] +[blocks.period.fields.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.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.frequency] +[blocks.period.fields.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.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.steps] +[blocks.period.fields.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.stress_period_data.item.arms.printrecord] +[blocks.period.fields.period_data.item.arms.printrecord] type = "record" optional = true -[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.print] +[blocks.period.fields.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.stress_period_data.item.arms.printrecord.fields.rtype] +[blocks.period.fields.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.stress_period_data.item.arms.printrecord.fields.ocsetting] +[blocks.period.fields.period_data.item.arms.printrecord.fields.ocsetting] type = "union" description = "specifies the steps for which the data will be saved." -[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.all] +[blocks.period.fields.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.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.first] +[blocks.period.fields.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.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.last] +[blocks.period.fields.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.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.frequency] +[blocks.period.fields.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.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.steps] +[blocks.period.fields.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 2b7df0f3..a1e75a1b 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: - stress_period_data: + 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 168ab85f..681916fd 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": { - "stress_period_data": { + "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 691a99a3..cd8f7d93 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.stress_period_data] +[blocks.period.fields.period_data] type = "list" -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.period_data.item] name = "reachperioddata" type = "record" -[blocks.period.fields.stress_period_data.item.fields.rno] +[blocks.period.fields.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.stress_period_data.item.fields.reachsetting] +[blocks.period.fields.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.stress_period_data.item.fields.reachsetting.arms.status] +[blocks.period.fields.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.stress_period_data.item.fields.reachsetting.arms.temperature] +[blocks.period.fields.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.stress_period_data.item.fields.reachsetting.arms.rainfall] +[blocks.period.fields.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.stress_period_data.item.fields.reachsetting.arms.evaporation] +[blocks.period.fields.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.stress_period_data.item.fields.reachsetting.arms.runoff] +[blocks.period.fields.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.stress_period_data.item.fields.reachsetting.arms.inflow] +[blocks.period.fields.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.stress_period_data.item.fields.reachsetting.arms.auxiliaryrecord] +[blocks.period.fields.period_data.item.fields.reachsetting.arms.auxiliaryrecord] type = "record" -[blocks.period.fields.stress_period_data.item.fields.reachsetting.arms.auxiliaryrecord.fields.auxiliary] +[blocks.period.fields.period_data.item.fields.reachsetting.arms.auxiliaryrecord.fields.auxiliary] type = "keyword" description = "keyword for specifying auxiliary variable." -[blocks.period.fields.stress_period_data.item.fields.reachsetting.arms.auxiliaryrecord.fields.auxname] +[blocks.period.fields.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.stress_period_data.item.fields.reachsetting.arms.auxiliaryrecord.fields.auxval] +[blocks.period.fields.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 71cc94a2..bcfcb3f9 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: - stress_period_data: + 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 b5ad914b..267c0dba 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": { - "stress_period_data": { + "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 7ebbc7d7..23cff8bc 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.stress_period_data] +[blocks.period.fields.period_data] type = "list" -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.period_data.item] name = "uzeperioddata" type = "record" -[blocks.period.fields.stress_period_data.item.fields.uzfno] +[blocks.period.fields.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.stress_period_data.item.fields.uzesetting] +[blocks.period.fields.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.stress_period_data.item.fields.uzesetting.arms.status] +[blocks.period.fields.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.stress_period_data.item.fields.uzesetting.arms.temperature] +[blocks.period.fields.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.stress_period_data.item.fields.uzesetting.arms.infiltration] +[blocks.period.fields.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.stress_period_data.item.fields.uzesetting.arms.uzet] +[blocks.period.fields.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.stress_period_data.item.fields.uzesetting.arms.auxiliaryrecord] +[blocks.period.fields.period_data.item.fields.uzesetting.arms.auxiliaryrecord] type = "record" -[blocks.period.fields.stress_period_data.item.fields.uzesetting.arms.auxiliaryrecord.fields.auxiliary] +[blocks.period.fields.period_data.item.fields.uzesetting.arms.auxiliaryrecord.fields.auxiliary] type = "keyword" description = "keyword for specifying auxiliary variable." -[blocks.period.fields.stress_period_data.item.fields.uzesetting.arms.auxiliaryrecord.fields.auxname] +[blocks.period.fields.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.stress_period_data.item.fields.uzesetting.arms.auxiliaryrecord.fields.auxval] +[blocks.period.fields.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 ede5574e..9dd00ddc 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: - stress_period_data: + period_data: type: list item: name: uzeperioddata diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chd.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chd.json index 8a3f51c3..cadf069c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chd.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chd.json @@ -115,7 +115,7 @@ }, "period": { "fields": { - "stress_period_data": { + "period_data": { "type": "list", "item": { "name": "stress_period_data", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chd.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chd.toml index 83849a9f..0564c10c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chd.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chd.toml @@ -98,30 +98,30 @@ type = "integer" longname = "maximum number of constant heads" description = "integer value specifying the maximum number of constant-head cells that will be specified for use during any stress period." -[blocks.period.fields.stress_period_data] +[blocks.period.fields.period_data] type = "list" shape = [ "<=maxbound", ] -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.period_data.item] name = "stress_period_data" type = "record" -[blocks.period.fields.stress_period_data.item.fields.cellid] +[blocks.period.fields.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.stress_period_data.item.fields.head] +[blocks.period.fields.period_data.item.fields.head] type = "double" longname = "head value assigned to constant head" description = "is the head at the boundary. 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.stress_period_data.item.fields.aux] +[blocks.period.fields.period_data.item.fields.aux] type = "array" longname = "auxiliary variables" description = "represents the values of the auxiliary variables for each constant head. The values of auxiliary variables must be present for each constant head. The values must be specified in the order of the auxiliary variables specified in the OPTIONS block. If the package supports time series and the Options block includes a TIMESERIESFILE entry (see the 'Time-Variable Input' section), values can be obtained from a time series by entering the time-series name in place of a numeric value." @@ -133,7 +133,7 @@ shape = [ "auxiliary", ] -[blocks.period.fields.stress_period_data.item.fields.boundname] +[blocks.period.fields.period_data.item.fields.boundname] type = "string" longname = "constant head boundary name" description = "name of the constant head boundary cell. BOUNDNAME is an ASCII character variable that can contain as many as 40 characters. If BOUNDNAME contains spaces in it, then the entire name must be enclosed within single quotes." diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chd.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chd.yaml index 6d54fcc2..cf67b6cd 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chd.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chd.yaml @@ -108,7 +108,7 @@ blocks: for use during any stress period. period: fields: - stress_period_data: + period_data: type: list item: name: stress_period_data diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-csub.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-csub.json index 5a501b2e..d1bc2b14 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-csub.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-csub.json @@ -475,7 +475,7 @@ }, "period": { "fields": { - "stress_period_data": { + "period_data": { "type": "list", "item": { "name": "stress_period_data", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-csub.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-csub.toml index 758135e7..4d368355 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-csub.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-csub.toml @@ -430,23 +430,23 @@ optional = true when = "boundnames" tagged = false -[blocks.period.fields.stress_period_data] +[blocks.period.fields.period_data] type = "list" shape = [ "<=maxsig0", ] -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.period_data.item] name = "stress_period_data" type = "record" -[blocks.period.fields.stress_period_data.item.fields.cellid] +[blocks.period.fields.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.stress_period_data.item.fields.sig0] +[blocks.period.fields.period_data.item.fields.sig0] type = "double" longname = "well stress offset" description = "is the stress offset for the cell. SIG0 is added to the calculated geostatic stress for the cell. SIG0 is specified only if MAXSIG0 is specified to be greater than 0 in the DIMENSIONS block. If the Options block includes a TIMESERIESFILE entry (see the 'Time-Variable Input' section), values can be obtained from a time series by entering the time-series name in place of a numeric value." diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-csub.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-csub.yaml index de3cdbd9..2d7217f4 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-csub.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-csub.yaml @@ -471,7 +471,7 @@ blocks: - ninterbeds period: fields: - stress_period_data: + period_data: type: list item: name: stress_period_data diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drn.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drn.json index f957e91c..49d4ff4e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drn.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drn.json @@ -126,7 +126,7 @@ }, "period": { "fields": { - "stress_period_data": { + "period_data": { "type": "list", "item": { "name": "stress_period_data", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drn.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drn.toml index 46521bd9..c7900a96 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drn.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drn.toml @@ -109,37 +109,37 @@ type = "integer" longname = "maximum number of drains" description = "integer value specifying the maximum number of drains cells that will be specified for use during any stress period." -[blocks.period.fields.stress_period_data] +[blocks.period.fields.period_data] type = "list" shape = [ "<=maxbound", ] -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.period_data.item] name = "stress_period_data" type = "record" -[blocks.period.fields.stress_period_data.item.fields.cellid] +[blocks.period.fields.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.stress_period_data.item.fields.elev] +[blocks.period.fields.period_data.item.fields.elev] type = "double" longname = "drain elevation" description = "is the elevation of the drain. 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.stress_period_data.item.fields.cond] +[blocks.period.fields.period_data.item.fields.cond] type = "double" longname = "drain conductance" description = "is the hydraulic conductance of the interface between the aquifer and the drain. 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.stress_period_data.item.fields.aux] +[blocks.period.fields.period_data.item.fields.aux] type = "array" longname = "auxiliary variables" description = "represents the values of the auxiliary variables for each drain. The values of auxiliary variables must be present for each drain. 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." @@ -151,7 +151,7 @@ shape = [ "auxiliary", ] -[blocks.period.fields.stress_period_data.item.fields.boundname] +[blocks.period.fields.period_data.item.fields.boundname] type = "string" longname = "drain name" description = "name of the drain cell. BOUNDNAME is an ASCII character variable that can contain as many as 40 characters. If BOUNDNAME contains spaces in it, then the entire name must be enclosed within single quotes." diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drn.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drn.yaml index 4cf94523..d933385c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drn.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drn.yaml @@ -126,7 +126,7 @@ blocks: for use during any stress period. period: fields: - stress_period_data: + period_data: type: list item: name: stress_period_data diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-evt.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-evt.json index 3f34bf8f..fd92d155 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-evt.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-evt.json @@ -128,7 +128,7 @@ }, "period": { "fields": { - "stress_period_data": { + "period_data": { "type": "list", "item": { "name": "stress_period_data", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-evt.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-evt.toml index 8ace039c..467bacbf 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-evt.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-evt.toml @@ -111,44 +111,44 @@ type = "integer" longname = "number of ET segments" description = "number of ET segments. Default is one. When NSEG is greater than 1, the PXDP and PETM arrays must be of size NSEG - 1 and be listed in order from the uppermost segment down. Values for PXDP must be listed first followed by the values for PETM. PXDP defines the extinction-depth proportion at the bottom of a segment. PETM defines the proportion of the maximum ET flux rate at the bottom of a segment." -[blocks.period.fields.stress_period_data] +[blocks.period.fields.period_data] type = "list" shape = [ "<=maxbound", ] -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.period_data.item] name = "stress_period_data" type = "record" -[blocks.period.fields.stress_period_data.item.fields.cellid] +[blocks.period.fields.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.stress_period_data.item.fields.surface] +[blocks.period.fields.period_data.item.fields.surface] type = "double" longname = "ET surface" description = "is the elevation of the ET surface ($L$). 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.stress_period_data.item.fields.rate] +[blocks.period.fields.period_data.item.fields.rate] type = "double" longname = "maximum ET rate" description = "is the maximum ET flux rate ($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.stress_period_data.item.fields.depth] +[blocks.period.fields.period_data.item.fields.depth] type = "double" longname = "ET extinction depth" description = "is the ET extinction depth ($L$). 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.stress_period_data.item.fields.pxdp] +[blocks.period.fields.period_data.item.fields.pxdp] type = "array" longname = "proportion of ET extinction depth" description = "is the proportion of the ET extinction depth at the bottom of a segment (dimensionless). pxdp is an array of size (nseg - 1). Values in pxdp must be greater than 0.0 and less than 1.0. pxdp values for a cell must increase monotonically. 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." @@ -160,7 +160,7 @@ shape = [ "nseg-1", ] -[blocks.period.fields.stress_period_data.item.fields.petm] +[blocks.period.fields.period_data.item.fields.petm] type = "array" longname = "proportion of maximum ET rate" description = "is the proportion of the maximum ET flux rate at the bottom of a segment (dimensionless). petm is an array of size (nseg - 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." @@ -172,7 +172,7 @@ shape = [ "nseg-1", ] -[blocks.period.fields.stress_period_data.item.fields.petm0] +[blocks.period.fields.period_data.item.fields.petm0] type = "double" longname = "proportion of maximum ET rate at ET surface" description = "is the proportion of the maximum ET flux rate that will apply when head is at or above the ET surface (dimensionless). PETM0 is read only when the SURF_RATE_SPECIFIED option is used. 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." @@ -180,7 +180,7 @@ when = "surf_rate_specified" tagged = false time_series = true -[blocks.period.fields.stress_period_data.item.fields.aux] +[blocks.period.fields.period_data.item.fields.aux] type = "array" longname = "auxiliary variables" description = "represents the values of the auxiliary variables for each evapotranspiration. The values of auxiliary variables must be present for each evapotranspiration. 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." @@ -192,7 +192,7 @@ shape = [ "auxiliary", ] -[blocks.period.fields.stress_period_data.item.fields.boundname] +[blocks.period.fields.period_data.item.fields.boundname] type = "string" longname = "evapotranspiration name" description = "name of the evapotranspiration cell. BOUNDNAME is an ASCII character variable that can contain as many as 40 characters. If BOUNDNAME contains spaces in it, then the entire name must be enclosed within single quotes." diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-evt.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-evt.yaml index 94b95846..684c776b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-evt.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-evt.yaml @@ -124,7 +124,7 @@ blocks: at the bottom of a segment. period: fields: - stress_period_data: + period_data: type: list item: name: stress_period_data diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghb.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghb.json index 84b8268b..f1afb8ea 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghb.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghb.json @@ -113,7 +113,7 @@ }, "period": { "fields": { - "stress_period_data": { + "period_data": { "type": "list", "item": { "name": "stress_period_data", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghb.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghb.toml index a2d92121..90081d6d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghb.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghb.toml @@ -96,37 +96,37 @@ type = "integer" longname = "maximum number of general-head boundaries" description = "integer value specifying the maximum number of general-head boundary cells that will be specified for use during any stress period." -[blocks.period.fields.stress_period_data] +[blocks.period.fields.period_data] type = "list" shape = [ "<=maxbound", ] -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.period_data.item] name = "stress_period_data" type = "record" -[blocks.period.fields.stress_period_data.item.fields.cellid] +[blocks.period.fields.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.stress_period_data.item.fields.bhead] +[blocks.period.fields.period_data.item.fields.bhead] type = "double" longname = "boundary head" description = "is the boundary head. 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.stress_period_data.item.fields.cond] +[blocks.period.fields.period_data.item.fields.cond] type = "double" longname = "boundary conductance" description = "is the hydraulic conductance of the interface between the aquifer cell and the boundary. 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.stress_period_data.item.fields.aux] +[blocks.period.fields.period_data.item.fields.aux] type = "array" longname = "auxiliary variables" description = "represents the values of the auxiliary variables for each general-head boundary. The values of auxiliary variables must be present for each general-head boundary. The values must be specified in the order of the auxiliary variables specified in the OPTIONS block. If the package supports time series and the Options block includes a TIMESERIESFILE entry (see the 'Time-Variable Input' section), values can be obtained from a time series by entering the time-series name in place of a numeric value." @@ -138,7 +138,7 @@ shape = [ "auxiliary", ] -[blocks.period.fields.stress_period_data.item.fields.boundname] +[blocks.period.fields.period_data.item.fields.boundname] type = "string" longname = "general-head boundary name" description = "name of the general-head boundary cell. BOUNDNAME is an ASCII character variable that can contain as many as 40 characters. If BOUNDNAME contains spaces in it, then the entire name must be enclosed within single quotes." diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghb.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghb.yaml index 23ffe8d2..dec201e8 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghb.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghb.yaml @@ -108,7 +108,7 @@ blocks: be specified for use during any stress period. period: fields: - stress_period_data: + period_data: type: list item: name: stress_period_data diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-hfb.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-hfb.json index b42e5f62..21013a6e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-hfb.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-hfb.json @@ -31,7 +31,7 @@ }, "period": { "fields": { - "stress_period_data": { + "period_data": { "type": "list", "item": { "name": "stress_period_data", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-hfb.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-hfb.toml index 4cc0888d..d8212cd9 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-hfb.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-hfb.toml @@ -18,29 +18,29 @@ type = "integer" longname = "maximum number of barriers" description = "integer value specifying the maximum number of hydraulic flow barriers that will be entered in this input file. The value of MAXHFB is used to allocate memory for the hydraulic flow barriers." -[blocks.period.fields.stress_period_data] +[blocks.period.fields.period_data] type = "list" shape = [ "<=maxhfb", ] -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.period_data.item] name = "stress_period_data" type = "record" -[blocks.period.fields.stress_period_data.item.fields.cellid1] +[blocks.period.fields.period_data.item.fields.cellid1] type = "cellid" longname = "first cell adjacent to barrier" description = "identifier for the first cell. For a structured grid that uses the DIS input file, CELLID1 is the layer, row, and column numbers of the cell. For a grid that uses the DISV input file, CELLID1 is the layer number and CELL2D number for the two cells. If the model uses the unstructured discretization (DISU) input file, then CELLID1 is the node numbers for the cell. The barrier is located between cells designated as CELLID1 and CELLID2. For models that use the DIS and DISV grid types, the layer number for CELLID1 and CELLID2 must be the same. For all grid types, cells must be horizontally or vertically adjacent." tagged = false -[blocks.period.fields.stress_period_data.item.fields.cellid2] +[blocks.period.fields.period_data.item.fields.cellid2] type = "cellid" longname = "second cell adjacent to barrier" description = "identifier for the second cell. See CELLID1 for description of how to specify." tagged = false -[blocks.period.fields.stress_period_data.item.fields.hydchr] +[blocks.period.fields.period_data.item.fields.hydchr] type = "double" longname = "barrier hydraulic characteristic" description = "is the hydraulic characteristic of the hydraulic-flow barrier. The hydraulic characteristic is the barrier hydraulic conductivity divided by the width of the hydraulic-flow barrier. If the hydraulic characteristic is negative, then the absolute value of HYDCHR acts as a multiplier to the conductance between the two model cells specified as containing the barrier. For example, if the value for HYDCHR was specified as -1.5, the conductance calculated for the two cells would be multiplied by 1.5." diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-hfb.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-hfb.yaml index 1fa2a660..54550ba1 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-hfb.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-hfb.yaml @@ -25,7 +25,7 @@ blocks: flow barriers. period: fields: - stress_period_data: + period_data: type: list item: name: stress_period_data 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 0b313a4a..818326cd 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-lak.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-lak.json @@ -487,7 +487,7 @@ }, "period": { "fields": { - "stress_period_data": { + "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 554d503a..3fe956b3 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-lak.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-lak.toml @@ -436,18 +436,18 @@ description = "real value that defines the bed slope for the lake outlet. Any va tagged = false time_series = true -[blocks.period.fields.stress_period_data] +[blocks.period.fields.period_data] type = "list" -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.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.stress_period_data.item.arms.status] +[blocks.period.fields.period_data.item.arms.status] type = "record" -[blocks.period.fields.stress_period_data.item.arms.status.fields.lakeno] +[blocks.period.fields.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." @@ -455,15 +455,15 @@ tagged = false index = true fk = "packagedata.ifno" -[blocks.period.fields.stress_period_data.item.arms.status.fields.status] +[blocks.period.fields.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.stress_period_data.item.arms.stage] +[blocks.period.fields.period_data.item.arms.stage] type = "record" -[blocks.period.fields.stress_period_data.item.arms.stage.fields.lakeno] +[blocks.period.fields.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." @@ -471,16 +471,16 @@ tagged = false index = true fk = "packagedata.ifno" -[blocks.period.fields.stress_period_data.item.arms.stage.fields.stage] +[blocks.period.fields.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.stress_period_data.item.arms.rainfall] +[blocks.period.fields.period_data.item.arms.rainfall] type = "record" -[blocks.period.fields.stress_period_data.item.arms.rainfall.fields.lakeno] +[blocks.period.fields.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." @@ -488,16 +488,16 @@ tagged = false index = true fk = "packagedata.ifno" -[blocks.period.fields.stress_period_data.item.arms.rainfall.fields.rainfall] +[blocks.period.fields.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.stress_period_data.item.arms.evaporation] +[blocks.period.fields.period_data.item.arms.evaporation] type = "record" -[blocks.period.fields.stress_period_data.item.arms.evaporation.fields.lakeno] +[blocks.period.fields.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." @@ -505,16 +505,16 @@ tagged = false index = true fk = "packagedata.ifno" -[blocks.period.fields.stress_period_data.item.arms.evaporation.fields.evaporation] +[blocks.period.fields.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.stress_period_data.item.arms.runoff] +[blocks.period.fields.period_data.item.arms.runoff] type = "record" -[blocks.period.fields.stress_period_data.item.arms.runoff.fields.lakeno] +[blocks.period.fields.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." @@ -522,16 +522,16 @@ tagged = false index = true fk = "packagedata.ifno" -[blocks.period.fields.stress_period_data.item.arms.runoff.fields.runoff] +[blocks.period.fields.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.stress_period_data.item.arms.inflow] +[blocks.period.fields.period_data.item.arms.inflow] type = "record" -[blocks.period.fields.stress_period_data.item.arms.inflow.fields.lakeno] +[blocks.period.fields.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." @@ -539,16 +539,16 @@ tagged = false index = true fk = "packagedata.ifno" -[blocks.period.fields.stress_period_data.item.arms.inflow.fields.inflow] +[blocks.period.fields.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.stress_period_data.item.arms.withdrawal] +[blocks.period.fields.period_data.item.arms.withdrawal] type = "record" -[blocks.period.fields.stress_period_data.item.arms.withdrawal.fields.lakeno] +[blocks.period.fields.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." @@ -556,16 +556,16 @@ tagged = false index = true fk = "packagedata.ifno" -[blocks.period.fields.stress_period_data.item.arms.withdrawal.fields.withdrawal] +[blocks.period.fields.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.stress_period_data.item.arms.rate] +[blocks.period.fields.period_data.item.arms.rate] type = "record" -[blocks.period.fields.stress_period_data.item.arms.rate.fields.outletno] +[blocks.period.fields.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." @@ -573,16 +573,16 @@ tagged = false index = true fk = "outlets.outletno" -[blocks.period.fields.stress_period_data.item.arms.rate.fields.rate] +[blocks.period.fields.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.stress_period_data.item.arms.invert] +[blocks.period.fields.period_data.item.arms.invert] type = "record" -[blocks.period.fields.stress_period_data.item.arms.invert.fields.outletno] +[blocks.period.fields.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." @@ -590,16 +590,16 @@ tagged = false index = true fk = "outlets.outletno" -[blocks.period.fields.stress_period_data.item.arms.invert.fields.invert] +[blocks.period.fields.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.stress_period_data.item.arms.width] +[blocks.period.fields.period_data.item.arms.width] type = "record" -[blocks.period.fields.stress_period_data.item.arms.width.fields.outletno] +[blocks.period.fields.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." @@ -607,16 +607,16 @@ tagged = false index = true fk = "outlets.outletno" -[blocks.period.fields.stress_period_data.item.arms.width.fields.width] +[blocks.period.fields.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.stress_period_data.item.arms.slope] +[blocks.period.fields.period_data.item.arms.slope] type = "record" -[blocks.period.fields.stress_period_data.item.arms.slope.fields.outletno] +[blocks.period.fields.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." @@ -624,16 +624,16 @@ tagged = false index = true fk = "outlets.outletno" -[blocks.period.fields.stress_period_data.item.arms.slope.fields.slope] +[blocks.period.fields.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.stress_period_data.item.arms.rough] +[blocks.period.fields.period_data.item.arms.rough] type = "record" -[blocks.period.fields.stress_period_data.item.arms.rough.fields.outletno] +[blocks.period.fields.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." @@ -641,16 +641,16 @@ tagged = false index = true fk = "outlets.outletno" -[blocks.period.fields.stress_period_data.item.arms.rough.fields.rough] +[blocks.period.fields.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.stress_period_data.item.arms.auxiliaryrecord] +[blocks.period.fields.period_data.item.arms.auxiliaryrecord] type = "record" -[blocks.period.fields.stress_period_data.item.arms.auxiliaryrecord.fields.lakeno] +[blocks.period.fields.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." @@ -658,16 +658,16 @@ tagged = false index = true fk = "packagedata.ifno" -[blocks.period.fields.stress_period_data.item.arms.auxiliaryrecord.fields.auxiliary] +[blocks.period.fields.period_data.item.arms.auxiliaryrecord.fields.auxiliary] type = "keyword" description = "keyword for specifying auxiliary variable." -[blocks.period.fields.stress_period_data.item.arms.auxiliaryrecord.fields.auxname] +[blocks.period.fields.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.stress_period_data.item.arms.auxiliaryrecord.fields.auxval] +[blocks.period.fields.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 5cb1e5e1..36e1addd 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-lak.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-lak.yaml @@ -512,7 +512,7 @@ blocks: - noutlets period: fields: - stress_period_data: + 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 dcb5809c..052841c6 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-maw.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-maw.json @@ -356,7 +356,7 @@ }, "period": { "fields": { - "stress_period_data": { + "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 e97c757f..3299ad94 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-maw.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-maw.toml @@ -319,14 +319,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.stress_period_data] +[blocks.period.fields.period_data] type = "list" -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.period_data.item] name = "perioddata" type = "record" -[blocks.period.fields.stress_period_data.item.fields.ifno] +[blocks.period.fields.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." @@ -334,123 +334,123 @@ tagged = false index = true fk = "packagedata.ifno" -[blocks.period.fields.stress_period_data.item.fields.mawsetting] +[blocks.period.fields.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.stress_period_data.item.fields.mawsetting.arms.status] +[blocks.period.fields.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.stress_period_data.item.fields.mawsetting.arms.flowing_wellrecord] +[blocks.period.fields.period_data.item.fields.mawsetting.arms.flowing_wellrecord] type = "record" -[blocks.period.fields.stress_period_data.item.fields.mawsetting.arms.flowing_wellrecord.fields.flowing_well] +[blocks.period.fields.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.stress_period_data.item.fields.mawsetting.arms.flowing_wellrecord.fields.fwelev] +[blocks.period.fields.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.stress_period_data.item.fields.mawsetting.arms.flowing_wellrecord.fields.fwcond] +[blocks.period.fields.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.stress_period_data.item.fields.mawsetting.arms.flowing_wellrecord.fields.fwrlen] +[blocks.period.fields.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.stress_period_data.item.fields.mawsetting.arms.rate] +[blocks.period.fields.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.stress_period_data.item.fields.mawsetting.arms.well_head] +[blocks.period.fields.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.stress_period_data.item.fields.mawsetting.arms.head_limitrecord] +[blocks.period.fields.period_data.item.fields.mawsetting.arms.head_limitrecord] type = "record" -[blocks.period.fields.stress_period_data.item.fields.mawsetting.arms.head_limitrecord.fields.head_limit] +[blocks.period.fields.period_data.item.fields.mawsetting.arms.head_limitrecord.fields.head_limit] type = "keyword" -[blocks.period.fields.stress_period_data.item.fields.mawsetting.arms.head_limitrecord.fields.head_limit_value] +[blocks.period.fields.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.stress_period_data.item.fields.mawsetting.arms.head_limitrecord.fields.head_limit_value.arms.off] +[blocks.period.fields.period_data.item.fields.mawsetting.arms.head_limitrecord.fields.head_limit_value.arms.off] type = "keyword" -[blocks.period.fields.stress_period_data.item.fields.mawsetting.arms.head_limitrecord.fields.head_limit_value.arms.value] +[blocks.period.fields.period_data.item.fields.mawsetting.arms.head_limitrecord.fields.head_limit_value.arms.value] type = "double" tagged = false -[blocks.period.fields.stress_period_data.item.fields.mawsetting.arms.shutoffrecord] +[blocks.period.fields.period_data.item.fields.mawsetting.arms.shutoffrecord] type = "record" -[blocks.period.fields.stress_period_data.item.fields.mawsetting.arms.shutoffrecord.fields.shut_off] +[blocks.period.fields.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.stress_period_data.item.fields.mawsetting.arms.shutoffrecord.fields.minrate] +[blocks.period.fields.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.stress_period_data.item.fields.mawsetting.arms.shutoffrecord.fields.maxrate] +[blocks.period.fields.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.stress_period_data.item.fields.mawsetting.arms.rate_scalingrecord] +[blocks.period.fields.period_data.item.fields.mawsetting.arms.rate_scalingrecord] type = "record" -[blocks.period.fields.stress_period_data.item.fields.mawsetting.arms.rate_scalingrecord.fields.rate_scaling] +[blocks.period.fields.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.stress_period_data.item.fields.mawsetting.arms.rate_scalingrecord.fields.pump_elevation] +[blocks.period.fields.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.stress_period_data.item.fields.mawsetting.arms.rate_scalingrecord.fields.scaling_length] +[blocks.period.fields.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.stress_period_data.item.fields.mawsetting.arms.auxiliaryrecord] +[blocks.period.fields.period_data.item.fields.mawsetting.arms.auxiliaryrecord] type = "record" -[blocks.period.fields.stress_period_data.item.fields.mawsetting.arms.auxiliaryrecord.fields.auxiliary] +[blocks.period.fields.period_data.item.fields.mawsetting.arms.auxiliaryrecord.fields.auxiliary] type = "keyword" description = "keyword for specifying auxiliary variable." -[blocks.period.fields.stress_period_data.item.fields.mawsetting.arms.auxiliaryrecord.fields.auxname] +[blocks.period.fields.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.stress_period_data.item.fields.mawsetting.arms.auxiliaryrecord.fields.auxval] +[blocks.period.fields.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 b2644b6e..60013887 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-maw.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-maw.yaml @@ -400,7 +400,7 @@ blocks: - ngwfnodes period: fields: - stress_period_data: + 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 325a6477..38d67ba1 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-mvr.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-mvr.json @@ -129,7 +129,7 @@ }, "period": { "fields": { - "stress_period_data": { + "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 33787596..71d002a5 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-mvr.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-mvr.toml @@ -106,82 +106,82 @@ path = "gwf-nam.packages.pname" scope = "mname" rule = "mover_enabled" -[blocks.period.fields.stress_period_data] +[blocks.period.fields.period_data] type = "list" -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.period_data.item] name = "perioddata" type = "record" -[blocks.period.fields.stress_period_data.item.fields.mname1] +[blocks.period.fields.period_data.item.fields.mname1] type = "string" description = "name of model containing the package, PNAME1." when = "modelnames" tagged = false -[blocks.period.fields.stress_period_data.item.fields.mname1.fk] +[blocks.period.fields.period_data.item.fields.mname1.fk] path = "sim-nam.models.mname" rule = "exchange_models" -[blocks.period.fields.stress_period_data.item.fields.pname1] +[blocks.period.fields.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 -[blocks.period.fields.stress_period_data.item.fields.pname1.fk] +[blocks.period.fields.period_data.item.fields.pname1.fk] path = "packages.pname" scope = "mname1" -[blocks.period.fields.stress_period_data.item.fields.id1] +[blocks.period.fields.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.stress_period_data.item.fields.id1.fk] +[blocks.period.fields.period_data.item.fields.id1.fk] scope = "pname1" key = "mover_provider" -[blocks.period.fields.stress_period_data.item.fields.mname2] +[blocks.period.fields.period_data.item.fields.mname2] type = "string" description = "name of model containing the package, PNAME2." when = "modelnames" tagged = false -[blocks.period.fields.stress_period_data.item.fields.mname2.fk] +[blocks.period.fields.period_data.item.fields.mname2.fk] path = "sim-nam.models.mname" rule = "exchange_models" -[blocks.period.fields.stress_period_data.item.fields.pname2] +[blocks.period.fields.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 -[blocks.period.fields.stress_period_data.item.fields.pname2.fk] +[blocks.period.fields.period_data.item.fields.pname2.fk] path = "packages.pname" scope = "mname2" -[blocks.period.fields.stress_period_data.item.fields.id2] +[blocks.period.fields.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.stress_period_data.item.fields.id2.fk] +[blocks.period.fields.period_data.item.fields.id2.fk] scope = "pname2" key = "mover_receiver" -[blocks.period.fields.stress_period_data.item.fields.mvrtype] +[blocks.period.fields.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.stress_period_data.item.fields.value] +[blocks.period.fields.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 0cb1c4da..ae395f1c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-mvr.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-mvr.yaml @@ -111,7 +111,7 @@ blocks: - maxpackages period: fields: - stress_period_data: + 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 ce21b6ad..085c1ccb 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": { - "stress_period_data": { + "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 0751efed..072205f9 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.stress_period_data] +[blocks.period.fields.period_data] type = "list" optional = true -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.period_data.item] name = "output_record" type = "union" -[blocks.period.fields.stress_period_data.item.arms.saverecord] +[blocks.period.fields.period_data.item.arms.saverecord] type = "record" optional = true -[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.save] +[blocks.period.fields.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.stress_period_data.item.arms.saverecord.fields.rtype] +[blocks.period.fields.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.stress_period_data.item.arms.saverecord.fields.ocsetting] +[blocks.period.fields.period_data.item.arms.saverecord.fields.ocsetting] type = "union" description = "specifies the steps for which the data will be saved." -[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.all] +[blocks.period.fields.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.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.first] +[blocks.period.fields.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.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.last] +[blocks.period.fields.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.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.frequency] +[blocks.period.fields.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.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.steps] +[blocks.period.fields.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.stress_period_data.item.arms.printrecord] +[blocks.period.fields.period_data.item.arms.printrecord] type = "record" optional = true -[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.print] +[blocks.period.fields.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.stress_period_data.item.arms.printrecord.fields.rtype] +[blocks.period.fields.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.stress_period_data.item.arms.printrecord.fields.ocsetting] +[blocks.period.fields.period_data.item.arms.printrecord.fields.ocsetting] type = "union" description = "specifies the steps for which the data will be saved." -[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.all] +[blocks.period.fields.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.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.first] +[blocks.period.fields.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.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.last] +[blocks.period.fields.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.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.frequency] +[blocks.period.fields.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.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.steps] +[blocks.period.fields.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 96ce3658..300b9031 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: - stress_period_data: + period_data: type: list optional: true item: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rch.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rch.json index 78f51ecc..e571cc15 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rch.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rch.json @@ -114,7 +114,7 @@ }, "period": { "fields": { - "stress_period_data": { + "period_data": { "type": "list", "item": { "name": "stress_period_data", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rch.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rch.toml index fa858baf..c6788cac 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rch.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rch.toml @@ -97,30 +97,30 @@ type = "integer" longname = "maximum number of recharge cells" description = "integer value specifying the maximum number of recharge cells that will be specified for use during any stress period." -[blocks.period.fields.stress_period_data] +[blocks.period.fields.period_data] type = "list" shape = [ "<=maxbound", ] -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.period_data.item] name = "stress_period_data" type = "record" -[blocks.period.fields.stress_period_data.item.fields.cellid] +[blocks.period.fields.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.stress_period_data.item.fields.recharge] +[blocks.period.fields.period_data.item.fields.recharge] type = "double" longname = "recharge rate" description = "is the recharge flux rate ($LT^{-1}$). This rate is multiplied inside the program by the surface area of the cell to calculate the volumetric recharge rate. 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.stress_period_data.item.fields.aux] +[blocks.period.fields.period_data.item.fields.aux] type = "array" longname = "auxiliary variables" description = "represents the values of the auxiliary variables for each recharge. The values of auxiliary variables must be present for each recharge. 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." @@ -132,7 +132,7 @@ shape = [ "auxiliary", ] -[blocks.period.fields.stress_period_data.item.fields.boundname] +[blocks.period.fields.period_data.item.fields.boundname] type = "string" longname = "recharge name" description = "name of the recharge cell. BOUNDNAME is an ASCII character variable that can contain as many as 40 characters. If BOUNDNAME contains spaces in it, then the entire name must be enclosed within single quotes." diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rch.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rch.yaml index 8038814c..68a7fce2 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rch.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rch.yaml @@ -108,7 +108,7 @@ blocks: for use during any stress period. period: fields: - stress_period_data: + period_data: type: list item: name: stress_period_data diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-riv.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-riv.json index 189dd8c9..e152e3af 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-riv.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-riv.json @@ -113,7 +113,7 @@ }, "period": { "fields": { - "stress_period_data": { + "period_data": { "type": "list", "item": { "name": "stress_period_data", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-riv.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-riv.toml index 649d6b2d..65f4d944 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-riv.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-riv.toml @@ -96,44 +96,44 @@ type = "integer" longname = "maximum number of rivers" description = "integer value specifying the maximum number of rivers cells that will be specified for use during any stress period." -[blocks.period.fields.stress_period_data] +[blocks.period.fields.period_data] type = "list" shape = [ "<=maxbound", ] -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.period_data.item] name = "stress_period_data" type = "record" -[blocks.period.fields.stress_period_data.item.fields.cellid] +[blocks.period.fields.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.stress_period_data.item.fields.stage] +[blocks.period.fields.period_data.item.fields.stage] type = "double" longname = "river stage" description = "is the head in the river. 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.stress_period_data.item.fields.cond] +[blocks.period.fields.period_data.item.fields.cond] type = "double" longname = "river conductance" description = "is the riverbed hydraulic conductance. 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.stress_period_data.item.fields.rbot] +[blocks.period.fields.period_data.item.fields.rbot] type = "double" longname = "river bottom elevation" description = "is the elevation of the bottom of the riverbed. 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.stress_period_data.item.fields.aux] +[blocks.period.fields.period_data.item.fields.aux] type = "array" longname = "auxiliary variables" description = "represents the values of the auxiliary variables for each river. The values of auxiliary variables must be present for each river. 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." @@ -145,7 +145,7 @@ shape = [ "auxiliary", ] -[blocks.period.fields.stress_period_data.item.fields.boundname] +[blocks.period.fields.period_data.item.fields.boundname] type = "string" longname = "drain name" description = "name of the river cell. BOUNDNAME is an ASCII character variable that can contain as many as 40 characters. If BOUNDNAME contains spaces in it, then the entire name must be enclosed within single quotes." diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-riv.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-riv.yaml index 2948610f..8a1c2fbd 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-riv.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-riv.yaml @@ -107,7 +107,7 @@ blocks: for use during any stress period. period: fields: - stress_period_data: + period_data: type: list item: name: stress_period_data 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 201bef87..9ab725c0 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sfr.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sfr.json @@ -492,7 +492,7 @@ }, "period": { "fields": { - "stress_period_data": { + "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 a0d01cab..b37b9f55 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sfr.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/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.stress_period_data] +[blocks.period.fields.period_data] type = "list" -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.period_data.item] name = "perioddata" type = "record" -[blocks.period.fields.stress_period_data.item.fields.ifno] +[blocks.period.fields.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,102 +452,102 @@ tagged = false index = true fk = "packagedata.ifno" -[blocks.period.fields.stress_period_data.item.fields.sfrsetting] +[blocks.period.fields.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.stress_period_data.item.fields.sfrsetting.arms.status] +[blocks.period.fields.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.stress_period_data.item.fields.sfrsetting.arms.bedk] +[blocks.period.fields.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.stress_period_data.item.fields.sfrsetting.arms.manning] +[blocks.period.fields.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.stress_period_data.item.fields.sfrsetting.arms.stage] +[blocks.period.fields.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.stress_period_data.item.fields.sfrsetting.arms.inflow] +[blocks.period.fields.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.stress_period_data.item.fields.sfrsetting.arms.rainfall] +[blocks.period.fields.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.stress_period_data.item.fields.sfrsetting.arms.evaporation] +[blocks.period.fields.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.stress_period_data.item.fields.sfrsetting.arms.runoff] +[blocks.period.fields.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.stress_period_data.item.fields.sfrsetting.arms.diversionrecord] +[blocks.period.fields.period_data.item.fields.sfrsetting.arms.diversionrecord] type = "record" -[blocks.period.fields.stress_period_data.item.fields.sfrsetting.arms.diversionrecord.fields.diversion] +[blocks.period.fields.period_data.item.fields.sfrsetting.arms.diversionrecord.fields.diversion] type = "keyword" longname = "diversion keyword" description = "keyword to indicate diversion record." -[blocks.period.fields.stress_period_data.item.fields.sfrsetting.arms.diversionrecord.fields.idv] +[blocks.period.fields.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.stress_period_data.item.fields.sfrsetting.arms.diversionrecord.fields.idv.fk] +[blocks.period.fields.period_data.item.fields.sfrsetting.arms.diversionrecord.fields.idv.fk] path = "diversions.idv" scope = "ifno" -[blocks.period.fields.stress_period_data.item.fields.sfrsetting.arms.diversionrecord.fields.divflow] +[blocks.period.fields.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.stress_period_data.item.fields.sfrsetting.arms.upstream_fraction] +[blocks.period.fields.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.stress_period_data.item.fields.sfrsetting.arms.cross_sectionrecord] +[blocks.period.fields.period_data.item.fields.sfrsetting.arms.cross_sectionrecord] type = "record" -[blocks.period.fields.stress_period_data.item.fields.sfrsetting.arms.cross_sectionrecord.fields.cross_section] +[blocks.period.fields.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.stress_period_data.item.fields.sfrsetting.arms.cross_sectionrecord.fields.tab6] +[blocks.period.fields.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.stress_period_data.item.fields.sfrsetting.arms.cross_sectionrecord.fields.tab6_filename] +[blocks.period.fields.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." @@ -555,19 +555,19 @@ tagged = false direction = "in" component = "utl-sfrtab" -[blocks.period.fields.stress_period_data.item.fields.sfrsetting.arms.auxiliaryrecord] +[blocks.period.fields.period_data.item.fields.sfrsetting.arms.auxiliaryrecord] type = "record" -[blocks.period.fields.stress_period_data.item.fields.sfrsetting.arms.auxiliaryrecord.fields.auxiliary] +[blocks.period.fields.period_data.item.fields.sfrsetting.arms.auxiliaryrecord.fields.auxiliary] type = "keyword" description = "keyword for specifying auxiliary variable." -[blocks.period.fields.stress_period_data.item.fields.sfrsetting.arms.auxiliaryrecord.fields.auxname] +[blocks.period.fields.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.stress_period_data.item.fields.sfrsetting.arms.auxiliaryrecord.fields.auxval] +[blocks.period.fields.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 7fd4c854..70fc8383 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sfr.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sfr.yaml @@ -526,7 +526,7 @@ blocks: tagged: false period: fields: - stress_period_data: + period_data: type: list item: name: perioddata diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sto.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sto.json index 3017a39e..552408f9 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sto.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sto.json @@ -114,7 +114,7 @@ }, "period": { "fields": { - "stress_period_data": { + "period_data": { "type": "string", "longname": "storage state", "description": "keyword to indicate that stress period IPER is steady-state. Steady-state conditions will apply until the TRANSIENT keyword is specified in a subsequent BEGIN PERIOD block. If the CSUB Package is included in the GWF model, only the first and last stress period can be steady-state.", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sto.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sto.toml index 1a641fef..df43a66f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sto.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sto.toml @@ -101,7 +101,7 @@ shape = [ "nodes", ] -[blocks.period.fields.stress_period_data] +[blocks.period.fields.period_data] type = "string" longname = "storage state" description = "keyword to indicate that stress period IPER is steady-state. Steady-state conditions will apply until the TRANSIENT keyword is specified in a subsequent BEGIN PERIOD block. If the CSUB Package is included in the GWF model, only the first and last stress period can be steady-state." diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sto.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sto.yaml index e6a1344b..a7a1a346 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sto.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sto.yaml @@ -111,7 +111,7 @@ blocks: - nodes period: fields: - stress_period_data: + period_data: type: string longname: storage state description: keyword to indicate that stress period IPER is steady-state. Steady-state conditions 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 a67ae8d3..3356d1c1 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-uzf.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-uzf.json @@ -328,7 +328,7 @@ }, "period": { "fields": { - "stress_period_data": { + "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 569c374f..01bdf21f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-uzf.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-uzf.toml @@ -297,14 +297,14 @@ optional = true when = "boundnames" tagged = false -[blocks.period.fields.stress_period_data] +[blocks.period.fields.period_data] type = "list" -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.period_data.item] name = "perioddata" type = "record" -[blocks.period.fields.stress_period_data.item.fields.ifno] +[blocks.period.fields.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." @@ -312,56 +312,56 @@ tagged = false index = true fk = "packagedata.ifno" -[blocks.period.fields.stress_period_data.item.fields.finf] +[blocks.period.fields.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.stress_period_data.item.fields.pet] +[blocks.period.fields.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.stress_period_data.item.fields.extdp] +[blocks.period.fields.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.stress_period_data.item.fields.extwc] +[blocks.period.fields.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.stress_period_data.item.fields.ha] +[blocks.period.fields.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.stress_period_data.item.fields.hroot] +[blocks.period.fields.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.stress_period_data.item.fields.rootact] +[blocks.period.fields.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.stress_period_data.item.fields.aux] +[blocks.period.fields.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 49ee89e9..e0047a0a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-uzf.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-uzf.yaml @@ -325,7 +325,7 @@ blocks: - nuzfcells period: fields: - stress_period_data: + period_data: type: list item: name: perioddata diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-wel.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-wel.json index a9b2b72a..e9e315cd 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-wel.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-wel.json @@ -143,7 +143,7 @@ }, "period": { "fields": { - "stress_period_data": { + "period_data": { "type": "list", "item": { "name": "stress_period_data", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-wel.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-wel.toml index 72762f20..f0dc9ba1 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-wel.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-wel.toml @@ -124,30 +124,30 @@ type = "integer" longname = "maximum number of wells" description = "integer value specifying the maximum number of wells cells that will be specified for use during any stress period." -[blocks.period.fields.stress_period_data] +[blocks.period.fields.period_data] type = "list" shape = [ "<=maxbound", ] -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.period_data.item] name = "stress_period_data" type = "record" -[blocks.period.fields.stress_period_data.item.fields.cellid] +[blocks.period.fields.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.stress_period_data.item.fields.q] +[blocks.period.fields.period_data.item.fields.q] type = "double" longname = "well rate" description = "is the volumetric well rate. A positive value indicates recharge (injection) and a negative value indicates discharge (extraction). 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.stress_period_data.item.fields.aux] +[blocks.period.fields.period_data.item.fields.aux] type = "array" longname = "auxiliary variables" description = "represents the values of the auxiliary variables for each well. The values of auxiliary variables must be present for each well. 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." @@ -159,7 +159,7 @@ shape = [ "auxiliary", ] -[blocks.period.fields.stress_period_data.item.fields.boundname] +[blocks.period.fields.period_data.item.fields.boundname] type = "string" longname = "well name" description = "name of the well cell. BOUNDNAME is an ASCII character variable that can contain as many as 40 characters. If BOUNDNAME contains spaces in it, then the entire name must be enclosed within single quotes." diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-wel.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-wel.yaml index d8c5671b..c18966e5 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-wel.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-wel.yaml @@ -147,7 +147,7 @@ blocks: for use during any stress period. period: fields: - stress_period_data: + period_data: type: list item: name: stress_period_data diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-cnc.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-cnc.json index 09bf8ee9..8d6e0208 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-cnc.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-cnc.json @@ -108,7 +108,7 @@ }, "period": { "fields": { - "stress_period_data": { + "period_data": { "type": "list", "item": { "name": "stress_period_data", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-cnc.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-cnc.toml index e76db0d8..d3590865 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-cnc.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-cnc.toml @@ -91,30 +91,30 @@ type = "integer" longname = "maximum number of constant concentrations" description = "integer value specifying the maximum number of constant concentrations cells that will be specified for use during any stress period." -[blocks.period.fields.stress_period_data] +[blocks.period.fields.period_data] type = "list" shape = [ "<=maxbound", ] -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.period_data.item] name = "stress_period_data" type = "record" -[blocks.period.fields.stress_period_data.item.fields.cellid] +[blocks.period.fields.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.stress_period_data.item.fields.conc] +[blocks.period.fields.period_data.item.fields.conc] type = "double" longname = "constant concentration value" description = "is the constant concentration value. 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.stress_period_data.item.fields.aux] +[blocks.period.fields.period_data.item.fields.aux] type = "array" longname = "auxiliary variables" description = "represents the values of the auxiliary variables for each constant concentration. The values of auxiliary variables must be present for each constant concentration. 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." @@ -126,7 +126,7 @@ shape = [ "auxiliary", ] -[blocks.period.fields.stress_period_data.item.fields.boundname] +[blocks.period.fields.period_data.item.fields.boundname] type = "string" longname = "constant concentration name" description = "name of the constant concentration cell. BOUNDNAME is an ASCII character variable that can contain as many as 40 characters. If BOUNDNAME contains spaces in it, then the entire name must be enclosed within single quotes." diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-cnc.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-cnc.yaml index 19376551..001b7a8c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-cnc.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-cnc.yaml @@ -102,7 +102,7 @@ blocks: will be specified for use during any stress period. period: fields: - stress_period_data: + period_data: type: list item: name: stress_period_data 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 4117bd42..66717a2a 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": { - "stress_period_data": { + "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 b75434c8..f16a0c16 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.stress_period_data] +[blocks.period.fields.period_data] type = "list" -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.period_data.item] name = "lakeperioddata" type = "record" -[blocks.period.fields.stress_period_data.item.fields.ifno] +[blocks.period.fields.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.stress_period_data.item.fields.laksetting] +[blocks.period.fields.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.stress_period_data.item.fields.laksetting.arms.status] +[blocks.period.fields.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.stress_period_data.item.fields.laksetting.arms.concentration] +[blocks.period.fields.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.stress_period_data.item.fields.laksetting.arms.rainfall] +[blocks.period.fields.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.stress_period_data.item.fields.laksetting.arms.evaporation] +[blocks.period.fields.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.stress_period_data.item.fields.laksetting.arms.runoff] +[blocks.period.fields.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.stress_period_data.item.fields.laksetting.arms.ext-inflow] +[blocks.period.fields.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.stress_period_data.item.fields.laksetting.arms.auxiliaryrecord] +[blocks.period.fields.period_data.item.fields.laksetting.arms.auxiliaryrecord] type = "record" -[blocks.period.fields.stress_period_data.item.fields.laksetting.arms.auxiliaryrecord.fields.auxiliary] +[blocks.period.fields.period_data.item.fields.laksetting.arms.auxiliaryrecord.fields.auxiliary] type = "keyword" description = "keyword for specifying auxiliary variable." -[blocks.period.fields.stress_period_data.item.fields.laksetting.arms.auxiliaryrecord.fields.auxname] +[blocks.period.fields.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.stress_period_data.item.fields.laksetting.arms.auxiliaryrecord.fields.auxval] +[blocks.period.fields.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 100dafad..82b76dd3 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: - stress_period_data: + 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 a8de4e06..ddb21432 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": { - "stress_period_data": { + "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 01cacc20..3c5117f2 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.stress_period_data] +[blocks.period.fields.period_data] type = "list" -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.period_data.item] name = "mwtperioddata" type = "record" -[blocks.period.fields.stress_period_data.item.fields.ifno] +[blocks.period.fields.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.stress_period_data.item.fields.mwtsetting] +[blocks.period.fields.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.stress_period_data.item.fields.mwtsetting.arms.status] +[blocks.period.fields.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.stress_period_data.item.fields.mwtsetting.arms.concentration] +[blocks.period.fields.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.stress_period_data.item.fields.mwtsetting.arms.rate] +[blocks.period.fields.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.stress_period_data.item.fields.mwtsetting.arms.auxiliaryrecord] +[blocks.period.fields.period_data.item.fields.mwtsetting.arms.auxiliaryrecord] type = "record" -[blocks.period.fields.stress_period_data.item.fields.mwtsetting.arms.auxiliaryrecord.fields.auxiliary] +[blocks.period.fields.period_data.item.fields.mwtsetting.arms.auxiliaryrecord.fields.auxiliary] type = "keyword" description = "keyword for specifying auxiliary variable." -[blocks.period.fields.stress_period_data.item.fields.mwtsetting.arms.auxiliaryrecord.fields.auxname] +[blocks.period.fields.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.stress_period_data.item.fields.mwtsetting.arms.auxiliaryrecord.fields.auxval] +[blocks.period.fields.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 775f08f9..470b2687 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: - stress_period_data: + 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 70d156cb..2f0c98d6 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": { - "stress_period_data": { + "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 1f2b48dd..caf89113 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.stress_period_data] +[blocks.period.fields.period_data] type = "list" optional = true -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.period_data.item] name = "output_record" type = "union" -[blocks.period.fields.stress_period_data.item.arms.saverecord] +[blocks.period.fields.period_data.item.arms.saverecord] type = "record" optional = true -[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.save] +[blocks.period.fields.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.stress_period_data.item.arms.saverecord.fields.rtype] +[blocks.period.fields.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.stress_period_data.item.arms.saverecord.fields.ocsetting] +[blocks.period.fields.period_data.item.arms.saverecord.fields.ocsetting] type = "union" description = "specifies the steps for which the data will be saved." -[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.all] +[blocks.period.fields.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.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.first] +[blocks.period.fields.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.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.last] +[blocks.period.fields.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.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.frequency] +[blocks.period.fields.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.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.steps] +[blocks.period.fields.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.stress_period_data.item.arms.printrecord] +[blocks.period.fields.period_data.item.arms.printrecord] type = "record" optional = true -[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.print] +[blocks.period.fields.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.stress_period_data.item.arms.printrecord.fields.rtype] +[blocks.period.fields.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.stress_period_data.item.arms.printrecord.fields.ocsetting] +[blocks.period.fields.period_data.item.arms.printrecord.fields.ocsetting] type = "union" description = "specifies the steps for which the data will be saved." -[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.all] +[blocks.period.fields.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.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.first] +[blocks.period.fields.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.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.last] +[blocks.period.fields.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.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.frequency] +[blocks.period.fields.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.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.steps] +[blocks.period.fields.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 7e5feea9..9aa2c859 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: - stress_period_data: + 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 1b00ccd4..cad17d5c 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": { - "stress_period_data": { + "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 4f1ffd02..793e9344 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.stress_period_data] +[blocks.period.fields.period_data] type = "list" -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.period_data.item] name = "reachperioddata" type = "record" -[blocks.period.fields.stress_period_data.item.fields.ifno] +[blocks.period.fields.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.stress_period_data.item.fields.reachsetting] +[blocks.period.fields.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.stress_period_data.item.fields.reachsetting.arms.status] +[blocks.period.fields.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.stress_period_data.item.fields.reachsetting.arms.concentration] +[blocks.period.fields.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.stress_period_data.item.fields.reachsetting.arms.rainfall] +[blocks.period.fields.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.stress_period_data.item.fields.reachsetting.arms.evaporation] +[blocks.period.fields.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.stress_period_data.item.fields.reachsetting.arms.runoff] +[blocks.period.fields.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.stress_period_data.item.fields.reachsetting.arms.inflow] +[blocks.period.fields.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.stress_period_data.item.fields.reachsetting.arms.auxiliaryrecord] +[blocks.period.fields.period_data.item.fields.reachsetting.arms.auxiliaryrecord] type = "record" -[blocks.period.fields.stress_period_data.item.fields.reachsetting.arms.auxiliaryrecord.fields.auxiliary] +[blocks.period.fields.period_data.item.fields.reachsetting.arms.auxiliaryrecord.fields.auxiliary] type = "keyword" description = "keyword for specifying auxiliary variable." -[blocks.period.fields.stress_period_data.item.fields.reachsetting.arms.auxiliaryrecord.fields.auxname] +[blocks.period.fields.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.stress_period_data.item.fields.reachsetting.arms.auxiliaryrecord.fields.auxval] +[blocks.period.fields.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 b50d864b..01661ae8 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: - stress_period_data: + period_data: type: list item: name: reachperioddata diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-src.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-src.json index 7d9203fe..5b14192c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-src.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-src.json @@ -114,7 +114,7 @@ }, "period": { "fields": { - "stress_period_data": { + "period_data": { "type": "list", "item": { "name": "stress_period_data", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-src.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-src.toml index e4bf767f..71322268 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-src.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-src.toml @@ -97,30 +97,30 @@ type = "integer" longname = "maximum number of sources" description = "integer value specifying the maximum number of sources cells that will be specified for use during any stress period." -[blocks.period.fields.stress_period_data] +[blocks.period.fields.period_data] type = "list" shape = [ "<=maxbound", ] -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.period_data.item] name = "stress_period_data" type = "record" -[blocks.period.fields.stress_period_data.item.fields.cellid] +[blocks.period.fields.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.stress_period_data.item.fields.smassrate] +[blocks.period.fields.period_data.item.fields.smassrate] type = "double" longname = "mass source loading rate" description = "is the mass source loading rate. A positive value indicates addition of solute mass and a negative value indicates removal of solute mass. 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.stress_period_data.item.fields.aux] +[blocks.period.fields.period_data.item.fields.aux] type = "array" longname = "auxiliary variables" description = "represents the values of the auxiliary variables for each mass source. The values of auxiliary variables must be present for each mass source. 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." @@ -132,7 +132,7 @@ shape = [ "auxiliary", ] -[blocks.period.fields.stress_period_data.item.fields.boundname] +[blocks.period.fields.period_data.item.fields.boundname] type = "string" longname = "well name" description = "name of the mass source cell. BOUNDNAME is an ASCII character variable that can contain as many as 40 characters. If BOUNDNAME contains spaces in it, then the entire name must be enclosed within single quotes." diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-src.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-src.yaml index b16d6838..354c1d74 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-src.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-src.yaml @@ -117,7 +117,7 @@ blocks: for use during any stress period. period: fields: - stress_period_data: + period_data: type: list item: name: stress_period_data 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 455b8aad..8f7a05fa 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": { - "stress_period_data": { + "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 f41b8661..3b7415f1 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.stress_period_data] +[blocks.period.fields.period_data] type = "list" -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.period_data.item] name = "uztperioddata" type = "record" -[blocks.period.fields.stress_period_data.item.fields.ifno] +[blocks.period.fields.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.stress_period_data.item.fields.uztsetting] +[blocks.period.fields.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.stress_period_data.item.fields.uztsetting.arms.status] +[blocks.period.fields.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.stress_period_data.item.fields.uztsetting.arms.concentration] +[blocks.period.fields.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.stress_period_data.item.fields.uztsetting.arms.infiltration] +[blocks.period.fields.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.stress_period_data.item.fields.uztsetting.arms.uzet] +[blocks.period.fields.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.stress_period_data.item.fields.uztsetting.arms.auxiliaryrecord] +[blocks.period.fields.period_data.item.fields.uztsetting.arms.auxiliaryrecord] type = "record" -[blocks.period.fields.stress_period_data.item.fields.uztsetting.arms.auxiliaryrecord.fields.auxiliary] +[blocks.period.fields.period_data.item.fields.uztsetting.arms.auxiliaryrecord.fields.auxiliary] type = "keyword" description = "keyword for specifying auxiliary variable." -[blocks.period.fields.stress_period_data.item.fields.uztsetting.arms.auxiliaryrecord.fields.auxname] +[blocks.period.fields.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.stress_period_data.item.fields.uztsetting.arms.auxiliaryrecord.fields.auxval] +[blocks.period.fields.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 1235d578..cd648c46 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: - stress_period_data: + period_data: type: list item: name: uztperioddata diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-cdb.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-cdb.json index 385da5c4..f7fb2f8c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-cdb.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-cdb.json @@ -79,7 +79,7 @@ }, "period": { "fields": { - "stress_period_data": { + "period_data": { "type": "list", "item": { "name": "stress_period_data", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-cdb.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-cdb.toml index c9271c85..09d56441 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-cdb.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-cdb.toml @@ -64,37 +64,37 @@ type = "integer" longname = "maximum number of critical depth boundaries" description = "integer value specifying the maximum number of critical depth boundary cells that will be specified for use during any stress period." -[blocks.period.fields.stress_period_data] +[blocks.period.fields.period_data] type = "list" shape = [ "<=maxbound", ] -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.period_data.item] name = "stress_period_data" type = "record" -[blocks.period.fields.stress_period_data.item.fields.cellid] +[blocks.period.fields.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.stress_period_data.item.fields.idcxs] +[blocks.period.fields.period_data.item.fields.idcxs] type = "integer" longname = "cross section identifier" description = "is the identifier for the cross section specified in the CXS Package. A value of zero indicates the zero-depth-gradient calculation will use parameters for a hydraulically wide channel." tagged = false index = true -[blocks.period.fields.stress_period_data.item.fields.width] +[blocks.period.fields.period_data.item.fields.width] type = "double" longname = "width of the zero-depth gradient boundary" description = "is the channel width of the zero-depth gradient boundary. If a cross section is associated with this boundary, the width will be scaled by the cross section information. 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.stress_period_data.item.fields.aux] +[blocks.period.fields.period_data.item.fields.aux] type = "array" longname = "auxiliary variables" description = "represents the values of the auxiliary variables for each zero-depth-gradient boundary. The values of auxiliary variables must be present for each zero-depth-gradient boundary. The values must be specified in the order of the auxiliary variables specified in the OPTIONS block. If the package supports time series and the Options block includes a TIMESERIESFILE entry (see the 'Time-Variable Input' section), values can be obtained from a time series by entering the time-series name in place of a numeric value." @@ -106,7 +106,7 @@ shape = [ "auxiliary", ] -[blocks.period.fields.stress_period_data.item.fields.boundname] +[blocks.period.fields.period_data.item.fields.boundname] type = "string" longname = "zero-depth-gradient boundary name" description = "name of the zero-depth-gradient boundary cell. BOUNDNAME is an ASCII character variable that can contain as many as 40 characters. If BOUNDNAME contains spaces in it, then the entire name must be enclosed within single quotes." diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-cdb.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-cdb.yaml index 141e7939..93da1f71 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-cdb.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-cdb.yaml @@ -77,7 +77,7 @@ blocks: will be specified for use during any stress period. period: fields: - stress_period_data: + period_data: type: list item: name: stress_period_data diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-chd.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-chd.json index 57b39ad5..00603abf 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-chd.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-chd.json @@ -108,7 +108,7 @@ }, "period": { "fields": { - "stress_period_data": { + "period_data": { "type": "list", "item": { "name": "stress_period_data", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-chd.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-chd.toml index 175555fa..57c5b01a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-chd.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-chd.toml @@ -91,30 +91,30 @@ type = "integer" longname = "maximum number of constant heads" description = "integer value specifying the maximum number of constant-head cells that will be specified for use during any stress period." -[blocks.period.fields.stress_period_data] +[blocks.period.fields.period_data] type = "list" shape = [ "<=maxbound", ] -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.period_data.item] name = "stress_period_data" type = "record" -[blocks.period.fields.stress_period_data.item.fields.cellid] +[blocks.period.fields.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.stress_period_data.item.fields.head] +[blocks.period.fields.period_data.item.fields.head] type = "double" longname = "head value assigned to constant head" description = "is the head at the boundary. 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.stress_period_data.item.fields.aux] +[blocks.period.fields.period_data.item.fields.aux] type = "array" longname = "auxiliary variables" description = "represents the values of the auxiliary variables for each constant head. The values of auxiliary variables must be present for each constant head. The values must be specified in the order of the auxiliary variables specified in the OPTIONS block. If the package supports time series and the Options block includes a TIMESERIESFILE entry (see the 'Time-Variable Input' section), values can be obtained from a time series by entering the time-series name in place of a numeric value." @@ -126,7 +126,7 @@ shape = [ "auxiliary", ] -[blocks.period.fields.stress_period_data.item.fields.boundname] +[blocks.period.fields.period_data.item.fields.boundname] type = "string" longname = "constant head boundary name" description = "name of the constant head boundary cell. BOUNDNAME is an ASCII character variable that can contain as many as 40 characters. If BOUNDNAME contains spaces in it, then the entire name must be enclosed within single quotes." diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-chd.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-chd.yaml index 1d890090..6ddb55b6 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-chd.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-chd.yaml @@ -102,7 +102,7 @@ blocks: for use during any stress period. period: fields: - stress_period_data: + period_data: type: list item: name: stress_period_data diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-evp.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-evp.json index 39e1b8f3..f0d13d04 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-evp.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-evp.json @@ -108,7 +108,7 @@ }, "period": { "fields": { - "stress_period_data": { + "period_data": { "type": "list", "item": { "name": "stress_period_data", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-evp.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-evp.toml index 855bda14..98778b4e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-evp.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-evp.toml @@ -91,30 +91,30 @@ type = "integer" longname = "maximum number of evaporation cells" description = "integer value specifying the maximum number of evaporation cells that will be specified for use during any stress period." -[blocks.period.fields.stress_period_data] +[blocks.period.fields.period_data] type = "list" shape = [ "<=maxbound", ] -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.period_data.item] name = "stress_period_data" type = "record" -[blocks.period.fields.stress_period_data.item.fields.cellid] +[blocks.period.fields.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.stress_period_data.item.fields.evaporation] +[blocks.period.fields.period_data.item.fields.evaporation] type = "double" longname = "evaporation rate" description = "is the evaporation flux rate ($LT^{-1}$). This rate is multiplied inside the program by the water surface area of the cell to calculate the volumetric evaporation rate. 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.stress_period_data.item.fields.aux] +[blocks.period.fields.period_data.item.fields.aux] type = "array" longname = "auxiliary variables" description = "represents the values of the auxiliary variables for each evaporation. The values of auxiliary variables must be present for each evaporation. 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." @@ -126,7 +126,7 @@ shape = [ "auxiliary", ] -[blocks.period.fields.stress_period_data.item.fields.boundname] +[blocks.period.fields.period_data.item.fields.boundname] type = "string" longname = "evaporation name" description = "name of the evaporation cell. BOUNDNAME is an ASCII character variable that can contain as many as 40 characters. If BOUNDNAME contains spaces in it, then the entire name must be enclosed within single quotes." diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-evp.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-evp.yaml index c7d30d01..973eb71a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-evp.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-evp.yaml @@ -102,7 +102,7 @@ blocks: for use during any stress period. period: fields: - stress_period_data: + period_data: type: list item: name: stress_period_data diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-flw.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-flw.json index 86d48efe..56074a3a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-flw.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-flw.json @@ -108,7 +108,7 @@ }, "period": { "fields": { - "stress_period_data": { + "period_data": { "type": "list", "item": { "name": "stress_period_data", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-flw.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-flw.toml index d2985055..271030da 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-flw.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-flw.toml @@ -91,30 +91,30 @@ type = "integer" longname = "maximum number of inflow" description = "integer value specifying the maximum number of inflow cells that will be specified for use during any stress period." -[blocks.period.fields.stress_period_data] +[blocks.period.fields.period_data] type = "list" shape = [ "<=maxbound", ] -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.period_data.item] name = "stress_period_data" type = "record" -[blocks.period.fields.stress_period_data.item.fields.cellid] +[blocks.period.fields.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.stress_period_data.item.fields.q] +[blocks.period.fields.period_data.item.fields.q] type = "double" longname = "flow rate" description = "is the volumetric inflow rate. A positive value indicates inflow to the stream. Negative values are not allowed. 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.stress_period_data.item.fields.aux] +[blocks.period.fields.period_data.item.fields.aux] type = "array" longname = "auxiliary variables" description = "represents the values of the auxiliary variables for each inflow. The values of auxiliary variables must be present for each inflow. 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." @@ -126,7 +126,7 @@ shape = [ "auxiliary", ] -[blocks.period.fields.stress_period_data.item.fields.boundname] +[blocks.period.fields.period_data.item.fields.boundname] type = "string" longname = "inflow name" description = "name of the inflow cell. BOUNDNAME is an ASCII character variable that can contain as many as 40 characters. If BOUNDNAME contains spaces in it, then the entire name must be enclosed within single quotes." diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-flw.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-flw.yaml index 67968cdd..820f7c6c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-flw.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-flw.yaml @@ -101,7 +101,7 @@ blocks: for use during any stress period. period: fields: - stress_period_data: + period_data: type: list item: name: stress_period_data 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 c860ebe4..f91c367a 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": { - "stress_period_data": { + "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 39288911..1ab2e0b6 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.stress_period_data] +[blocks.period.fields.period_data] type = "list" optional = true -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.period_data.item] name = "output_record" type = "union" -[blocks.period.fields.stress_period_data.item.arms.saverecord] +[blocks.period.fields.period_data.item.arms.saverecord] type = "record" optional = true -[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.save] +[blocks.period.fields.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.stress_period_data.item.arms.saverecord.fields.rtype] +[blocks.period.fields.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.stress_period_data.item.arms.saverecord.fields.ocsetting] +[blocks.period.fields.period_data.item.arms.saverecord.fields.ocsetting] type = "union" description = "specifies the steps for which the data will be saved." -[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.all] +[blocks.period.fields.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.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.first] +[blocks.period.fields.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.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.last] +[blocks.period.fields.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.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.frequency] +[blocks.period.fields.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.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.steps] +[blocks.period.fields.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.stress_period_data.item.arms.printrecord] +[blocks.period.fields.period_data.item.arms.printrecord] type = "record" optional = true -[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.print] +[blocks.period.fields.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.stress_period_data.item.arms.printrecord.fields.rtype] +[blocks.period.fields.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.stress_period_data.item.arms.printrecord.fields.ocsetting] +[blocks.period.fields.period_data.item.arms.printrecord.fields.ocsetting] type = "union" description = "specifies the steps for which the data will be saved." -[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.all] +[blocks.period.fields.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.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.first] +[blocks.period.fields.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.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.last] +[blocks.period.fields.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.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.frequency] +[blocks.period.fields.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.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.steps] +[blocks.period.fields.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 49f5859a..d13caaee 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: - stress_period_data: + period_data: type: list optional: true item: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-pcp.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-pcp.json index ca4fe789..f5178fcf 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-pcp.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-pcp.json @@ -108,7 +108,7 @@ }, "period": { "fields": { - "stress_period_data": { + "period_data": { "type": "list", "item": { "name": "stress_period_data", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-pcp.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-pcp.toml index 744ff228..3cb730e4 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-pcp.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-pcp.toml @@ -91,30 +91,30 @@ type = "integer" longname = "maximum number of precipitation cells" description = "integer value specifying the maximum number of precipitation cells that will be specified for use during any stress period." -[blocks.period.fields.stress_period_data] +[blocks.period.fields.period_data] type = "list" shape = [ "<=maxbound", ] -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.period_data.item] name = "stress_period_data" type = "record" -[blocks.period.fields.stress_period_data.item.fields.cellid] +[blocks.period.fields.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.stress_period_data.item.fields.precipitation] +[blocks.period.fields.period_data.item.fields.precipitation] type = "double" longname = "precipitation rate" description = "is the precipitation flux rate ($LT^{-1}$). This rate is multiplied inside the program by the surface area of the cell to calculate the volumetric precipitation rate. 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.stress_period_data.item.fields.aux] +[blocks.period.fields.period_data.item.fields.aux] type = "array" longname = "auxiliary variables" description = "represents the values of the auxiliary variables for each precipitation. The values of auxiliary variables must be present for each precipitation. 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." @@ -126,7 +126,7 @@ shape = [ "auxiliary", ] -[blocks.period.fields.stress_period_data.item.fields.boundname] +[blocks.period.fields.period_data.item.fields.boundname] type = "string" longname = "precipitation name" description = "name of the precipitation cell. BOUNDNAME is an ASCII character variable that can contain as many as 40 characters. If BOUNDNAME contains spaces in it, then the entire name must be enclosed within single quotes." diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-pcp.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-pcp.yaml index 16cc03e6..688598c0 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-pcp.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-pcp.yaml @@ -102,7 +102,7 @@ blocks: for use during any stress period. period: fields: - stress_period_data: + period_data: type: list item: name: stress_period_data diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-sto.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-sto.json index 0597f8af..86195e1f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-sto.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-sto.json @@ -23,7 +23,7 @@ }, "period": { "fields": { - "stress_period_data": { + "period_data": { "type": "string", "longname": "storage state", "description": "keyword to indicate that stress period IPER is steady-state. Steady-state conditions will apply until the TRANSIENT keyword is specified in a subsequent BEGIN PERIOD block.", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-sto.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-sto.toml index ef3dae98..4a72d773 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-sto.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-sto.toml @@ -16,7 +16,7 @@ longname = "export array variables to layered ascii files." description = "keyword that specifies input grid arrays, which already support the layered keyword, should be written to layered ascii output files." optional = true -[blocks.period.fields.stress_period_data] +[blocks.period.fields.period_data] type = "string" longname = "storage state" description = "keyword to indicate that stress period IPER is steady-state. Steady-state conditions will apply until the TRANSIENT keyword is specified in a subsequent BEGIN PERIOD block." diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-sto.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-sto.yaml index 33b4cce8..3d099aef 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-sto.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-sto.yaml @@ -20,7 +20,7 @@ blocks: optional: true period: fields: - stress_period_data: + period_data: type: string longname: storage state description: keyword to indicate that stress period IPER is steady-state. Steady-state conditions diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-zdg.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-zdg.json index f6f9eb6d..5d730740 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-zdg.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-zdg.json @@ -102,7 +102,7 @@ }, "period": { "fields": { - "stress_period_data": { + "period_data": { "type": "list", "item": { "name": "stress_period_data", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-zdg.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-zdg.toml index 4df04474..745c064c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-zdg.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-zdg.toml @@ -85,23 +85,23 @@ type = "integer" longname = "maximum number of zero-depth-gradient boundaries" description = "integer value specifying the maximum number of zero-depth-gradient boundary cells that will be specified for use during any stress period." -[blocks.period.fields.stress_period_data] +[blocks.period.fields.period_data] type = "list" shape = [ "<=maxbound", ] -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.period_data.item] name = "stress_period_data" type = "record" -[blocks.period.fields.stress_period_data.item.fields.cellid] +[blocks.period.fields.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.stress_period_data.item.fields.idcxs] +[blocks.period.fields.period_data.item.fields.idcxs] type = "integer" longname = "cross section identifier" description = "is the identifier for the cross section specified in the CXS Package. A value of zero indicates the zero-depth-gradient calculation will use parameters for a hydraulically wide channel." @@ -109,28 +109,28 @@ tagged = false index = true fk = "chf-cxs.packagedata.idcxs" -[blocks.period.fields.stress_period_data.item.fields.width] +[blocks.period.fields.period_data.item.fields.width] type = "double" longname = "width of the zero-depth gradient boundary" description = "is the channel width of the zero-depth gradient boundary. If a cross section is associated with this boundary, the width will be scaled by the cross section information. 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.stress_period_data.item.fields.slope] +[blocks.period.fields.period_data.item.fields.slope] type = "double" longname = "channel slope" description = "is the channel slope used to calculate flow to the zero-depth-gradient boundary. 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.stress_period_data.item.fields.rough] +[blocks.period.fields.period_data.item.fields.rough] type = "double" longname = "channel roughness" description = "is the Manning channel roughness value used to calculate flow to the zero-depth-gradient boundary. If a cross section is associated with this boundary, the roughness value will be multiplied by the roughness fraction for each part of the cross section. 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.stress_period_data.item.fields.aux] +[blocks.period.fields.period_data.item.fields.aux] type = "array" longname = "auxiliary variables" description = "represents the values of the auxiliary variables for each zero-depth-gradient boundary. The values of auxiliary variables must be present for each zero-depth-gradient boundary. The values must be specified in the order of the auxiliary variables specified in the OPTIONS block. If the package supports time series and the Options block includes a TIMESERIESFILE entry (see the 'Time-Variable Input' section), values can be obtained from a time series by entering the time-series name in place of a numeric value." @@ -142,7 +142,7 @@ shape = [ "auxiliary", ] -[blocks.period.fields.stress_period_data.item.fields.boundname] +[blocks.period.fields.period_data.item.fields.boundname] type = "string" longname = "zero-depth-gradient boundary name" description = "name of the zero-depth-gradient boundary cell. BOUNDNAME is an ASCII character variable that can contain as many as 40 characters. If BOUNDNAME contains spaces in it, then the entire name must be enclosed within single quotes." diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-zdg.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-zdg.yaml index 762a5e89..85a1e438 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-zdg.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-zdg.yaml @@ -97,7 +97,7 @@ blocks: that will be specified for use during any stress period. period: fields: - stress_period_data: + period_data: type: list item: name: stress_period_data 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 5ceba28c..91d30127 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": { - "stress_period_data": { + "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 dfe2a27f..d09c7b99 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.stress_period_data] +[blocks.period.fields.period_data] type = "list" optional = true -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.period_data.item] name = "output_record" type = "union" -[blocks.period.fields.stress_period_data.item.arms.saverecord] +[blocks.period.fields.period_data.item.arms.saverecord] type = "record" optional = true -[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.save] +[blocks.period.fields.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.stress_period_data.item.arms.saverecord.fields.rtype] +[blocks.period.fields.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.stress_period_data.item.arms.saverecord.fields.ocsetting] +[blocks.period.fields.period_data.item.arms.saverecord.fields.ocsetting] type = "union" description = "specifies the steps for which the data will be saved." -[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.all] +[blocks.period.fields.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.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.first] +[blocks.period.fields.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.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.last] +[blocks.period.fields.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.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.frequency] +[blocks.period.fields.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.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.steps] +[blocks.period.fields.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.stress_period_data.item.arms.printrecord] +[blocks.period.fields.period_data.item.arms.printrecord] type = "record" optional = true -[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.print] +[blocks.period.fields.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.stress_period_data.item.arms.printrecord.fields.rtype] +[blocks.period.fields.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.stress_period_data.item.arms.printrecord.fields.ocsetting] +[blocks.period.fields.period_data.item.arms.printrecord.fields.ocsetting] type = "union" description = "specifies the steps for which the data will be saved." -[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.all] +[blocks.period.fields.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.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.first] +[blocks.period.fields.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.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.last] +[blocks.period.fields.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.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.frequency] +[blocks.period.fields.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.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.steps] +[blocks.period.fields.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 1d4d155b..34a6f068 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: - stress_period_data: + 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 2d52117f..ef1400ee 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": { - "stress_period_data": { + "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 2091d030..525d7329 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.stress_period_data] +[blocks.period.fields.period_data] type = "list" -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.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.stress_period_data.item.arms.all] +[blocks.period.fields.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.stress_period_data.item.arms.first] +[blocks.period.fields.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.stress_period_data.item.arms.last] +[blocks.period.fields.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.stress_period_data.item.arms.frequency] +[blocks.period.fields.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.stress_period_data.item.arms.steps] +[blocks.period.fields.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.stress_period_data.item.arms.fraction] +[blocks.period.fields.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 01992425..884fb805 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: - stress_period_data: + period_data: type: list item: name: releasesetting diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-cdb.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-cdb.json index 3be991d5..f1e5c24c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-cdb.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-cdb.json @@ -79,7 +79,7 @@ }, "period": { "fields": { - "stress_period_data": { + "period_data": { "type": "list", "item": { "name": "stress_period_data", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-cdb.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-cdb.toml index 6af195a3..6a9a6113 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-cdb.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-cdb.toml @@ -64,37 +64,37 @@ type = "integer" longname = "maximum number of critical depth boundaries" description = "integer value specifying the maximum number of critical depth boundary cells that will be specified for use during any stress period." -[blocks.period.fields.stress_period_data] +[blocks.period.fields.period_data] type = "list" shape = [ "<=maxbound", ] -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.period_data.item] name = "stress_period_data" type = "record" -[blocks.period.fields.stress_period_data.item.fields.cellid] +[blocks.period.fields.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.stress_period_data.item.fields.idcxs] +[blocks.period.fields.period_data.item.fields.idcxs] type = "integer" longname = "cross section identifier" description = "is the identifier for the cross section specified in the CXS Package. A value of zero indicates the zero-depth-gradient calculation will use parameters for a hydraulically wide channel." tagged = false index = true -[blocks.period.fields.stress_period_data.item.fields.width] +[blocks.period.fields.period_data.item.fields.width] type = "double" longname = "width of the zero-depth gradient boundary" description = "is the channel width of the zero-depth gradient boundary. If a cross section is associated with this boundary, the width will be scaled by the cross section information. 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.stress_period_data.item.fields.aux] +[blocks.period.fields.period_data.item.fields.aux] type = "array" longname = "auxiliary variables" description = "represents the values of the auxiliary variables for each zero-depth-gradient boundary. The values of auxiliary variables must be present for each zero-depth-gradient boundary. The values must be specified in the order of the auxiliary variables specified in the OPTIONS block. If the package supports time series and the Options block includes a TIMESERIESFILE entry (see the 'Time-Variable Input' section), values can be obtained from a time series by entering the time-series name in place of a numeric value." @@ -106,7 +106,7 @@ shape = [ "auxiliary", ] -[blocks.period.fields.stress_period_data.item.fields.boundname] +[blocks.period.fields.period_data.item.fields.boundname] type = "string" longname = "zero-depth-gradient boundary name" description = "name of the zero-depth-gradient boundary cell. BOUNDNAME is an ASCII character variable that can contain as many as 40 characters. If BOUNDNAME contains spaces in it, then the entire name must be enclosed within single quotes." diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-cdb.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-cdb.yaml index 4d90ed80..cff67740 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-cdb.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-cdb.yaml @@ -78,7 +78,7 @@ blocks: will be specified for use during any stress period. period: fields: - stress_period_data: + period_data: type: list item: name: stress_period_data diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-chd.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-chd.json index 78db4f1a..22768d57 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-chd.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-chd.json @@ -108,7 +108,7 @@ }, "period": { "fields": { - "stress_period_data": { + "period_data": { "type": "list", "item": { "name": "stress_period_data", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-chd.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-chd.toml index eb6cb968..7868754d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-chd.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-chd.toml @@ -91,30 +91,30 @@ type = "integer" longname = "maximum number of constant heads" description = "integer value specifying the maximum number of constant-head cells that will be specified for use during any stress period." -[blocks.period.fields.stress_period_data] +[blocks.period.fields.period_data] type = "list" shape = [ "<=maxbound", ] -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.period_data.item] name = "stress_period_data" type = "record" -[blocks.period.fields.stress_period_data.item.fields.cellid] +[blocks.period.fields.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.stress_period_data.item.fields.head] +[blocks.period.fields.period_data.item.fields.head] type = "double" longname = "head value assigned to constant head" description = "is the head at the boundary. 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.stress_period_data.item.fields.aux] +[blocks.period.fields.period_data.item.fields.aux] type = "array" longname = "auxiliary variables" description = "represents the values of the auxiliary variables for each constant head. The values of auxiliary variables must be present for each constant head. The values must be specified in the order of the auxiliary variables specified in the OPTIONS block. If the package supports time series and the Options block includes a TIMESERIESFILE entry (see the 'Time-Variable Input' section), values can be obtained from a time series by entering the time-series name in place of a numeric value." @@ -126,7 +126,7 @@ shape = [ "auxiliary", ] -[blocks.period.fields.stress_period_data.item.fields.boundname] +[blocks.period.fields.period_data.item.fields.boundname] type = "string" longname = "constant head boundary name" description = "name of the constant head boundary cell. BOUNDNAME is an ASCII character variable that can contain as many as 40 characters. If BOUNDNAME contains spaces in it, then the entire name must be enclosed within single quotes." diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-chd.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-chd.yaml index 01557c55..2cb9e9c4 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-chd.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-chd.yaml @@ -102,7 +102,7 @@ blocks: for use during any stress period. period: fields: - stress_period_data: + period_data: type: list item: name: stress_period_data diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-evp.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-evp.json index 640c7cc6..1e5120ff 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-evp.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-evp.json @@ -108,7 +108,7 @@ }, "period": { "fields": { - "stress_period_data": { + "period_data": { "type": "list", "item": { "name": "stress_period_data", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-evp.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-evp.toml index d7452715..27ea956e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-evp.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-evp.toml @@ -91,30 +91,30 @@ type = "integer" longname = "maximum number of evaporation cells" description = "integer value specifying the maximum number of evaporation cells that will be specified for use during any stress period." -[blocks.period.fields.stress_period_data] +[blocks.period.fields.period_data] type = "list" shape = [ "<=maxbound", ] -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.period_data.item] name = "stress_period_data" type = "record" -[blocks.period.fields.stress_period_data.item.fields.cellid] +[blocks.period.fields.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.stress_period_data.item.fields.evaporation] +[blocks.period.fields.period_data.item.fields.evaporation] type = "double" longname = "evaporation rate" description = "is the evaporation flux rate ($LT^{-1}$). This rate is multiplied inside the program by the water surface area of the cell to calculate the volumetric evaporation rate. 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.stress_period_data.item.fields.aux] +[blocks.period.fields.period_data.item.fields.aux] type = "array" longname = "auxiliary variables" description = "represents the values of the auxiliary variables for each evaporation. The values of auxiliary variables must be present for each evaporation. 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." @@ -126,7 +126,7 @@ shape = [ "auxiliary", ] -[blocks.period.fields.stress_period_data.item.fields.boundname] +[blocks.period.fields.period_data.item.fields.boundname] type = "string" longname = "evaporation name" description = "name of the evaporation cell. BOUNDNAME is an ASCII character variable that can contain as many as 40 characters. If BOUNDNAME contains spaces in it, then the entire name must be enclosed within single quotes." diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-evp.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-evp.yaml index 4b6fb970..ee4fc457 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-evp.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-evp.yaml @@ -102,7 +102,7 @@ blocks: for use during any stress period. period: fields: - stress_period_data: + period_data: type: list item: name: stress_period_data diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-flw.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-flw.json index 0e9baa43..58132ba3 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-flw.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-flw.json @@ -108,7 +108,7 @@ }, "period": { "fields": { - "stress_period_data": { + "period_data": { "type": "list", "item": { "name": "stress_period_data", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-flw.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-flw.toml index 0097a72e..1338a112 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-flw.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-flw.toml @@ -91,30 +91,30 @@ type = "integer" longname = "maximum number of inflow" description = "integer value specifying the maximum number of inflow cells that will be specified for use during any stress period." -[blocks.period.fields.stress_period_data] +[blocks.period.fields.period_data] type = "list" shape = [ "<=maxbound", ] -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.period_data.item] name = "stress_period_data" type = "record" -[blocks.period.fields.stress_period_data.item.fields.cellid] +[blocks.period.fields.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.stress_period_data.item.fields.q] +[blocks.period.fields.period_data.item.fields.q] type = "double" longname = "well rate" description = "is the volumetric inflow rate. A positive value indicates inflow to the stream. Negative values are not allows. 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.stress_period_data.item.fields.aux] +[blocks.period.fields.period_data.item.fields.aux] type = "array" longname = "auxiliary variables" description = "represents the values of the auxiliary variables for each inflow. The values of auxiliary variables must be present for each inflow. 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." @@ -126,7 +126,7 @@ shape = [ "auxiliary", ] -[blocks.period.fields.stress_period_data.item.fields.boundname] +[blocks.period.fields.period_data.item.fields.boundname] type = "string" longname = "inflow name" description = "name of the inflow cell. BOUNDNAME is an ASCII character variable that can contain as many as 40 characters. If BOUNDNAME contains spaces in it, then the entire name must be enclosed within single quotes." diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-flw.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-flw.yaml index 4f414945..3a1cec4f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-flw.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-flw.yaml @@ -101,7 +101,7 @@ blocks: for use during any stress period. period: fields: - stress_period_data: + period_data: type: list item: name: stress_period_data 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 014a64b4..b63972bb 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": { - "stress_period_data": { + "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 fa5d623d..c5db28d0 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.stress_period_data] +[blocks.period.fields.period_data] type = "list" optional = true -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.period_data.item] name = "output_record" type = "union" -[blocks.period.fields.stress_period_data.item.arms.saverecord] +[blocks.period.fields.period_data.item.arms.saverecord] type = "record" optional = true -[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.save] +[blocks.period.fields.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.stress_period_data.item.arms.saverecord.fields.rtype] +[blocks.period.fields.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.stress_period_data.item.arms.saverecord.fields.ocsetting] +[blocks.period.fields.period_data.item.arms.saverecord.fields.ocsetting] type = "union" description = "specifies the steps for which the data will be saved." -[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.all] +[blocks.period.fields.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.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.first] +[blocks.period.fields.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.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.last] +[blocks.period.fields.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.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.frequency] +[blocks.period.fields.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.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.steps] +[blocks.period.fields.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.stress_period_data.item.arms.printrecord] +[blocks.period.fields.period_data.item.arms.printrecord] type = "record" optional = true -[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.print] +[blocks.period.fields.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.stress_period_data.item.arms.printrecord.fields.rtype] +[blocks.period.fields.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.stress_period_data.item.arms.printrecord.fields.ocsetting] +[blocks.period.fields.period_data.item.arms.printrecord.fields.ocsetting] type = "union" description = "specifies the steps for which the data will be saved." -[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.all] +[blocks.period.fields.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.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.first] +[blocks.period.fields.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.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.last] +[blocks.period.fields.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.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.frequency] +[blocks.period.fields.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.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.steps] +[blocks.period.fields.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 2d73870e..70a18297 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: - stress_period_data: + period_data: type: list optional: true item: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-pcp.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-pcp.json index 90c2f7e1..a8cfd846 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-pcp.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-pcp.json @@ -108,7 +108,7 @@ }, "period": { "fields": { - "stress_period_data": { + "period_data": { "type": "list", "item": { "name": "stress_period_data", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-pcp.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-pcp.toml index 7230c709..fc2e0db1 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-pcp.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-pcp.toml @@ -91,30 +91,30 @@ type = "integer" longname = "maximum number of precipitation cells" description = "integer value specifying the maximum number of precipitation cells that will be specified for use during any stress period." -[blocks.period.fields.stress_period_data] +[blocks.period.fields.period_data] type = "list" shape = [ "<=maxbound", ] -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.period_data.item] name = "stress_period_data" type = "record" -[blocks.period.fields.stress_period_data.item.fields.cellid] +[blocks.period.fields.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.stress_period_data.item.fields.precipitation] +[blocks.period.fields.period_data.item.fields.precipitation] type = "double" longname = "precipitation rate" description = "is the precipitation flux rate ($LT^{-1}$). This rate is multiplied inside the program by the surface area of the cell to calculate the volumetric precipitation rate. 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.stress_period_data.item.fields.aux] +[blocks.period.fields.period_data.item.fields.aux] type = "array" longname = "auxiliary variables" description = "represents the values of the auxiliary variables for each precipitation. The values of auxiliary variables must be present for each precipitation. 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." @@ -126,7 +126,7 @@ shape = [ "auxiliary", ] -[blocks.period.fields.stress_period_data.item.fields.boundname] +[blocks.period.fields.period_data.item.fields.boundname] type = "string" longname = "precipitation name" description = "name of the precipitation cell. BOUNDNAME is an ASCII character variable that can contain as many as 40 characters. If BOUNDNAME contains spaces in it, then the entire name must be enclosed within single quotes." diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-pcp.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-pcp.yaml index 6aa9d3dd..9615f370 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-pcp.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-pcp.yaml @@ -102,7 +102,7 @@ blocks: for use during any stress period. period: fields: - stress_period_data: + period_data: type: list item: name: stress_period_data diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-sto.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-sto.json index 040d21df..aa6a5c36 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-sto.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-sto.json @@ -23,7 +23,7 @@ }, "period": { "fields": { - "stress_period_data": { + "period_data": { "type": "string", "longname": "storage state", "description": "keyword to indicate that stress period IPER is steady-state. Steady-state conditions will apply until the TRANSIENT keyword is specified in a subsequent BEGIN PERIOD block.", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-sto.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-sto.toml index 0217f00c..35d7b4af 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-sto.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-sto.toml @@ -16,7 +16,7 @@ longname = "export array variables to layered ascii files." description = "keyword that specifies input grid arrays, which already support the layered keyword, should be written to layered ascii output files." optional = true -[blocks.period.fields.stress_period_data] +[blocks.period.fields.period_data] type = "string" longname = "storage state" description = "keyword to indicate that stress period IPER is steady-state. Steady-state conditions will apply until the TRANSIENT keyword is specified in a subsequent BEGIN PERIOD block." diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-sto.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-sto.yaml index 758b0f5e..8166086e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-sto.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-sto.yaml @@ -20,7 +20,7 @@ blocks: optional: true period: fields: - stress_period_data: + period_data: type: string longname: storage state description: keyword to indicate that stress period IPER is steady-state. Steady-state conditions diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-zdg.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-zdg.json index 83aaf1f5..c6663438 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-zdg.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-zdg.json @@ -102,7 +102,7 @@ }, "period": { "fields": { - "stress_period_data": { + "period_data": { "type": "list", "item": { "name": "stress_period_data", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-zdg.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-zdg.toml index c36342ac..49721102 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-zdg.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-zdg.toml @@ -85,51 +85,51 @@ type = "integer" longname = "maximum number of zero-depth-gradient boundaries" description = "integer value specifying the maximum number of zero-depth-gradient boundary cells that will be specified for use during any stress period." -[blocks.period.fields.stress_period_data] +[blocks.period.fields.period_data] type = "list" shape = [ "<=maxbound", ] -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.period_data.item] name = "stress_period_data" type = "record" -[blocks.period.fields.stress_period_data.item.fields.cellid] +[blocks.period.fields.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.stress_period_data.item.fields.idcxs] +[blocks.period.fields.period_data.item.fields.idcxs] type = "integer" longname = "cross section identifier" description = "is the identifier for the cross section specified in the CXS Package. A value of zero indicates the zero-depth-gradient calculation will use parameters for a hydraulically wide channel." tagged = false index = true -[blocks.period.fields.stress_period_data.item.fields.width] +[blocks.period.fields.period_data.item.fields.width] type = "double" longname = "width of the zero-depth gradient boundary" description = "is the channel width of the zero-depth gradient boundary. If a cross section is associated with this boundary, the width will be scaled by the cross section information. 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.stress_period_data.item.fields.slope] +[blocks.period.fields.period_data.item.fields.slope] type = "double" longname = "channel slope" description = "is the channel slope used to calculate flow to the zero-depth-gradient boundary. 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.stress_period_data.item.fields.rough] +[blocks.period.fields.period_data.item.fields.rough] type = "double" longname = "channel roughness" description = "is the Manning channel roughness value used to calculate flow to the zero-depth-gradient boundary. If a cross section is associated with this boundary, the roughness value will be multiplied by the roughness fraction for each part of the cross section. 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.stress_period_data.item.fields.aux] +[blocks.period.fields.period_data.item.fields.aux] type = "array" longname = "auxiliary variables" description = "represents the values of the auxiliary variables for each zero-depth-gradient boundary. The values of auxiliary variables must be present for each zero-depth-gradient boundary. The values must be specified in the order of the auxiliary variables specified in the OPTIONS block. If the package supports time series and the Options block includes a TIMESERIESFILE entry (see the 'Time-Variable Input' section), values can be obtained from a time series by entering the time-series name in place of a numeric value." @@ -141,7 +141,7 @@ shape = [ "auxiliary", ] -[blocks.period.fields.stress_period_data.item.fields.boundname] +[blocks.period.fields.period_data.item.fields.boundname] type = "string" longname = "zero-depth-gradient boundary name" description = "name of the zero-depth-gradient boundary cell. BOUNDNAME is an ASCII character variable that can contain as many as 40 characters. If BOUNDNAME contains spaces in it, then the entire name must be enclosed within single quotes." diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-zdg.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-zdg.yaml index af638e52..53cf2678 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-zdg.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-zdg.yaml @@ -98,7 +98,7 @@ blocks: that will be specified for use during any stress period. period: fields: - stress_period_data: + period_data: type: list item: name: stress_period_data 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 1b1418f3..c909d0f9 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": { - "stress_period_data": { + "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 a7498623..70fd328f 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.stress_period_data] +[blocks.period.fields.period_data] type = "list" shape = [ "<=maxbound", ] -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.period_data.item] name = "perioddata" type = "record" -[blocks.period.fields.stress_period_data.item.fields.bndno] +[blocks.period.fields.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,21 +62,21 @@ tagged = false index = true pk = true -[blocks.period.fields.stress_period_data.item.fields.bndno.fk] +[blocks.period.fields.period_data.item.fields.bndno.fk] key = "bound" rule = "ssm_package" -[blocks.period.fields.stress_period_data.item.fields.spcsetting] +[blocks.period.fields.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.stress_period_data.item.fields.spcsetting.arms.concentration] +[blocks.period.fields.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.stress_period_data.item.fields.spcsetting.arms.temperature] +[blocks.period.fields.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 f14e6fac..eb6d0c0d 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: - stress_period_data: + 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 71ab6244..8a3d6576 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": { - "stress_period_data": { + "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 b6ce6788..e622a8b9 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.stress_period_data] +[blocks.period.fields.period_data] type = "list" -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.period_data.item] name = "perioddata" type = "record" -[blocks.period.fields.stress_period_data.item.fields.cellid] +[blocks.period.fields.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.stress_period_data.item.fields.tvksetting] +[blocks.period.fields.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.stress_period_data.item.fields.tvksetting.arms.k] +[blocks.period.fields.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.stress_period_data.item.fields.tvksetting.arms.k22] +[blocks.period.fields.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.stress_period_data.item.fields.tvksetting.arms.k33] +[blocks.period.fields.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 2e3ef606..8330017d 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: - stress_period_data: + 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 976d96e9..e77d6654 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": { - "stress_period_data": { + "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 dd4669e1..8b0e65be 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.stress_period_data] +[blocks.period.fields.period_data] type = "list" -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.period_data.item] name = "perioddata" type = "record" -[blocks.period.fields.stress_period_data.item.fields.cellid] +[blocks.period.fields.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.stress_period_data.item.fields.tvssetting] +[blocks.period.fields.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.stress_period_data.item.fields.tvssetting.arms.ss] +[blocks.period.fields.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.stress_period_data.item.fields.tvssetting.arms.sy] +[blocks.period.fields.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 184729e4..a2f33265 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: - stress_period_data: + period_data: type: list item: name: perioddata diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-cdb.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-cdb.json index 8424c2b3..37fcc991 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-cdb.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-cdb.json @@ -90,7 +90,7 @@ }, "period": { "fields": { - "stress_period_data": { + "period_data": { "type": "list", "item": { "name": "stress_period_data", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-cdb.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-cdb.toml index f0e1dc2a..86b0661d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-cdb.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-cdb.toml @@ -73,23 +73,23 @@ type = "integer" longname = "maximum number of critical depth boundaries" description = "integer value specifying the maximum number of critical depth boundary cells that will be specified for use during any stress period." -[blocks.period.fields.stress_period_data] +[blocks.period.fields.period_data] type = "list" shape = [ "<=maxbound", ] -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.period_data.item] name = "stress_period_data" type = "record" -[blocks.period.fields.stress_period_data.item.fields.cellid] +[blocks.period.fields.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.stress_period_data.item.fields.idcxs] +[blocks.period.fields.period_data.item.fields.idcxs] type = "integer" longname = "cross section identifier" description = "is the identifier for the cross section specified in the CXS Package. A value of zero indicates the zero-depth-gradient calculation will use parameters for a hydraulically wide channel." @@ -97,14 +97,14 @@ tagged = false index = true fk = "chf-cxs.packagedata.idcxs" -[blocks.period.fields.stress_period_data.item.fields.width] +[blocks.period.fields.period_data.item.fields.width] type = "double" longname = "width of the zero-depth gradient boundary" description = "is the channel width of the zero-depth gradient boundary. If a cross section is associated with this boundary, the width will be scaled by the cross section information. 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.stress_period_data.item.fields.aux] +[blocks.period.fields.period_data.item.fields.aux] type = "array" longname = "auxiliary variables" description = "represents the values of the auxiliary variables for each zero-depth-gradient boundary. The values of auxiliary variables must be present for each zero-depth-gradient boundary. The values must be specified in the order of the auxiliary variables specified in the OPTIONS block. If the package supports time series and the Options block includes a TIMESERIESFILE entry (see the 'Time-Variable Input' section), values can be obtained from a time series by entering the time-series name in place of a numeric value." @@ -116,7 +116,7 @@ shape = [ "auxiliary", ] -[blocks.period.fields.stress_period_data.item.fields.boundname] +[blocks.period.fields.period_data.item.fields.boundname] type = "string" longname = "zero-depth-gradient boundary name" description = "name of the zero-depth-gradient boundary cell. BOUNDNAME is an ASCII character variable that can contain as many as 40 characters. If BOUNDNAME contains spaces in it, then the entire name must be enclosed within single quotes." diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-cdb.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-cdb.yaml index a8609642..a0ef7dc6 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-cdb.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-cdb.yaml @@ -84,7 +84,7 @@ blocks: will be specified for use during any stress period. period: fields: - stress_period_data: + period_data: type: list item: name: stress_period_data diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-chd.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-chd.json index 92cad0dd..05ce6b1e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-chd.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-chd.json @@ -119,7 +119,7 @@ }, "period": { "fields": { - "stress_period_data": { + "period_data": { "type": "list", "item": { "name": "stress_period_data", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-chd.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-chd.toml index 3acf8238..8a7eaf40 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-chd.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-chd.toml @@ -100,30 +100,30 @@ type = "integer" longname = "maximum number of constant heads" description = "integer value specifying the maximum number of constant-head cells that will be specified for use during any stress period." -[blocks.period.fields.stress_period_data] +[blocks.period.fields.period_data] type = "list" shape = [ "<=maxbound", ] -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.period_data.item] name = "stress_period_data" type = "record" -[blocks.period.fields.stress_period_data.item.fields.cellid] +[blocks.period.fields.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.stress_period_data.item.fields.head] +[blocks.period.fields.period_data.item.fields.head] type = "double" longname = "head value assigned to constant head" description = "is the head at the boundary. 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.stress_period_data.item.fields.aux] +[blocks.period.fields.period_data.item.fields.aux] type = "array" longname = "auxiliary variables" description = "represents the values of the auxiliary variables for each constant head. The values of auxiliary variables must be present for each constant head. The values must be specified in the order of the auxiliary variables specified in the OPTIONS block. If the package supports time series and the Options block includes a TIMESERIESFILE entry (see the 'Time-Variable Input' section), values can be obtained from a time series by entering the time-series name in place of a numeric value." @@ -135,7 +135,7 @@ shape = [ "auxiliary", ] -[blocks.period.fields.stress_period_data.item.fields.boundname] +[blocks.period.fields.period_data.item.fields.boundname] type = "string" longname = "constant head boundary name" description = "name of the constant head boundary cell. BOUNDNAME is an ASCII character variable that can contain as many as 40 characters. If BOUNDNAME contains spaces in it, then the entire name must be enclosed within single quotes." diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-chd.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-chd.yaml index f480b8fc..457a3425 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-chd.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-chd.yaml @@ -109,7 +109,7 @@ blocks: for use during any stress period. period: fields: - stress_period_data: + period_data: type: list item: name: stress_period_data diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-evp.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-evp.json index 7297b9df..d6e718a7 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-evp.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-evp.json @@ -119,7 +119,7 @@ }, "period": { "fields": { - "stress_period_data": { + "period_data": { "type": "list", "item": { "name": "stress_period_data", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-evp.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-evp.toml index 419888bd..8e6f3d7c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-evp.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-evp.toml @@ -100,30 +100,30 @@ type = "integer" longname = "maximum number of evaporation cells" description = "integer value specifying the maximum number of evaporation cells that will be specified for use during any stress period." -[blocks.period.fields.stress_period_data] +[blocks.period.fields.period_data] type = "list" shape = [ "<=maxbound", ] -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.period_data.item] name = "stress_period_data" type = "record" -[blocks.period.fields.stress_period_data.item.fields.cellid] +[blocks.period.fields.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.stress_period_data.item.fields.evaporation] +[blocks.period.fields.period_data.item.fields.evaporation] type = "double" longname = "evaporation rate" description = "is the evaporation flux rate ($LT^{-1}$). This rate is multiplied inside the program by the water surface area of the cell to calculate the volumetric evaporation rate. 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.stress_period_data.item.fields.aux] +[blocks.period.fields.period_data.item.fields.aux] type = "array" longname = "auxiliary variables" description = "represents the values of the auxiliary variables for each evaporation. The values of auxiliary variables must be present for each evaporation. 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." @@ -135,7 +135,7 @@ shape = [ "auxiliary", ] -[blocks.period.fields.stress_period_data.item.fields.boundname] +[blocks.period.fields.period_data.item.fields.boundname] type = "string" longname = "evaporation name" description = "name of the evaporation cell. BOUNDNAME is an ASCII character variable that can contain as many as 40 characters. If BOUNDNAME contains spaces in it, then the entire name must be enclosed within single quotes." diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-evp.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-evp.yaml index 00202b00..368c32ff 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-evp.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-evp.yaml @@ -109,7 +109,7 @@ blocks: for use during any stress period. period: fields: - stress_period_data: + period_data: type: list item: name: stress_period_data diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-flw.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-flw.json index b358042f..d281385f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-flw.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-flw.json @@ -119,7 +119,7 @@ }, "period": { "fields": { - "stress_period_data": { + "period_data": { "type": "list", "item": { "name": "stress_period_data", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-flw.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-flw.toml index afca2b69..69f16406 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-flw.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-flw.toml @@ -100,30 +100,30 @@ type = "integer" longname = "maximum number of inflow" description = "integer value specifying the maximum number of inflow cells that will be specified for use during any stress period." -[blocks.period.fields.stress_period_data] +[blocks.period.fields.period_data] type = "list" shape = [ "<=maxbound", ] -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.period_data.item] name = "stress_period_data" type = "record" -[blocks.period.fields.stress_period_data.item.fields.cellid] +[blocks.period.fields.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.stress_period_data.item.fields.q] +[blocks.period.fields.period_data.item.fields.q] type = "double" longname = "well rate" description = "is the volumetric inflow rate. A positive value indicates inflow to the stream. Negative values are not allows. 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.stress_period_data.item.fields.aux] +[blocks.period.fields.period_data.item.fields.aux] type = "array" longname = "auxiliary variables" description = "represents the values of the auxiliary variables for each inflow. The values of auxiliary variables must be present for each inflow. 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." @@ -135,7 +135,7 @@ shape = [ "auxiliary", ] -[blocks.period.fields.stress_period_data.item.fields.boundname] +[blocks.period.fields.period_data.item.fields.boundname] type = "string" longname = "inflow name" description = "name of the inflow cell. BOUNDNAME is an ASCII character variable that can contain as many as 40 characters. If BOUNDNAME contains spaces in it, then the entire name must be enclosed within single quotes." diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-flw.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-flw.yaml index 6194ca3c..df1d42ba 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-flw.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-flw.yaml @@ -108,7 +108,7 @@ blocks: for use during any stress period. period: fields: - stress_period_data: + period_data: type: list item: name: stress_period_data 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 3a935ef8..c80fe0f7 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": { - "stress_period_data": { + "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 945c291c..864006bb 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.stress_period_data] +[blocks.period.fields.period_data] type = "list" optional = true -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.period_data.item] name = "output_record" type = "union" -[blocks.period.fields.stress_period_data.item.arms.saverecord] +[blocks.period.fields.period_data.item.arms.saverecord] type = "record" optional = true -[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.save] +[blocks.period.fields.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.stress_period_data.item.arms.saverecord.fields.rtype] +[blocks.period.fields.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.stress_period_data.item.arms.saverecord.fields.ocsetting] +[blocks.period.fields.period_data.item.arms.saverecord.fields.ocsetting] type = "union" description = "specifies the steps for which the data will be saved." -[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.all] +[blocks.period.fields.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.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.first] +[blocks.period.fields.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.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.last] +[blocks.period.fields.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.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.frequency] +[blocks.period.fields.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.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.steps] +[blocks.period.fields.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.stress_period_data.item.arms.printrecord] +[blocks.period.fields.period_data.item.arms.printrecord] type = "record" optional = true -[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.print] +[blocks.period.fields.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.stress_period_data.item.arms.printrecord.fields.rtype] +[blocks.period.fields.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.stress_period_data.item.arms.printrecord.fields.ocsetting] +[blocks.period.fields.period_data.item.arms.printrecord.fields.ocsetting] type = "union" description = "specifies the steps for which the data will be saved." -[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.all] +[blocks.period.fields.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.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.first] +[blocks.period.fields.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.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.last] +[blocks.period.fields.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.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.frequency] +[blocks.period.fields.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.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.steps] +[blocks.period.fields.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 30319875..26182dca 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: - stress_period_data: + period_data: type: list optional: true item: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-pcp.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-pcp.json index 1d319fdc..7dcff075 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-pcp.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-pcp.json @@ -119,7 +119,7 @@ }, "period": { "fields": { - "stress_period_data": { + "period_data": { "type": "list", "item": { "name": "stress_period_data", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-pcp.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-pcp.toml index 280b4b41..d76c0398 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-pcp.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-pcp.toml @@ -100,30 +100,30 @@ type = "integer" longname = "maximum number of precipitation cells" description = "integer value specifying the maximum number of precipitation cells that will be specified for use during any stress period." -[blocks.period.fields.stress_period_data] +[blocks.period.fields.period_data] type = "list" shape = [ "<=maxbound", ] -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.period_data.item] name = "stress_period_data" type = "record" -[blocks.period.fields.stress_period_data.item.fields.cellid] +[blocks.period.fields.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.stress_period_data.item.fields.precipitation] +[blocks.period.fields.period_data.item.fields.precipitation] type = "double" longname = "precipitation rate" description = "is the precipitation flux rate ($LT^{-1}$). This rate is multiplied inside the program by the surface area of the cell to calculate the volumetric precipitation rate. 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.stress_period_data.item.fields.aux] +[blocks.period.fields.period_data.item.fields.aux] type = "array" longname = "auxiliary variables" description = "represents the values of the auxiliary variables for each precipitation. The values of auxiliary variables must be present for each precipitation. 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." @@ -135,7 +135,7 @@ shape = [ "auxiliary", ] -[blocks.period.fields.stress_period_data.item.fields.boundname] +[blocks.period.fields.period_data.item.fields.boundname] type = "string" longname = "precipitation name" description = "name of the precipitation cell. BOUNDNAME is an ASCII character variable that can contain as many as 40 characters. If BOUNDNAME contains spaces in it, then the entire name must be enclosed within single quotes." diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-pcp.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-pcp.yaml index da493079..885722cd 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-pcp.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-pcp.yaml @@ -109,7 +109,7 @@ blocks: for use during any stress period. period: fields: - stress_period_data: + period_data: type: list item: name: stress_period_data diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-sto.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-sto.json index 3be181ac..b19037df 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-sto.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-sto.json @@ -23,7 +23,7 @@ }, "period": { "fields": { - "stress_period_data": { + "period_data": { "type": "string", "longname": "storage state", "description": "keyword to indicate that stress period IPER is steady-state. Steady-state conditions will apply until the TRANSIENT keyword is specified in a subsequent BEGIN PERIOD block.", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-sto.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-sto.toml index 4cf4b217..6671f1f4 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-sto.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-sto.toml @@ -16,7 +16,7 @@ longname = "export array variables to layered ascii files." description = "keyword that specifies input grid arrays, which already support the layered keyword, should be written to layered ascii output files." optional = true -[blocks.period.fields.stress_period_data] +[blocks.period.fields.period_data] type = "string" longname = "storage state" description = "keyword to indicate that stress period IPER is steady-state. Steady-state conditions will apply until the TRANSIENT keyword is specified in a subsequent BEGIN PERIOD block." diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-sto.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-sto.yaml index af7fcae9..21c0cb55 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-sto.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-sto.yaml @@ -20,7 +20,7 @@ blocks: optional: true period: fields: - stress_period_data: + period_data: type: string longname: storage state description: keyword to indicate that stress period IPER is steady-state. Steady-state conditions diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-zdg.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-zdg.json index c2370ae4..ec08d0c7 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-zdg.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-zdg.json @@ -113,7 +113,7 @@ }, "period": { "fields": { - "stress_period_data": { + "period_data": { "type": "list", "item": { "name": "stress_period_data", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-zdg.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-zdg.toml index c1723ca4..1e2cb77a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-zdg.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-zdg.toml @@ -94,23 +94,23 @@ type = "integer" longname = "maximum number of zero-depth-gradient boundaries" description = "integer value specifying the maximum number of zero-depth-gradient boundary cells that will be specified for use during any stress period." -[blocks.period.fields.stress_period_data] +[blocks.period.fields.period_data] type = "list" shape = [ "<=maxbound", ] -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.period_data.item] name = "stress_period_data" type = "record" -[blocks.period.fields.stress_period_data.item.fields.cellid] +[blocks.period.fields.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.stress_period_data.item.fields.idcxs] +[blocks.period.fields.period_data.item.fields.idcxs] type = "integer" longname = "cross section identifier" description = "is the identifier for the cross section specified in the CXS Package. A value of zero indicates the zero-depth-gradient calculation will use parameters for a hydraulically wide channel." @@ -118,28 +118,28 @@ tagged = false index = true fk = "chf-cxs.packagedata.idcxs" -[blocks.period.fields.stress_period_data.item.fields.width] +[blocks.period.fields.period_data.item.fields.width] type = "double" longname = "width of the zero-depth gradient boundary" description = "is the channel width of the zero-depth gradient boundary. If a cross section is associated with this boundary, the width will be scaled by the cross section information. 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.stress_period_data.item.fields.slope] +[blocks.period.fields.period_data.item.fields.slope] type = "double" longname = "channel slope" description = "is the channel slope used to calculate flow to the zero-depth-gradient boundary. 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.stress_period_data.item.fields.rough] +[blocks.period.fields.period_data.item.fields.rough] type = "double" longname = "channel roughness" description = "is the Manning channel roughness value used to calculate flow to the zero-depth-gradient boundary. If a cross section is associated with this boundary, the roughness value will be multiplied by the roughness fraction for each part of the cross section. 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.stress_period_data.item.fields.aux] +[blocks.period.fields.period_data.item.fields.aux] type = "array" longname = "auxiliary variables" description = "represents the values of the auxiliary variables for each zero-depth-gradient boundary. The values of auxiliary variables must be present for each zero-depth-gradient boundary. The values must be specified in the order of the auxiliary variables specified in the OPTIONS block. If the package supports time series and the Options block includes a TIMESERIESFILE entry (see the 'Time-Variable Input' section), values can be obtained from a time series by entering the time-series name in place of a numeric value." @@ -151,7 +151,7 @@ shape = [ "auxiliary", ] -[blocks.period.fields.stress_period_data.item.fields.boundname] +[blocks.period.fields.period_data.item.fields.boundname] type = "string" longname = "zero-depth-gradient boundary name" description = "name of the zero-depth-gradient boundary cell. BOUNDNAME is an ASCII character variable that can contain as many as 40 characters. If BOUNDNAME contains spaces in it, then the entire name must be enclosed within single quotes." diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-zdg.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-zdg.yaml index 83b75b15..f5d975ce 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-zdg.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-zdg.yaml @@ -104,7 +104,7 @@ blocks: that will be specified for use during any stress period. period: fields: - stress_period_data: + period_data: type: list item: name: stress_period_data diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ctp.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ctp.json index 87577694..30b78031 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ctp.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ctp.json @@ -119,7 +119,7 @@ }, "period": { "fields": { - "stress_period_data": { + "period_data": { "type": "list", "item": { "name": "stress_period_data", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ctp.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ctp.toml index dda13ff5..025df2f0 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ctp.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ctp.toml @@ -100,30 +100,30 @@ type = "integer" longname = "maximum number of constant temperatures" description = "integer value specifying the maximum number of constant temperature cells that will be specified for use during any stress period." -[blocks.period.fields.stress_period_data] +[blocks.period.fields.period_data] type = "list" shape = [ "<=maxbound", ] -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.period_data.item] name = "stress_period_data" type = "record" -[blocks.period.fields.stress_period_data.item.fields.cellid] +[blocks.period.fields.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.stress_period_data.item.fields.temp] +[blocks.period.fields.period_data.item.fields.temp] type = "double" longname = "constant temperature value" description = "is the constant temperature value. 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.stress_period_data.item.fields.aux] +[blocks.period.fields.period_data.item.fields.aux] type = "array" longname = "auxiliary variables" description = "represents the values of the auxiliary variables for each constant temperature. The values of auxiliary variables must be present for each constant temperature. 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." @@ -135,7 +135,7 @@ shape = [ "auxiliary", ] -[blocks.period.fields.stress_period_data.item.fields.boundname] +[blocks.period.fields.period_data.item.fields.boundname] type = "string" longname = "constant temperature name" description = "name of the constant temperature cell. BOUNDNAME is an ASCII character variable that can contain as many as 40 characters. If BOUNDNAME contains spaces in it, then the entire name must be enclosed within single quotes." diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ctp.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ctp.yaml index 69a03047..23f0ef27 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ctp.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ctp.yaml @@ -109,7 +109,7 @@ blocks: be specified for use during any stress period. period: fields: - stress_period_data: + period_data: type: list item: name: stress_period_data diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-esl.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-esl.json index e36be627..292763df 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-esl.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-esl.json @@ -119,7 +119,7 @@ }, "period": { "fields": { - "stress_period_data": { + "period_data": { "type": "list", "item": { "name": "stress_period_data", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-esl.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-esl.toml index 826b5a93..34f0d5a4 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-esl.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-esl.toml @@ -100,30 +100,30 @@ type = "integer" longname = "maximum number of sources" description = "integer value specifying the maximum number of source cells that will be specified for use during any stress period." -[blocks.period.fields.stress_period_data] +[blocks.period.fields.period_data] type = "list" shape = [ "<=maxbound", ] -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.period_data.item] name = "stress_period_data" type = "record" -[blocks.period.fields.stress_period_data.item.fields.cellid] +[blocks.period.fields.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.stress_period_data.item.fields.senerrate] +[blocks.period.fields.period_data.item.fields.senerrate] type = "double" longname = "energy source loading rate" description = "is the energy source loading rate. A positive value indicates addition of energy and a negative value indicates removal of energy. 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.stress_period_data.item.fields.aux] +[blocks.period.fields.period_data.item.fields.aux] type = "array" longname = "auxiliary variables" description = "represents the values of the auxiliary variables for each energy source. The values of auxiliary variables must be present for each energy source. 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." @@ -135,7 +135,7 @@ shape = [ "auxiliary", ] -[blocks.period.fields.stress_period_data.item.fields.boundname] +[blocks.period.fields.period_data.item.fields.boundname] type = "string" longname = "well name" description = "name of the energy source cell. BOUNDNAME is an ASCII character variable that can contain as many as 40 characters. If BOUNDNAME contains spaces in it, then the entire name must be enclosed within single quotes." diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-esl.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-esl.yaml index d4d30df6..cd81e5a0 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-esl.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-esl.yaml @@ -109,7 +109,7 @@ blocks: for use during any stress period. period: fields: - stress_period_data: + period_data: type: list item: name: stress_period_data 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 5f9b64d7..96f482e4 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": { - "stress_period_data": { + "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 31ffd845..c93b8b33 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.stress_period_data] +[blocks.period.fields.period_data] type = "list" -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.period_data.item] name = "lakeperioddata" type = "record" -[blocks.period.fields.stress_period_data.item.fields.lakeno] +[blocks.period.fields.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.stress_period_data.item.fields.laksetting] +[blocks.period.fields.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.stress_period_data.item.fields.laksetting.arms.status] +[blocks.period.fields.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.stress_period_data.item.fields.laksetting.arms.temperature] +[blocks.period.fields.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.stress_period_data.item.fields.laksetting.arms.rainfall] +[blocks.period.fields.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.stress_period_data.item.fields.laksetting.arms.evaporation] +[blocks.period.fields.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.stress_period_data.item.fields.laksetting.arms.runoff] +[blocks.period.fields.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.stress_period_data.item.fields.laksetting.arms.ext-inflow] +[blocks.period.fields.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.stress_period_data.item.fields.laksetting.arms.auxiliaryrecord] +[blocks.period.fields.period_data.item.fields.laksetting.arms.auxiliaryrecord] type = "record" -[blocks.period.fields.stress_period_data.item.fields.laksetting.arms.auxiliaryrecord.fields.auxiliary] +[blocks.period.fields.period_data.item.fields.laksetting.arms.auxiliaryrecord.fields.auxiliary] type = "keyword" description = "keyword for specifying auxiliary variable." -[blocks.period.fields.stress_period_data.item.fields.laksetting.arms.auxiliaryrecord.fields.auxname] +[blocks.period.fields.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.stress_period_data.item.fields.laksetting.arms.auxiliaryrecord.fields.auxval] +[blocks.period.fields.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 386c5d87..88e7925f 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: - stress_period_data: + 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 637436ab..04876b19 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": { - "stress_period_data": { + "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 89851d94..97b1475c 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.stress_period_data] +[blocks.period.fields.period_data] type = "list" -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.period_data.item] name = "mweperioddata" type = "record" -[blocks.period.fields.stress_period_data.item.fields.mawno] +[blocks.period.fields.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.stress_period_data.item.fields.mwesetting] +[blocks.period.fields.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.stress_period_data.item.fields.mwesetting.arms.status] +[blocks.period.fields.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.stress_period_data.item.fields.mwesetting.arms.temperature] +[blocks.period.fields.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.stress_period_data.item.fields.mwesetting.arms.rate] +[blocks.period.fields.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.stress_period_data.item.fields.mwesetting.arms.auxiliaryrecord] +[blocks.period.fields.period_data.item.fields.mwesetting.arms.auxiliaryrecord] type = "record" -[blocks.period.fields.stress_period_data.item.fields.mwesetting.arms.auxiliaryrecord.fields.auxiliary] +[blocks.period.fields.period_data.item.fields.mwesetting.arms.auxiliaryrecord.fields.auxiliary] type = "keyword" description = "keyword for specifying auxiliary variable." -[blocks.period.fields.stress_period_data.item.fields.mwesetting.arms.auxiliaryrecord.fields.auxname] +[blocks.period.fields.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.stress_period_data.item.fields.mwesetting.arms.auxiliaryrecord.fields.auxval] +[blocks.period.fields.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 19566103..6799c06e 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: - stress_period_data: + 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 8f6c8f1d..a7db393f 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": { - "stress_period_data": { + "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 ea1cb36b..941b7c37 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.stress_period_data] +[blocks.period.fields.period_data] type = "list" optional = true -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.period_data.item] name = "output_record" type = "union" -[blocks.period.fields.stress_period_data.item.arms.saverecord] +[blocks.period.fields.period_data.item.arms.saverecord] type = "record" optional = true -[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.save] +[blocks.period.fields.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.stress_period_data.item.arms.saverecord.fields.rtype] +[blocks.period.fields.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.stress_period_data.item.arms.saverecord.fields.ocsetting] +[blocks.period.fields.period_data.item.arms.saverecord.fields.ocsetting] type = "union" description = "specifies the steps for which the data will be saved." -[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.all] +[blocks.period.fields.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.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.first] +[blocks.period.fields.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.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.last] +[blocks.period.fields.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.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.frequency] +[blocks.period.fields.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.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.steps] +[blocks.period.fields.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.stress_period_data.item.arms.printrecord] +[blocks.period.fields.period_data.item.arms.printrecord] type = "record" optional = true -[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.print] +[blocks.period.fields.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.stress_period_data.item.arms.printrecord.fields.rtype] +[blocks.period.fields.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.stress_period_data.item.arms.printrecord.fields.ocsetting] +[blocks.period.fields.period_data.item.arms.printrecord.fields.ocsetting] type = "union" description = "specifies the steps for which the data will be saved." -[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.all] +[blocks.period.fields.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.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.first] +[blocks.period.fields.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.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.last] +[blocks.period.fields.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.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.frequency] +[blocks.period.fields.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.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.steps] +[blocks.period.fields.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 8a0419de..1d524a3e 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: - stress_period_data: + 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 e00acb96..c53399cc 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": { - "stress_period_data": { + "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 9c4fefa5..be28b46a 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.stress_period_data] +[blocks.period.fields.period_data] type = "list" -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.period_data.item] name = "reachperioddata" type = "record" -[blocks.period.fields.stress_period_data.item.fields.rno] +[blocks.period.fields.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.stress_period_data.item.fields.reachsetting] +[blocks.period.fields.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.stress_period_data.item.fields.reachsetting.arms.status] +[blocks.period.fields.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.stress_period_data.item.fields.reachsetting.arms.temperature] +[blocks.period.fields.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.stress_period_data.item.fields.reachsetting.arms.rainfall] +[blocks.period.fields.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.stress_period_data.item.fields.reachsetting.arms.evaporation] +[blocks.period.fields.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.stress_period_data.item.fields.reachsetting.arms.runoff] +[blocks.period.fields.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.stress_period_data.item.fields.reachsetting.arms.inflow] +[blocks.period.fields.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.stress_period_data.item.fields.reachsetting.arms.auxiliaryrecord] +[blocks.period.fields.period_data.item.fields.reachsetting.arms.auxiliaryrecord] type = "record" -[blocks.period.fields.stress_period_data.item.fields.reachsetting.arms.auxiliaryrecord.fields.auxiliary] +[blocks.period.fields.period_data.item.fields.reachsetting.arms.auxiliaryrecord.fields.auxiliary] type = "keyword" description = "keyword for specifying auxiliary variable." -[blocks.period.fields.stress_period_data.item.fields.reachsetting.arms.auxiliaryrecord.fields.auxname] +[blocks.period.fields.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.stress_period_data.item.fields.reachsetting.arms.auxiliaryrecord.fields.auxval] +[blocks.period.fields.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 f60659c2..9f637a80 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: - stress_period_data: + 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 97c39af8..651c0036 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": { - "stress_period_data": { + "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 7c67cde5..f87165d9 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.stress_period_data] +[blocks.period.fields.period_data] type = "list" -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.period_data.item] name = "uzeperioddata" type = "record" -[blocks.period.fields.stress_period_data.item.fields.uzfno] +[blocks.period.fields.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.stress_period_data.item.fields.uzesetting] +[blocks.period.fields.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.stress_period_data.item.fields.uzesetting.arms.status] +[blocks.period.fields.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.stress_period_data.item.fields.uzesetting.arms.temperature] +[blocks.period.fields.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.stress_period_data.item.fields.uzesetting.arms.infiltration] +[blocks.period.fields.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.stress_period_data.item.fields.uzesetting.arms.uzet] +[blocks.period.fields.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.stress_period_data.item.fields.uzesetting.arms.auxiliaryrecord] +[blocks.period.fields.period_data.item.fields.uzesetting.arms.auxiliaryrecord] type = "record" -[blocks.period.fields.stress_period_data.item.fields.uzesetting.arms.auxiliaryrecord.fields.auxiliary] +[blocks.period.fields.period_data.item.fields.uzesetting.arms.auxiliaryrecord.fields.auxiliary] type = "keyword" description = "keyword for specifying auxiliary variable." -[blocks.period.fields.stress_period_data.item.fields.uzesetting.arms.auxiliaryrecord.fields.auxname] +[blocks.period.fields.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.stress_period_data.item.fields.uzesetting.arms.auxiliaryrecord.fields.auxval] +[blocks.period.fields.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 c015ce3f..eb9ce56d 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: - stress_period_data: + period_data: type: list item: name: uzeperioddata diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chd.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chd.json index 204d0992..601ec946 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chd.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chd.json @@ -126,7 +126,7 @@ }, "period": { "fields": { - "stress_period_data": { + "period_data": { "type": "list", "item": { "name": "stress_period_data", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chd.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chd.toml index 4a3946e0..5065250f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chd.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chd.toml @@ -107,30 +107,30 @@ type = "integer" longname = "maximum number of constant heads" description = "integer value specifying the maximum number of constant-head cells that will be specified for use during any stress period." -[blocks.period.fields.stress_period_data] +[blocks.period.fields.period_data] type = "list" shape = [ "<=maxbound", ] -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.period_data.item] name = "stress_period_data" type = "record" -[blocks.period.fields.stress_period_data.item.fields.cellid] +[blocks.period.fields.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.stress_period_data.item.fields.head] +[blocks.period.fields.period_data.item.fields.head] type = "double" longname = "head value assigned to constant head" description = "is the head at the boundary. 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.stress_period_data.item.fields.aux] +[blocks.period.fields.period_data.item.fields.aux] type = "array" longname = "auxiliary variables" description = "represents the values of the auxiliary variables for each constant head. The values of auxiliary variables must be present for each constant head. The values must be specified in the order of the auxiliary variables specified in the OPTIONS block. If the package supports time series and the Options block includes a TIMESERIESFILE entry (see the 'Time-Variable Input' section), values can be obtained from a time series by entering the time-series name in place of a numeric value." @@ -142,7 +142,7 @@ shape = [ "auxiliary", ] -[blocks.period.fields.stress_period_data.item.fields.boundname] +[blocks.period.fields.period_data.item.fields.boundname] type = "string" longname = "constant head boundary name" description = "name of the constant head boundary cell. BOUNDNAME is an ASCII character variable that can contain as many as 40 characters. If BOUNDNAME contains spaces in it, then the entire name must be enclosed within single quotes." diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chd.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chd.yaml index 3c3a01d3..5df5633c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chd.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chd.yaml @@ -115,7 +115,7 @@ blocks: for use during any stress period. period: fields: - stress_period_data: + period_data: type: list item: name: stress_period_data diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-csub.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-csub.json index 6cce752b..c3c9794d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-csub.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-csub.json @@ -483,7 +483,7 @@ }, "period": { "fields": { - "stress_period_data": { + "period_data": { "type": "list", "item": { "name": "stress_period_data", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-csub.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-csub.toml index 92f623f3..105b7a4d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-csub.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-csub.toml @@ -436,23 +436,23 @@ optional = true when = "boundnames" tagged = false -[blocks.period.fields.stress_period_data] +[blocks.period.fields.period_data] type = "list" shape = [ "<=maxsig0", ] -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.period_data.item] name = "stress_period_data" type = "record" -[blocks.period.fields.stress_period_data.item.fields.cellid] +[blocks.period.fields.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.stress_period_data.item.fields.sig0] +[blocks.period.fields.period_data.item.fields.sig0] type = "double" longname = "well stress offset" description = "is the stress offset for the cell. SIG0 is added to the calculated geostatic stress for the cell. SIG0 is specified only if MAXSIG0 is specified to be greater than 0 in the DIMENSIONS block. If the Options block includes a TIMESERIESFILE entry (see the 'Time-Variable Input' section), values can be obtained from a time series by entering the time-series name in place of a numeric value." diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-csub.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-csub.yaml index 203fdc32..f940633b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-csub.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-csub.yaml @@ -476,7 +476,7 @@ blocks: - ninterbeds period: fields: - stress_period_data: + period_data: type: list item: name: stress_period_data diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drn.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drn.json index ebe93433..2e90663c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drn.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drn.json @@ -137,7 +137,7 @@ }, "period": { "fields": { - "stress_period_data": { + "period_data": { "type": "list", "item": { "name": "stress_period_data", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drn.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drn.toml index ca3e252b..077ddb3e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drn.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drn.toml @@ -118,37 +118,37 @@ type = "integer" longname = "maximum number of drains" description = "integer value specifying the maximum number of drains cells that will be specified for use during any stress period." -[blocks.period.fields.stress_period_data] +[blocks.period.fields.period_data] type = "list" shape = [ "<=maxbound", ] -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.period_data.item] name = "stress_period_data" type = "record" -[blocks.period.fields.stress_period_data.item.fields.cellid] +[blocks.period.fields.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.stress_period_data.item.fields.elev] +[blocks.period.fields.period_data.item.fields.elev] type = "double" longname = "drain elevation" description = "is the elevation of the drain. 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.stress_period_data.item.fields.cond] +[blocks.period.fields.period_data.item.fields.cond] type = "double" longname = "drain conductance" description = "is the hydraulic conductance of the interface between the aquifer and the drain. 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.stress_period_data.item.fields.aux] +[blocks.period.fields.period_data.item.fields.aux] type = "array" longname = "auxiliary variables" description = "represents the values of the auxiliary variables for each drain. The values of auxiliary variables must be present for each drain. 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." @@ -160,7 +160,7 @@ shape = [ "auxiliary", ] -[blocks.period.fields.stress_period_data.item.fields.boundname] +[blocks.period.fields.period_data.item.fields.boundname] type = "string" longname = "drain name" description = "name of the drain cell. BOUNDNAME is an ASCII character variable that can contain as many as 40 characters. If BOUNDNAME contains spaces in it, then the entire name must be enclosed within single quotes." diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drn.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drn.yaml index 2a1dcc15..35be1e50 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drn.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drn.yaml @@ -133,7 +133,7 @@ blocks: for use during any stress period. period: fields: - stress_period_data: + period_data: type: list item: name: stress_period_data diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evt.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evt.json index 75bf8a4c..32e3659f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evt.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evt.json @@ -139,7 +139,7 @@ }, "period": { "fields": { - "stress_period_data": { + "period_data": { "type": "list", "item": { "name": "stress_period_data", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evt.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evt.toml index 15fe6201..d4582158 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evt.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evt.toml @@ -120,44 +120,44 @@ type = "integer" longname = "number of ET segments" description = "number of ET segments. Default is one. When NSEG is greater than 1, the PXDP and PETM arrays must be of size NSEG - 1 and be listed in order from the uppermost segment down. Values for PXDP must be listed first followed by the values for PETM. PXDP defines the extinction-depth proportion at the bottom of a segment. PETM defines the proportion of the maximum ET flux rate at the bottom of a segment." -[blocks.period.fields.stress_period_data] +[blocks.period.fields.period_data] type = "list" shape = [ "<=maxbound", ] -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.period_data.item] name = "stress_period_data" type = "record" -[blocks.period.fields.stress_period_data.item.fields.cellid] +[blocks.period.fields.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.stress_period_data.item.fields.surface] +[blocks.period.fields.period_data.item.fields.surface] type = "double" longname = "ET surface" description = "is the elevation of the ET surface ($L$). 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.stress_period_data.item.fields.rate] +[blocks.period.fields.period_data.item.fields.rate] type = "double" longname = "maximum ET rate" description = "is the maximum ET flux rate ($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.stress_period_data.item.fields.depth] +[blocks.period.fields.period_data.item.fields.depth] type = "double" longname = "ET extinction depth" description = "is the ET extinction depth ($L$). 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.stress_period_data.item.fields.pxdp] +[blocks.period.fields.period_data.item.fields.pxdp] type = "array" longname = "proportion of ET extinction depth" description = "is the proportion of the ET extinction depth at the bottom of a segment (dimensionless). pxdp is an array of size (nseg - 1). Values in pxdp must be greater than 0.0 and less than 1.0. pxdp values for a cell must increase monotonically. 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." @@ -169,7 +169,7 @@ shape = [ "nseg-1", ] -[blocks.period.fields.stress_period_data.item.fields.petm] +[blocks.period.fields.period_data.item.fields.petm] type = "array" longname = "proportion of maximum ET rate" description = "is the proportion of the maximum ET flux rate at the bottom of a segment (dimensionless). petm is an array of size (nseg - 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." @@ -181,7 +181,7 @@ shape = [ "nseg-1", ] -[blocks.period.fields.stress_period_data.item.fields.petm0] +[blocks.period.fields.period_data.item.fields.petm0] type = "double" longname = "proportion of maximum ET rate at ET surface" description = "is the proportion of the maximum ET flux rate that will apply when head is at or above the ET surface (dimensionless). PETM0 is read only when the SURF_RATE_SPECIFIED option is used. 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." @@ -189,7 +189,7 @@ when = "surf_rate_specified" tagged = false time_series = true -[blocks.period.fields.stress_period_data.item.fields.aux] +[blocks.period.fields.period_data.item.fields.aux] type = "array" longname = "auxiliary variables" description = "represents the values of the auxiliary variables for each evapotranspiration. The values of auxiliary variables must be present for each evapotranspiration. 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." @@ -201,7 +201,7 @@ shape = [ "auxiliary", ] -[blocks.period.fields.stress_period_data.item.fields.boundname] +[blocks.period.fields.period_data.item.fields.boundname] type = "string" longname = "evapotranspiration name" description = "name of the evapotranspiration cell. BOUNDNAME is an ASCII character variable that can contain as many as 40 characters. If BOUNDNAME contains spaces in it, then the entire name must be enclosed within single quotes." diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evt.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evt.yaml index fead9ee2..f3987ad6 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evt.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evt.yaml @@ -131,7 +131,7 @@ blocks: at the bottom of a segment. period: fields: - stress_period_data: + period_data: type: list item: name: stress_period_data diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghb.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghb.json index 39d91aff..a34c1c5d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghb.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghb.json @@ -124,7 +124,7 @@ }, "period": { "fields": { - "stress_period_data": { + "period_data": { "type": "list", "item": { "name": "stress_period_data", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghb.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghb.toml index c9cfdc6c..ecc60f47 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghb.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghb.toml @@ -105,37 +105,37 @@ type = "integer" longname = "maximum number of general-head boundaries" description = "integer value specifying the maximum number of general-head boundary cells that will be specified for use during any stress period." -[blocks.period.fields.stress_period_data] +[blocks.period.fields.period_data] type = "list" shape = [ "<=maxbound", ] -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.period_data.item] name = "stress_period_data" type = "record" -[blocks.period.fields.stress_period_data.item.fields.cellid] +[blocks.period.fields.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.stress_period_data.item.fields.bhead] +[blocks.period.fields.period_data.item.fields.bhead] type = "double" longname = "boundary head" description = "is the boundary head. 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.stress_period_data.item.fields.cond] +[blocks.period.fields.period_data.item.fields.cond] type = "double" longname = "boundary conductance" description = "is the hydraulic conductance of the interface between the aquifer cell and the boundary. 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.stress_period_data.item.fields.aux] +[blocks.period.fields.period_data.item.fields.aux] type = "array" longname = "auxiliary variables" description = "represents the values of the auxiliary variables for each general-head boundary. The values of auxiliary variables must be present for each general-head boundary. The values must be specified in the order of the auxiliary variables specified in the OPTIONS block. If the package supports time series and the Options block includes a TIMESERIESFILE entry (see the 'Time-Variable Input' section), values can be obtained from a time series by entering the time-series name in place of a numeric value." @@ -147,7 +147,7 @@ shape = [ "auxiliary", ] -[blocks.period.fields.stress_period_data.item.fields.boundname] +[blocks.period.fields.period_data.item.fields.boundname] type = "string" longname = "general-head boundary name" description = "name of the general-head boundary cell. BOUNDNAME is an ASCII character variable that can contain as many as 40 characters. If BOUNDNAME contains spaces in it, then the entire name must be enclosed within single quotes." diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghb.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghb.yaml index 684df345..890d08ce 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghb.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghb.yaml @@ -115,7 +115,7 @@ blocks: be specified for use during any stress period. period: fields: - stress_period_data: + period_data: type: list item: name: stress_period_data diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-hfb.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-hfb.json index 67617837..32472b1b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-hfb.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-hfb.json @@ -31,7 +31,7 @@ }, "period": { "fields": { - "stress_period_data": { + "period_data": { "type": "list", "item": { "name": "stress_period_data", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-hfb.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-hfb.toml index c562fca0..6e947a3c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-hfb.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-hfb.toml @@ -18,29 +18,29 @@ type = "integer" longname = "maximum number of barriers" description = "integer value specifying the maximum number of hydraulic flow barriers that will be entered in this input file. The value of MAXHFB is used to allocate memory for the hydraulic flow barriers." -[blocks.period.fields.stress_period_data] +[blocks.period.fields.period_data] type = "list" shape = [ "<=maxhfb", ] -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.period_data.item] name = "stress_period_data" type = "record" -[blocks.period.fields.stress_period_data.item.fields.cellid1] +[blocks.period.fields.period_data.item.fields.cellid1] type = "cellid" longname = "first cell adjacent to barrier" description = "identifier for the first cell. For a structured grid that uses the DIS input file, CELLID1 is the layer, row, and column numbers of the cell. For a grid that uses the DISV input file, CELLID1 is the layer number and CELL2D number for the two cells. If the model uses the unstructured discretization (DISU) input file, then CELLID1 is the node numbers for the cell. The barrier is located between cells designated as CELLID1 and CELLID2. For models that use the DIS and DISV grid types, the layer number for CELLID1 and CELLID2 must be the same. For all grid types, cells must be horizontally or vertically adjacent." tagged = false -[blocks.period.fields.stress_period_data.item.fields.cellid2] +[blocks.period.fields.period_data.item.fields.cellid2] type = "cellid" longname = "second cell adjacent to barrier" description = "identifier for the second cell. See CELLID1 for description of how to specify." tagged = false -[blocks.period.fields.stress_period_data.item.fields.hydchr] +[blocks.period.fields.period_data.item.fields.hydchr] type = "double" longname = "barrier hydraulic characteristic" description = "is the hydraulic characteristic of the hydraulic-flow barrier. The hydraulic characteristic is the barrier hydraulic conductivity divided by the width of the hydraulic-flow barrier. If the hydraulic characteristic is negative, then the absolute value of HYDCHR acts as a multiplier to the conductance between the two model cells specified as containing the barrier. For example, if the value for HYDCHR was specified as -1.5, the conductance calculated for the two cells would be multiplied by 1.5." diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-hfb.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-hfb.yaml index 6bdfcb7f..7f18af7e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-hfb.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-hfb.yaml @@ -25,7 +25,7 @@ blocks: flow barriers. period: fields: - stress_period_data: + period_data: type: list item: name: stress_period_data 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 1f37e024..74e91cd9 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-lak.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-lak.json @@ -487,7 +487,7 @@ }, "period": { "fields": { - "stress_period_data": { + "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 5cbdaf44..c61bfa36 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-lak.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-lak.toml @@ -436,18 +436,18 @@ description = "real value that defines the bed slope for the lake outlet. Any va tagged = false time_series = true -[blocks.period.fields.stress_period_data] +[blocks.period.fields.period_data] type = "list" -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.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.stress_period_data.item.arms.status] +[blocks.period.fields.period_data.item.arms.status] type = "record" -[blocks.period.fields.stress_period_data.item.arms.status.fields.lakeno] +[blocks.period.fields.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." @@ -455,15 +455,15 @@ tagged = false index = true fk = "packagedata.ifno" -[blocks.period.fields.stress_period_data.item.arms.status.fields.status] +[blocks.period.fields.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.stress_period_data.item.arms.stage] +[blocks.period.fields.period_data.item.arms.stage] type = "record" -[blocks.period.fields.stress_period_data.item.arms.stage.fields.lakeno] +[blocks.period.fields.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." @@ -471,16 +471,16 @@ tagged = false index = true fk = "packagedata.ifno" -[blocks.period.fields.stress_period_data.item.arms.stage.fields.stage] +[blocks.period.fields.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.stress_period_data.item.arms.rainfall] +[blocks.period.fields.period_data.item.arms.rainfall] type = "record" -[blocks.period.fields.stress_period_data.item.arms.rainfall.fields.lakeno] +[blocks.period.fields.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." @@ -488,16 +488,16 @@ tagged = false index = true fk = "packagedata.ifno" -[blocks.period.fields.stress_period_data.item.arms.rainfall.fields.rainfall] +[blocks.period.fields.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.stress_period_data.item.arms.evaporation] +[blocks.period.fields.period_data.item.arms.evaporation] type = "record" -[blocks.period.fields.stress_period_data.item.arms.evaporation.fields.lakeno] +[blocks.period.fields.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." @@ -505,16 +505,16 @@ tagged = false index = true fk = "packagedata.ifno" -[blocks.period.fields.stress_period_data.item.arms.evaporation.fields.evaporation] +[blocks.period.fields.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.stress_period_data.item.arms.runoff] +[blocks.period.fields.period_data.item.arms.runoff] type = "record" -[blocks.period.fields.stress_period_data.item.arms.runoff.fields.lakeno] +[blocks.period.fields.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." @@ -522,16 +522,16 @@ tagged = false index = true fk = "packagedata.ifno" -[blocks.period.fields.stress_period_data.item.arms.runoff.fields.runoff] +[blocks.period.fields.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.stress_period_data.item.arms.inflow] +[blocks.period.fields.period_data.item.arms.inflow] type = "record" -[blocks.period.fields.stress_period_data.item.arms.inflow.fields.lakeno] +[blocks.period.fields.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." @@ -539,16 +539,16 @@ tagged = false index = true fk = "packagedata.ifno" -[blocks.period.fields.stress_period_data.item.arms.inflow.fields.inflow] +[blocks.period.fields.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.stress_period_data.item.arms.withdrawal] +[blocks.period.fields.period_data.item.arms.withdrawal] type = "record" -[blocks.period.fields.stress_period_data.item.arms.withdrawal.fields.lakeno] +[blocks.period.fields.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." @@ -556,16 +556,16 @@ tagged = false index = true fk = "packagedata.ifno" -[blocks.period.fields.stress_period_data.item.arms.withdrawal.fields.withdrawal] +[blocks.period.fields.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.stress_period_data.item.arms.rate] +[blocks.period.fields.period_data.item.arms.rate] type = "record" -[blocks.period.fields.stress_period_data.item.arms.rate.fields.outletno] +[blocks.period.fields.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." @@ -573,16 +573,16 @@ tagged = false index = true fk = "outlets.outletno" -[blocks.period.fields.stress_period_data.item.arms.rate.fields.rate] +[blocks.period.fields.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.stress_period_data.item.arms.invert] +[blocks.period.fields.period_data.item.arms.invert] type = "record" -[blocks.period.fields.stress_period_data.item.arms.invert.fields.outletno] +[blocks.period.fields.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." @@ -590,16 +590,16 @@ tagged = false index = true fk = "outlets.outletno" -[blocks.period.fields.stress_period_data.item.arms.invert.fields.invert] +[blocks.period.fields.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.stress_period_data.item.arms.width] +[blocks.period.fields.period_data.item.arms.width] type = "record" -[blocks.period.fields.stress_period_data.item.arms.width.fields.outletno] +[blocks.period.fields.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." @@ -607,16 +607,16 @@ tagged = false index = true fk = "outlets.outletno" -[blocks.period.fields.stress_period_data.item.arms.width.fields.width] +[blocks.period.fields.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.stress_period_data.item.arms.slope] +[blocks.period.fields.period_data.item.arms.slope] type = "record" -[blocks.period.fields.stress_period_data.item.arms.slope.fields.outletno] +[blocks.period.fields.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." @@ -624,16 +624,16 @@ tagged = false index = true fk = "outlets.outletno" -[blocks.period.fields.stress_period_data.item.arms.slope.fields.slope] +[blocks.period.fields.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.stress_period_data.item.arms.rough] +[blocks.period.fields.period_data.item.arms.rough] type = "record" -[blocks.period.fields.stress_period_data.item.arms.rough.fields.outletno] +[blocks.period.fields.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." @@ -641,16 +641,16 @@ tagged = false index = true fk = "outlets.outletno" -[blocks.period.fields.stress_period_data.item.arms.rough.fields.rough] +[blocks.period.fields.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.stress_period_data.item.arms.auxiliaryrecord] +[blocks.period.fields.period_data.item.arms.auxiliaryrecord] type = "record" -[blocks.period.fields.stress_period_data.item.arms.auxiliaryrecord.fields.lakeno] +[blocks.period.fields.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." @@ -658,16 +658,16 @@ tagged = false index = true fk = "packagedata.ifno" -[blocks.period.fields.stress_period_data.item.arms.auxiliaryrecord.fields.auxiliary] +[blocks.period.fields.period_data.item.arms.auxiliaryrecord.fields.auxiliary] type = "keyword" description = "keyword for specifying auxiliary variable." -[blocks.period.fields.stress_period_data.item.arms.auxiliaryrecord.fields.auxname] +[blocks.period.fields.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.stress_period_data.item.arms.auxiliaryrecord.fields.auxval] +[blocks.period.fields.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 2c104e62..5d17908d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-lak.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-lak.yaml @@ -512,7 +512,7 @@ blocks: - noutlets period: fields: - stress_period_data: + 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 96c3c3aa..df42f012 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-maw.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-maw.json @@ -356,7 +356,7 @@ }, "period": { "fields": { - "stress_period_data": { + "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 36c82027..981de3d5 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-maw.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-maw.toml @@ -319,14 +319,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.stress_period_data] +[blocks.period.fields.period_data] type = "list" -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.period_data.item] name = "perioddata" type = "record" -[blocks.period.fields.stress_period_data.item.fields.ifno] +[blocks.period.fields.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." @@ -334,123 +334,123 @@ tagged = false index = true fk = "packagedata.ifno" -[blocks.period.fields.stress_period_data.item.fields.mawsetting] +[blocks.period.fields.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.stress_period_data.item.fields.mawsetting.arms.status] +[blocks.period.fields.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.stress_period_data.item.fields.mawsetting.arms.flowing_wellrecord] +[blocks.period.fields.period_data.item.fields.mawsetting.arms.flowing_wellrecord] type = "record" -[blocks.period.fields.stress_period_data.item.fields.mawsetting.arms.flowing_wellrecord.fields.flowing_well] +[blocks.period.fields.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.stress_period_data.item.fields.mawsetting.arms.flowing_wellrecord.fields.fwelev] +[blocks.period.fields.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.stress_period_data.item.fields.mawsetting.arms.flowing_wellrecord.fields.fwcond] +[blocks.period.fields.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.stress_period_data.item.fields.mawsetting.arms.flowing_wellrecord.fields.fwrlen] +[blocks.period.fields.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.stress_period_data.item.fields.mawsetting.arms.rate] +[blocks.period.fields.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.stress_period_data.item.fields.mawsetting.arms.well_head] +[blocks.period.fields.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.stress_period_data.item.fields.mawsetting.arms.head_limitrecord] +[blocks.period.fields.period_data.item.fields.mawsetting.arms.head_limitrecord] type = "record" -[blocks.period.fields.stress_period_data.item.fields.mawsetting.arms.head_limitrecord.fields.head_limit] +[blocks.period.fields.period_data.item.fields.mawsetting.arms.head_limitrecord.fields.head_limit] type = "keyword" -[blocks.period.fields.stress_period_data.item.fields.mawsetting.arms.head_limitrecord.fields.head_limit_value] +[blocks.period.fields.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.stress_period_data.item.fields.mawsetting.arms.head_limitrecord.fields.head_limit_value.arms.off] +[blocks.period.fields.period_data.item.fields.mawsetting.arms.head_limitrecord.fields.head_limit_value.arms.off] type = "keyword" -[blocks.period.fields.stress_period_data.item.fields.mawsetting.arms.head_limitrecord.fields.head_limit_value.arms.value] +[blocks.period.fields.period_data.item.fields.mawsetting.arms.head_limitrecord.fields.head_limit_value.arms.value] type = "double" tagged = false -[blocks.period.fields.stress_period_data.item.fields.mawsetting.arms.shutoffrecord] +[blocks.period.fields.period_data.item.fields.mawsetting.arms.shutoffrecord] type = "record" -[blocks.period.fields.stress_period_data.item.fields.mawsetting.arms.shutoffrecord.fields.shut_off] +[blocks.period.fields.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.stress_period_data.item.fields.mawsetting.arms.shutoffrecord.fields.minrate] +[blocks.period.fields.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.stress_period_data.item.fields.mawsetting.arms.shutoffrecord.fields.maxrate] +[blocks.period.fields.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.stress_period_data.item.fields.mawsetting.arms.rate_scalingrecord] +[blocks.period.fields.period_data.item.fields.mawsetting.arms.rate_scalingrecord] type = "record" -[blocks.period.fields.stress_period_data.item.fields.mawsetting.arms.rate_scalingrecord.fields.rate_scaling] +[blocks.period.fields.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.stress_period_data.item.fields.mawsetting.arms.rate_scalingrecord.fields.pump_elevation] +[blocks.period.fields.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.stress_period_data.item.fields.mawsetting.arms.rate_scalingrecord.fields.scaling_length] +[blocks.period.fields.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.stress_period_data.item.fields.mawsetting.arms.auxiliaryrecord] +[blocks.period.fields.period_data.item.fields.mawsetting.arms.auxiliaryrecord] type = "record" -[blocks.period.fields.stress_period_data.item.fields.mawsetting.arms.auxiliaryrecord.fields.auxiliary] +[blocks.period.fields.period_data.item.fields.mawsetting.arms.auxiliaryrecord.fields.auxiliary] type = "keyword" description = "keyword for specifying auxiliary variable." -[blocks.period.fields.stress_period_data.item.fields.mawsetting.arms.auxiliaryrecord.fields.auxname] +[blocks.period.fields.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.stress_period_data.item.fields.mawsetting.arms.auxiliaryrecord.fields.auxval] +[blocks.period.fields.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 bc97f92f..8d24c10b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-maw.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-maw.yaml @@ -400,7 +400,7 @@ blocks: - ngwfnodes period: fields: - stress_period_data: + 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 a798405d..8b8ad6d1 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-mvr.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-mvr.json @@ -129,7 +129,7 @@ }, "period": { "fields": { - "stress_period_data": { + "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 332bf9f6..90237fff 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-mvr.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-mvr.toml @@ -106,82 +106,82 @@ path = "gwf-nam.packages.pname" scope = "mname" rule = "mover_enabled" -[blocks.period.fields.stress_period_data] +[blocks.period.fields.period_data] type = "list" -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.period_data.item] name = "perioddata" type = "record" -[blocks.period.fields.stress_period_data.item.fields.mname1] +[blocks.period.fields.period_data.item.fields.mname1] type = "string" description = "name of model containing the package, PNAME1." when = "modelnames" tagged = false -[blocks.period.fields.stress_period_data.item.fields.mname1.fk] +[blocks.period.fields.period_data.item.fields.mname1.fk] path = "sim-nam.models.mname" rule = "exchange_models" -[blocks.period.fields.stress_period_data.item.fields.pname1] +[blocks.period.fields.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 -[blocks.period.fields.stress_period_data.item.fields.pname1.fk] +[blocks.period.fields.period_data.item.fields.pname1.fk] path = "packages.pname" scope = "mname1" -[blocks.period.fields.stress_period_data.item.fields.id1] +[blocks.period.fields.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.stress_period_data.item.fields.id1.fk] +[blocks.period.fields.period_data.item.fields.id1.fk] scope = "pname1" key = "mover_provider" -[blocks.period.fields.stress_period_data.item.fields.mname2] +[blocks.period.fields.period_data.item.fields.mname2] type = "string" description = "name of model containing the package, PNAME2." when = "modelnames" tagged = false -[blocks.period.fields.stress_period_data.item.fields.mname2.fk] +[blocks.period.fields.period_data.item.fields.mname2.fk] path = "sim-nam.models.mname" rule = "exchange_models" -[blocks.period.fields.stress_period_data.item.fields.pname2] +[blocks.period.fields.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 -[blocks.period.fields.stress_period_data.item.fields.pname2.fk] +[blocks.period.fields.period_data.item.fields.pname2.fk] path = "packages.pname" scope = "mname2" -[blocks.period.fields.stress_period_data.item.fields.id2] +[blocks.period.fields.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.stress_period_data.item.fields.id2.fk] +[blocks.period.fields.period_data.item.fields.id2.fk] scope = "pname2" key = "mover_receiver" -[blocks.period.fields.stress_period_data.item.fields.mvrtype] +[blocks.period.fields.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.stress_period_data.item.fields.value] +[blocks.period.fields.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 720e793a..6e0fd597 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-mvr.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-mvr.yaml @@ -111,7 +111,7 @@ blocks: - maxpackages period: fields: - stress_period_data: + 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 ec907250..93d4855a 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": { - "stress_period_data": { + "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 a3f8727d..e96210bf 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.stress_period_data] +[blocks.period.fields.period_data] type = "list" optional = true -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.period_data.item] name = "output_record" type = "union" -[blocks.period.fields.stress_period_data.item.arms.saverecord] +[blocks.period.fields.period_data.item.arms.saverecord] type = "record" optional = true -[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.save] +[blocks.period.fields.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.stress_period_data.item.arms.saverecord.fields.rtype] +[blocks.period.fields.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.stress_period_data.item.arms.saverecord.fields.ocsetting] +[blocks.period.fields.period_data.item.arms.saverecord.fields.ocsetting] type = "union" description = "specifies the steps for which the data will be saved." -[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.all] +[blocks.period.fields.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.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.first] +[blocks.period.fields.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.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.last] +[blocks.period.fields.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.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.frequency] +[blocks.period.fields.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.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.steps] +[blocks.period.fields.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.stress_period_data.item.arms.printrecord] +[blocks.period.fields.period_data.item.arms.printrecord] type = "record" optional = true -[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.print] +[blocks.period.fields.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.stress_period_data.item.arms.printrecord.fields.rtype] +[blocks.period.fields.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.stress_period_data.item.arms.printrecord.fields.ocsetting] +[blocks.period.fields.period_data.item.arms.printrecord.fields.ocsetting] type = "union" description = "specifies the steps for which the data will be saved." -[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.all] +[blocks.period.fields.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.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.first] +[blocks.period.fields.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.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.last] +[blocks.period.fields.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.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.frequency] +[blocks.period.fields.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.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.steps] +[blocks.period.fields.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 dc7fd869..f73253d1 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: - stress_period_data: + period_data: type: list optional: true item: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rch.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rch.json index f8798c94..1933d1a7 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rch.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rch.json @@ -125,7 +125,7 @@ }, "period": { "fields": { - "stress_period_data": { + "period_data": { "type": "list", "item": { "name": "stress_period_data", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rch.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rch.toml index 9883ec05..ba696ba0 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rch.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rch.toml @@ -106,30 +106,30 @@ type = "integer" longname = "maximum number of recharge cells" description = "integer value specifying the maximum number of recharge cells that will be specified for use during any stress period." -[blocks.period.fields.stress_period_data] +[blocks.period.fields.period_data] type = "list" shape = [ "<=maxbound", ] -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.period_data.item] name = "stress_period_data" type = "record" -[blocks.period.fields.stress_period_data.item.fields.cellid] +[blocks.period.fields.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.stress_period_data.item.fields.recharge] +[blocks.period.fields.period_data.item.fields.recharge] type = "double" longname = "recharge rate" description = "is the recharge flux rate ($LT^{-1}$). This rate is multiplied inside the program by the surface area of the cell to calculate the volumetric recharge rate. 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.stress_period_data.item.fields.aux] +[blocks.period.fields.period_data.item.fields.aux] type = "array" longname = "auxiliary variables" description = "represents the values of the auxiliary variables for each recharge. The values of auxiliary variables must be present for each recharge. 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." @@ -141,7 +141,7 @@ shape = [ "auxiliary", ] -[blocks.period.fields.stress_period_data.item.fields.boundname] +[blocks.period.fields.period_data.item.fields.boundname] type = "string" longname = "recharge name" description = "name of the recharge cell. BOUNDNAME is an ASCII character variable that can contain as many as 40 characters. If BOUNDNAME contains spaces in it, then the entire name must be enclosed within single quotes." diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rch.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rch.yaml index b46267d0..8013e2e4 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rch.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rch.yaml @@ -115,7 +115,7 @@ blocks: for use during any stress period. period: fields: - stress_period_data: + period_data: type: list item: name: stress_period_data diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-riv.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-riv.json index 314f5f1c..87715e00 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-riv.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-riv.json @@ -124,7 +124,7 @@ }, "period": { "fields": { - "stress_period_data": { + "period_data": { "type": "list", "item": { "name": "stress_period_data", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-riv.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-riv.toml index f7e77264..63f9566a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-riv.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-riv.toml @@ -105,44 +105,44 @@ type = "integer" longname = "maximum number of rivers" description = "integer value specifying the maximum number of rivers cells that will be specified for use during any stress period." -[blocks.period.fields.stress_period_data] +[blocks.period.fields.period_data] type = "list" shape = [ "<=maxbound", ] -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.period_data.item] name = "stress_period_data" type = "record" -[blocks.period.fields.stress_period_data.item.fields.cellid] +[blocks.period.fields.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.stress_period_data.item.fields.stage] +[blocks.period.fields.period_data.item.fields.stage] type = "double" longname = "river stage" description = "is the head in the river. 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.stress_period_data.item.fields.cond] +[blocks.period.fields.period_data.item.fields.cond] type = "double" longname = "river conductance" description = "is the riverbed hydraulic conductance. 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.stress_period_data.item.fields.rbot] +[blocks.period.fields.period_data.item.fields.rbot] type = "double" longname = "river bottom elevation" description = "is the elevation of the bottom of the riverbed. 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.stress_period_data.item.fields.aux] +[blocks.period.fields.period_data.item.fields.aux] type = "array" longname = "auxiliary variables" description = "represents the values of the auxiliary variables for each river. The values of auxiliary variables must be present for each river. 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." @@ -154,7 +154,7 @@ shape = [ "auxiliary", ] -[blocks.period.fields.stress_period_data.item.fields.boundname] +[blocks.period.fields.period_data.item.fields.boundname] type = "string" longname = "drain name" description = "name of the river cell. BOUNDNAME is an ASCII character variable that can contain as many as 40 characters. If BOUNDNAME contains spaces in it, then the entire name must be enclosed within single quotes." diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-riv.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-riv.yaml index ee1e252c..1650e1b0 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-riv.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-riv.yaml @@ -114,7 +114,7 @@ blocks: for use during any stress period. period: fields: - stress_period_data: + period_data: type: list item: name: stress_period_data 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 45b87f6c..6c401818 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sfr.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sfr.json @@ -497,7 +497,7 @@ }, "period": { "fields": { - "stress_period_data": { + "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 7b69d424..6f851da2 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sfr.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sfr.toml @@ -440,14 +440,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.stress_period_data] +[blocks.period.fields.period_data] type = "list" -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.period_data.item] name = "perioddata" type = "record" -[blocks.period.fields.stress_period_data.item.fields.ifno] +[blocks.period.fields.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." @@ -455,102 +455,102 @@ tagged = false index = true fk = "packagedata.ifno" -[blocks.period.fields.stress_period_data.item.fields.sfrsetting] +[blocks.period.fields.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.stress_period_data.item.fields.sfrsetting.arms.status] +[blocks.period.fields.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.stress_period_data.item.fields.sfrsetting.arms.bedk] +[blocks.period.fields.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.stress_period_data.item.fields.sfrsetting.arms.manning] +[blocks.period.fields.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.stress_period_data.item.fields.sfrsetting.arms.stage] +[blocks.period.fields.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.stress_period_data.item.fields.sfrsetting.arms.inflow] +[blocks.period.fields.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.stress_period_data.item.fields.sfrsetting.arms.rainfall] +[blocks.period.fields.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.stress_period_data.item.fields.sfrsetting.arms.evaporation] +[blocks.period.fields.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.stress_period_data.item.fields.sfrsetting.arms.runoff] +[blocks.period.fields.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.stress_period_data.item.fields.sfrsetting.arms.diversionrecord] +[blocks.period.fields.period_data.item.fields.sfrsetting.arms.diversionrecord] type = "record" -[blocks.period.fields.stress_period_data.item.fields.sfrsetting.arms.diversionrecord.fields.diversion] +[blocks.period.fields.period_data.item.fields.sfrsetting.arms.diversionrecord.fields.diversion] type = "keyword" longname = "diversion keyword" description = "keyword to indicate diversion record." -[blocks.period.fields.stress_period_data.item.fields.sfrsetting.arms.diversionrecord.fields.idv] +[blocks.period.fields.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.stress_period_data.item.fields.sfrsetting.arms.diversionrecord.fields.idv.fk] +[blocks.period.fields.period_data.item.fields.sfrsetting.arms.diversionrecord.fields.idv.fk] path = "diversions.idv" scope = "ifno" -[blocks.period.fields.stress_period_data.item.fields.sfrsetting.arms.diversionrecord.fields.divflow] +[blocks.period.fields.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.stress_period_data.item.fields.sfrsetting.arms.upstream_fraction] +[blocks.period.fields.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.stress_period_data.item.fields.sfrsetting.arms.cross_sectionrecord] +[blocks.period.fields.period_data.item.fields.sfrsetting.arms.cross_sectionrecord] type = "record" -[blocks.period.fields.stress_period_data.item.fields.sfrsetting.arms.cross_sectionrecord.fields.cross_section] +[blocks.period.fields.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.stress_period_data.item.fields.sfrsetting.arms.cross_sectionrecord.fields.tab6] +[blocks.period.fields.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.stress_period_data.item.fields.sfrsetting.arms.cross_sectionrecord.fields.tab6_filename] +[blocks.period.fields.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." @@ -558,19 +558,19 @@ tagged = false direction = "in" component = "utl-sfrtab" -[blocks.period.fields.stress_period_data.item.fields.sfrsetting.arms.auxiliaryrecord] +[blocks.period.fields.period_data.item.fields.sfrsetting.arms.auxiliaryrecord] type = "record" -[blocks.period.fields.stress_period_data.item.fields.sfrsetting.arms.auxiliaryrecord.fields.auxiliary] +[blocks.period.fields.period_data.item.fields.sfrsetting.arms.auxiliaryrecord.fields.auxiliary] type = "keyword" description = "keyword for specifying auxiliary variable." -[blocks.period.fields.stress_period_data.item.fields.sfrsetting.arms.auxiliaryrecord.fields.auxname] +[blocks.period.fields.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.stress_period_data.item.fields.sfrsetting.arms.auxiliaryrecord.fields.auxval] +[blocks.period.fields.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 b8e6cbdd..584b6919 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sfr.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sfr.yaml @@ -529,7 +529,7 @@ blocks: tagged: false period: fields: - stress_period_data: + period_data: type: list item: name: perioddata diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sto.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sto.json index c4a5de61..1ae9cb4e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sto.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sto.json @@ -119,7 +119,7 @@ }, "period": { "fields": { - "stress_period_data": { + "period_data": { "type": "string", "longname": "storage state", "description": "keyword to indicate that stress period IPER is steady-state. Steady-state conditions will apply until the TRANSIENT keyword is specified in a subsequent BEGIN PERIOD block. If the CSUB Package is included in the GWF model, only the first and last stress period can be steady-state.", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sto.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sto.toml index 082068f3..a84f32db 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sto.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sto.toml @@ -104,7 +104,7 @@ shape = [ "nodes", ] -[blocks.period.fields.stress_period_data] +[blocks.period.fields.period_data] type = "string" longname = "storage state" description = "keyword to indicate that stress period IPER is steady-state. Steady-state conditions will apply until the TRANSIENT keyword is specified in a subsequent BEGIN PERIOD block. If the CSUB Package is included in the GWF model, only the first and last stress period can be steady-state." diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sto.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sto.yaml index b1199024..2dbbed72 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sto.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sto.yaml @@ -114,7 +114,7 @@ blocks: - nodes period: fields: - stress_period_data: + period_data: type: string longname: storage state description: keyword to indicate that stress period IPER is steady-state. Steady-state conditions 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 7d2de89f..350ae3a1 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-uzf.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-uzf.json @@ -328,7 +328,7 @@ }, "period": { "fields": { - "stress_period_data": { + "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 65b250da..0d42ebe0 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-uzf.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-uzf.toml @@ -297,14 +297,14 @@ optional = true when = "boundnames" tagged = false -[blocks.period.fields.stress_period_data] +[blocks.period.fields.period_data] type = "list" -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.period_data.item] name = "perioddata" type = "record" -[blocks.period.fields.stress_period_data.item.fields.ifno] +[blocks.period.fields.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." @@ -312,56 +312,56 @@ tagged = false index = true fk = "packagedata.ifno" -[blocks.period.fields.stress_period_data.item.fields.finf] +[blocks.period.fields.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.stress_period_data.item.fields.pet] +[blocks.period.fields.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.stress_period_data.item.fields.extdp] +[blocks.period.fields.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.stress_period_data.item.fields.extwc] +[blocks.period.fields.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.stress_period_data.item.fields.ha] +[blocks.period.fields.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.stress_period_data.item.fields.hroot] +[blocks.period.fields.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.stress_period_data.item.fields.rootact] +[blocks.period.fields.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.stress_period_data.item.fields.aux] +[blocks.period.fields.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 c91a80bd..dd972a25 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-uzf.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-uzf.yaml @@ -325,7 +325,7 @@ blocks: - nuzfcells period: fields: - stress_period_data: + period_data: type: list item: name: perioddata diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-wel.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-wel.json index 075efa86..7d8c8db5 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-wel.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-wel.json @@ -154,7 +154,7 @@ }, "period": { "fields": { - "stress_period_data": { + "period_data": { "type": "list", "item": { "name": "stress_period_data", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-wel.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-wel.toml index e3464f37..1db42372 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-wel.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-wel.toml @@ -133,30 +133,30 @@ type = "integer" longname = "maximum number of wells" description = "integer value specifying the maximum number of wells cells that will be specified for use during any stress period." -[blocks.period.fields.stress_period_data] +[blocks.period.fields.period_data] type = "list" shape = [ "<=maxbound", ] -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.period_data.item] name = "stress_period_data" type = "record" -[blocks.period.fields.stress_period_data.item.fields.cellid] +[blocks.period.fields.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.stress_period_data.item.fields.q] +[blocks.period.fields.period_data.item.fields.q] type = "double" longname = "well rate" description = "is the volumetric well rate. A positive value indicates recharge (injection) and a negative value indicates discharge (extraction). 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.stress_period_data.item.fields.aux] +[blocks.period.fields.period_data.item.fields.aux] type = "array" longname = "auxiliary variables" description = "represents the values of the auxiliary variables for each well. The values of auxiliary variables must be present for each well. 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." @@ -168,7 +168,7 @@ shape = [ "auxiliary", ] -[blocks.period.fields.stress_period_data.item.fields.boundname] +[blocks.period.fields.period_data.item.fields.boundname] type = "string" longname = "well name" description = "name of the well cell. BOUNDNAME is an ASCII character variable that can contain as many as 40 characters. If BOUNDNAME contains spaces in it, then the entire name must be enclosed within single quotes." diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-wel.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-wel.yaml index 15eee9e8..5cebcea6 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-wel.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-wel.yaml @@ -154,7 +154,7 @@ blocks: for use during any stress period. period: fields: - stress_period_data: + period_data: type: list item: name: stress_period_data diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-cnc.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-cnc.json index 22061232..0c3f7076 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-cnc.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-cnc.json @@ -119,7 +119,7 @@ }, "period": { "fields": { - "stress_period_data": { + "period_data": { "type": "list", "item": { "name": "stress_period_data", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-cnc.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-cnc.toml index 43c7fd9e..f4221700 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-cnc.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-cnc.toml @@ -100,30 +100,30 @@ type = "integer" longname = "maximum number of constant concentrations" description = "integer value specifying the maximum number of constant concentrations cells that will be specified for use during any stress period." -[blocks.period.fields.stress_period_data] +[blocks.period.fields.period_data] type = "list" shape = [ "<=maxbound", ] -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.period_data.item] name = "stress_period_data" type = "record" -[blocks.period.fields.stress_period_data.item.fields.cellid] +[blocks.period.fields.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.stress_period_data.item.fields.conc] +[blocks.period.fields.period_data.item.fields.conc] type = "double" longname = "constant concentration value" description = "is the constant concentration value. 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.stress_period_data.item.fields.aux] +[blocks.period.fields.period_data.item.fields.aux] type = "array" longname = "auxiliary variables" description = "represents the values of the auxiliary variables for each constant concentration. The values of auxiliary variables must be present for each constant concentration. 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." @@ -135,7 +135,7 @@ shape = [ "auxiliary", ] -[blocks.period.fields.stress_period_data.item.fields.boundname] +[blocks.period.fields.period_data.item.fields.boundname] type = "string" longname = "constant concentration name" description = "name of the constant concentration cell. BOUNDNAME is an ASCII character variable that can contain as many as 40 characters. If BOUNDNAME contains spaces in it, then the entire name must be enclosed within single quotes." diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-cnc.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-cnc.yaml index 28702707..a7512642 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-cnc.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-cnc.yaml @@ -109,7 +109,7 @@ blocks: will be specified for use during any stress period. period: fields: - stress_period_data: + period_data: type: list item: name: stress_period_data 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 61551af4..c1c1ce89 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": { - "stress_period_data": { + "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 c094c4ac..6d4bcc6c 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.stress_period_data] +[blocks.period.fields.period_data] type = "list" -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.period_data.item] name = "lakeperioddata" type = "record" -[blocks.period.fields.stress_period_data.item.fields.ifno] +[blocks.period.fields.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.stress_period_data.item.fields.laksetting] +[blocks.period.fields.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.stress_period_data.item.fields.laksetting.arms.status] +[blocks.period.fields.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.stress_period_data.item.fields.laksetting.arms.concentration] +[blocks.period.fields.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.stress_period_data.item.fields.laksetting.arms.rainfall] +[blocks.period.fields.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.stress_period_data.item.fields.laksetting.arms.evaporation] +[blocks.period.fields.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.stress_period_data.item.fields.laksetting.arms.runoff] +[blocks.period.fields.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.stress_period_data.item.fields.laksetting.arms.ext-inflow] +[blocks.period.fields.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.stress_period_data.item.fields.laksetting.arms.auxiliaryrecord] +[blocks.period.fields.period_data.item.fields.laksetting.arms.auxiliaryrecord] type = "record" -[blocks.period.fields.stress_period_data.item.fields.laksetting.arms.auxiliaryrecord.fields.auxiliary] +[blocks.period.fields.period_data.item.fields.laksetting.arms.auxiliaryrecord.fields.auxiliary] type = "keyword" description = "keyword for specifying auxiliary variable." -[blocks.period.fields.stress_period_data.item.fields.laksetting.arms.auxiliaryrecord.fields.auxname] +[blocks.period.fields.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.stress_period_data.item.fields.laksetting.arms.auxiliaryrecord.fields.auxval] +[blocks.period.fields.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 fde1b333..5e0ab522 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: - stress_period_data: + 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 c390fdc5..165201a4 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": { - "stress_period_data": { + "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 668eaa95..da808a23 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.stress_period_data] +[blocks.period.fields.period_data] type = "list" -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.period_data.item] name = "mwtperioddata" type = "record" -[blocks.period.fields.stress_period_data.item.fields.ifno] +[blocks.period.fields.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.stress_period_data.item.fields.mwtsetting] +[blocks.period.fields.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.stress_period_data.item.fields.mwtsetting.arms.status] +[blocks.period.fields.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.stress_period_data.item.fields.mwtsetting.arms.concentration] +[blocks.period.fields.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.stress_period_data.item.fields.mwtsetting.arms.rate] +[blocks.period.fields.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.stress_period_data.item.fields.mwtsetting.arms.auxiliaryrecord] +[blocks.period.fields.period_data.item.fields.mwtsetting.arms.auxiliaryrecord] type = "record" -[blocks.period.fields.stress_period_data.item.fields.mwtsetting.arms.auxiliaryrecord.fields.auxiliary] +[blocks.period.fields.period_data.item.fields.mwtsetting.arms.auxiliaryrecord.fields.auxiliary] type = "keyword" description = "keyword for specifying auxiliary variable." -[blocks.period.fields.stress_period_data.item.fields.mwtsetting.arms.auxiliaryrecord.fields.auxname] +[blocks.period.fields.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.stress_period_data.item.fields.mwtsetting.arms.auxiliaryrecord.fields.auxval] +[blocks.period.fields.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 98fe4a71..ffb0fb5a 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: - stress_period_data: + 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 0da92851..52ef69f7 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": { - "stress_period_data": { + "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 0879c712..a421cd0e 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.stress_period_data] +[blocks.period.fields.period_data] type = "list" optional = true -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.period_data.item] name = "output_record" type = "union" -[blocks.period.fields.stress_period_data.item.arms.saverecord] +[blocks.period.fields.period_data.item.arms.saverecord] type = "record" optional = true -[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.save] +[blocks.period.fields.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.stress_period_data.item.arms.saverecord.fields.rtype] +[blocks.period.fields.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.stress_period_data.item.arms.saverecord.fields.ocsetting] +[blocks.period.fields.period_data.item.arms.saverecord.fields.ocsetting] type = "union" description = "specifies the steps for which the data will be saved." -[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.all] +[blocks.period.fields.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.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.first] +[blocks.period.fields.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.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.last] +[blocks.period.fields.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.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.frequency] +[blocks.period.fields.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.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.steps] +[blocks.period.fields.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.stress_period_data.item.arms.printrecord] +[blocks.period.fields.period_data.item.arms.printrecord] type = "record" optional = true -[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.print] +[blocks.period.fields.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.stress_period_data.item.arms.printrecord.fields.rtype] +[blocks.period.fields.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.stress_period_data.item.arms.printrecord.fields.ocsetting] +[blocks.period.fields.period_data.item.arms.printrecord.fields.ocsetting] type = "union" description = "specifies the steps for which the data will be saved." -[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.all] +[blocks.period.fields.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.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.first] +[blocks.period.fields.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.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.last] +[blocks.period.fields.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.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.frequency] +[blocks.period.fields.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.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.steps] +[blocks.period.fields.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 563f5014..9ba0ab1d 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: - stress_period_data: + 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 43c18ca5..f352df5e 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": { - "stress_period_data": { + "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 e204cc4e..d92e5de4 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.stress_period_data] +[blocks.period.fields.period_data] type = "list" -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.period_data.item] name = "reachperioddata" type = "record" -[blocks.period.fields.stress_period_data.item.fields.ifno] +[blocks.period.fields.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.stress_period_data.item.fields.reachsetting] +[blocks.period.fields.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.stress_period_data.item.fields.reachsetting.arms.status] +[blocks.period.fields.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.stress_period_data.item.fields.reachsetting.arms.concentration] +[blocks.period.fields.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.stress_period_data.item.fields.reachsetting.arms.rainfall] +[blocks.period.fields.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.stress_period_data.item.fields.reachsetting.arms.evaporation] +[blocks.period.fields.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.stress_period_data.item.fields.reachsetting.arms.runoff] +[blocks.period.fields.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.stress_period_data.item.fields.reachsetting.arms.inflow] +[blocks.period.fields.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.stress_period_data.item.fields.reachsetting.arms.auxiliaryrecord] +[blocks.period.fields.period_data.item.fields.reachsetting.arms.auxiliaryrecord] type = "record" -[blocks.period.fields.stress_period_data.item.fields.reachsetting.arms.auxiliaryrecord.fields.auxiliary] +[blocks.period.fields.period_data.item.fields.reachsetting.arms.auxiliaryrecord.fields.auxiliary] type = "keyword" description = "keyword for specifying auxiliary variable." -[blocks.period.fields.stress_period_data.item.fields.reachsetting.arms.auxiliaryrecord.fields.auxname] +[blocks.period.fields.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.stress_period_data.item.fields.reachsetting.arms.auxiliaryrecord.fields.auxval] +[blocks.period.fields.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 6af68f0a..b0f809be 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: - stress_period_data: + period_data: type: list item: name: reachperioddata diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-src.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-src.json index c5ef666c..24df24b7 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-src.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-src.json @@ -125,7 +125,7 @@ }, "period": { "fields": { - "stress_period_data": { + "period_data": { "type": "list", "item": { "name": "stress_period_data", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-src.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-src.toml index 9e61f609..0d748ecb 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-src.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-src.toml @@ -106,30 +106,30 @@ type = "integer" longname = "maximum number of sources" description = "integer value specifying the maximum number of sources cells that will be specified for use during any stress period." -[blocks.period.fields.stress_period_data] +[blocks.period.fields.period_data] type = "list" shape = [ "<=maxbound", ] -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.period_data.item] name = "stress_period_data" type = "record" -[blocks.period.fields.stress_period_data.item.fields.cellid] +[blocks.period.fields.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.stress_period_data.item.fields.smassrate] +[blocks.period.fields.period_data.item.fields.smassrate] type = "double" longname = "mass source loading rate" description = "is the mass source loading rate. A positive value indicates addition of solute mass and a negative value indicates removal of solute mass. 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.stress_period_data.item.fields.aux] +[blocks.period.fields.period_data.item.fields.aux] type = "array" longname = "auxiliary variables" description = "represents the values of the auxiliary variables for each mass source. The values of auxiliary variables must be present for each mass source. 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." @@ -141,7 +141,7 @@ shape = [ "auxiliary", ] -[blocks.period.fields.stress_period_data.item.fields.boundname] +[blocks.period.fields.period_data.item.fields.boundname] type = "string" longname = "well name" description = "name of the mass source cell. BOUNDNAME is an ASCII character variable that can contain as many as 40 characters. If BOUNDNAME contains spaces in it, then the entire name must be enclosed within single quotes." diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-src.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-src.yaml index d72a818d..9e8f781d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-src.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-src.yaml @@ -124,7 +124,7 @@ blocks: for use during any stress period. period: fields: - stress_period_data: + period_data: type: list item: name: stress_period_data 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 903b618e..a3e1b63f 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": { - "stress_period_data": { + "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 6736d316..14c41eb5 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.stress_period_data] +[blocks.period.fields.period_data] type = "list" -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.period_data.item] name = "uztperioddata" type = "record" -[blocks.period.fields.stress_period_data.item.fields.ifno] +[blocks.period.fields.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.stress_period_data.item.fields.uztsetting] +[blocks.period.fields.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.stress_period_data.item.fields.uztsetting.arms.status] +[blocks.period.fields.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.stress_period_data.item.fields.uztsetting.arms.concentration] +[blocks.period.fields.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.stress_period_data.item.fields.uztsetting.arms.infiltration] +[blocks.period.fields.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.stress_period_data.item.fields.uztsetting.arms.uzet] +[blocks.period.fields.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.stress_period_data.item.fields.uztsetting.arms.auxiliaryrecord] +[blocks.period.fields.period_data.item.fields.uztsetting.arms.auxiliaryrecord] type = "record" -[blocks.period.fields.stress_period_data.item.fields.uztsetting.arms.auxiliaryrecord.fields.auxiliary] +[blocks.period.fields.period_data.item.fields.uztsetting.arms.auxiliaryrecord.fields.auxiliary] type = "keyword" description = "keyword for specifying auxiliary variable." -[blocks.period.fields.stress_period_data.item.fields.uztsetting.arms.auxiliaryrecord.fields.auxname] +[blocks.period.fields.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.stress_period_data.item.fields.uztsetting.arms.auxiliaryrecord.fields.auxval] +[blocks.period.fields.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 b344091c..f60aeb31 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: - stress_period_data: + period_data: type: list item: name: uztperioddata diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-cdb.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-cdb.json index 204068cf..d0ced84b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-cdb.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-cdb.json @@ -90,7 +90,7 @@ }, "period": { "fields": { - "stress_period_data": { + "period_data": { "type": "list", "item": { "name": "stress_period_data", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-cdb.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-cdb.toml index 07de862e..88136a95 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-cdb.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-cdb.toml @@ -73,37 +73,37 @@ type = "integer" longname = "maximum number of critical depth boundaries" description = "integer value specifying the maximum number of critical depth boundary cells that will be specified for use during any stress period." -[blocks.period.fields.stress_period_data] +[blocks.period.fields.period_data] type = "list" shape = [ "<=maxbound", ] -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.period_data.item] name = "stress_period_data" type = "record" -[blocks.period.fields.stress_period_data.item.fields.cellid] +[blocks.period.fields.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.stress_period_data.item.fields.idcxs] +[blocks.period.fields.period_data.item.fields.idcxs] type = "integer" longname = "cross section identifier" description = "is the identifier for the cross section specified in the CXS Package. A value of zero indicates the zero-depth-gradient calculation will use parameters for a hydraulically wide channel." tagged = false index = true -[blocks.period.fields.stress_period_data.item.fields.width] +[blocks.period.fields.period_data.item.fields.width] type = "double" longname = "width of the zero-depth gradient boundary" description = "is the channel width of the zero-depth gradient boundary. If a cross section is associated with this boundary, the width will be scaled by the cross section information. 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.stress_period_data.item.fields.aux] +[blocks.period.fields.period_data.item.fields.aux] type = "array" longname = "auxiliary variables" description = "represents the values of the auxiliary variables for each zero-depth-gradient boundary. The values of auxiliary variables must be present for each zero-depth-gradient boundary. The values must be specified in the order of the auxiliary variables specified in the OPTIONS block. If the package supports time series and the Options block includes a TIMESERIESFILE entry (see the 'Time-Variable Input' section), values can be obtained from a time series by entering the time-series name in place of a numeric value." @@ -115,7 +115,7 @@ shape = [ "auxiliary", ] -[blocks.period.fields.stress_period_data.item.fields.boundname] +[blocks.period.fields.period_data.item.fields.boundname] type = "string" longname = "zero-depth-gradient boundary name" description = "name of the zero-depth-gradient boundary cell. BOUNDNAME is an ASCII character variable that can contain as many as 40 characters. If BOUNDNAME contains spaces in it, then the entire name must be enclosed within single quotes." diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-cdb.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-cdb.yaml index ca1afffe..a77d25c8 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-cdb.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-cdb.yaml @@ -84,7 +84,7 @@ blocks: will be specified for use during any stress period. period: fields: - stress_period_data: + period_data: type: list item: name: stress_period_data diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-chd.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-chd.json index bc48c87e..5f409f68 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-chd.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-chd.json @@ -119,7 +119,7 @@ }, "period": { "fields": { - "stress_period_data": { + "period_data": { "type": "list", "item": { "name": "stress_period_data", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-chd.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-chd.toml index 2fbeac5a..a33f33df 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-chd.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-chd.toml @@ -100,30 +100,30 @@ type = "integer" longname = "maximum number of constant heads" description = "integer value specifying the maximum number of constant-head cells that will be specified for use during any stress period." -[blocks.period.fields.stress_period_data] +[blocks.period.fields.period_data] type = "list" shape = [ "<=maxbound", ] -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.period_data.item] name = "stress_period_data" type = "record" -[blocks.period.fields.stress_period_data.item.fields.cellid] +[blocks.period.fields.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.stress_period_data.item.fields.head] +[blocks.period.fields.period_data.item.fields.head] type = "double" longname = "head value assigned to constant head" description = "is the head at the boundary. 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.stress_period_data.item.fields.aux] +[blocks.period.fields.period_data.item.fields.aux] type = "array" longname = "auxiliary variables" description = "represents the values of the auxiliary variables for each constant head. The values of auxiliary variables must be present for each constant head. The values must be specified in the order of the auxiliary variables specified in the OPTIONS block. If the package supports time series and the Options block includes a TIMESERIESFILE entry (see the 'Time-Variable Input' section), values can be obtained from a time series by entering the time-series name in place of a numeric value." @@ -135,7 +135,7 @@ shape = [ "auxiliary", ] -[blocks.period.fields.stress_period_data.item.fields.boundname] +[blocks.period.fields.period_data.item.fields.boundname] type = "string" longname = "constant head boundary name" description = "name of the constant head boundary cell. BOUNDNAME is an ASCII character variable that can contain as many as 40 characters. If BOUNDNAME contains spaces in it, then the entire name must be enclosed within single quotes." diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-chd.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-chd.yaml index 328b6579..7defbbb9 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-chd.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-chd.yaml @@ -109,7 +109,7 @@ blocks: for use during any stress period. period: fields: - stress_period_data: + period_data: type: list item: name: stress_period_data diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-evp.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-evp.json index ad17a333..ec8a15e3 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-evp.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-evp.json @@ -119,7 +119,7 @@ }, "period": { "fields": { - "stress_period_data": { + "period_data": { "type": "list", "item": { "name": "stress_period_data", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-evp.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-evp.toml index c58e1bb4..98a4825c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-evp.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-evp.toml @@ -100,30 +100,30 @@ type = "integer" longname = "maximum number of evaporation cells" description = "integer value specifying the maximum number of evaporation cells that will be specified for use during any stress period." -[blocks.period.fields.stress_period_data] +[blocks.period.fields.period_data] type = "list" shape = [ "<=maxbound", ] -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.period_data.item] name = "stress_period_data" type = "record" -[blocks.period.fields.stress_period_data.item.fields.cellid] +[blocks.period.fields.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.stress_period_data.item.fields.evaporation] +[blocks.period.fields.period_data.item.fields.evaporation] type = "double" longname = "evaporation rate" description = "is the evaporation flux rate ($LT^{-1}$). This rate is multiplied inside the program by the water surface area of the cell to calculate the volumetric evaporation rate. 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.stress_period_data.item.fields.aux] +[blocks.period.fields.period_data.item.fields.aux] type = "array" longname = "auxiliary variables" description = "represents the values of the auxiliary variables for each evaporation. The values of auxiliary variables must be present for each evaporation. 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." @@ -135,7 +135,7 @@ shape = [ "auxiliary", ] -[blocks.period.fields.stress_period_data.item.fields.boundname] +[blocks.period.fields.period_data.item.fields.boundname] type = "string" longname = "evaporation name" description = "name of the evaporation cell. BOUNDNAME is an ASCII character variable that can contain as many as 40 characters. If BOUNDNAME contains spaces in it, then the entire name must be enclosed within single quotes." diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-evp.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-evp.yaml index cd1878d7..32ea8eae 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-evp.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-evp.yaml @@ -109,7 +109,7 @@ blocks: for use during any stress period. period: fields: - stress_period_data: + period_data: type: list item: name: stress_period_data diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-flw.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-flw.json index 0d17b35a..8a97e03b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-flw.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-flw.json @@ -119,7 +119,7 @@ }, "period": { "fields": { - "stress_period_data": { + "period_data": { "type": "list", "item": { "name": "stress_period_data", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-flw.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-flw.toml index bb788f16..434810b1 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-flw.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-flw.toml @@ -100,30 +100,30 @@ type = "integer" longname = "maximum number of inflow" description = "integer value specifying the maximum number of inflow cells that will be specified for use during any stress period." -[blocks.period.fields.stress_period_data] +[blocks.period.fields.period_data] type = "list" shape = [ "<=maxbound", ] -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.period_data.item] name = "stress_period_data" type = "record" -[blocks.period.fields.stress_period_data.item.fields.cellid] +[blocks.period.fields.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.stress_period_data.item.fields.q] +[blocks.period.fields.period_data.item.fields.q] type = "double" longname = "flow rate" description = "is the volumetric inflow rate. A positive value indicates inflow to the stream. Negative values are not allowed. 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.stress_period_data.item.fields.aux] +[blocks.period.fields.period_data.item.fields.aux] type = "array" longname = "auxiliary variables" description = "represents the values of the auxiliary variables for each inflow. The values of auxiliary variables must be present for each inflow. 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." @@ -135,7 +135,7 @@ shape = [ "auxiliary", ] -[blocks.period.fields.stress_period_data.item.fields.boundname] +[blocks.period.fields.period_data.item.fields.boundname] type = "string" longname = "inflow name" description = "name of the inflow cell. BOUNDNAME is an ASCII character variable that can contain as many as 40 characters. If BOUNDNAME contains spaces in it, then the entire name must be enclosed within single quotes." diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-flw.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-flw.yaml index 72d1ae78..4e68124e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-flw.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-flw.yaml @@ -108,7 +108,7 @@ blocks: for use during any stress period. period: fields: - stress_period_data: + period_data: type: list item: name: stress_period_data 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 a15548f2..4404cf20 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": { - "stress_period_data": { + "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 d18c526e..8af44bc2 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.stress_period_data] +[blocks.period.fields.period_data] type = "list" optional = true -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.period_data.item] name = "output_record" type = "union" -[blocks.period.fields.stress_period_data.item.arms.saverecord] +[blocks.period.fields.period_data.item.arms.saverecord] type = "record" optional = true -[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.save] +[blocks.period.fields.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.stress_period_data.item.arms.saverecord.fields.rtype] +[blocks.period.fields.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.stress_period_data.item.arms.saverecord.fields.ocsetting] +[blocks.period.fields.period_data.item.arms.saverecord.fields.ocsetting] type = "union" description = "specifies the steps for which the data will be saved." -[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.all] +[blocks.period.fields.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.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.first] +[blocks.period.fields.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.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.last] +[blocks.period.fields.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.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.frequency] +[blocks.period.fields.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.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.steps] +[blocks.period.fields.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.stress_period_data.item.arms.printrecord] +[blocks.period.fields.period_data.item.arms.printrecord] type = "record" optional = true -[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.print] +[blocks.period.fields.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.stress_period_data.item.arms.printrecord.fields.rtype] +[blocks.period.fields.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.stress_period_data.item.arms.printrecord.fields.ocsetting] +[blocks.period.fields.period_data.item.arms.printrecord.fields.ocsetting] type = "union" description = "specifies the steps for which the data will be saved." -[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.all] +[blocks.period.fields.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.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.first] +[blocks.period.fields.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.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.last] +[blocks.period.fields.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.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.frequency] +[blocks.period.fields.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.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.steps] +[blocks.period.fields.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 901743a9..8b21a8d9 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: - stress_period_data: + period_data: type: list optional: true item: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-pcp.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-pcp.json index c6ce51a5..d99926a8 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-pcp.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-pcp.json @@ -119,7 +119,7 @@ }, "period": { "fields": { - "stress_period_data": { + "period_data": { "type": "list", "item": { "name": "stress_period_data", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-pcp.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-pcp.toml index 8c3231e3..f0ce0ef9 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-pcp.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-pcp.toml @@ -100,30 +100,30 @@ type = "integer" longname = "maximum number of precipitation cells" description = "integer value specifying the maximum number of precipitation cells that will be specified for use during any stress period." -[blocks.period.fields.stress_period_data] +[blocks.period.fields.period_data] type = "list" shape = [ "<=maxbound", ] -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.period_data.item] name = "stress_period_data" type = "record" -[blocks.period.fields.stress_period_data.item.fields.cellid] +[blocks.period.fields.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.stress_period_data.item.fields.precipitation] +[blocks.period.fields.period_data.item.fields.precipitation] type = "double" longname = "precipitation rate" description = "is the precipitation flux rate ($LT^{-1}$). This rate is multiplied inside the program by the surface area of the cell to calculate the volumetric precipitation rate. 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.stress_period_data.item.fields.aux] +[blocks.period.fields.period_data.item.fields.aux] type = "array" longname = "auxiliary variables" description = "represents the values of the auxiliary variables for each precipitation. The values of auxiliary variables must be present for each precipitation. 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." @@ -135,7 +135,7 @@ shape = [ "auxiliary", ] -[blocks.period.fields.stress_period_data.item.fields.boundname] +[blocks.period.fields.period_data.item.fields.boundname] type = "string" longname = "precipitation name" description = "name of the precipitation cell. BOUNDNAME is an ASCII character variable that can contain as many as 40 characters. If BOUNDNAME contains spaces in it, then the entire name must be enclosed within single quotes." diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-pcp.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-pcp.yaml index 4b8a3810..beac95cf 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-pcp.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-pcp.yaml @@ -109,7 +109,7 @@ blocks: for use during any stress period. period: fields: - stress_period_data: + period_data: type: list item: name: stress_period_data diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-sto.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-sto.json index e887c2a7..cf081c35 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-sto.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-sto.json @@ -23,7 +23,7 @@ }, "period": { "fields": { - "stress_period_data": { + "period_data": { "type": "string", "longname": "storage state", "description": "keyword to indicate that stress period IPER is steady-state. Steady-state conditions will apply until the TRANSIENT keyword is specified in a subsequent BEGIN PERIOD block.", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-sto.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-sto.toml index e5a70c96..c04ce97b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-sto.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-sto.toml @@ -16,7 +16,7 @@ longname = "export array variables to layered ascii files." description = "keyword that specifies input grid arrays, which already support the layered keyword, should be written to layered ascii output files." optional = true -[blocks.period.fields.stress_period_data] +[blocks.period.fields.period_data] type = "string" longname = "storage state" description = "keyword to indicate that stress period IPER is steady-state. Steady-state conditions will apply until the TRANSIENT keyword is specified in a subsequent BEGIN PERIOD block." diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-sto.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-sto.yaml index 3150b562..550be02b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-sto.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-sto.yaml @@ -20,7 +20,7 @@ blocks: optional: true period: fields: - stress_period_data: + period_data: type: string longname: storage state description: keyword to indicate that stress period IPER is steady-state. Steady-state conditions diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-zdg.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-zdg.json index 8926d69e..456a3843 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-zdg.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-zdg.json @@ -113,7 +113,7 @@ }, "period": { "fields": { - "stress_period_data": { + "period_data": { "type": "list", "item": { "name": "stress_period_data", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-zdg.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-zdg.toml index 9e6c99cb..6753b004 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-zdg.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-zdg.toml @@ -94,23 +94,23 @@ type = "integer" longname = "maximum number of zero-depth-gradient boundaries" description = "integer value specifying the maximum number of zero-depth-gradient boundary cells that will be specified for use during any stress period." -[blocks.period.fields.stress_period_data] +[blocks.period.fields.period_data] type = "list" shape = [ "<=maxbound", ] -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.period_data.item] name = "stress_period_data" type = "record" -[blocks.period.fields.stress_period_data.item.fields.cellid] +[blocks.period.fields.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.stress_period_data.item.fields.idcxs] +[blocks.period.fields.period_data.item.fields.idcxs] type = "integer" longname = "cross section identifier" description = "is the identifier for the cross section specified in the CXS Package. A value of zero indicates the zero-depth-gradient calculation will use parameters for a hydraulically wide channel." @@ -118,28 +118,28 @@ tagged = false index = true fk = "chf-cxs.packagedata.idcxs" -[blocks.period.fields.stress_period_data.item.fields.width] +[blocks.period.fields.period_data.item.fields.width] type = "double" longname = "width of the zero-depth gradient boundary" description = "is the channel width of the zero-depth gradient boundary. If a cross section is associated with this boundary, the width will be scaled by the cross section information. 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.stress_period_data.item.fields.slope] +[blocks.period.fields.period_data.item.fields.slope] type = "double" longname = "channel slope" description = "is the channel slope used to calculate flow to the zero-depth-gradient boundary. 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.stress_period_data.item.fields.rough] +[blocks.period.fields.period_data.item.fields.rough] type = "double" longname = "channel roughness" description = "is the Manning channel roughness value used to calculate flow to the zero-depth-gradient boundary. If a cross section is associated with this boundary, the roughness value will be multiplied by the roughness fraction for each part of the cross section. 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.stress_period_data.item.fields.aux] +[blocks.period.fields.period_data.item.fields.aux] type = "array" longname = "auxiliary variables" description = "represents the values of the auxiliary variables for each zero-depth-gradient boundary. The values of auxiliary variables must be present for each zero-depth-gradient boundary. The values must be specified in the order of the auxiliary variables specified in the OPTIONS block. If the package supports time series and the Options block includes a TIMESERIESFILE entry (see the 'Time-Variable Input' section), values can be obtained from a time series by entering the time-series name in place of a numeric value." @@ -151,7 +151,7 @@ shape = [ "auxiliary", ] -[blocks.period.fields.stress_period_data.item.fields.boundname] +[blocks.period.fields.period_data.item.fields.boundname] type = "string" longname = "zero-depth-gradient boundary name" description = "name of the zero-depth-gradient boundary cell. BOUNDNAME is an ASCII character variable that can contain as many as 40 characters. If BOUNDNAME contains spaces in it, then the entire name must be enclosed within single quotes." diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-zdg.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-zdg.yaml index b7f4a30b..efdb9b16 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-zdg.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-zdg.yaml @@ -104,7 +104,7 @@ blocks: that will be specified for use during any stress period. period: fields: - stress_period_data: + period_data: type: list item: name: stress_period_data 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 5e9f79f1..27de8fd6 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": { - "stress_period_data": { + "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 254c326e..03b9df44 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.stress_period_data] +[blocks.period.fields.period_data] type = "list" optional = true -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.period_data.item] name = "output_record" type = "union" -[blocks.period.fields.stress_period_data.item.arms.saverecord] +[blocks.period.fields.period_data.item.arms.saverecord] type = "record" optional = true -[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.save] +[blocks.period.fields.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.stress_period_data.item.arms.saverecord.fields.rtype] +[blocks.period.fields.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.stress_period_data.item.arms.saverecord.fields.ocsetting] +[blocks.period.fields.period_data.item.arms.saverecord.fields.ocsetting] type = "union" description = "specifies the steps for which the data will be saved." -[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.all] +[blocks.period.fields.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.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.first] +[blocks.period.fields.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.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.last] +[blocks.period.fields.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.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.frequency] +[blocks.period.fields.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.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.steps] +[blocks.period.fields.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.stress_period_data.item.arms.printrecord] +[blocks.period.fields.period_data.item.arms.printrecord] type = "record" optional = true -[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.print] +[blocks.period.fields.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.stress_period_data.item.arms.printrecord.fields.rtype] +[blocks.period.fields.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.stress_period_data.item.arms.printrecord.fields.ocsetting] +[blocks.period.fields.period_data.item.arms.printrecord.fields.ocsetting] type = "union" description = "specifies the steps for which the data will be saved." -[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.all] +[blocks.period.fields.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.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.first] +[blocks.period.fields.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.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.last] +[blocks.period.fields.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.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.frequency] +[blocks.period.fields.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.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.steps] +[blocks.period.fields.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 15ce22f6..d194e845 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: - stress_period_data: + 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 6479f62a..550fd079 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": { - "stress_period_data": { + "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 d827649e..7aeb1227 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.stress_period_data] +[blocks.period.fields.period_data] type = "list" -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.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.stress_period_data.item.arms.all] +[blocks.period.fields.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.stress_period_data.item.arms.first] +[blocks.period.fields.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.stress_period_data.item.arms.last] +[blocks.period.fields.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.stress_period_data.item.arms.frequency] +[blocks.period.fields.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.stress_period_data.item.arms.steps] +[blocks.period.fields.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.stress_period_data.item.arms.fraction] +[blocks.period.fields.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 9fb0cb94..cade67cb 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: - stress_period_data: + period_data: type: list item: name: releasesetting diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-cdb.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-cdb.json index 7767e4f3..8d1257dc 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-cdb.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-cdb.json @@ -90,7 +90,7 @@ }, "period": { "fields": { - "stress_period_data": { + "period_data": { "type": "list", "item": { "name": "stress_period_data", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-cdb.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-cdb.toml index af725dd9..0e69fa95 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-cdb.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-cdb.toml @@ -73,37 +73,37 @@ type = "integer" longname = "maximum number of critical depth boundaries" description = "integer value specifying the maximum number of critical depth boundary cells that will be specified for use during any stress period." -[blocks.period.fields.stress_period_data] +[blocks.period.fields.period_data] type = "list" shape = [ "<=maxbound", ] -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.period_data.item] name = "stress_period_data" type = "record" -[blocks.period.fields.stress_period_data.item.fields.cellid] +[blocks.period.fields.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.stress_period_data.item.fields.idcxs] +[blocks.period.fields.period_data.item.fields.idcxs] type = "integer" longname = "cross section identifier" description = "is the identifier for the cross section specified in the CXS Package. A value of zero indicates the zero-depth-gradient calculation will use parameters for a hydraulically wide channel." tagged = false index = true -[blocks.period.fields.stress_period_data.item.fields.width] +[blocks.period.fields.period_data.item.fields.width] type = "double" longname = "width of the zero-depth gradient boundary" description = "is the channel width of the zero-depth gradient boundary. If a cross section is associated with this boundary, the width will be scaled by the cross section information. 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.stress_period_data.item.fields.aux] +[blocks.period.fields.period_data.item.fields.aux] type = "array" longname = "auxiliary variables" description = "represents the values of the auxiliary variables for each zero-depth-gradient boundary. The values of auxiliary variables must be present for each zero-depth-gradient boundary. The values must be specified in the order of the auxiliary variables specified in the OPTIONS block. If the package supports time series and the Options block includes a TIMESERIESFILE entry (see the 'Time-Variable Input' section), values can be obtained from a time series by entering the time-series name in place of a numeric value." @@ -115,7 +115,7 @@ shape = [ "auxiliary", ] -[blocks.period.fields.stress_period_data.item.fields.boundname] +[blocks.period.fields.period_data.item.fields.boundname] type = "string" longname = "zero-depth-gradient boundary name" description = "name of the zero-depth-gradient boundary cell. BOUNDNAME is an ASCII character variable that can contain as many as 40 characters. If BOUNDNAME contains spaces in it, then the entire name must be enclosed within single quotes." diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-cdb.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-cdb.yaml index 8efb3699..24664f16 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-cdb.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-cdb.yaml @@ -85,7 +85,7 @@ blocks: will be specified for use during any stress period. period: fields: - stress_period_data: + period_data: type: list item: name: stress_period_data diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-chd.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-chd.json index 38547d01..eb7e7ec9 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-chd.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-chd.json @@ -119,7 +119,7 @@ }, "period": { "fields": { - "stress_period_data": { + "period_data": { "type": "list", "item": { "name": "stress_period_data", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-chd.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-chd.toml index 683e5f18..e912fc20 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-chd.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-chd.toml @@ -100,30 +100,30 @@ type = "integer" longname = "maximum number of constant heads" description = "integer value specifying the maximum number of constant-head cells that will be specified for use during any stress period." -[blocks.period.fields.stress_period_data] +[blocks.period.fields.period_data] type = "list" shape = [ "<=maxbound", ] -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.period_data.item] name = "stress_period_data" type = "record" -[blocks.period.fields.stress_period_data.item.fields.cellid] +[blocks.period.fields.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.stress_period_data.item.fields.head] +[blocks.period.fields.period_data.item.fields.head] type = "double" longname = "head value assigned to constant head" description = "is the head at the boundary. 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.stress_period_data.item.fields.aux] +[blocks.period.fields.period_data.item.fields.aux] type = "array" longname = "auxiliary variables" description = "represents the values of the auxiliary variables for each constant head. The values of auxiliary variables must be present for each constant head. The values must be specified in the order of the auxiliary variables specified in the OPTIONS block. If the package supports time series and the Options block includes a TIMESERIESFILE entry (see the 'Time-Variable Input' section), values can be obtained from a time series by entering the time-series name in place of a numeric value." @@ -135,7 +135,7 @@ shape = [ "auxiliary", ] -[blocks.period.fields.stress_period_data.item.fields.boundname] +[blocks.period.fields.period_data.item.fields.boundname] type = "string" longname = "constant head boundary name" description = "name of the constant head boundary cell. BOUNDNAME is an ASCII character variable that can contain as many as 40 characters. If BOUNDNAME contains spaces in it, then the entire name must be enclosed within single quotes." diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-chd.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-chd.yaml index 8b03a168..0aa4966c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-chd.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-chd.yaml @@ -109,7 +109,7 @@ blocks: for use during any stress period. period: fields: - stress_period_data: + period_data: type: list item: name: stress_period_data diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-evp.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-evp.json index 8fe375f0..71292a9c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-evp.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-evp.json @@ -119,7 +119,7 @@ }, "period": { "fields": { - "stress_period_data": { + "period_data": { "type": "list", "item": { "name": "stress_period_data", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-evp.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-evp.toml index 83bb93a2..ac97de8c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-evp.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-evp.toml @@ -100,30 +100,30 @@ type = "integer" longname = "maximum number of evaporation cells" description = "integer value specifying the maximum number of evaporation cells that will be specified for use during any stress period." -[blocks.period.fields.stress_period_data] +[blocks.period.fields.period_data] type = "list" shape = [ "<=maxbound", ] -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.period_data.item] name = "stress_period_data" type = "record" -[blocks.period.fields.stress_period_data.item.fields.cellid] +[blocks.period.fields.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.stress_period_data.item.fields.evaporation] +[blocks.period.fields.period_data.item.fields.evaporation] type = "double" longname = "evaporation rate" description = "is the evaporation flux rate ($LT^{-1}$). This rate is multiplied inside the program by the water surface area of the cell to calculate the volumetric evaporation rate. 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.stress_period_data.item.fields.aux] +[blocks.period.fields.period_data.item.fields.aux] type = "array" longname = "auxiliary variables" description = "represents the values of the auxiliary variables for each evaporation. The values of auxiliary variables must be present for each evaporation. 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." @@ -135,7 +135,7 @@ shape = [ "auxiliary", ] -[blocks.period.fields.stress_period_data.item.fields.boundname] +[blocks.period.fields.period_data.item.fields.boundname] type = "string" longname = "evaporation name" description = "name of the evaporation cell. BOUNDNAME is an ASCII character variable that can contain as many as 40 characters. If BOUNDNAME contains spaces in it, then the entire name must be enclosed within single quotes." diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-evp.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-evp.yaml index 12690b37..415ed1d7 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-evp.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-evp.yaml @@ -109,7 +109,7 @@ blocks: for use during any stress period. period: fields: - stress_period_data: + period_data: type: list item: name: stress_period_data diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-flw.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-flw.json index ccbffc0a..329174b2 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-flw.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-flw.json @@ -119,7 +119,7 @@ }, "period": { "fields": { - "stress_period_data": { + "period_data": { "type": "list", "item": { "name": "stress_period_data", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-flw.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-flw.toml index 92c2df99..6e6f21a3 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-flw.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-flw.toml @@ -100,30 +100,30 @@ type = "integer" longname = "maximum number of inflow" description = "integer value specifying the maximum number of inflow cells that will be specified for use during any stress period." -[blocks.period.fields.stress_period_data] +[blocks.period.fields.period_data] type = "list" shape = [ "<=maxbound", ] -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.period_data.item] name = "stress_period_data" type = "record" -[blocks.period.fields.stress_period_data.item.fields.cellid] +[blocks.period.fields.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.stress_period_data.item.fields.q] +[blocks.period.fields.period_data.item.fields.q] type = "double" longname = "well rate" description = "is the volumetric inflow rate. A positive value indicates inflow to the stream. Negative values are not allows. 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.stress_period_data.item.fields.aux] +[blocks.period.fields.period_data.item.fields.aux] type = "array" longname = "auxiliary variables" description = "represents the values of the auxiliary variables for each inflow. The values of auxiliary variables must be present for each inflow. 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." @@ -135,7 +135,7 @@ shape = [ "auxiliary", ] -[blocks.period.fields.stress_period_data.item.fields.boundname] +[blocks.period.fields.period_data.item.fields.boundname] type = "string" longname = "inflow name" description = "name of the inflow cell. BOUNDNAME is an ASCII character variable that can contain as many as 40 characters. If BOUNDNAME contains spaces in it, then the entire name must be enclosed within single quotes." diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-flw.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-flw.yaml index af0f91ca..68eec5fe 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-flw.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-flw.yaml @@ -108,7 +108,7 @@ blocks: for use during any stress period. period: fields: - stress_period_data: + period_data: type: list item: name: stress_period_data 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 ed07f848..accec534 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": { - "stress_period_data": { + "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 aa2bea6e..6dee42ab 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.stress_period_data] +[blocks.period.fields.period_data] type = "list" optional = true -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.period_data.item] name = "output_record" type = "union" -[blocks.period.fields.stress_period_data.item.arms.saverecord] +[blocks.period.fields.period_data.item.arms.saverecord] type = "record" optional = true -[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.save] +[blocks.period.fields.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.stress_period_data.item.arms.saverecord.fields.rtype] +[blocks.period.fields.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.stress_period_data.item.arms.saverecord.fields.ocsetting] +[blocks.period.fields.period_data.item.arms.saverecord.fields.ocsetting] type = "union" description = "specifies the steps for which the data will be saved." -[blocks.period.fields.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.all] +[blocks.period.fields.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.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.first] +[blocks.period.fields.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.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.last] +[blocks.period.fields.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.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.frequency] +[blocks.period.fields.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.stress_period_data.item.arms.saverecord.fields.ocsetting.arms.steps] +[blocks.period.fields.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.stress_period_data.item.arms.printrecord] +[blocks.period.fields.period_data.item.arms.printrecord] type = "record" optional = true -[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.print] +[blocks.period.fields.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.stress_period_data.item.arms.printrecord.fields.rtype] +[blocks.period.fields.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.stress_period_data.item.arms.printrecord.fields.ocsetting] +[blocks.period.fields.period_data.item.arms.printrecord.fields.ocsetting] type = "union" description = "specifies the steps for which the data will be saved." -[blocks.period.fields.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.all] +[blocks.period.fields.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.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.first] +[blocks.period.fields.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.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.last] +[blocks.period.fields.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.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.frequency] +[blocks.period.fields.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.stress_period_data.item.arms.printrecord.fields.ocsetting.arms.steps] +[blocks.period.fields.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 a552629a..37768139 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: - stress_period_data: + period_data: type: list optional: true item: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-pcp.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-pcp.json index 589a6616..7f3e612f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-pcp.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-pcp.json @@ -119,7 +119,7 @@ }, "period": { "fields": { - "stress_period_data": { + "period_data": { "type": "list", "item": { "name": "stress_period_data", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-pcp.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-pcp.toml index 3991883e..0e7a3345 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-pcp.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-pcp.toml @@ -100,30 +100,30 @@ type = "integer" longname = "maximum number of precipitation cells" description = "integer value specifying the maximum number of precipitation cells that will be specified for use during any stress period." -[blocks.period.fields.stress_period_data] +[blocks.period.fields.period_data] type = "list" shape = [ "<=maxbound", ] -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.period_data.item] name = "stress_period_data" type = "record" -[blocks.period.fields.stress_period_data.item.fields.cellid] +[blocks.period.fields.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.stress_period_data.item.fields.precipitation] +[blocks.period.fields.period_data.item.fields.precipitation] type = "double" longname = "precipitation rate" description = "is the precipitation flux rate ($LT^{-1}$). This rate is multiplied inside the program by the surface area of the cell to calculate the volumetric precipitation rate. 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.stress_period_data.item.fields.aux] +[blocks.period.fields.period_data.item.fields.aux] type = "array" longname = "auxiliary variables" description = "represents the values of the auxiliary variables for each precipitation. The values of auxiliary variables must be present for each precipitation. 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." @@ -135,7 +135,7 @@ shape = [ "auxiliary", ] -[blocks.period.fields.stress_period_data.item.fields.boundname] +[blocks.period.fields.period_data.item.fields.boundname] type = "string" longname = "precipitation name" description = "name of the precipitation cell. BOUNDNAME is an ASCII character variable that can contain as many as 40 characters. If BOUNDNAME contains spaces in it, then the entire name must be enclosed within single quotes." diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-pcp.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-pcp.yaml index ce949ffb..558dbb9c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-pcp.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-pcp.yaml @@ -109,7 +109,7 @@ blocks: for use during any stress period. period: fields: - stress_period_data: + period_data: type: list item: name: stress_period_data diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-sto.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-sto.json index d442fb5b..22042ccf 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-sto.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-sto.json @@ -23,7 +23,7 @@ }, "period": { "fields": { - "stress_period_data": { + "period_data": { "type": "string", "longname": "storage state", "description": "keyword to indicate that stress period IPER is steady-state. Steady-state conditions will apply until the TRANSIENT keyword is specified in a subsequent BEGIN PERIOD block.", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-sto.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-sto.toml index f797efd5..2900a0a1 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-sto.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-sto.toml @@ -16,7 +16,7 @@ longname = "export array variables to layered ascii files." description = "keyword that specifies input grid arrays, which already support the layered keyword, should be written to layered ascii output files." optional = true -[blocks.period.fields.stress_period_data] +[blocks.period.fields.period_data] type = "string" longname = "storage state" description = "keyword to indicate that stress period IPER is steady-state. Steady-state conditions will apply until the TRANSIENT keyword is specified in a subsequent BEGIN PERIOD block." diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-sto.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-sto.yaml index 39327cfc..97b22f40 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-sto.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-sto.yaml @@ -20,7 +20,7 @@ blocks: optional: true period: fields: - stress_period_data: + period_data: type: string longname: storage state description: keyword to indicate that stress period IPER is steady-state. Steady-state conditions diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-zdg.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-zdg.json index 8cd5c859..9d0d8d89 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-zdg.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-zdg.json @@ -113,7 +113,7 @@ }, "period": { "fields": { - "stress_period_data": { + "period_data": { "type": "list", "item": { "name": "stress_period_data", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-zdg.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-zdg.toml index 69a26851..b3e97547 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-zdg.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-zdg.toml @@ -94,51 +94,51 @@ type = "integer" longname = "maximum number of zero-depth-gradient boundaries" description = "integer value specifying the maximum number of zero-depth-gradient boundary cells that will be specified for use during any stress period." -[blocks.period.fields.stress_period_data] +[blocks.period.fields.period_data] type = "list" shape = [ "<=maxbound", ] -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.period_data.item] name = "stress_period_data" type = "record" -[blocks.period.fields.stress_period_data.item.fields.cellid] +[blocks.period.fields.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.stress_period_data.item.fields.idcxs] +[blocks.period.fields.period_data.item.fields.idcxs] type = "integer" longname = "cross section identifier" description = "is the identifier for the cross section specified in the CXS Package. A value of zero indicates the zero-depth-gradient calculation will use parameters for a hydraulically wide channel." tagged = false index = true -[blocks.period.fields.stress_period_data.item.fields.width] +[blocks.period.fields.period_data.item.fields.width] type = "double" longname = "width of the zero-depth gradient boundary" description = "is the channel width of the zero-depth gradient boundary. If a cross section is associated with this boundary, the width will be scaled by the cross section information. 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.stress_period_data.item.fields.slope] +[blocks.period.fields.period_data.item.fields.slope] type = "double" longname = "channel slope" description = "is the channel slope used to calculate flow to the zero-depth-gradient boundary. 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.stress_period_data.item.fields.rough] +[blocks.period.fields.period_data.item.fields.rough] type = "double" longname = "channel roughness" description = "is the Manning channel roughness value used to calculate flow to the zero-depth-gradient boundary. If a cross section is associated with this boundary, the roughness value will be multiplied by the roughness fraction for each part of the cross section. 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.stress_period_data.item.fields.aux] +[blocks.period.fields.period_data.item.fields.aux] type = "array" longname = "auxiliary variables" description = "represents the values of the auxiliary variables for each zero-depth-gradient boundary. The values of auxiliary variables must be present for each zero-depth-gradient boundary. The values must be specified in the order of the auxiliary variables specified in the OPTIONS block. If the package supports time series and the Options block includes a TIMESERIESFILE entry (see the 'Time-Variable Input' section), values can be obtained from a time series by entering the time-series name in place of a numeric value." @@ -150,7 +150,7 @@ shape = [ "auxiliary", ] -[blocks.period.fields.stress_period_data.item.fields.boundname] +[blocks.period.fields.period_data.item.fields.boundname] type = "string" longname = "zero-depth-gradient boundary name" description = "name of the zero-depth-gradient boundary cell. BOUNDNAME is an ASCII character variable that can contain as many as 40 characters. If BOUNDNAME contains spaces in it, then the entire name must be enclosed within single quotes." diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-zdg.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-zdg.yaml index 757bf65d..03acc8df 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-zdg.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-zdg.yaml @@ -105,7 +105,7 @@ blocks: that will be specified for use during any stress period. period: fields: - stress_period_data: + period_data: type: list item: name: stress_period_data 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 3c5bf67d..c90a4a66 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": { - "stress_period_data": { + "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 a089ad8d..34089c69 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.stress_period_data] +[blocks.period.fields.period_data] type = "list" shape = [ "<=maxbound", ] -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.period_data.item] name = "perioddata" type = "record" -[blocks.period.fields.stress_period_data.item.fields.bndno] +[blocks.period.fields.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,21 +62,21 @@ tagged = false index = true pk = true -[blocks.period.fields.stress_period_data.item.fields.bndno.fk] +[blocks.period.fields.period_data.item.fields.bndno.fk] key = "bound" rule = "ssm_package" -[blocks.period.fields.stress_period_data.item.fields.spcsetting] +[blocks.period.fields.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.stress_period_data.item.fields.spcsetting.arms.concentration] +[blocks.period.fields.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.stress_period_data.item.fields.spcsetting.arms.temperature] +[blocks.period.fields.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 612a844c..c398584c 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: - stress_period_data: + 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 41150b0a..d3a8ba11 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": { - "stress_period_data": { + "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 093c4b21..131c4053 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.stress_period_data] +[blocks.period.fields.period_data] type = "list" -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.period_data.item] name = "perioddata" type = "record" -[blocks.period.fields.stress_period_data.item.fields.cellid] +[blocks.period.fields.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.stress_period_data.item.fields.tvksetting] +[blocks.period.fields.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.stress_period_data.item.fields.tvksetting.arms.k] +[blocks.period.fields.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.stress_period_data.item.fields.tvksetting.arms.k22] +[blocks.period.fields.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.stress_period_data.item.fields.tvksetting.arms.k33] +[blocks.period.fields.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 6b4400bd..e6fc3155 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: - stress_period_data: + 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 8b8451fd..45d989cd 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": { - "stress_period_data": { + "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 b8604f72..c835e7e4 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.stress_period_data] +[blocks.period.fields.period_data] type = "list" -[blocks.period.fields.stress_period_data.item] +[blocks.period.fields.period_data.item] name = "perioddata" type = "record" -[blocks.period.fields.stress_period_data.item.fields.cellid] +[blocks.period.fields.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.stress_period_data.item.fields.tvssetting] +[blocks.period.fields.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.stress_period_data.item.fields.tvssetting.arms.ss] +[blocks.period.fields.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.stress_period_data.item.fields.tvssetting.arms.sy] +[blocks.period.fields.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 ef531db5..1e31b75e 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: - stress_period_data: + period_data: type: list item: name: perioddata diff --git a/autotest/dfns/test_migrate.py b/autotest/dfns/test_migrate.py index da5ad544..48d4355c 100644 --- a/autotest/dfns/test_migrate.py +++ b/autotest/dfns/test_migrate.py @@ -335,7 +335,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["stress_period_data"].item + item = component.blocks["period"].fields["period_data"].item assert isinstance(item, v2.Union) and item.name == setting if name == "gwf-lak": assert item.arms["stage"].fields["lakeno"].fk.path == "packagedata.ifno" @@ -380,7 +380,7 @@ def test_migrate_mvr_keys(dfn_dir): component = _migrate_dev3(dfn_dir, "gwf-mvr") blocks = component.blocks packages = blocks["packages"].fields["packages"].item.fields - period = blocks["period"].fields["stress_period_data"].item.fields + period = blocks["period"].fields["period_data"].item.fields # a model, and one of the exchange's two (MF6's xmvr_check_packages) model = v2.ForeignKey(path="sim-nam.models.mname", rule="exchange_models") assert packages["mname"].fk == model @@ -478,7 +478,7 @@ def item(component, block): assert maw.dims["ngwfnodes"].value == "sum(packagedata.ngwfnodes)" sfr = _migrate_dev3(dfn_dir, "gwf-sfr") assert item(sfr, "diversions")["idv"].pk == _SCOPED - period = sfr.blocks["period"].fields["stress_period_data"].item + period = sfr.blocks["period"].fields["period_data"].item idv = period.fields["sfrsetting"].arms["diversionrecord"].fields["idv"] assert (idv.pk, idv.fk) == (None, v2.ForeignKey(path="diversions.idv", scope="ifno")) assert _fix_scoped_index_keys("gwf-sfr", sfr.blocks) == sfr.blocks @@ -512,7 +512,7 @@ def test_migrate_spc_bndno(dfn_dir): """SPC's bndno is one row per bound, and names a bound of the flow package its SSM row names.""" blocks = _migrate_dev3(dfn_dir, "utl-spc").blocks - bndno = blocks["period"].fields["stress_period_data"].item.fields["bndno"] + bndno = blocks["period"].fields["period_data"].item.fields["bndno"] assert bndno.pk == v2.PrimaryKey() assert bndno.fk == v2.ForeignKey(key="bound", rule="ssm_package") assert _fix_spc_relations("utl-spc", blocks) == blocks @@ -522,7 +522,7 @@ def test_migrate_mvr_model_names_when_option(dfn_dir): """MVR's model names are read iff MODELNAMES, and then required.""" blocks = _migrate_dev3(dfn_dir, "gwf-mvr").blocks packages = blocks["packages"].fields["packages"].item.fields - period = blocks["period"].fields["stress_period_data"].item.fields + period = blocks["period"].fields["period_data"].item.fields for field in (packages["mname"], period["mname1"], period["mname2"]): assert (field.when, field.optional) == ("modelnames", False) @@ -572,7 +572,7 @@ def test_migrate_cross_section_keys(dfn_dir, tmp_path, pk): (tmp_path / path.name).write_text(text) components = v2.Dfns.load(tmp_path).components for name in ("chf-cdb", "chf-zdg", "olf-zdg"): - item = components[name].blocks["period"].fields["stress_period_data"].item + item = components[name].blocks["period"].fields["period_data"].item assert item.fields["idcxs"].fk.path == f"chf-cxs.packagedata.{pk}" for name in ("chf-dfw", "olf-dfw"): idcxs = components[name].blocks["griddata"].fields["idcxs"] @@ -672,7 +672,7 @@ def test_migrate_exchange_cellids(dfn_dir, name): def test_migrate_evt_petm0_when_option(dfn_dir): # Read only, and then always, with SURF_RATE_SPECIFIED. component = _migrate_dev3(dfn_dir, "gwf-evt") - item = component.blocks["period"].fields["stress_period_data"].item + item = component.blocks["period"].fields["period_data"].item petm0 = item.fields["petm0"] assert (petm0.when, petm0.optional) == ("surf_rate_specified", False) assert petm0.render(inline=True) == "[<@petm0@>]" @@ -683,7 +683,7 @@ def test_migrate_evt_petm0_when_option(dfn_dir): @pytest.mark.parametrize( "name,block,field", [ - ("gwf-chd", "period", "stress_period_data"), + ("gwf-chd", "period", "period_data"), ("gwf-maw", "packagedata", "packagedata"), ("gwf-sfr", "packagedata", "packagedata"), ], @@ -732,7 +732,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["stress_period_data"].item + item = component.blocks["period"].fields["period_data"].item arms = item.fields["mawsetting"].arms assert "head_limit" not in arms record = arms["head_limitrecord"] @@ -747,7 +747,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["stress_period_data"].item + item = component.blocks["period"].fields["period_data"].item for name in ("finf", "pet", "extdp", "extwc", "ha", "hroot", "rootact"): field = item.fields[name] assert isinstance(field, v2.Double), name @@ -770,7 +770,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["stress_period_data"].item + maw = components["gwf-maw"].blocks["period"].fields["period_data"].item arm = maw.fields["mawsetting"].arms["head_limitrecord"] _number_or_word(arm.fields["head_limit_value"], "off") @@ -1221,8 +1221,8 @@ def test_migrate_ftypes_unique_among_name_file_children(linked_spec): 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`, +def test_migrate_period_lists_named_period_data(dev3): + """A fill-forward block's single list is named `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.""" @@ -1235,8 +1235,8 @@ def test_migrate_period_lists_named_stress_period_data(dev3): 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" + assert list(fields) == ["period_data"], (name, bname) + assert fields["period_data"].name == "period_data" renamed.add(name) for fname in fields: assert not fname.endswith("perioddata"), (name, bname, fname) diff --git a/autotest/dfns/test_schema.py b/autotest/dfns/test_schema.py index 5ec9faa5..7a89304c 100644 --- a/autotest/dfns/test_schema.py +++ b/autotest/dfns/test_schema.py @@ -393,7 +393,7 @@ def test_sto_period_field_is_untagged(dev3_spec, name): """STO's PERIOD block writes a bare STEADY-STATE/TRANSIENT line, no STORAGE prefix.""" fields = dev3_spec.components[name].blocks["period"].fields assert "storage" not in fields - storage = fields["stress_period_data"] + storage = fields["period_data"] assert storage.tagged is False assert storage.valid == ["steady-state", "transient"] @@ -896,7 +896,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["stress_period_data"].item + item = period.fields["period_data"].item union = item.children["sfrsetting"] xsrecord = union.arms["cross_sectionrecord"] assert isinstance(xsrecord, Record) @@ -1084,8 +1084,8 @@ def test_render_list_inline_raises(): """List has no inline form — it can never appear nested in a Record/Union, so `inline=True` is a caller misuse, not a reachable internal state.""" field = List( - name="stress_period_data", - item=Record(name="stress_period_data", fields={"cellid": Keyword(name="cellid")}), + name="period_data", + item=Record(name="period_data", fields={"cellid": Keyword(name="cellid")}), ) with pytest.raises(ValueError): field.render(inline=True) diff --git a/autotest/dfns/test_schema_dimensions.py b/autotest/dfns/test_schema_dimensions.py index 285a6028..3f6ac3d0 100644 --- a/autotest/dfns/test_schema_dimensions.py +++ b/autotest/dfns/test_schema_dimensions.py @@ -402,23 +402,23 @@ def test_validate_shape_element_bound_repeated_operator(): @pytest.mark.parametrize("element", ["maxbound", "=maxbound"]) def test_validate_list_shape_element_bound(element): - lst = List(name="stress_period_data", item=Record(name="item", fields={})) + lst = List(name="period_data", item=Record(name="item", fields={})) _validate_list_shape_element(element, lst, {"maxbound"}) def test_validate_list_shape_element_bound_arithmetic(): - lst = List(name="stress_period_data", item=Record(name="item", fields={})) + lst = List(name="period_data", item=Record(name="item", fields={})) _validate_list_shape_element(">=maxbound - 1", lst, {"maxbound"}) def test_validate_list_shape_element_bound_unknown_dim(): - lst = List(name="stress_period_data", item=Record(name="item", fields={})) + lst = List(name="period_data", item=Record(name="item", fields={})) with pytest.raises(ValueError, match="does not resolve"): _validate_list_shape_element("<=nope", lst, {"maxbound"}) def test_validate_list_shape_element_bound_repeated_operator(): - lst = List(name="stress_period_data", item=Record(name="item", fields={})) + lst = List(name="period_data", item=Record(name="item", fields={})) with pytest.raises(ValueError, match="at most one bound operator"): _validate_list_shape_element("<<=maxbound", lst, {"maxbound"}) @@ -642,7 +642,7 @@ def test_validate_shape_element_cross_component_lookup_unknown_component(): def test_validate_list_shape_element_lookup(): - lst = List(name="stress_period_data", item=Record(name="item", fields={})) + lst = List(name="period_data", item=Record(name="item", fields={})) with pytest.raises(ValueError, match="not inside a record"): _validate_list_shape_element("packagedata.ncon(ifno)", lst, {"maxbound"}) diff --git a/autotest/dfns/test_schema_relations.py b/autotest/dfns/test_schema_relations.py index 42e096de..5af6fe96 100644 --- a/autotest/dfns/test_schema_relations.py +++ b/autotest/dfns/test_schema_relations.py @@ -1145,7 +1145,7 @@ def _ctx_mvr(mname_fk=_MNAME_FK, id1_fk=None, id2_fk=None, pname_fk=_PNAME_FK, * index=True, fk=id2_fk or {"scope": "pname2", "key": "mover_receiver"}, ), - list_name="stress_period_data", + list_name="period_data", ) mvr = Package( name="gwf-mvr", @@ -1158,7 +1158,7 @@ def _ctx_mvr(mname_fk=_MNAME_FK, id1_fk=None, id2_fk=None, pname_fk=_PNAME_FK, * def test_dfns_validate_mover_keys(): spec = Dfns(components=_ctx_mvr()) - period = spec.components["gwf-mvr"].blocks["period"].fields["stress_period_data"] + period = spec.components["gwf-mvr"].blocks["period"].fields["period_data"] assert period.item.fields["id1"].fk == ForeignKey(scope="pname1", key="mover_provider") assert period.item.fields["mname1"].fk.rule == "exchange_models" assert spec.components["gwf-wel"].keys["mover_provider"].bound == "maxbound" @@ -1200,7 +1200,7 @@ def test_dfns_validate_key_scope_names_no_package(): def test_dfns_validate_key_bound_needs_index(): ctx = _ctx_mvr() - period = ctx["gwf-mvr"].blocks["period"].fields["stress_period_data"] + period = ctx["gwf-mvr"].blocks["period"].fields["period_data"] id1 = period.item.fields["id1"].model_copy(update={"index": False}) item = period.item.model_copy(update={"fields": {**period.item.fields, "id1": id1}}) lst = period.model_copy(update={"item": item}) @@ -1295,7 +1295,7 @@ def _ctx_transport(spc_key="bound", ssm_keys=_SOURCE, srctype=None): fk={"key": spc_key, "rule": "ssm_package"}, ), Double(name="concentration", tagged=False), - list_name="stress_period_data", + list_name="period_data", ) }, ) @@ -1311,7 +1311,7 @@ def test_dfns_validate_ssm_and_spc_rules(): spec = Dfns(components=_ctx_transport()) item = spec.components["gwt-ssm"].blocks["fileinput"].fields["fileinput"].item assert item.fields["pname"].fk.rule == "flow_model" - period = spec.components["utl-spc"].blocks["period"].fields["stress_period_data"] + period = spec.components["utl-spc"].blocks["period"].fields["period_data"] assert period.item.fields["bndno"].fk == ForeignKey(key="bound", rule="ssm_package") diff --git a/docs/md/dfns.md b/docs/md/dfns.md index 1a1bf9ff..483eb2b1 100644 --- a/docs/md/dfns.md +++ b/docs/md/dfns.md @@ -179,7 +179,7 @@ assert period.repeats is True assert period.header.field.name == "iper" assert period.header.fill_forward is True -spd = period.fields["stress_period_data"] +spd = period.fields["period_data"] assert isinstance(spd, List) assert isinstance(spd.item, Record) @@ -314,8 +314,8 @@ Optional fields are wrapped in `[...]`. Array shapes use the abstract dimension The two `Union`-in-`List` cases correspond to different MF6 idioms: -- **Union of Records** (e.g. `gwf-oc` period block): the `output` list accepts either a `SAVE` row or a `PRINT` row — each arm is shown as a distinct optional row with no ellipsis. -- **Union of scalars** (e.g. `prt-prp` period block): the `perioddata` list accepts one of several keywords (`ALL`, `FIRST`, `LAST`, `FREQUENCY`, `STEPS`, `FRACTION`) — the alternatives are collapsed to `` to avoid noise. +- **Union of Records** (e.g. `gwf-oc` period block): the `period_data` list accepts either a `SAVE` row or a `PRINT` row — each arm is shown as a distinct optional row with no ellipsis. +- **Union of scalars** (e.g. `prt-prp` period block): the `period_data` list accepts one of several keywords (`ALL`, `FIRST`, `LAST`, `FREQUENCY`, `STEPS`, `FRACTION`) — the alternatives are collapsed to `` to avoid noise. ### Managing DFNs diff --git a/docs/md/dfnspec.md b/docs/md/dfnspec.md index 523c1af9..6b2b75c1 100644 --- a/docs/md/dfnspec.md +++ b/docs/md/dfnspec.md @@ -287,7 +287,7 @@ A header field may set [`index`](#index) like any integer field. The period bloc 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`). +When a fill-forward block holds a single field and that field is a list, the list is named `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). @@ -900,7 +900,7 @@ For example, MODFLOW 6 rejects a mover whose `packages` block lists the same mod pk = { scope = "mname" } fk = { path = "gwf-nam.packages.pname", scope = "mname" } -[blocks.period.fields.perioddata.item.fields.pname1] +[blocks.period.fields.period_data.item.fields.pname1] fk = { path = "packages.pname", scope = "mname1" } ``` @@ -921,7 +921,7 @@ Every composite key in MODFLOW 6 is hierarchical, so there is no separate tuple pk = { scope = "ifno" } # gwf-sfr period: the diversion arm's idv is one of the row's reach's diversions -[blocks.period.fields.stress_period_data.item.fields.sfrsetting.arms.diversionrecord.fields.idv] +[blocks.period.fields.period_data.item.fields.sfrsetting.arms.diversionrecord.fields.idv] fk = { path = "diversions.idv", scope = "ifno" } ``` 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 566aa058..a60ab601 100644 --- a/modflow_devtools/dfns/migrate_to_v2_0_0_dev2.py +++ b/modflow_devtools/dfns/migrate_to_v2_0_0_dev2.py @@ -940,6 +940,9 @@ def _walk(field: Any) -> Any: # derived. Each entry: component -> [(block name, list field name, {column: # fk target}), ...]. Unlike `_NODE_REF_FIELDS`, block name and list field name # aren't assumed equal (MF6's period/perioddata idiom applies to two of these). +# The list field name is the v1 name, which `_apply_fk_backfill` needs because +# it runs before `_name_period_lists`. `_retarget_fk_backfill` runs after, so it +# looks a period list up by its final name. # A column may be an integer scalar or an integer array (each element a key). # # - UZF's `ivertcon` is a self-referential fk (a UZF cell may point to another @@ -1145,6 +1148,9 @@ def retarget(f: v2.InputField) -> v2.InputField: for block_name, list_field_name, field_targets in entries: if (block := blocks.get(block_name)) is None: continue + # `_FK_BACKFILL` has the v1 name; `_name_period_lists` has run since + if block.header is not None and block.header.fill_forward: + list_field_name = _PERIOD_LIST_NAME list_field = block.fields.get(list_field_name) if not isinstance(list_field, v2.List) or not isinstance(list_field.item, v2.Record): continue @@ -1450,8 +1456,8 @@ def _collapse_sto_keywords( """ STO packages define their period block with two mutually exclusive optional Keywords (steady-state, transient). Replace them with a single optional - String field with constrained valid values, named 'stress_period_data' like - every other package's period data. + String field with constrained valid values, named 'period_data' like every + other package's period data. """ _STO_KEYWORDS = frozenset({"steady-state", "transient"}) result = {} @@ -1470,7 +1476,7 @@ def _collapse_sto_keywords( continue non_sto = {name: f for name, f in fields.items() if name not in _STO_KEYWORDS} storage = v2.String( - name="stress_period_data", + name=_PERIOD_LIST_NAME, longname="storage state", description=fields["steady-state"].description, optional=True, @@ -1480,9 +1486,7 @@ def _collapse_sto_keywords( tagged=False, valid=["steady-state", "transient"], ) - result[bname] = block.model_copy( - update={"fields": {**non_sto, "stress_period_data": storage}} - ) + result[bname] = block.model_copy(update={"fields": {**non_sto, _PERIOD_LIST_NAME: storage}}) return result @@ -2146,12 +2150,12 @@ 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" +_PERIOD_LIST_NAME = "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 + Name a fill-forward block's single list `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. @@ -2161,7 +2165,8 @@ def _name_period_lists(blocks: dict[str, v2.Block]) -> dict[str, v2.Block]: (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`). + (`_mark_lonely_pk`, `_fix_lak_relations`, `_fix_mvr_relations`, + `_apply_fk_backfill`). """ result = {} for bname, block in blocks.items(): diff --git a/modflow_devtools/dfns/migrate_to_v2_0_0_dev3.py b/modflow_devtools/dfns/migrate_to_v2_0_0_dev3.py index f2735424..8948f9a1 100644 --- a/modflow_devtools/dfns/migrate_to_v2_0_0_dev3.py +++ b/modflow_devtools/dfns/migrate_to_v2_0_0_dev3.py @@ -1440,7 +1440,7 @@ def to_v2_0_0_dev3( # Step 5c: clear stale string source references. # Some v1 field names are renamed by dev2 transforms (e.g. _collapse_sto_keywords - # replaces "steady-state"/"transient" with "stress_period_data"). The stress template also + # replaces "steady-state"/"transient" with "period_data"). The stress template also # sets nodelist.source = "cellid" for all stress packages, including gridded # variants that have no cellid field. Clear any source that no longer resolves. v2_field_names = set(component.get_fields(recurse=True).keys()) diff --git a/modflow_devtools/dfns/schema.py b/modflow_devtools/dfns/schema.py index 3fe9ced5..60b1f253 100644 --- a/modflow_devtools/dfns/schema.py +++ b/modflow_devtools/dfns/schema.py @@ -662,7 +662,7 @@ def _check_shape_length(self) -> "List": @property def children(self) -> "dict[str, InputField]": - # item.name duplicates the List's own name, so it's not a useful key here. + # The item isn't a level of its own, so its name isn't a key here. return self.item.children