From 0cf3d1fb00c637b507af1d668a7da03d238efbce Mon Sep 17 00:00:00 2001 From: Eric Morway Date: Tue, 26 Sep 2023 10:02:10 -0700 Subject: [PATCH] docs(mf6io): standardize variable name of the feature ID in the UZF & UZT dfn files (#1361) --- .github/workflows/ci.yml | 2 -- autotest/test_gwf_auxvars.py | 4 ++-- autotest/test_gwf_uzf_gwet.py | 2 +- autotest/test_gwf_uzf_surfdep.py | 2 +- autotest/test_gwf_uzf_wc_output.py | 2 +- doc/Common/gwf-uzfobs.tex | 24 +++++++++---------- doc/Common/gwt-uztobs.tex | 20 ++++++++-------- doc/mf6io/mf6ivar/dfn/gwf-uzf.dfn | 12 +++++----- doc/mf6io/mf6ivar/dfn/gwt-uzt.dfn | 12 +++++----- .../mf6ivar/examples/gwt-uzt-example-obs.dat | 11 +++++---- .../mf6ivar/examples/gwt-uzt-example.dat | 8 +++---- doc/mf6io/mf6ivar/md/mf6ivar.md | 8 +++---- doc/mf6io/mf6ivar/tex/gwf-uzf-desc.tex | 4 ++-- doc/mf6io/mf6ivar/tex/gwf-uzf-packagedata.dat | 4 ++-- doc/mf6io/mf6ivar/tex/gwf-uzf-period.dat | 4 ++-- doc/mf6io/mf6ivar/tex/gwt-uzt-desc.tex | 4 ++-- doc/mf6io/mf6ivar/tex/gwt-uzt-packagedata.dat | 4 ++-- doc/mf6io/mf6ivar/tex/gwt-uzt-period.dat | 4 ++-- 18 files changed, 65 insertions(+), 66 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 499d00595d1..6b05ab13acc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,7 +14,6 @@ on: - '**.png' - '**.bbl' - '**.bib' - - 'doc/**' - 'doc/**.dat' - 'doc/**.ipynb' - 'doc/**.py' @@ -33,7 +32,6 @@ on: - '**.png' - '**.bbl' - '**.bib' - - 'doc/**' - 'doc/**.dat' - 'doc/**.ipynb' - 'doc/**.py' diff --git a/autotest/test_gwf_auxvars.py b/autotest/test_gwf_auxvars.py index 0dc73f44bd7..326a4fcdf67 100644 --- a/autotest/test_gwf_auxvars.py +++ b/autotest/test_gwf_auxvars.py @@ -202,14 +202,14 @@ def build_model(idx, dir): ) # lak.remove() - # [] + # [] packagedata = [ [0, (0, nrow - 1, 5), 1, -1, 0.1, 0.01, 0.01, 0.1, 0.01, 3.5, "uz1"], [1, (0, nrow - 1, 6), 1, -1, 0.1, 0.01, 0.01, 0.1, 0.01, 3.5, "uz1"], [2, (0, nrow - 1, 7), 1, -1, 0.1, 0.01, 0.01, 0.1, 0.01, 3.5, "uz1"], [3, (0, nrow - 1, 8), 1, -1, 0.1, 0.01, 0.01, 0.1, 0.01, 3.5, "uz1"], ] - # [] + # [] perioddata = [] for p in packagedata: perioddata.append( diff --git a/autotest/test_gwf_uzf_gwet.py b/autotest/test_gwf_uzf_gwet.py index a06115897d3..ce0342bc6d4 100644 --- a/autotest/test_gwf_uzf_gwet.py +++ b/autotest/test_gwf_uzf_gwet.py @@ -97,7 +97,7 @@ def build_model(idx, dir): ) # transient uzf info - # iuzno cellid landflg ivertcn surfdp vks thtr thts thti eps [bndnm] + # ifno cellid landflg ivertcn surfdp vks thtr thts thti eps [bndnm] uzf_pkdat = [ [0, (0, 0, 1), 1, 8, 1, 1, 0.05, 0.35, 0.05, 4, "uzf01"], [1, (0, 0, 2), 1, 9, 1, 1, 0.05, 0.35, 0.05, 4, "uzf02"], diff --git a/autotest/test_gwf_uzf_surfdep.py b/autotest/test_gwf_uzf_surfdep.py index 824727a9fff..533f1a04d34 100644 --- a/autotest/test_gwf_uzf_surfdep.py +++ b/autotest/test_gwf_uzf_surfdep.py @@ -98,7 +98,7 @@ def build_model(dir, exe): ) # transient uzf info - # iuzno cellid landflg ivertcn surfdp vks thtr thts thti eps [bndnm] + # ifno cellid landflg ivertcn surfdp vks thtr thts thti eps [bndnm] uzf_pkdat = [ [0, (0, 0, 1), 1, 8, 6, 1, 0.05, 0.35, 0.05, 4, "uzf01"], [1, (0, 0, 2), 1, 9, 6, 1, 0.05, 0.35, 0.05, 4, "uzf02"], diff --git a/autotest/test_gwf_uzf_wc_output.py b/autotest/test_gwf_uzf_wc_output.py index bd43193ace4..704e535382b 100644 --- a/autotest/test_gwf_uzf_wc_output.py +++ b/autotest/test_gwf_uzf_wc_output.py @@ -49,7 +49,7 @@ 3: [[(2, 0, 0), ghbelv2, ghbcond], [(2, 0, ncol - 1), ghbelv2, ghbcond]], } -# iuzno cellid landflg ivertcn surfdp vks thtr thts thti eps [bndnm] +# ifno cellid landflg ivertcn surfdp vks thtr thts thti eps [bndnm] surfdep1 = 1.0 surfdep2 = 0.001 vks = 0.5 diff --git a/doc/Common/gwf-uzfobs.tex b/doc/Common/gwf-uzfobs.tex index b69b947ae86..abe1a42bd9f 100644 --- a/doc/Common/gwf-uzfobs.tex +++ b/doc/Common/gwf-uzfobs.tex @@ -1,12 +1,12 @@ -UZF & uzf-gwrch & iuzno or boundname & -- & Simulated recharge to the aquifer calculated by the UZF package for a UZF cell or a group of UZF cells.\\ -UZF & uzf-gwd & iuzno or boundname & -- & Simulated groundwater discharge to the land surface calculated by the UZF package for a UZF cell or a group of UZF cells. \\ -UZF & uzf-gwd-to-mvr & iuzno or boundname & -- & Simulated groundwater discharge to the land surface calculated by the UZF package that is available to the MVR package for a UZF cell or a group of UZF cells. \\ -UZF & uzf-gwet & iuzno or boundname & -- & Simulated groundwater evapotranspiration calculated by the UZF package for a UZF cell or a group of UZF cells.\\ -UZF & infiltration & iuzno or boundname & -- & Specified infiltration rate applied to a UZF package for a UZF cell or a group of UZF cells with landflag values not equal to zero.\\ -UZF & from-mvr & iuzno or boundname & -- & Inflow into a UZF cell from the MVR package for a UZF cell or a group of UZF cells. \\ -UZF & rej-inf & iuzno or boundname & -- & Simulated rejected infiltration calculated by the UZF package for a UZF cell or a group of UZF cells. \\ -UZF & rej-inf-to-mvr & iuzno or boundname & -- & Simulated rejected infiltration calculated by the UZF package that is available to the MVR package for a UZF cell or a group of UZF cells. \\ -UZF & uzet & iuzno or boundname & -- & Simulated unsaturated evapotranspiration calculated by the UZF package for a UZF cell or a group of UZF cells.\\ -UZF & storage & iuzno or boundname & -- & Simulated storage flow rate for a UZF package cell or a group of UZF cells. \\ -UZF & net-infiltration & iuzno or boundname & -- & Simulated net infiltration rate for a UZF package cell or a group of UZF cells. \\ -UZF & water-content & iuzno or boundname & depth & Unsaturated-zone water content at a user-specified depth (ID2) relative to the top of GWF cellid for a UZF cell. The user-specified depth must be greater than or equal to zero and less than the thickness of GWF cellid (TOP - BOT). If boundname is specified, boundname must be unique for each UZF cell. \ No newline at end of file +UZF & uzf-gwrch & ifno or boundname & -- & Simulated recharge to the aquifer calculated by the UZF package for a UZF cell or a group of UZF cells.\\ +UZF & uzf-gwd & ifno or boundname & -- & Simulated groundwater discharge to the land surface calculated by the UZF package for a UZF cell or a group of UZF cells. \\ +UZF & uzf-gwd-to-mvr & ifno or boundname & -- & Simulated groundwater discharge to the land surface calculated by the UZF package that is available to the MVR package for a UZF cell or a group of UZF cells. \\ +UZF & uzf-gwet & ifno or boundname & -- & Simulated groundwater evapotranspiration calculated by the UZF package for a UZF cell or a group of UZF cells.\\ +UZF & infiltration & ifno or boundname & -- & Specified infiltration rate applied to a UZF package for a UZF cell or a group of UZF cells with landflag values not equal to zero.\\ +UZF & from-mvr & ifno or boundname & -- & Inflow into a UZF cell from the MVR package for a UZF cell or a group of UZF cells. \\ +UZF & rej-inf & ifno or boundname & -- & Simulated rejected infiltration calculated by the UZF package for a UZF cell or a group of UZF cells. \\ +UZF & rej-inf-to-mvr & ifno or boundname & -- & Simulated rejected infiltration calculated by the UZF package that is available to the MVR package for a UZF cell or a group of UZF cells. \\ +UZF & uzet & ifno or boundname & -- & Simulated unsaturated evapotranspiration calculated by the UZF package for a UZF cell or a group of UZF cells.\\ +UZF & storage & ifno or boundname & -- & Simulated storage flow rate for a UZF package cell or a group of UZF cells. \\ +UZF & net-infiltration & ifno or boundname & -- & Simulated net infiltration rate for a UZF package cell or a group of UZF cells. \\ +UZF & water-content & ifno or boundname & depth & Unsaturated-zone water content at a user-specified depth (ID2) relative to the top of GWF cellid for a UZF cell. The user-specified depth must be greater than or equal to zero and less than the thickness of GWF cellid (TOP - BOT). If boundname is specified, boundname must be unique for each UZF cell. \ No newline at end of file diff --git a/doc/Common/gwt-uztobs.tex b/doc/Common/gwt-uztobs.tex index 917b46b54a3..87b1c679258 100644 --- a/doc/Common/gwt-uztobs.tex +++ b/doc/Common/gwt-uztobs.tex @@ -1,14 +1,14 @@ % general APT observations -UZT & concentration & uztno or boundname & -- & uzt cell concentration. If boundname is specified, boundname must be unique for each uzt cell. \\ -UZT & flow-ja-face & uztno or boundname & uztno or -- & Mass flow between two uzt cells. If a boundname is specified for ID1, then the result is the total mass flow for all uzt cells. If a boundname is specified for ID1 then ID2 is not used.\\ -UZT & storage & uztno or boundname & -- & Simulated mass storage flow rate for a uzt cell or group of uzt cells. \\ -UZT & constant & uztno or boundname & -- & Simulated mass constant-flow rate for a uzt cell or a group of uzt cells. \\ -UZT & from-mvr & uztno or boundname & -- & Simulated mass inflow into a uzt cell or group of uzt cells from the MVT package. Mass inflow is calculated as the product of provider concentration and the mover flow rate. \\ -UZT & uzt & uztno or boundname & -- & Mass flow rate for a uzt cell or group of uzt cells and its aquifer connection(s). \\ +UZT & concentration & ifno or boundname & -- & uzt cell concentration. If boundname is specified, boundname must be unique for each uzt cell. \\ +UZT & flow-ja-face & ifno or boundname & ifno or -- & Mass flow between two uzt cells. If a boundname is specified for ID1, then the result is the total mass flow for all uzt cells. If a boundname is specified for ID1 then ID2 is not used.\\ +UZT & storage & ifno or boundname & -- & Simulated mass storage flow rate for a uzt cell or group of uzt cells. \\ +UZT & constant & ifno or boundname & -- & Simulated mass constant-flow rate for a uzt cell or a group of uzt cells. \\ +UZT & from-mvr & ifno or boundname & -- & Simulated mass inflow into a uzt cell or group of uzt cells from the MVT package. Mass inflow is calculated as the product of provider concentration and the mover flow rate. \\ +UZT & uzt & ifno or boundname & -- & Mass flow rate for a uzt cell or group of uzt cells and its aquifer connection(s). \\ %observations specific to the uzt package % infiltration rej-inf uzet rej-inf-to-mvr -UZT & infiltration & uztno or boundname & -- & Infiltration rate applied to a uzt cell or group of uzt cells multiplied by the infiltration concentration. \\ -UZT & rej-inf & uztno or boundname & -- & Rejected infiltration rate applied to a uzt cell or group of uzt cells multiplied by the infiltration concentration. \\ -UZT & uzet & uztno or boundname & -- & Unsaturated zone evapotranspiration rate applied to a uzt cell or group of uzt cells multiplied by the uzt cell concentration. \\ -UZT & rej-inf-to-mvr & uztno or boundname & -- & Rejected infiltration rate applied to a uzt cell or group of uzt cells multiplied by the infiltration concentration that is sent to the mover package. \\ +UZT & infiltration & ifno or boundname & -- & Infiltration rate applied to a uzt cell or group of uzt cells multiplied by the infiltration concentration. \\ +UZT & rej-inf & ifno or boundname & -- & Rejected infiltration rate applied to a uzt cell or group of uzt cells multiplied by the infiltration concentration. \\ +UZT & uzet & ifno or boundname & -- & Unsaturated zone evapotranspiration rate applied to a uzt cell or group of uzt cells multiplied by the uzt cell concentration. \\ +UZT & rej-inf-to-mvr & ifno or boundname & -- & Rejected infiltration rate applied to a uzt cell or group of uzt cells multiplied by the infiltration concentration that is sent to the mover package. \\ diff --git a/doc/mf6io/mf6ivar/dfn/gwf-uzf.dfn b/doc/mf6io/mf6ivar/dfn/gwf-uzf.dfn index 02833c08967..1b61e1fb6be 100644 --- a/doc/mf6io/mf6ivar/dfn/gwf-uzf.dfn +++ b/doc/mf6io/mf6ivar/dfn/gwf-uzf.dfn @@ -365,21 +365,21 @@ default_value 40 block packagedata name packagedata -type recarray iuzno cellid landflag ivertcon surfdep vks thtr thts thti eps boundname +type recarray ifno cellid landflag ivertcon surfdep vks thtr thts thti eps boundname shape (nuzfcells) reader urword longname description block packagedata -name iuzno +name ifno type integer shape tagged false in_record true reader urword longname uzf id number for this entry -description integer value that defines the UZF cell number associated with the specified PACKAGEDATA data on the line. IUZNO must be greater than zero and less than or equal to NUZFCELLS. UZF information must be specified for every UZF cell or the program will terminate with an error. The program will also terminate with an error if information for a UZF cell is specified more than once. +description integer value that defines the feature (UZF object) number associated with the specified PACKAGEDATA data on the line. IFNO must be greater than zero and less than or equal to NUZFCELLS. UZF information must be specified for every UZF cell or the program will terminate with an error. The program will also terminate with an error if information for a UZF cell is specified more than once. numeric_index true block packagedata @@ -502,21 +502,21 @@ description REPLACE iper {} block period name perioddata -type recarray iuzno finf pet extdp extwc ha hroot rootact aux +type recarray ifno finf pet extdp extwc ha hroot rootact aux shape reader urword longname description block period -name iuzno +name ifno type integer shape tagged false in_record true reader urword longname UZF id number -description integer value that defines the UZF cell number associated with the specified PERIOD data on the line. +description integer value that defines the feature (UZF object) number associated with the specified PERIOD data on the line. numeric_index true block period diff --git a/doc/mf6io/mf6ivar/dfn/gwt-uzt.dfn b/doc/mf6io/mf6ivar/dfn/gwt-uzt.dfn index d95baabe6e4..00524848bdd 100644 --- a/doc/mf6io/mf6ivar/dfn/gwt-uzt.dfn +++ b/doc/mf6io/mf6ivar/dfn/gwt-uzt.dfn @@ -259,21 +259,21 @@ description REPLACE obs6_filename {'{#1}': 'UZT'} block packagedata name packagedata -type recarray uzfno strt aux boundname +type recarray ifno strt aux boundname shape (maxbound) reader urword longname description block packagedata -name uzfno +name ifno type integer shape tagged false in_record true reader urword longname UZF cell number for this entry -description integer value that defines the UZF cell number associated with the specified PACKAGEDATA data on the line. UZFNO must be greater than zero and less than or equal to NUZFCELLS. Unsaturated zone flow information must be specified for every UZF cell or the program will terminate with an error. The program will also terminate with an error if information for a UZF cell is specified more than once. +description integer value that defines the feature (UZF object) number associated with the specified PACKAGEDATA data on the line. IFNO must be greater than zero and less than or equal to NUZFCELLS. Unsaturated zone flow information must be specified for every UZF cell or the program will terminate with an error. The program will also terminate with an error if information for a UZF cell is specified more than once. numeric_index true block packagedata @@ -327,21 +327,21 @@ description REPLACE iper {} block period name uztperioddata -type recarray uzfno uztsetting +type recarray ifno uztsetting shape reader urword longname description block period -name uzfno +name ifno type integer shape tagged false in_record true reader urword 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. +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. numeric_index true block period diff --git a/doc/mf6io/mf6ivar/examples/gwt-uzt-example-obs.dat b/doc/mf6io/mf6ivar/examples/gwt-uzt-example-obs.dat index 8d52cf11160..5a9feb5dd1d 100644 --- a/doc/mf6io/mf6ivar/examples/gwt-uzt-example-obs.dat +++ b/doc/mf6io/mf6ivar/examples/gwt-uzt-example-obs.dat @@ -4,9 +4,10 @@ BEGIN options END options BEGIN continuous FILEOUT gwt_02.uzt.obs.csv - mwt-1-conc CONCENTRATION 1 - mwt-1-stor STORAGE 1 - mwt-1-gwt1 UZT 1 - mwt-1-gwt2 UZT 2 - mwt-2-gwt1 UZT 3 +# obs_name obs_type ID + mwt-1-conc CONCENTRATION 1 + mwt-1-stor STORAGE 1 + mwt-1-gwt1 UZT 1 + mwt-1-gwt2 UZT 2 + mwt-2-gwt1 UZT 3 END continuous diff --git a/doc/mf6io/mf6ivar/examples/gwt-uzt-example.dat b/doc/mf6io/mf6ivar/examples/gwt-uzt-example.dat index 5a525d35959..5896535f8d7 100644 --- a/doc/mf6io/mf6ivar/examples/gwt-uzt-example.dat +++ b/doc/mf6io/mf6ivar/examples/gwt-uzt-example.dat @@ -11,10 +11,10 @@ BEGIN OPTIONS END OPTIONS BEGIN PACKAGEDATA -# L STRT aux1 aux2 bname - 1 0.00000000 99.00000000 999.00000000 MYUZFCELL1 - 2 0.00000000 99.00000000 999.00000000 MYUZFCELL2 - 3 0.00000000 99.00000000 999.00000000 MYUZFCELL3 +# ifno STRT aux1 aux2 bname + 1 0.00000000 99.00000000 999.00000000 MYUZFCELL1 + 2 0.00000000 99.00000000 999.00000000 MYUZFCELL2 + 3 0.00000000 99.00000000 999.00000000 MYUZFCELL3 END PACKAGEDATA BEGIN PERIOD 1 diff --git a/doc/mf6io/mf6ivar/md/mf6ivar.md b/doc/mf6io/mf6ivar/md/mf6ivar.md index 105859d3b0b..f2fdfdd12fd 100644 --- a/doc/mf6io/mf6ivar/md/mf6ivar.md +++ b/doc/mf6io/mf6ivar/md/mf6ivar.md @@ -723,7 +723,7 @@ | GWF | UZF | DIMENSIONS | NUZFCELLS | INTEGER | is the number of UZF cells. More than one UZF cell can be assigned to a GWF cell; however, only one GWF cell can be assigned to a single UZF cell. If more than one UZF cell is assigned to a GWF cell, then an auxiliary variable should be used to reduce the surface area of the UZF cell with the AUXMULTNAME option. | | GWF | UZF | DIMENSIONS | NTRAILWAVES | INTEGER | is the number of trailing waves. A recommended value of 7 can be used for NTRAILWAVES. This value can be increased to lower mass balance error in the unsaturated zone. | | GWF | UZF | DIMENSIONS | NWAVESETS | INTEGER | is the number of wave sets. A recommended value of 40 can be used for NWAVESETS. This value can be increased if more waves are required to resolve variations in water content within the unsaturated zone. | -| GWF | UZF | PACKAGEDATA | IUZNO | INTEGER | integer value that defines the UZF cell number associated with the specified PACKAGEDATA data on the line. IUZNO must be greater than zero and less than or equal to NUZFCELLS. UZF information must be specified for every UZF cell or the program will terminate with an error. The program will also terminate with an error if information for a UZF cell is specified more than once. | +| GWF | UZF | PACKAGEDATA | IFNO | INTEGER | integer value that defines the feature (UZF object) number associated with the specified PACKAGEDATA data on the line. IFNO must be greater than zero and less than or equal to NUZFCELLS. UZF information must be specified for every UZF cell or the program will terminate with an error. The program will also terminate with an error if information for a UZF cell is specified more than once. | | GWF | UZF | PACKAGEDATA | CELLID | INTEGER (NCELLDIM) | 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. | | GWF | UZF | PACKAGEDATA | LANDFLAG | INTEGER | integer value set to one for land surface cells indicating that boundary conditions can be applied and data can be specified in the PERIOD block. A value of 0 specifies a non-land surface cell. | | GWF | UZF | PACKAGEDATA | IVERTCON | INTEGER | integer value set to specify underlying UZF cell that receives water flowing to bottom of cell. If unsaturated zone flow reaches the water table before the cell bottom, then water is added to the GWF cell instead of flowing to the underlying UZF cell. A value of 0 indicates the UZF cell is not connected to an underlying UZF cell. | @@ -735,7 +735,7 @@ | GWF | UZF | PACKAGEDATA | EPS | DOUBLE PRECISION | is the exponent used in the Brooks-Corey function. The Brooks-Corey function is used by UZF to calculated hydraulic conductivity under partially saturated conditions as a function of water content and the user-specified saturated hydraulic conductivity. | | GWF | UZF | PACKAGEDATA | BOUNDNAME | STRING | name of the UZF cell 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. | | GWF | UZF | PERIOD | IPER | INTEGER | integer value specifying the starting stress period number for which the data specified in the PERIOD block apply. IPER must be less than or equal to NPER in the TDIS Package and greater than zero. The IPER value assigned to a stress period block must be greater than the IPER value assigned for the previous PERIOD block. The information specified in the PERIOD block will continue to apply for all subsequent stress periods, unless the program encounters another PERIOD block. | -| GWF | UZF | PERIOD | IUZNO | INTEGER | integer value that defines the UZF cell number associated with the specified PERIOD data on the line. | +| GWF | UZF | PERIOD | IFNO | INTEGER | integer value that defines the feature (UZF object) number associated with the specified PERIOD data on the line. | | GWF | UZF | PERIOD | FINF | STRING | 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. | | GWF | UZF | PERIOD | PET | STRING | 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. | | GWF | UZF | PERIOD | EXTDP | STRING | 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. | @@ -1121,12 +1121,12 @@ | GWT | UZT | OPTIONS | TS6_FILENAME | STRING | defines a time-series file defining time series that can be used to assign time-varying values. See the ``Time-Variable Input'' section for instructions on using the time-series capability. | | GWT | UZT | OPTIONS | OBS6 | KEYWORD | keyword to specify that record corresponds to an observations file. | | GWT | UZT | OPTIONS | OBS6_FILENAME | STRING | name of input file to define observations for the UZT package. See the ``Observation utility'' section for instructions for preparing observation input files. Tables \ref{table:gwf-obstypetable} and \ref{table:gwt-obstypetable} lists observation type(s) supported by the UZT package. | -| GWT | UZT | PACKAGEDATA | UZFNO | INTEGER | integer value that defines the UZF cell number associated with the specified PACKAGEDATA data on the line. UZFNO must be greater than zero and less than or equal to NUZFCELLS. Unsaturated zone flow information must be specified for every UZF cell or the program will terminate with an error. The program will also terminate with an error if information for a UZF cell is specified more than once. | +| GWT | UZT | PACKAGEDATA | IFNO | INTEGER | integer value that defines the feature (UZF object) number associated with the specified PACKAGEDATA data on the line. IFNO must be greater than zero and less than or equal to NUZFCELLS. Unsaturated zone flow information must be specified for every UZF cell or the program will terminate with an error. The program will also terminate with an error if information for a UZF cell is specified more than once. | | GWT | UZT | PACKAGEDATA | STRT | DOUBLE PRECISION | real value that defines the starting concentration for the unsaturated zone flow cell. | | GWT | UZT | PACKAGEDATA | AUX | DOUBLE PRECISION (NAUX) | represents the values of the auxiliary variables for each unsaturated zone flow. The values of auxiliary variables must be present for each unsaturated zone flow. 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. | | GWT | UZT | PACKAGEDATA | BOUNDNAME | STRING | name of the unsaturated zone flow 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. | | GWT | UZT | PERIOD | IPER | INTEGER | integer value specifying the starting stress period number for which the data specified in the PERIOD block apply. IPER must be less than or equal to NPER in the TDIS Package and greater than zero. The IPER value assigned to a stress period block must be greater than the IPER value assigned for the previous PERIOD block. The information specified in the PERIOD block will continue to apply for all subsequent stress periods, unless the program encounters another PERIOD block. | -| GWT | UZT | PERIOD | UZFNO | INTEGER | 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. | +| GWT | UZT | PERIOD | IFNO | INTEGER | 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. | | GWT | UZT | PERIOD | UZTSETTING | KEYSTRING | 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. | | GWT | UZT | PERIOD | STATUS | STRING | 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. | | GWT | UZT | PERIOD | CONCENTRATION | STRING | 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. | diff --git a/doc/mf6io/mf6ivar/tex/gwf-uzf-desc.tex b/doc/mf6io/mf6ivar/tex/gwf-uzf-desc.tex index 88f4401eddc..1944e303cee 100644 --- a/doc/mf6io/mf6ivar/tex/gwf-uzf-desc.tex +++ b/doc/mf6io/mf6ivar/tex/gwf-uzf-desc.tex @@ -71,7 +71,7 @@ \item \textbf{Block: PACKAGEDATA} \begin{description} -\item \texttt{iuzno}---integer value that defines the UZF cell number associated with the specified PACKAGEDATA data on the line. IUZNO must be greater than zero and less than or equal to NUZFCELLS. UZF information must be specified for every UZF cell or the program will terminate with an error. The program will also terminate with an error if information for a UZF cell is specified more than once. +\item \texttt{ifno}---integer value that defines the feature (UZF object) number associated with the specified PACKAGEDATA data on the line. IFNO must be greater than zero and less than or equal to NUZFCELLS. UZF information must be specified for every UZF cell or the program will terminate with an error. The program will also terminate with an error if information for a UZF cell is specified more than once. \item \texttt{cellid}---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. @@ -99,7 +99,7 @@ \begin{description} \item \texttt{iper}---integer value specifying the starting stress period number for which the data specified in the PERIOD block apply. IPER must be less than or equal to NPER in the TDIS Package and greater than zero. The IPER value assigned to a stress period block must be greater than the IPER value assigned for the previous PERIOD block. The information specified in the PERIOD block will continue to apply for all subsequent stress periods, unless the program encounters another PERIOD block. -\item \texttt{iuzno}---integer value that defines the UZF cell number associated with the specified PERIOD data on the line. +\item \texttt{ifno}---integer value that defines the feature (UZF object) number associated with the specified PERIOD data on the line. \item \textcolor{blue}{\texttt{finf}---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.} diff --git a/doc/mf6io/mf6ivar/tex/gwf-uzf-packagedata.dat b/doc/mf6io/mf6ivar/tex/gwf-uzf-packagedata.dat index f035038f5dc..773eb0d8c1e 100644 --- a/doc/mf6io/mf6ivar/tex/gwf-uzf-packagedata.dat +++ b/doc/mf6io/mf6ivar/tex/gwf-uzf-packagedata.dat @@ -1,5 +1,5 @@ BEGIN PACKAGEDATA - [] - [] + [] + [] ... END PACKAGEDATA diff --git a/doc/mf6io/mf6ivar/tex/gwf-uzf-period.dat b/doc/mf6io/mf6ivar/tex/gwf-uzf-period.dat index 05bb378fcbc..38ce0a956ae 100644 --- a/doc/mf6io/mf6ivar/tex/gwf-uzf-period.dat +++ b/doc/mf6io/mf6ivar/tex/gwf-uzf-period.dat @@ -1,5 +1,5 @@ BEGIN PERIOD - <@finf@> <@pet@> <@extdp@> <@extwc@> <@ha@> <@hroot@> <@rootact@> [<@aux(naux)@>] - <@finf@> <@pet@> <@extdp@> <@extwc@> <@ha@> <@hroot@> <@rootact@> [<@aux(naux)@>] + <@finf@> <@pet@> <@extdp@> <@extwc@> <@ha@> <@hroot@> <@rootact@> [<@aux(naux)@>] + <@finf@> <@pet@> <@extdp@> <@extwc@> <@ha@> <@hroot@> <@rootact@> [<@aux(naux)@>] ... END PERIOD diff --git a/doc/mf6io/mf6ivar/tex/gwt-uzt-desc.tex b/doc/mf6io/mf6ivar/tex/gwt-uzt-desc.tex index aab78138481..bd53d44a933 100644 --- a/doc/mf6io/mf6ivar/tex/gwt-uzt-desc.tex +++ b/doc/mf6io/mf6ivar/tex/gwt-uzt-desc.tex @@ -47,7 +47,7 @@ \item \textbf{Block: PACKAGEDATA} \begin{description} -\item \texttt{uzfno}---integer value that defines the UZF cell number associated with the specified PACKAGEDATA data on the line. UZFNO must be greater than zero and less than or equal to NUZFCELLS. Unsaturated zone flow information must be specified for every UZF cell or the program will terminate with an error. The program will also terminate with an error if information for a UZF cell is specified more than once. +\item \texttt{ifno}---integer value that defines the feature (UZF object) number associated with the specified PACKAGEDATA data on the line. IFNO must be greater than zero and less than or equal to NUZFCELLS. Unsaturated zone flow information must be specified for every UZF cell or the program will terminate with an error. The program will also terminate with an error if information for a UZF cell is specified more than once. \item \texttt{strt}---real value that defines the starting concentration for the unsaturated zone flow cell. @@ -61,7 +61,7 @@ \begin{description} \item \texttt{iper}---integer value specifying the starting stress period number for which the data specified in the PERIOD block apply. IPER must be less than or equal to NPER in the TDIS Package and greater than zero. The IPER value assigned to a stress period block must be greater than the IPER value assigned for the previous PERIOD block. The information specified in the PERIOD block will continue to apply for all subsequent stress periods, unless the program encounters another PERIOD block. -\item \texttt{uzfno}---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. +\item \texttt{ifno}---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. \item \texttt{uztsetting}---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. diff --git a/doc/mf6io/mf6ivar/tex/gwt-uzt-packagedata.dat b/doc/mf6io/mf6ivar/tex/gwt-uzt-packagedata.dat index b6b04c298fe..c293a94d109 100644 --- a/doc/mf6io/mf6ivar/tex/gwt-uzt-packagedata.dat +++ b/doc/mf6io/mf6ivar/tex/gwt-uzt-packagedata.dat @@ -1,5 +1,5 @@ BEGIN PACKAGEDATA - [<@aux(naux)@>] [] - [<@aux(naux)@>] [] + [<@aux(naux)@>] [] + [<@aux(naux)@>] [] ... END PACKAGEDATA diff --git a/doc/mf6io/mf6ivar/tex/gwt-uzt-period.dat b/doc/mf6io/mf6ivar/tex/gwt-uzt-period.dat index 8bd28bd48b9..5e1d29136c6 100644 --- a/doc/mf6io/mf6ivar/tex/gwt-uzt-period.dat +++ b/doc/mf6io/mf6ivar/tex/gwt-uzt-period.dat @@ -1,5 +1,5 @@ BEGIN PERIOD - - + + ... END PERIOD