diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index df2b2c08ccd..a51323a4452 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,6 +14,7 @@ on: - '**.png' - '**.bbl' - '**.bib' + - 'doc/**' - 'doc/**.dat' - 'doc/**.ipynb' - 'doc/**.py' @@ -32,6 +33,7 @@ on: - '**.png' - '**.bbl' - '**.bib' + - 'doc/**' - 'doc/**.dat' - 'doc/**.ipynb' - 'doc/**.py' diff --git a/autotest/test_gwf_ats_lak01.py b/autotest/test_gwf_ats_lak01.py index 5f2381c08f3..5d041ea6fae 100644 --- a/autotest/test_gwf_ats_lak01.py +++ b/autotest/test_gwf_ats_lak01.py @@ -152,7 +152,7 @@ def build_model(idx, dir): irch[i, j] = k + 1 nlakeconn = len(lake_vconnect) - # pak_data = [lakeno, strt, nlakeconn] + # pak_data = [ifno, strt, nlakeconn] initial_stage = 0.1 pak_data = [(0, initial_stage, nlakeconn)] diff --git a/autotest/test_gwf_auxvars.py b/autotest/test_gwf_auxvars.py index 95cd656527b..0dc73f44bd7 100644 --- a/autotest/test_gwf_auxvars.py +++ b/autotest/test_gwf_auxvars.py @@ -176,12 +176,12 @@ def build_model(idx, dir): ) # sfr.remove() - # [] [] + # [] [] packagedata = [ [0, 100.0, 1, auxvar1, auxvar2, "lake1"], [1, 100.0, 1, auxvar1, auxvar2, "lake2"], ] - # + # connectiondata = [ [0, 0, (0, 1, 1), "vertical", DNODATA, 0.0, 0.0, 0.0, 0.0], [1, 0, (0, 2, 2), "vertical", DNODATA, 0.0, 0.0, 0.0, 0.0], diff --git a/autotest/test_gwf_buy_lak01.py b/autotest/test_gwf_buy_lak01.py index 7a12bb2cffa..7f1ecee87ea 100644 --- a/autotest/test_gwf_buy_lak01.py +++ b/autotest/test_gwf_buy_lak01.py @@ -130,14 +130,14 @@ def build_model(idx, dir): ) nlakeconn = 11 # note: number of connections for this lake - # pak_data = [lakeno, strt, nlakeconn, dense, boundname] + # pak_data = [ifno, strt, nlakeconn, dense, boundname] pak_data = [(0, 2.25, nlakeconn, lake_dense)] connlen = delr / 2.0 connwidth = delc bedleak = "None" con_data = [ - # con_data=(lakeno,iconn,(cellid),claktype,bedleak,belev,telev,connlen,connwidth ) + # con_data=(ifno,iconn,(cellid),claktype,bedleak,belev,telev,connlen,connwidth ) (0, 0, (0, 0, 0), "HORIZONTAL", bedleak, 10, 10, connlen, connwidth), (0, 1, (1, 0, 1), "VERTICAL", bedleak, 10, 10, connlen, connwidth), (0, 2, (1, 0, 1), "HORIZONTAL", bedleak, 10, 10, connlen, connwidth), diff --git a/autotest/test_gwf_buy_lak02.py b/autotest/test_gwf_buy_lak02.py index 514f3348da5..b27662a6959 100644 --- a/autotest/test_gwf_buy_lak02.py +++ b/autotest/test_gwf_buy_lak02.py @@ -144,14 +144,14 @@ def case_generator(self, data, function_tmpdir): buy = flopy.mf6.ModflowGwfbuy(gwf, denseref=1000.0, packagedata=pd) nlakeconn = 11 # note: number of connections for this lake - # pak_data = [lakeno, strt, nlakeconn, testauxvar, concentration, boundname] + # pak_data = [ifno, strt, nlakeconn, testauxvar, concentration, boundname] pak_data = [(0, 2.25, nlakeconn, 0.0, 0.0)] connlen = delr / 2.0 connwidth = delc bedleak = "None" con_data = [ - # con_data=(lakeno,iconn,(cellid),claktype,bedleak,belev,telev,connlen,connwidth ) + # con_data=(ifno,iconn,(cellid),claktype,bedleak,belev,telev,connlen,connwidth ) ( 0, 0, diff --git a/autotest/test_gwf_lak_bedleak.py b/autotest/test_gwf_lak_bedleak.py index 0787ff3cac1..53d406f5548 100644 --- a/autotest/test_gwf_lak_bedleak.py +++ b/autotest/test_gwf_lak_bedleak.py @@ -116,12 +116,12 @@ def build_model(idx, dir): else: bedleak = DNODATA - # [] [] + # [] [] packagedata = [ [0, 100.0, 1, "lake1"], [1, 100.0, 1, "lake2"], ] - # + # connectiondata = [ [0, 0, (0, 1, 1), "vertical", bedleak, 0.0, 0.0, 0.0, 0.0], [1, 0, (0, 2, 2), "vertical", bedleak, 0.0, 0.0, 0.0, 0.0], diff --git a/autotest/test_gwf_laket.py b/autotest/test_gwf_laket.py index b180ff3baed..8f78a4cd4f5 100644 --- a/autotest/test_gwf_laket.py +++ b/autotest/test_gwf_laket.py @@ -112,7 +112,7 @@ def get_model(idx, ws): ] nlakeconn = 1 - # pak_data = [lakeno, strt, nlakeconn] + # pak_data = [ifno, strt, nlakeconn] pak_data = [(0, lakestage[idx], nlakeconn)] belev = top diff --git a/autotest/test_gwf_lakobs01.py b/autotest/test_gwf_lakobs01.py index 8cfc8ff2de9..f47e3568f3e 100644 --- a/autotest/test_gwf_lakobs01.py +++ b/autotest/test_gwf_lakobs01.py @@ -138,7 +138,7 @@ def build_model(dir, exe): irch[i, j] = k + 1 nlakeconn = len(lake_vconnect) - # pak_data = [lakeno, strt, nlakeconn] + # pak_data = [ifno, strt, nlakeconn] initial_stage = 0.1 pak_data = [(0, initial_stage, nlakeconn)] diff --git a/autotest/test_gwf_vsc04_lak.py b/autotest/test_gwf_vsc04_lak.py index 912b2772f5e..5117256c7b9 100644 --- a/autotest/test_gwf_vsc04_lak.py +++ b/autotest/test_gwf_vsc04_lak.py @@ -331,7 +331,7 @@ def build_model(idx, ws): # by setting belev==telev, MF6 will automatically # re-assign elevations based on cell dimensions h = [ - ilak, # + ilak, # ilakconn, # (k, i - 1, j), # "horizontal", # diff --git a/autotest/test_gwt_lkt01.py b/autotest/test_gwt_lkt01.py index 44ef5eb63c5..e6b9914ce75 100644 --- a/autotest/test_gwt_lkt01.py +++ b/autotest/test_gwt_lkt01.py @@ -127,12 +127,12 @@ def build_model(idx, dir): ) nlakeconn = 3 # note: this is the number of connectiosn for a lake, not total number of connections - # pak_data = [lakeno, strt, nlakeconn, CONC, dense, boundname] + # pak_data = [ifno, strt, nlakeconn, CONC, dense, boundname] pak_data = [(0, -0.4, nlakeconn, 0.0, 1025.0)] connlen = connwidth = delr / 2.0 con_data = [] - # con_data=(lakeno,iconn,(cellid),claktype,bedleak,belev,telev,connlen,connwidth ) + # con_data=(ifno,iconn,(cellid),claktype,bedleak,belev,telev,connlen,connwidth ) con_data.append( (0, 0, (0, 0, 1), "HORIZONTAL", DNODATA, 10, 10, connlen, connwidth) ) diff --git a/autotest/test_gwt_lkt02.py b/autotest/test_gwt_lkt02.py index 73b4daf6796..0328881da4f 100644 --- a/autotest/test_gwt_lkt02.py +++ b/autotest/test_gwt_lkt02.py @@ -124,7 +124,7 @@ def build_model(idx, dir): filename=f"{gwfname}.chd", ) - # pak_data = [lakeno, strt, nlakeconn, CONC, dense, boundname] + # pak_data = [ifno, strt, nlakeconn, CONC, dense, boundname] pak_data = [ (0, -0.4, 2, 0.0, 1025.0), (1, -0.4, 1, 0.0, 1025.0), @@ -133,7 +133,7 @@ def build_model(idx, dir): connlen = connwidth = delr / 2.0 con_data = [] - # con_data=(lakeno,iconn,(cellid),claktype,bedleak,belev,telev,connlen,connwidth ) + # con_data=(ifno,iconn,(cellid),claktype,bedleak,belev,telev,connlen,connwidth ) # lake 1 con_data.append( (0, 0, (0, 0, 1), "HORIZONTAL", DNODATA, 10, 10, connlen, connwidth) diff --git a/autotest/test_gwt_lkt03.py b/autotest/test_gwt_lkt03.py index 0d3c55e99ae..35ce85d573f 100644 --- a/autotest/test_gwt_lkt03.py +++ b/autotest/test_gwt_lkt03.py @@ -122,7 +122,7 @@ def build_model(idx, dir): filename=f"{gwfname}.chd", ) - # pak_data = [lakeno, strt, nlakeconn, CONC, dense, boundname] + # pak_data = [ifno, strt, nlakeconn, CONC, dense, boundname] pak_data = [ (0, 0.0, 1, 0.0, 1025.0), (1, 0.0, 1, 0.0, 1025.0), @@ -131,7 +131,7 @@ def build_model(idx, dir): connlen = connwidth = delr / 2.0 con_data = [] - # con_data=(lakeno,iconn,(cellid),claktype,bedleak,belev,telev,connlen,connwidth ) + # con_data=(ifno,iconn,(cellid),claktype,bedleak,belev,telev,connlen,connwidth ) # lake 1 con_data.append( (0, 0, (0, 0, 2), "VERTICAL", DNODATA, 10, 10, connlen, connwidth) diff --git a/autotest/test_gwt_lkt04.py b/autotest/test_gwt_lkt04.py index 888c3388042..a1f07aa2546 100644 --- a/autotest/test_gwt_lkt04.py +++ b/autotest/test_gwt_lkt04.py @@ -127,12 +127,12 @@ def build_model(idx, dir, exe): ) nlakeconn = 3 # note: this is the number of connectiosn for a lake, not total number of connections - # pak_data = [lakeno, strt, nlakeconn, CONC, dense, boundname] + # pak_data = [ifno, strt, nlakeconn, CONC, dense, boundname] pak_data = [(0, -0.4, nlakeconn, 0.0, 1025.0)] connlen = connwidth = delr / 2.0 con_data = [] - # con_data=(lakeno,iconn,(cellid),claktype,bedleak,belev,telev,connlen,connwidth ) + # con_data=(ifno,iconn,(cellid),claktype,bedleak,belev,telev,connlen,connwidth ) con_data.append( (0, 0, (0, 0, 1), "HORIZONTAL", DNODATA, 10, 10, connlen, connwidth) ) diff --git a/autotest/test_gwt_mvt01.py b/autotest/test_gwt_mvt01.py index 1818b8f5724..b578c6ee77a 100644 --- a/autotest/test_gwt_mvt01.py +++ b/autotest/test_gwt_mvt01.py @@ -142,7 +142,7 @@ def build_model(idx, dir): ) nlakeconn = 1 # note: this is the number of connectiosn for a lake, not total number of connections - # pak_data = [lakeno, strt, nlakeconn, CONC, dense, boundname] + # pak_data = [ifno, strt, nlakeconn, CONC, dense, boundname] pak_data = [ (0, 1.0, nlakeconn, 0.0, 1025.0), (1, 1.0, nlakeconn, 0.0, 1025.0), @@ -150,7 +150,7 @@ def build_model(idx, dir): connlen = connwidth = delr / 2.0 con_data = [] - # con_data=(lakeno,iconn,(cellid),claktype,bedleak,belev,telev,connlen,connwidth ) + # con_data=(ifno,iconn,(cellid),claktype,bedleak,belev,telev,connlen,connwidth ) con_data.append( (0, 0, (0, 0, 0), "VERTICAL", 0.0, 0, 0, connlen, connwidth) ) diff --git a/doc/Common/gwf-lakobs.tex b/doc/Common/gwf-lakobs.tex index 6686e6f650f..36efa37f01a 100644 --- a/doc/Common/gwf-lakobs.tex +++ b/doc/Common/gwf-lakobs.tex @@ -1,19 +1,19 @@ -LAK & stage & lakeno or boundname & -- & Surface-water stage in a lake. If boundname is specified, boundname must be unique for each lake. \\ -LAK & ext-inflow & lakeno or boundname & -- & Specified inflow into a lake or group of lakes. \\ -LAK & outlet-inflow & lakeno or boundname & -- & Simulated inflow from upstream lake outlets into a lake or group of lakes. \\ -LAK & inflow & lakeno or boundname & -- & Sum of specified inflow and simulated inflow from upstream lake outlets into a lake or group of lakes. \\ -LAK & from-mvr & lakeno or boundname & -- & Inflow into a lake or group of lakes from the MVR package. \\ -LAK & rainfall & lakeno or boundname & -- & Rainfall rate applied to a lake or group of lakes. \\ -LAK & runoff & lakeno or boundname & -- & Runoff rate applied to a lake or group of lakes. \\ -LAK & lak & lakeno or boundname & \texttt{iconn} or -- & Simulated flow rate for a lake or group of lakes and its aquifer connection(s). If boundname is not specified for ID, then the simulated lake-aquifer flow rate at a specific lake connection is observed. In this case, ID2 must be specified and is the connection number \texttt{iconn}. \\ -LAK & withdrawal & lakeno or boundname & -- & Specified withdrawal rate from a lake or group of lakes. \\ -LAK & evaporation & lakeno or boundname & -- & Simulated evaporation rate from a lake or group of lakes. \\ +LAK & stage & ifno or boundname & -- & Surface-water stage in a lake. If boundname is specified, boundname must be unique for each lake. \\ +LAK & ext-inflow & ifno or boundname & -- & Specified inflow into a lake or group of lakes. \\ +LAK & outlet-inflow & ifno or boundname & -- & Simulated inflow from upstream lake outlets into a lake or group of lakes. \\ +LAK & inflow & ifno or boundname & -- & Sum of specified inflow and simulated inflow from upstream lake outlets into a lake or group of lakes. \\ +LAK & from-mvr & ifno or boundname & -- & Inflow into a lake or group of lakes from the MVR package. \\ +LAK & rainfall & ifno or boundname & -- & Rainfall rate applied to a lake or group of lakes. \\ +LAK & runoff & ifno or boundname & -- & Runoff rate applied to a lake or group of lakes. \\ +LAK & lak & ifno or boundname & \texttt{iconn} or -- & Simulated flow rate for a lake or group of lakes and its aquifer connection(s). If boundname is not specified for ID, then the simulated lake-aquifer flow rate at a specific lake connection is observed. In this case, ID2 must be specified and is the connection number \texttt{iconn}. \\ +LAK & withdrawal & ifno or boundname & -- & Specified withdrawal rate from a lake or group of lakes. \\ +LAK & evaporation & ifno or boundname & -- & Simulated evaporation rate from a lake or group of lakes. \\ LAK & ext-outflow & outletno or boundname & -- & External outflow from a lake outlet, a lake, or a group of lakes to an external boundary. If boundname is not specified for ID, then the external outflow from a specific lake outlet is observed. In this case, ID is the outlet number outletno. \\ LAK & to-mvr & outletno or boundname & -- & Outflow from a lake outlet, a lake, or a group of lakes that is available for the MVR package. If boundname is not specified for ID, then the outflow available for the MVR package from a specific lake outlet is observed. In this case, ID is the outlet number outletno. \\ -LAK & storage & lakeno or boundname & -- & Simulated storage flow rate for a lake or group of lakes. \\ -LAK & constant & lakeno or boundname & -- & Simulated constant-flow rate for a lake or group of lakes. \\ +LAK & storage & ifno or boundname & -- & Simulated storage flow rate for a lake or group of lakes. \\ +LAK & constant & ifno or boundname & -- & Simulated constant-flow rate for a lake or group of lakes. \\ LAK & outlet & outletno or boundname & -- & Simulated outlet flow rate from a lake outlet, a lake, or a group of lakes. If boundname is not specified for ID, then the flow from a specific lake outlet is observed. In this case, ID is the outlet number outletno. \\ -LAK & volume & lakeno or boundname & -- & Simulated lake volume or group of lakes. \\ -LAK & surface-area & lakeno or boundname & -- & Simulated surface area for a lake or group of lakes. \\ -LAK & wetted-area & lakeno or boundname & \texttt{iconn} or -- & Simulated wetted-area for a lake or group of lakes and its aquifer connection(s). If boundname is not specified for ID, then the wetted area of a specific lake connection is observed. In this case, ID2 must be specified and is the connection number \texttt{iconn}. \\ -LAK & conductance & lakeno or boundname & \texttt{iconn} or -- & Calculated conductance for a lake or group of lakes and its aquifer connection(s). If boundname is not specified for ID, then the calculated conductance of a specific lake connection is observed. In this case, ID2 must be specified and is the connection number \texttt{iconn}. +LAK & volume & ifno or boundname & -- & Simulated lake volume or group of lakes. \\ +LAK & surface-area & ifno or boundname & -- & Simulated surface area for a lake or group of lakes. \\ +LAK & wetted-area & ifno or boundname & \texttt{iconn} or -- & Simulated wetted-area for a lake or group of lakes and its aquifer connection(s). If boundname is not specified for ID, then the wetted area of a specific lake connection is observed. In this case, ID2 must be specified and is the connection number \texttt{iconn}. \\ +LAK & conductance & ifno or boundname & \texttt{iconn} or -- & Calculated conductance for a lake or group of lakes and its aquifer connection(s). If boundname is not specified for ID, then the calculated conductance of a specific lake connection is observed. In this case, ID2 must be specified and is the connection number \texttt{iconn}. diff --git a/doc/Common/gwt-lktobs.tex b/doc/Common/gwt-lktobs.tex index 637dbcf3d49..7d5279fa655 100644 --- a/doc/Common/gwt-lktobs.tex +++ b/doc/Common/gwt-lktobs.tex @@ -1,25 +1,25 @@ % general APT observations -LKT & concentration & lakeno or boundname & -- & Lake concentration. If boundname is specified, boundname must be unique for each lake. \\ -LKT & flow-ja-face & lakeno or boundname & lakeno or -- & Mass flow between two lakes connected by an outlet. If more than one outlet is used to connect the same two lakes, then the mass flow for only the first outlet can be observed. If a boundname is specified for ID1, then the result is the total mass flow for all outlets for a lake. If a boundname is specified for ID1 then ID2 is not used.\\ -LKT & storage & lakeno or boundname & -- & Simulated mass storage flow rate for a lake or group of lakes. \\ -LKT & constant & lakeno or boundname & -- & Simulated mass constant-flow rate for a lake or group of lakes. \\ -LKT & from-mvr & lakeno or boundname & -- & Simulated mass inflow into a lake or group of lakes from the MVT package. Mass inflow is calculated as the product of provider concentration and the mover flow rate. \\ +LKT & concentration & ifno or boundname & -- & Lake concentration. If boundname is specified, boundname must be unique for each lake. \\ +LKT & flow-ja-face & ifno or boundname & ifno or -- & Mass flow between two lakes connected by an outlet. If more than one outlet is used to connect the same two lakes, then the mass flow for only the first outlet can be observed. If a boundname is specified for ID1, then the result is the total mass flow for all outlets for a lake. If a boundname is specified for ID1 then ID2 is not used.\\ +LKT & storage & ifno or boundname & -- & Simulated mass storage flow rate for a lake or group of lakes. \\ +LKT & constant & ifno or boundname & -- & Simulated mass constant-flow rate for a lake or group of lakes. \\ +LKT & from-mvr & ifno or boundname & -- & Simulated mass inflow into a lake or group of lakes from the MVT package. Mass inflow is calculated as the product of provider concentration and the mover flow rate. \\ LKT & to-mvr & outletno or boundname & -- & Mass outflow from a lake outlet, a lake, or a group of lakes that is available for the MVR package. If boundname is not specified for ID, then the outflow available for the MVR package from a specific lake outlet is observed. In this case, ID is the outlet number, which must be between 1 and NOUTLETS. \\ -LKT & lkt & lakeno or boundname & \texttt{iconn} or -- & Mass flow rate for a lake or group of lakes and its aquifer connection(s). If boundname is not specified for ID, then the simulated lake-aquifer flow rate at a specific lake connection is observed. In this case, ID2 must be specified and is the connection number \texttt{iconn} for lake \texttt{lakeno}. \\ +LKT & lkt & ifno or boundname & \texttt{iconn} or -- & Mass flow rate for a lake or group of lakes and its aquifer connection(s). If boundname is not specified for ID, then the simulated lake-aquifer flow rate at a specific lake connection is observed. In this case, ID2 must be specified and is the connection number \texttt{iconn} for lake \texttt{ifno}. \\ %observations specific to the lake package % rainfall evaporation runoff ext-inflow withdrawal outflow -LKT & rainfall & lakeno or boundname & -- & Rainfall rate applied to a lake or group of lakes multiplied by the rainfall concentration. \\ -LKT & evaporation & lakeno or boundname & -- & Simulated evaporation rate from a lake or group of lakes multiplied by the evaporation concentration. \\ -LKT & runoff & lakeno or boundname & -- & Runoff rate applied to a lake or group of lakes multiplied by the runoff concentration. \\ -LKT & ext-inflow & lakeno or boundname & -- & Mass inflow into a lake or group of lakes calculated as the external inflow rate multiplied by the inflow concentration. \\ -LKT & withdrawal & lakeno or boundname & -- & Specified withdrawal rate from a lake or group of lakes multiplied by the simulated lake concentration. \\ -LKT & ext-outflow & lakeno or boundname & -- & External outflow from a lake or a group of lakes, through their outlets, to an external boundary. If the water mover is active, the reported ext-outflow value plus the rate to mover is equal to the total outlet outflow. +LKT & rainfall & ifno or boundname & -- & Rainfall rate applied to a lake or group of lakes multiplied by the rainfall concentration. \\ +LKT & evaporation & ifno or boundname & -- & Simulated evaporation rate from a lake or group of lakes multiplied by the evaporation concentration. \\ +LKT & runoff & ifno or boundname & -- & Runoff rate applied to a lake or group of lakes multiplied by the runoff concentration. \\ +LKT & ext-inflow & ifno or boundname & -- & Mass inflow into a lake or group of lakes calculated as the external inflow rate multiplied by the inflow concentration. \\ +LKT & withdrawal & ifno or boundname & -- & Specified withdrawal rate from a lake or group of lakes multiplied by the simulated lake concentration. \\ +LKT & ext-outflow & ifno or boundname & -- & External outflow from a lake or a group of lakes, through their outlets, to an external boundary. If the water mover is active, the reported ext-outflow value plus the rate to mover is equal to the total outlet outflow. -%LKT & outlet-inflow & lakeno or boundname & -- & Simulated inflow from upstream lake outlets into a lake or group of lakes. \\ -%LKT & inflow & lakeno or boundname & -- & Sum of specified inflow and simulated inflow from upstream lake outlets into a lake or group of lakes. \\ +%LKT & outlet-inflow & ifno or boundname & -- & Simulated inflow from upstream lake outlets into a lake or group of lakes. \\ +%LKT & inflow & ifno or boundname & -- & Sum of specified inflow and simulated inflow from upstream lake outlets into a lake or group of lakes. \\ %LKT & outlet & outletno or boundname & -- & Simulate outlet flow rate from a lake outlet, a lake, or a group of lakes. If boundname is not specified for ID, then the flow from a specific lake outlet is observed. In this case, ID is the outlet number outletno. \\ -%LKT & volume & lakeno or boundname & -- & Simulated lake volume or group of lakes. \\ -%LKT & surface-area & lakeno or boundname & -- & Simulated surface area for a lake or group of lakes. \\ -%LKT & wetted-area & lakeno or boundname & \texttt{iconn} or -- & Simulated wetted-area for a lake or group of lakes and its aquifer connection(s). If boundname is not specified for ID, then the wetted area of a specific lake connection is observed. In this case, ID2 must be specified and is the connection number \texttt{iconn}. \\ -%LKT & conductance & lakeno or boundname & \texttt{iconn} or -- & Calculated conductance for a lake or group of lakes and its aquifer connection(s). If boundname is not specified for ID, then the calculated conductance of a specific lake connection is observed. In this case, ID2 must be specified and is the connection number \texttt{iconn}. +%LKT & volume & ifno or boundname & -- & Simulated lake volume or group of lakes. \\ +%LKT & surface-area & ifno or boundname & -- & Simulated surface area for a lake or group of lakes. \\ +%LKT & wetted-area & ifno or boundname & \texttt{iconn} or -- & Simulated wetted-area for a lake or group of lakes and its aquifer connection(s). If boundname is not specified for ID, then the wetted area of a specific lake connection is observed. In this case, ID2 must be specified and is the connection number \texttt{iconn}. \\ +%LKT & conductance & ifno or boundname & \texttt{iconn} or -- & Calculated conductance for a lake or group of lakes and its aquifer connection(s). If boundname is not specified for ID, then the calculated conductance of a specific lake connection is observed. In this case, ID2 must be specified and is the connection number \texttt{iconn}. diff --git a/doc/mf6io/mf6ivar/dfn/gwf-lak.dfn b/doc/mf6io/mf6ivar/dfn/gwf-lak.dfn index 15693270266..d73c4d13b7e 100644 --- a/doc/mf6io/mf6ivar/dfn/gwf-lak.dfn +++ b/doc/mf6io/mf6ivar/dfn/gwf-lak.dfn @@ -349,21 +349,21 @@ description value specifying the number of lakes tables that will be used to def block packagedata name packagedata -type recarray lakeno strt nlakeconn aux boundname +type recarray ifno strt nlakeconn aux boundname shape (maxbound) reader urword longname description block packagedata -name lakeno +name ifno type integer shape tagged false in_record true reader urword longname lake number for this entry -description integer value that defines the lake number associated with the specified PACKAGEDATA data on the line. LAKENO must be greater than zero and less than or equal to NLAKES. Lake information must be specified for every lake or the program will terminate with an error. The program will also terminate with an error if information for a lake is specified more than once. +description integer value that defines the feature (lake) number associated with the specified PACKAGEDATA data on the line. IFNO must be greater than zero and less than or equal to NLAKES. Lake information must be specified for every lake or the program will terminate with an error. The program will also terminate with an error if information for a lake is specified more than once. numeric_index true block packagedata @@ -384,7 +384,7 @@ tagged false in_record true reader urword longname number of lake connections -description integer value that defines the number of GWF cells connected to this (LAKENO) lake. There can only be one vertical lake connection to each GWF cell. NLAKECONN must be greater than zero. +description integer value that defines the number of GWF cells connected to this (IFNO) lake. There can only be one vertical lake connection to each GWF cell. NLAKECONN must be greater than zero. block packagedata name aux @@ -414,21 +414,21 @@ description REPLACE boundname {'{#1}': 'lake'} block connectiondata name connectiondata -type recarray lakeno iconn cellid claktype bedleak belev telev connlen connwidth +type recarray ifno iconn cellid claktype bedleak belev telev connlen connwidth shape (sum(nlakeconn)) reader urword longname description block connectiondata -name lakeno +name ifno type integer shape tagged false in_record true reader urword longname lake number for this entry -description integer value that defines the lake number associated with the specified CONNECTIONDATA data on the line. LAKENO must be greater than zero and less than or equal to NLAKES. Lake connection information must be specified for every lake connection to the GWF model (NLAKECONN) or the program will terminate with an error. The program will also terminate with an error if connection information for a lake connection to the GWF model is specified more than once. +description integer value that defines the feature (lake) number associated with the specified CONNECTIONDATA data on the line. IFNO must be greater than zero and less than or equal to NLAKES. Lake connection information must be specified for every lake connection to the GWF model (NLAKECONN) or the program will terminate with an error. The program will also terminate with an error if connection information for a lake connection to the GWF model is specified more than once. numeric_index true block connectiondata @@ -439,7 +439,7 @@ tagged false in_record true reader urword longname connection number for this entry -description integer value that defines the GWF connection number for this lake connection entry. ICONN must be greater than zero and less than or equal to NLAKECONN for lake LAKENO. +description integer value that defines the GWF connection number for this lake connection entry. ICONN must be greater than zero and less than or equal to NLAKECONN for lake IFNO. numeric_index true block connectiondata @@ -517,21 +517,21 @@ description real value that defines the connection face width for a HORIZONTAL l block tables name tables -type recarray lakeno tab6 filein tab6_filename +type recarray ifno tab6 filein tab6_filename shape (ntables) reader urword longname description block tables -name lakeno +name ifno type integer shape tagged false in_record true reader urword longname lake number for this entry -description integer value that defines the lake number associated with the specified TABLES data on the line. LAKENO must be greater than zero and less than or equal to NLAKES. The program will terminate with an error if table information for a lake is specified more than once or the number of specified tables is less than NTABLES. +description integer value that defines the feature (lake) number associated with the specified TABLES data on the line. IFNO must be greater than zero and less than or equal to NLAKES. The program will terminate with an error if table information for a lake is specified more than once or the number of specified tables is less than NTABLES. numeric_index true block tables diff --git a/doc/mf6io/mf6ivar/dfn/gwt-lkt.dfn b/doc/mf6io/mf6ivar/dfn/gwt-lkt.dfn index 44fb4422ca6..60b5aaf773e 100644 --- a/doc/mf6io/mf6ivar/dfn/gwt-lkt.dfn +++ b/doc/mf6io/mf6ivar/dfn/gwt-lkt.dfn @@ -259,21 +259,21 @@ description REPLACE obs6_filename {'{#1}': 'LKT'} block packagedata name packagedata -type recarray lakeno strt aux boundname +type recarray ifno strt aux boundname shape (maxbound) reader urword longname description block packagedata -name lakeno +name ifno type integer shape tagged false in_record true reader urword longname lake number for this entry -description integer value that defines the lake number associated with the specified PACKAGEDATA data on the line. LAKENO must be greater than zero and less than or equal to NLAKES. Lake information must be specified for every lake or the program will terminate with an error. The program will also terminate with an error if information for a lake is specified more than once. +description integer value that defines the feature (lake) number associated with the specified PACKAGEDATA data on the line. IFNO must be greater than zero and less than or equal to NLAKES. Lake information must be specified for every lake or the program will terminate with an error. The program will also terminate with an error if information for a lake is specified more than once. numeric_index true block packagedata @@ -327,21 +327,21 @@ description REPLACE iper {} block period name lakeperioddata -type recarray lakeno laksetting +type recarray ifno laksetting shape reader urword longname description block period -name lakeno +name ifno type integer shape tagged false in_record true reader urword 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. +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. numeric_index true block period diff --git a/doc/mf6io/mf6ivar/examples/gwf-lak-example.dat b/doc/mf6io/mf6ivar/examples/gwf-lak-example.dat index 9e3250aa2c2..b422457ba66 100644 --- a/doc/mf6io/mf6ivar/examples/gwf-lak-example.dat +++ b/doc/mf6io/mf6ivar/examples/gwf-lak-example.dat @@ -13,69 +13,69 @@ BEGIN DIMENSIONS END DIMENSIONS BEGIN PACKAGEDATA -# lakeno strt lakeconn boundname - 1 110.00 57 LAKE_1 +# ifno strt lakeconn boundname + 1 110.00 57 LAKE_1 END PACKAGEDATA BEGIN CONNECTIONDATA -# lakeno iconn layer row column ctype bedleak belev telev dx width - 1 1 1 7 6 HORIZONTAL 0.1 0 0 500 500 - 1 2 1 8 6 HORIZONTAL 0.1 0 0 500 500 - 1 3 1 9 6 HORIZONTAL 0.1 0 0 500 500 - 1 4 1 10 6 HORIZONTAL 0.1 0 0 500 500 - 1 5 1 11 6 HORIZONTAL 0.1 0 0 500 500 - 1 6 1 6 7 HORIZONTAL 0.1 0 0 500 500 - 1 7 2 7 7 VERTICAL 0.1 0 0 0 0 - 1 8 2 8 7 VERTICAL 0.1 0 0 0 0 - 1 9 2 8 7 HORIZONTAL 0.1 0 0 250 500 - 1 10 2 9 7 VERTICAL 0.1 0 0 0 0 - 1 11 2 9 7 HORIZONTAL 0.1 0 0 250 500 - 1 12 2 10 7 VERTICAL 0.1 0 0 0 0 - 1 13 2 10 7 HORIZONTAL 0.1 0 0 250 500 - 1 14 2 11 7 VERTICAL 0.1 0 0 0 0 - 1 15 1 12 7 HORIZONTAL 0.1 0 0 500 500 - 1 16 1 6 8 HORIZONTAL 0.1 0 0 500 500 - 1 17 2 7 8 VERTICAL 0.1 0 0 0 0 - 1 18 2 7 8 HORIZONTAL 0.1 0 0 250 500 - 1 19 3 8 8 VERTICAL 0.1 0 0 0 0 - 1 20 3 9 8 VERTICAL 0.1 0 0 0 0 - 1 21 3 10 8 VERTICAL 0.1 0 0 0 0 - 1 22 2 11 8 VERTICAL 0.1 0 0 0 0 - 1 23 2 11 8 HORIZONTAL 0.1 0 0 250 500 - 1 24 1 12 8 HORIZONTAL 0.1 0 0 500 500 - 1 25 1 6 9 HORIZONTAL 0.1 0 0 500 500 - 1 26 2 7 9 VERTICAL 0.1 0 0 0 0 - 1 27 2 7 9 HORIZONTAL 0.1 0 0 250 500 - 1 28 3 8 9 VERTICAL 0.1 0 0 0 0 - 1 29 3 9 9 VERTICAL 0.1 0 0 0 0 - 1 30 3 10 9 VERTICAL 0.1 0 0 0 0 - 1 31 2 11 9 VERTICAL 0.1 0 0 0 0 - 1 32 2 11 9 HORIZONTAL 0.1 0 0 250 500 - 1 33 1 12 9 HORIZONTAL 0.1 0 0 500 500 - 1 34 1 6 10 HORIZONTAL 0.1 0 0 500 500 - 1 35 2 7 10 VERTICAL 0.1 0 0 0 0 - 1 36 2 7 10 HORIZONTAL 0.1 0 0 250 500 - 1 37 3 8 10 VERTICAL 0.1 0 0 0 0 - 1 38 3 9 10 VERTICAL 0.1 0 0 0 0 - 1 39 3 10 10 VERTICAL 0.1 0 0 0 0 - 1 40 2 11 10 VERTICAL 0.1 0 0 0 0 - 1 41 2 11 10 HORIZONTAL 0.1 0 0 250 500 - 1 42 1 12 10 HORIZONTAL 0.1 0 0 500 500 - 1 43 1 6 11 HORIZONTAL 0.1 0 0 500 500 - 1 44 2 7 11 VERTICAL 0.1 0 0 0 0 - 1 45 2 8 11 VERTICAL 0.1 0 0 0 0 - 1 46 2 8 11 HORIZONTAL 0.1 0 0 250 500 - 1 47 2 9 11 VERTICAL 0.1 0 0 0 0 - 1 48 2 9 11 HORIZONTAL 0.1 0 0 250 500 - 1 49 2 10 11 VERTICAL 0.1 0 0 0 0 - 1 50 2 10 11 HORIZONTAL 0.1 0 0 250 500 - 1 51 2 11 11 VERTICAL 0.1 0 0 0 0 - 1 52 1 12 11 HORIZONTAL 0.1 0 0 500 500 - 1 53 1 7 12 HORIZONTAL 0.1 0 0 500 500 - 1 54 1 8 12 HORIZONTAL 0.1 0 0 500 500 - 1 55 1 9 12 HORIZONTAL 0.1 0 0 500 500 - 1 56 1 10 12 HORIZONTAL 0.1 0 0 500 500 - 1 57 1 11 12 HORIZONTAL 0.1 0 0 500 500 +# ifno iconn layer row column ctype bedleak belev telev dx width + 1 1 1 7 6 HORIZONTAL 0.1 0 0 500 500 + 1 2 1 8 6 HORIZONTAL 0.1 0 0 500 500 + 1 3 1 9 6 HORIZONTAL 0.1 0 0 500 500 + 1 4 1 10 6 HORIZONTAL 0.1 0 0 500 500 + 1 5 1 11 6 HORIZONTAL 0.1 0 0 500 500 + 1 6 1 6 7 HORIZONTAL 0.1 0 0 500 500 + 1 7 2 7 7 VERTICAL 0.1 0 0 0 0 + 1 8 2 8 7 VERTICAL 0.1 0 0 0 0 + 1 9 2 8 7 HORIZONTAL 0.1 0 0 250 500 + 1 10 2 9 7 VERTICAL 0.1 0 0 0 0 + 1 11 2 9 7 HORIZONTAL 0.1 0 0 250 500 + 1 12 2 10 7 VERTICAL 0.1 0 0 0 0 + 1 13 2 10 7 HORIZONTAL 0.1 0 0 250 500 + 1 14 2 11 7 VERTICAL 0.1 0 0 0 0 + 1 15 1 12 7 HORIZONTAL 0.1 0 0 500 500 + 1 16 1 6 8 HORIZONTAL 0.1 0 0 500 500 + 1 17 2 7 8 VERTICAL 0.1 0 0 0 0 + 1 18 2 7 8 HORIZONTAL 0.1 0 0 250 500 + 1 19 3 8 8 VERTICAL 0.1 0 0 0 0 + 1 20 3 9 8 VERTICAL 0.1 0 0 0 0 + 1 21 3 10 8 VERTICAL 0.1 0 0 0 0 + 1 22 2 11 8 VERTICAL 0.1 0 0 0 0 + 1 23 2 11 8 HORIZONTAL 0.1 0 0 250 500 + 1 24 1 12 8 HORIZONTAL 0.1 0 0 500 500 + 1 25 1 6 9 HORIZONTAL 0.1 0 0 500 500 + 1 26 2 7 9 VERTICAL 0.1 0 0 0 0 + 1 27 2 7 9 HORIZONTAL 0.1 0 0 250 500 + 1 28 3 8 9 VERTICAL 0.1 0 0 0 0 + 1 29 3 9 9 VERTICAL 0.1 0 0 0 0 + 1 30 3 10 9 VERTICAL 0.1 0 0 0 0 + 1 31 2 11 9 VERTICAL 0.1 0 0 0 0 + 1 32 2 11 9 HORIZONTAL 0.1 0 0 250 500 + 1 33 1 12 9 HORIZONTAL 0.1 0 0 500 500 + 1 34 1 6 10 HORIZONTAL 0.1 0 0 500 500 + 1 35 2 7 10 VERTICAL 0.1 0 0 0 0 + 1 36 2 7 10 HORIZONTAL 0.1 0 0 250 500 + 1 37 3 8 10 VERTICAL 0.1 0 0 0 0 + 1 38 3 9 10 VERTICAL 0.1 0 0 0 0 + 1 39 3 10 10 VERTICAL 0.1 0 0 0 0 + 1 40 2 11 10 VERTICAL 0.1 0 0 0 0 + 1 41 2 11 10 HORIZONTAL 0.1 0 0 250 500 + 1 42 1 12 10 HORIZONTAL 0.1 0 0 500 500 + 1 43 1 6 11 HORIZONTAL 0.1 0 0 500 500 + 1 44 2 7 11 VERTICAL 0.1 0 0 0 0 + 1 45 2 8 11 VERTICAL 0.1 0 0 0 0 + 1 46 2 8 11 HORIZONTAL 0.1 0 0 250 500 + 1 47 2 9 11 VERTICAL 0.1 0 0 0 0 + 1 48 2 9 11 HORIZONTAL 0.1 0 0 250 500 + 1 49 2 10 11 VERTICAL 0.1 0 0 0 0 + 1 50 2 10 11 HORIZONTAL 0.1 0 0 250 500 + 1 51 2 11 11 VERTICAL 0.1 0 0 0 0 + 1 52 1 12 11 HORIZONTAL 0.1 0 0 500 500 + 1 53 1 7 12 HORIZONTAL 0.1 0 0 500 500 + 1 54 1 8 12 HORIZONTAL 0.1 0 0 500 500 + 1 55 1 9 12 HORIZONTAL 0.1 0 0 500 500 + 1 56 1 10 12 HORIZONTAL 0.1 0 0 500 500 + 1 57 1 11 12 HORIZONTAL 0.1 0 0 500 500 END CONNECTIONDATA BEGIN OUTLETS diff --git a/doc/mf6io/mf6ivar/examples/gwt-lkt-example-obs.dat b/doc/mf6io/mf6ivar/examples/gwt-lkt-example-obs.dat index 219b663b6f5..b099bbb1b3f 100644 --- a/doc/mf6io/mf6ivar/examples/gwt-lkt-example-obs.dat +++ b/doc/mf6io/mf6ivar/examples/gwt-lkt-example-obs.dat @@ -4,23 +4,24 @@ BEGIN options END options BEGIN continuous FILEOUT gwt_lkt02.lkt.obs.csv - lkt-1-conc CONCENTRATION 1 - lkt-1-extinflow EXT-INFLOW 1 - lkt-1-rain RAINFALL 1 - lkt-1-roff RUNOFF 1 - lkt-1-evap EVAPORATION 1 - lkt-1-wdrl WITHDRAWAL 1 - lkt-1-stor STORAGE 1 - lkt-1-const CONSTANT 1 - lkt-1-gwt1 LKT 1 1 - lkt-1-gwt2 LKT 1 2 - lkt-2-gwt1 LKT 2 1 - lkt-1-mylake1 LKT MYLAKE1 - lkt-1-fjf FLOW-JA-FACE 1 2 - lkt-2-fjf FLOW-JA-FACE 2 1 - lkt-3-fjf FLOW-JA-FACE 2 3 - lkt-4-fjf FLOW-JA-FACE 3 2 - lkt-5-fjf FLOW-JA-FACE MYLAKE1 - lkt-6-fjf FLOW-JA-FACE MYLAKE2 - lkt-7-fjf FLOW-JA-FACE MYLAKE3 +# obs_name obs_type ID ID2 + lkt-1-conc CONCENTRATION 1 + lkt-1-extinflow EXT-INFLOW 1 + lkt-1-rain RAINFALL 1 + lkt-1-roff RUNOFF 1 + lkt-1-evap EVAPORATION 1 + lkt-1-wdrl WITHDRAWAL 1 + lkt-1-stor STORAGE 1 + lkt-1-const CONSTANT 1 + lkt-1-gwt1 LKT 1 1 + lkt-1-gwt2 LKT 1 2 + lkt-2-gwt1 LKT 2 1 + lkt-1-mylake1 LKT MYLAKE1 + lkt-1-fjf FLOW-JA-FACE 1 2 + lkt-2-fjf FLOW-JA-FACE 2 1 + lkt-3-fjf FLOW-JA-FACE 2 3 + lkt-4-fjf FLOW-JA-FACE 3 2 + lkt-5-fjf FLOW-JA-FACE MYLAKE1 + lkt-6-fjf FLOW-JA-FACE MYLAKE2 + lkt-7-fjf FLOW-JA-FACE MYLAKE3 END continuous diff --git a/doc/mf6io/mf6ivar/examples/gwt-lkt-example.dat b/doc/mf6io/mf6ivar/examples/gwt-lkt-example.dat index 5e3706eb239..76e1f6986ee 100644 --- a/doc/mf6io/mf6ivar/examples/gwt-lkt-example.dat +++ b/doc/mf6io/mf6ivar/examples/gwt-lkt-example.dat @@ -11,10 +11,10 @@ BEGIN OPTIONS END OPTIONS BEGIN PACKAGEDATA -# L STRT aux1 aux2 bname - 1 0.00000000 99.00000000 999.00000000 MYLAKE1 - 2 0.00000000 99.00000000 999.00000000 MYLAKE2 - 3 0.00000000 99.00000000 999.00000000 MYLAKE3 +# ifno STRT aux1 aux2 bname + 1 0.00000000 99.00000000 999.00000000 MYLAKE1 + 2 0.00000000 99.00000000 999.00000000 MYLAKE2 + 3 0.00000000 99.00000000 999.00000000 MYLAKE3 END PACKAGEDATA BEGIN PERIOD 1 diff --git a/doc/mf6io/mf6ivar/md/mf6ivar.md b/doc/mf6io/mf6ivar/md/mf6ivar.md index f0c16364354..f27978c4c69 100644 --- a/doc/mf6io/mf6ivar/md/mf6ivar.md +++ b/doc/mf6io/mf6ivar/md/mf6ivar.md @@ -649,13 +649,13 @@ | GWF | LAK | DIMENSIONS | NLAKES | INTEGER | value specifying the number of lakes that will be simulated for all stress periods. | | GWF | LAK | DIMENSIONS | NOUTLETS | INTEGER | value specifying the number of outlets that will be simulated for all stress periods. If NOUTLETS is not specified, a default value of zero is used. | | GWF | LAK | DIMENSIONS | NTABLES | INTEGER | value specifying the number of lakes tables that will be used to define the lake stage, volume relation, and surface area. If NTABLES is not specified, a default value of zero is used. | -| GWF | LAK | PACKAGEDATA | LAKENO | INTEGER | integer value that defines the lake number associated with the specified PACKAGEDATA data on the line. LAKENO must be greater than zero and less than or equal to NLAKES. Lake information must be specified for every lake or the program will terminate with an error. The program will also terminate with an error if information for a lake is specified more than once. | +| GWF | LAK | PACKAGEDATA | IFNO | INTEGER | integer value that defines the feature (lake) number associated with the specified PACKAGEDATA data on the line. IFNO must be greater than zero and less than or equal to NLAKES. Lake information must be specified for every lake or the program will terminate with an error. The program will also terminate with an error if information for a lake is specified more than once. | | GWF | LAK | PACKAGEDATA | STRT | DOUBLE PRECISION | real value that defines the starting stage for the lake. | -| GWF | LAK | PACKAGEDATA | NLAKECONN | INTEGER | integer value that defines the number of GWF cells connected to this (LAKENO) lake. There can only be one vertical lake connection to each GWF cell. NLAKECONN must be greater than zero. | +| GWF | LAK | PACKAGEDATA | NLAKECONN | INTEGER | integer value that defines the number of GWF cells connected to this (IFNO) lake. There can only be one vertical lake connection to each GWF cell. NLAKECONN must be greater than zero. | | GWF | LAK | PACKAGEDATA | AUX | DOUBLE PRECISION (NAUX) | represents the values of the auxiliary variables for each lake. The values of auxiliary variables must be present for each lake. 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. | | GWF | LAK | PACKAGEDATA | BOUNDNAME | STRING | name of the lake 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 | LAK | CONNECTIONDATA | LAKENO | INTEGER | integer value that defines the lake number associated with the specified CONNECTIONDATA data on the line. LAKENO must be greater than zero and less than or equal to NLAKES. Lake connection information must be specified for every lake connection to the GWF model (NLAKECONN) or the program will terminate with an error. The program will also terminate with an error if connection information for a lake connection to the GWF model is specified more than once. | -| GWF | LAK | CONNECTIONDATA | ICONN | INTEGER | integer value that defines the GWF connection number for this lake connection entry. ICONN must be greater than zero and less than or equal to NLAKECONN for lake LAKENO. | +| GWF | LAK | CONNECTIONDATA | IFNO | INTEGER | integer value that defines the feature (lake) number associated with the specified CONNECTIONDATA data on the line. IFNO must be greater than zero and less than or equal to NLAKES. Lake connection information must be specified for every lake connection to the GWF model (NLAKECONN) or the program will terminate with an error. The program will also terminate with an error if connection information for a lake connection to the GWF model is specified more than once. | +| GWF | LAK | CONNECTIONDATA | ICONN | INTEGER | integer value that defines the GWF connection number for this lake connection entry. ICONN must be greater than zero and less than or equal to NLAKECONN for lake IFNO. | | GWF | LAK | CONNECTIONDATA | 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 | LAK | CONNECTIONDATA | CLAKTYPE | STRING | character string that defines the lake-GWF connection type for the lake connection. Possible lake-GWF connection type strings include: VERTICAL--character keyword to indicate the lake-GWF connection is vertical and connection conductance calculations use the hydraulic conductivity corresponding to the $K_{33}$ tensor component defined for CELLID in the NPF package. HORIZONTAL--character keyword to indicate the lake-GWF connection is horizontal and connection conductance calculations use the hydraulic conductivity corresponding to the $K_{11}$ tensor component defined for CELLID in the NPF package. EMBEDDEDH--character keyword to indicate the lake-GWF connection is embedded in a single cell and connection conductance calculations use the hydraulic conductivity corresponding to the $K_{11}$ tensor component defined for CELLID in the NPF package. EMBEDDEDV--character keyword to indicate the lake-GWF connection is embedded in a single cell and connection conductance calculations use the hydraulic conductivity corresponding to the $K_{33}$ tensor component defined for CELLID in the NPF package. Embedded lakes can only be connected to a single cell (NLAKECONN = 1) and there must be a lake table associated with each embedded lake. | | GWF | LAK | CONNECTIONDATA | BEDLEAK | STRING | real value or character string that defines the bed leakance for the lake-GWF connection. BEDLEAK must be greater than or equal to zero, equal to the DNODATA value (3.0E+30), or specified to be NONE. If DNODATA or NONE is specified for BEDLEAK, the lake-GWF connection conductance is solely a function of aquifer properties in the connected GWF cell and lakebed sediments are assumed to be absent. Warning messages will be issued if NONE is specified. Eventually the ability to specify NONE will be deprecated and cause MODFLOW 6 to terminate with an error. | @@ -663,7 +663,7 @@ | GWF | LAK | CONNECTIONDATA | TELEV | DOUBLE PRECISION | real value that defines the top elevation for a HORIZONTAL lake-GWF connection. Any value can be specified if CLAKTYPE is VERTICAL, EMBEDDEDH, or EMBEDDEDV. If CLAKTYPE is HORIZONTAL and TELEV is not equal to BELEV, TELEV must be less than or equal to the top of the GWF cell CELLID. If TELEV is equal to BELEV, TELEV is reset to the top of the GWF cell CELLID. | | GWF | LAK | CONNECTIONDATA | CONNLEN | DOUBLE PRECISION | real value that defines the distance between the connected GWF CELLID node and the lake for a HORIZONTAL, EMBEDDEDH, or EMBEDDEDV lake-GWF connection. CONLENN must be greater than zero for a HORIZONTAL, EMBEDDEDH, or EMBEDDEDV lake-GWF connection. Any value can be specified if CLAKTYPE is VERTICAL. | | GWF | LAK | CONNECTIONDATA | CONNWIDTH | DOUBLE PRECISION | real value that defines the connection face width for a HORIZONTAL lake-GWF connection. CONNWIDTH must be greater than zero for a HORIZONTAL lake-GWF connection. Any value can be specified if CLAKTYPE is VERTICAL, EMBEDDEDH, or EMBEDDEDV. | -| GWF | LAK | TABLES | LAKENO | INTEGER | integer value that defines the lake number associated with the specified TABLES data on the line. LAKENO must be greater than zero and less than or equal to NLAKES. The program will terminate with an error if table information for a lake is specified more than once or the number of specified tables is less than NTABLES. | +| GWF | LAK | TABLES | IFNO | INTEGER | integer value that defines the feature (lake) number associated with the specified TABLES data on the line. IFNO must be greater than zero and less than or equal to NLAKES. The program will terminate with an error if table information for a lake is specified more than once or the number of specified tables is less than NTABLES. | | GWF | LAK | TABLES | TAB6 | KEYWORD | keyword to specify that record corresponds to a table file. | | GWF | LAK | TABLES | FILEIN | KEYWORD | keyword to specify that an input filename is expected next. | | GWF | LAK | TABLES | TAB6_FILENAME | STRING | character string that defines the path and filename for the file containing lake table data for the lake connection. The TAB6\_FILENAME file includes the number of entries in the file and the relation between stage, volume, and surface area for each entry in the file. Lake table files for EMBEDDEDH and EMBEDDEDV lake-GWF connections also include lake-GWF exchange area data for each entry in the file. Instructions for creating the TAB6\_FILENAME input file are provided in Lake Table Input File section. | @@ -1052,12 +1052,12 @@ | GWT | LKT | 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 | LKT | OPTIONS | OBS6 | KEYWORD | keyword to specify that record corresponds to an observations file. | | GWT | LKT | OPTIONS | OBS6_FILENAME | STRING | name of input file to define observations for the LKT 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 LKT package. | -| GWT | LKT | PACKAGEDATA | LAKENO | INTEGER | integer value that defines the lake number associated with the specified PACKAGEDATA data on the line. LAKENO must be greater than zero and less than or equal to NLAKES. Lake information must be specified for every lake or the program will terminate with an error. The program will also terminate with an error if information for a lake is specified more than once. | +| GWT | LKT | PACKAGEDATA | IFNO | INTEGER | integer value that defines the feature (lake) number associated with the specified PACKAGEDATA data on the line. IFNO must be greater than zero and less than or equal to NLAKES. Lake information must be specified for every lake or the program will terminate with an error. The program will also terminate with an error if information for a lake is specified more than once. | | GWT | LKT | PACKAGEDATA | STRT | DOUBLE PRECISION | real value that defines the starting concentration for the lake. | | GWT | LKT | PACKAGEDATA | AUX | DOUBLE PRECISION (NAUX) | represents the values of the auxiliary variables for each lake. The values of auxiliary variables must be present for each lake. 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 | LKT | PACKAGEDATA | BOUNDNAME | STRING | name of the lake 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 | LKT | 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 | LKT | PERIOD | LAKENO | INTEGER | 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. | +| GWT | LKT | PERIOD | IFNO | INTEGER | 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. | | GWT | LKT | PERIOD | LAKSETTING | KEYSTRING | 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, 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. | | GWT | LKT | PERIOD | STATUS | STRING | 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. | | GWT | LKT | PERIOD | CONCENTRATION | STRING | 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. | diff --git a/doc/mf6io/mf6ivar/tex/gwf-lak-connectiondata.dat b/doc/mf6io/mf6ivar/tex/gwf-lak-connectiondata.dat index 4a5c586a689..aaab3cb1544 100644 --- a/doc/mf6io/mf6ivar/tex/gwf-lak-connectiondata.dat +++ b/doc/mf6io/mf6ivar/tex/gwf-lak-connectiondata.dat @@ -1,5 +1,5 @@ BEGIN CONNECTIONDATA - - + + ... END CONNECTIONDATA diff --git a/doc/mf6io/mf6ivar/tex/gwf-lak-desc.tex b/doc/mf6io/mf6ivar/tex/gwf-lak-desc.tex index 5dbb3fbb2cd..5db6336bb82 100644 --- a/doc/mf6io/mf6ivar/tex/gwf-lak-desc.tex +++ b/doc/mf6io/mf6ivar/tex/gwf-lak-desc.tex @@ -69,11 +69,11 @@ \item \textbf{Block: PACKAGEDATA} \begin{description} -\item \texttt{lakeno}---integer value that defines the lake number associated with the specified PACKAGEDATA data on the line. LAKENO must be greater than zero and less than or equal to NLAKES. Lake information must be specified for every lake or the program will terminate with an error. The program will also terminate with an error if information for a lake is specified more than once. +\item \texttt{ifno}---integer value that defines the feature (lake) number associated with the specified PACKAGEDATA data on the line. IFNO must be greater than zero and less than or equal to NLAKES. Lake information must be specified for every lake or the program will terminate with an error. The program will also terminate with an error if information for a lake is specified more than once. \item \texttt{strt}---real value that defines the starting stage for the lake. -\item \texttt{nlakeconn}---integer value that defines the number of GWF cells connected to this (LAKENO) lake. There can only be one vertical lake connection to each GWF cell. NLAKECONN must be greater than zero. +\item \texttt{nlakeconn}---integer value that defines the number of GWF cells connected to this (IFNO) lake. There can only be one vertical lake connection to each GWF cell. NLAKECONN must be greater than zero. \item \textcolor{blue}{\texttt{aux}---represents the values of the auxiliary variables for each lake. The values of auxiliary variables must be present for each lake. 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.} @@ -83,9 +83,9 @@ \item \textbf{Block: CONNECTIONDATA} \begin{description} -\item \texttt{lakeno}---integer value that defines the lake number associated with the specified CONNECTIONDATA data on the line. LAKENO must be greater than zero and less than or equal to NLAKES. Lake connection information must be specified for every lake connection to the GWF model (NLAKECONN) or the program will terminate with an error. The program will also terminate with an error if connection information for a lake connection to the GWF model is specified more than once. +\item \texttt{ifno}---integer value that defines the feature (lake) number associated with the specified CONNECTIONDATA data on the line. IFNO must be greater than zero and less than or equal to NLAKES. Lake connection information must be specified for every lake connection to the GWF model (NLAKECONN) or the program will terminate with an error. The program will also terminate with an error if connection information for a lake connection to the GWF model is specified more than once. -\item \texttt{iconn}---integer value that defines the GWF connection number for this lake connection entry. ICONN must be greater than zero and less than or equal to NLAKECONN for lake LAKENO. +\item \texttt{iconn}---integer value that defines the GWF connection number for this lake connection entry. ICONN must be greater than zero and less than or equal to NLAKECONN for lake IFNO. \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. @@ -105,7 +105,7 @@ \item \textbf{Block: TABLES} \begin{description} -\item \texttt{lakeno}---integer value that defines the lake number associated with the specified TABLES data on the line. LAKENO must be greater than zero and less than or equal to NLAKES. The program will terminate with an error if table information for a lake is specified more than once or the number of specified tables is less than NTABLES. +\item \texttt{ifno}---integer value that defines the feature (lake) number associated with the specified TABLES data on the line. IFNO must be greater than zero and less than or equal to NLAKES. The program will terminate with an error if table information for a lake is specified more than once or the number of specified tables is less than NTABLES. \item \texttt{TAB6}---keyword to specify that record corresponds to a table file. diff --git a/doc/mf6io/mf6ivar/tex/gwf-lak-packagedata.dat b/doc/mf6io/mf6ivar/tex/gwf-lak-packagedata.dat index 7ef345a403f..11adb3c02eb 100644 --- a/doc/mf6io/mf6ivar/tex/gwf-lak-packagedata.dat +++ b/doc/mf6io/mf6ivar/tex/gwf-lak-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/gwf-lak-tables.dat b/doc/mf6io/mf6ivar/tex/gwf-lak-tables.dat index b009e0b0d41..e81e4988592 100644 --- a/doc/mf6io/mf6ivar/tex/gwf-lak-tables.dat +++ b/doc/mf6io/mf6ivar/tex/gwf-lak-tables.dat @@ -1,5 +1,5 @@ BEGIN TABLES - TAB6 FILEIN - TAB6 FILEIN + TAB6 FILEIN + TAB6 FILEIN ... END TABLES diff --git a/doc/mf6io/mf6ivar/tex/gwt-lkt-desc.tex b/doc/mf6io/mf6ivar/tex/gwt-lkt-desc.tex index 29e18ed0fef..0cb746186ca 100644 --- a/doc/mf6io/mf6ivar/tex/gwt-lkt-desc.tex +++ b/doc/mf6io/mf6ivar/tex/gwt-lkt-desc.tex @@ -47,7 +47,7 @@ \item \textbf{Block: PACKAGEDATA} \begin{description} -\item \texttt{lakeno}---integer value that defines the lake number associated with the specified PACKAGEDATA data on the line. LAKENO must be greater than zero and less than or equal to NLAKES. Lake information must be specified for every lake or the program will terminate with an error. The program will also terminate with an error if information for a lake is specified more than once. +\item \texttt{ifno}---integer value that defines the feature (lake) number associated with the specified PACKAGEDATA data on the line. IFNO must be greater than zero and less than or equal to NLAKES. Lake information must be specified for every lake or the program will terminate with an error. The program will also terminate with an error if information for a lake is specified more than once. \item \texttt{strt}---real value that defines the starting concentration for the lake. @@ -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{lakeno}---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. +\item \texttt{ifno}---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. \item \texttt{laksetting}---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, 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. diff --git a/doc/mf6io/mf6ivar/tex/gwt-lkt-packagedata.dat b/doc/mf6io/mf6ivar/tex/gwt-lkt-packagedata.dat index c3a9aeec732..c293a94d109 100644 --- a/doc/mf6io/mf6ivar/tex/gwt-lkt-packagedata.dat +++ b/doc/mf6io/mf6ivar/tex/gwt-lkt-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-lkt-period.dat b/doc/mf6io/mf6ivar/tex/gwt-lkt-period.dat index dfe899b47ef..da60631beac 100644 --- a/doc/mf6io/mf6ivar/tex/gwt-lkt-period.dat +++ b/doc/mf6io/mf6ivar/tex/gwt-lkt-period.dat @@ -1,5 +1,5 @@ BEGIN PERIOD - - + + ... END PERIOD