Skip to content

Commit

Permalink
Merge branch 'develop' into standardize_feat_no_param_name
Browse files Browse the repository at this point in the history
  • Loading branch information
@langevin-usgs
langevin-usgs authored Sep 22, 2023
2 parents 681dbeb + 9987e5e commit 8d48ad6
Show file tree
Hide file tree
Showing 68 changed files with 5,735 additions and 1,577 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ on:
- ci-diagnose*
paths-ignore:
- '**.md'
- 'doc/**'
- '**.pdf'
- '**.tex'
- '**.jpg'
- '**.jpeg'
- '**.png'
- '**.bbl'
- '**.bib'
- 'doc/**'
- 'doc/**.dat'
- 'doc/**.ipynb'
- 'doc/**.py'
Expand All @@ -26,14 +26,14 @@ on:
- develop
paths-ignore:
- '**.md'
- 'doc/**'
- '**.pdf'
- '**.tex'
- '**.jpg'
- '**.jpeg'
- '**.png'
- '**.bbl'
- '**.bib'
- 'doc/**'
- 'doc/**.dat'
- 'doc/**.ipynb'
- 'doc/**.py'
Expand Down
78 changes: 39 additions & 39 deletions autotest/data/prudic2004test2/sfr-packagedata.dat
View file
Original file line number Diff line number Diff line change
@@ -1,39 +1,39 @@
#rno rlen rwid rgrd rtp rbth rhk man ncon ustrf ndv
0 400.0000 5.000000 0.1818182E-02 48.63636 1.000000 100.0000 0.3000000E-01 1 1.0000 0
1 200.0000 5.000000 0.1818182E-02 48.09091 1.000000 100.0000 0.3000000E-01 2 1.0000 0
2 400.0000 5.000000 0.1818182E-02 47.54546 1.000000 100.0000 0.3000000E-01 2 1.0000 0
3 400.0000 5.000000 0.1818182E-02 46.81818 1.000000 100.0000 0.3000000E-01 2 1.0000 0
4 400.0000 5.000000 0.1818182E-02 46.09091 1.000000 100.0000 0.3000000E-01 2 1.0000 0
5 400.0000 5.000000 0.1818182E-02 45.36364 1.000000 100.0000 0.3000000E-01 1 1.0000 0
6 400.0000 5.000000 0.2187500E-02 44.06250 1.000000 100.0000 0.3000000E-01 1 1.0000 0
7 400.0000 5.000000 0.2187500E-02 43.18750 1.000000 100.0000 0.3000000E-01 2 1.0000 0
8 400.0000 5.000000 0.2187500E-02 42.31250 1.000000 100.0000 0.3000000E-01 2 1.0000 0
9 400.0000 5.000000 0.2187500E-02 41.43750 1.000000 100.0000 0.3000000E-01 2 1.0000 0
10 400.0000 5.000000 0.2187500E-02 40.56250 1.000000 100.0000 0.3000000E-01 2 1.0000 0
11 400.0000 5.000000 0.2187500E-02 39.68750 1.000000 100.0000 0.3000000E-01 2 1.0000 0
12 400.0000 5.000000 0.2187500E-02 38.81250 1.000000 100.0000 0.3000000E-01 2 1.0000 0
13 400.0000 5.000000 0.2187500E-02 37.93750 1.000000 100.0000 0.3000000E-01 2 1.0000 0
14 400.0000 5.000000 0.2187500E-02 37.06250 1.000000 100.0000 0.3000000E-01 2 1.0000 0
15 400.0000 5.000000 0.2187500E-02 36.18750 1.000000 100.0000 0.3000000E-01 2 1.0000 0
16 400.0000 5.000000 0.2187500E-02 35.31250 1.000000 100.0000 0.3000000E-01 2 1.0000 0
17 400.0000 5.000000 0.2187500E-02 34.43750 1.000000 100.0000 0.3000000E-01 2 1.0000 0
18 400.0000 5.000000 0.1704545E-02 41.15909 1.000000 100.0000 0.3000000E-01 1 1.0000 0
19 200.0000 5.000000 0.1704545E-02 40.64773 1.000000 100.0000 0.3000000E-01 2 1.0000 0
20 200.0000 5.000000 0.1704545E-02 40.30682 1.000000 100.0000 0.3000000E-01 2 1.0000 0
21 400.0000 5.000000 0.1704545E-02 39.79546 1.000000 100.0000 0.3000000E-01 2 1.0000 0
22 400.0000 5.000000 0.1704545E-02 39.11364 1.000000 100.0000 0.3000000E-01 2 1.0000 0
23 400.0000 5.000000 0.1704545E-02 38.43182 1.000000 100.0000 0.3000000E-01 2 1.0000 0
24 400.0000 5.000000 0.1704545E-02 37.75000 1.000000 100.0000 0.3000000E-01 2 1.0000 0
25 200.0000 5.000000 0.1704545E-02 37.23864 1.000000 100.0000 0.3000000E-01 2 1.0000 0
26 200.0000 5.000000 0.1704545E-02 36.89773 1.000000 100.0000 0.3000000E-01 2 1.0000 0
27 400.0000 5.000000 0.1704545E-02 36.38636 1.000000 100.0000 0.3000000E-01 2 1.0000 0
28 400.0000 5.000000 0.1704545E-02 35.70454 1.000000 100.0000 0.3000000E-01 2 1.0000 0
29 400.0000 5.000000 0.1704545E-02 35.02273 1.000000 100.0000 0.3000000E-01 2 1.0000 0
30 400.0000 5.000000 0.1704545E-02 34.34091 1.000000 100.0000 0.3000000E-01 2 1.0000 0
31 400.0000 5.000000 0.2428571E-02 33.51429 1.000000 100.0000 0.3000000E-01 3 1.0000 0
32 400.0000 5.000000 0.2428571E-02 32.54286 1.000000 100.0000 0.3000000E-01 2 1.0000 0
33 400.0000 5.000000 0.2428571E-02 31.57143 1.000000 100.0000 0.3000000E-01 2 1.0000 0
34 400.0000 5.000000 0.2428571E-02 30.60000 1.000000 100.0000 0.3000000E-01 2 1.0000 0
35 400.0000 5.000000 0.2428571E-02 29.62857 1.000000 100.0000 0.3000000E-01 2 1.0000 0
36 400.0000 5.000000 0.2428571E-02 28.65714 1.000000 100.0000 0.3000000E-01 2 1.0000 0
37 400.0000 5.000000 0.2428571E-02 27.68571 1.000000 100.0000 0.3000000E-01 1 1.0000 0
#ifno rlen rwid rgrd rtp rbth rhk man ncon ustrf ndv
0 400.0000 5.000000 0.1818182E-02 48.63636 1.000000 100.0000 0.3000000E-01 1 1.0000 0
1 200.0000 5.000000 0.1818182E-02 48.09091 1.000000 100.0000 0.3000000E-01 2 1.0000 0
2 400.0000 5.000000 0.1818182E-02 47.54546 1.000000 100.0000 0.3000000E-01 2 1.0000 0
3 400.0000 5.000000 0.1818182E-02 46.81818 1.000000 100.0000 0.3000000E-01 2 1.0000 0
4 400.0000 5.000000 0.1818182E-02 46.09091 1.000000 100.0000 0.3000000E-01 2 1.0000 0
5 400.0000 5.000000 0.1818182E-02 45.36364 1.000000 100.0000 0.3000000E-01 1 1.0000 0
6 400.0000 5.000000 0.2187500E-02 44.06250 1.000000 100.0000 0.3000000E-01 1 1.0000 0
7 400.0000 5.000000 0.2187500E-02 43.18750 1.000000 100.0000 0.3000000E-01 2 1.0000 0
8 400.0000 5.000000 0.2187500E-02 42.31250 1.000000 100.0000 0.3000000E-01 2 1.0000 0
9 400.0000 5.000000 0.2187500E-02 41.43750 1.000000 100.0000 0.3000000E-01 2 1.0000 0
10 400.0000 5.000000 0.2187500E-02 40.56250 1.000000 100.0000 0.3000000E-01 2 1.0000 0
11 400.0000 5.000000 0.2187500E-02 39.68750 1.000000 100.0000 0.3000000E-01 2 1.0000 0
12 400.0000 5.000000 0.2187500E-02 38.81250 1.000000 100.0000 0.3000000E-01 2 1.0000 0
13 400.0000 5.000000 0.2187500E-02 37.93750 1.000000 100.0000 0.3000000E-01 2 1.0000 0
14 400.0000 5.000000 0.2187500E-02 37.06250 1.000000 100.0000 0.3000000E-01 2 1.0000 0
15 400.0000 5.000000 0.2187500E-02 36.18750 1.000000 100.0000 0.3000000E-01 2 1.0000 0
16 400.0000 5.000000 0.2187500E-02 35.31250 1.000000 100.0000 0.3000000E-01 2 1.0000 0
17 400.0000 5.000000 0.2187500E-02 34.43750 1.000000 100.0000 0.3000000E-01 2 1.0000 0
18 400.0000 5.000000 0.1704545E-02 41.15909 1.000000 100.0000 0.3000000E-01 1 1.0000 0
19 200.0000 5.000000 0.1704545E-02 40.64773 1.000000 100.0000 0.3000000E-01 2 1.0000 0
20 200.0000 5.000000 0.1704545E-02 40.30682 1.000000 100.0000 0.3000000E-01 2 1.0000 0
21 400.0000 5.000000 0.1704545E-02 39.79546 1.000000 100.0000 0.3000000E-01 2 1.0000 0
22 400.0000 5.000000 0.1704545E-02 39.11364 1.000000 100.0000 0.3000000E-01 2 1.0000 0
23 400.0000 5.000000 0.1704545E-02 38.43182 1.000000 100.0000 0.3000000E-01 2 1.0000 0
24 400.0000 5.000000 0.1704545E-02 37.75000 1.000000 100.0000 0.3000000E-01 2 1.0000 0
25 200.0000 5.000000 0.1704545E-02 37.23864 1.000000 100.0000 0.3000000E-01 2 1.0000 0
26 200.0000 5.000000 0.1704545E-02 36.89773 1.000000 100.0000 0.3000000E-01 2 1.0000 0
27 400.0000 5.000000 0.1704545E-02 36.38636 1.000000 100.0000 0.3000000E-01 2 1.0000 0
28 400.0000 5.000000 0.1704545E-02 35.70454 1.000000 100.0000 0.3000000E-01 2 1.0000 0
29 400.0000 5.000000 0.1704545E-02 35.02273 1.000000 100.0000 0.3000000E-01 2 1.0000 0
30 400.0000 5.000000 0.1704545E-02 34.34091 1.000000 100.0000 0.3000000E-01 2 1.0000 0
31 400.0000 5.000000 0.2428571E-02 33.51429 1.000000 100.0000 0.3000000E-01 3 1.0000 0
32 400.0000 5.000000 0.2428571E-02 32.54286 1.000000 100.0000 0.3000000E-01 2 1.0000 0
33 400.0000 5.000000 0.2428571E-02 31.57143 1.000000 100.0000 0.3000000E-01 2 1.0000 0
34 400.0000 5.000000 0.2428571E-02 30.60000 1.000000 100.0000 0.3000000E-01 2 1.0000 0
35 400.0000 5.000000 0.2428571E-02 29.62857 1.000000 100.0000 0.3000000E-01 2 1.0000 0
36 400.0000 5.000000 0.2428571E-02 28.65714 1.000000 100.0000 0.3000000E-01 2 1.0000 0
37 400.0000 5.000000 0.2428571E-02 27.68571 1.000000 100.0000 0.3000000E-01 1 1.0000 0
6 changes: 3 additions & 3 deletions autotest/test_gwt_prudic2004t2gwtgwt.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ def sfr_packagedata_to_list(
dt[14] = ("boundname", "S40")
ra = np.genfromtxt(fname, dtype=dt)
if convert_to_zero_base:
ra["rno"] -= 1
ra["ifno"] -= 1
ra["layer"] -= 1
ra["row"] -= 1
ra["column"] -= 1
Expand Down Expand Up @@ -649,8 +649,8 @@ def build_gwfgwt_combo(
sfrpack = gwf.get_package(pname)
nreaches = sfrpack.nreaches.get_data()
sftpackagedata = []
for irno in range(nreaches):
t = (irno, 0.0, 99.0, 999.0, f"myreach{irno + 1}")
for ifno in range(nreaches):
t = (ifno, 0.0, 99.0, 999.0, f"myreach{ifno + 1}")
sftpackagedata.append(t)

sft_obs = {
Expand Down
34 changes: 17 additions & 17 deletions doc/Common/gwf-sfrobs.tex
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
SFR & stage & rno or boundname & -- & Surface-water stage in a stream-reach boundary. If boundname is specified, boundname must be unique for each reach. \\
SFR & ext-inflow & rno or boundname & -- & Inflow into a stream-reach from an external boundary for a stream-reach or a group of stream-reaches. \\
SFR & inflow & rno or boundname & -- & Inflow into a stream-reach from upstream reaches for a stream-reach or a group of stream-reaches. \\
SFR & from-mvr & rno or boundname & -- & Inflow into a stream-reach from the MVR package for a stream-reach or a group of stream-reaches. \\
SFR & rainfall & rno or boundname & -- & Rainfall rate applied to a stream-reach or a group of stream-reaches. \\
SFR & runoff & rno or boundname & -- & Runoff rate applied to a stream-reach or a group of stream-reaches. \\
SFR & sfr & rno or boundname & -- & Simulated flow rate for a stream-reach and its aquifer connection for a stream-reach or a group of stream-reaches. \\
SFR & evaporation & rno or boundname & -- & Simulated evaporation rate from a stream-reach or a group of stream-reaches. \\
SFR & outflow & rno or boundname & -- & Outflow from a stream-reach to downstream reaches for a stream-reach or a group of stream-reaches. \\
SFR & ext-outflow & rno or boundname & -- & Outflow from a stream-reach to an external boundary for a stream-reach or a group of stream-reaches. \\
SFR & to-mvr & rno or boundname & -- & Outflow from a stream-reach that is available for the MVR package for a stream-reach or a group of stream-reaches. \\
SFR & upstream-flow & rno or boundname & -- & Upstream flow for a stream-reach or a group of stream-reaches from upstream reaches and the MVR package. \\
SFR & downstream-flow & rno or boundname & -- & Downstream flow for a stream-reach or a group of stream-reaches prior to diversions and the MVR package. \\
SFR & depth & rno or boundname & -- & Surface-water depth in a stream-reach boundary. If boundname is specified, boundname must be unique for each reach. \\
SFR & wet-perimeter & rno or boundname & -- & Wetted perimeter in a stream-reach boundary. If boundname is specified, boundname must be unique for each reach. \\
SFR & wet-area & rno or boundname & -- & Wetted cross-section area in a stream-reach boundary. If boundname is specified, boundname must be unique for each reach. \\
SFR & wet-width & rno or boundname & -- & Wetted top width in a stream-reach boundary. If boundname is specified, boundname must be unique for each reach. \\
SFR & stage & ifno or boundname & -- & Surface-water stage in a stream-reach boundary. If boundname is specified, boundname must be unique for each reach. \\
SFR & ext-inflow & ifno or boundname & -- & Inflow into a stream-reach from an external boundary for a stream-reach or a group of stream-reaches. \\
SFR & inflow & ifno or boundname & -- & Inflow into a stream-reach from upstream reaches for a stream-reach or a group of stream-reaches. \\
SFR & from-mvr & ifno or boundname & -- & Inflow into a stream-reach from the MVR package for a stream-reach or a group of stream-reaches. \\
SFR & rainfall & ifno or boundname & -- & Rainfall rate applied to a stream-reach or a group of stream-reaches. \\
SFR & runoff & ifno or boundname & -- & Runoff rate applied to a stream-reach or a group of stream-reaches. \\
SFR & sfr & ifno or boundname & -- & Simulated flow rate for a stream-reach and its aquifer connection for a stream-reach or a group of stream-reaches. \\
SFR & evaporation & ifno or boundname & -- & Simulated evaporation rate from a stream-reach or a group of stream-reaches. \\
SFR & outflow & ifno or boundname & -- & Outflow from a stream-reach to downstream reaches for a stream-reach or a group of stream-reaches. \\
SFR & ext-outflow & ifno or boundname & -- & Outflow from a stream-reach to an external boundary for a stream-reach or a group of stream-reaches. \\
SFR & to-mvr & ifno or boundname & -- & Outflow from a stream-reach that is available for the MVR package for a stream-reach or a group of stream-reaches. \\
SFR & upstream-flow & ifno or boundname & -- & Upstream flow for a stream-reach or a group of stream-reaches from upstream reaches and the MVR package. \\
SFR & downstream-flow & ifno or boundname & -- & Downstream flow for a stream-reach or a group of stream-reaches prior to diversions and the MVR package. \\
SFR & depth & ifno or boundname & -- & Surface-water depth in a stream-reach boundary. If boundname is specified, boundname must be unique for each reach. \\
SFR & wet-perimeter & ifno or boundname & -- & Wetted perimeter in a stream-reach boundary. If boundname is specified, boundname must be unique for each reach. \\
SFR & wet-area & ifno or boundname & -- & Wetted cross-section area in a stream-reach boundary. If boundname is specified, boundname must be unique for each reach. \\
SFR & wet-width & ifno or boundname & -- & Wetted top width in a stream-reach boundary. If boundname is specified, boundname must be unique for each reach. \\

24 changes: 12 additions & 12 deletions doc/Common/gwt-sftobs.tex
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
% general APT observations
SFT & concentration & rno or boundname & -- & Reach concentration. If boundname is specified, boundname must be unique for each reach. \\
SFT & flow-ja-face & rno or boundname & rno or -- & Mass flow between two reaches. If a boundname is specified for ID1, then the result is the total mass flow for all reaches. If a boundname is specified for ID1 then ID2 is not used.\\
SFT & storage & rno or boundname & -- & Simulated mass storage flow rate for a reach or group of reaches. \\
SFT & constant & rno or boundname & -- & Simulated mass constant-flow rate for a reach or group of reaches. \\
SFT & from-mvr & rno or boundname & -- & Simulated mass inflow into a reach or group of reaches from the MVT package. Mass inflow is calculated as the product of provider concentration and the mover flow rate. \\
SFT & to-mvr & rno or boundname & -- & Mass outflow from a reach, or a group of reaches 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 reach is observed. \\
SFT & sft & rno or boundname & -- & Mass flow rate for a reach or group of reaches and its aquifer connection(s). \\
SFT & concentration & ifno or boundname & -- & Reach concentration. If boundname is specified, boundname must be unique for each reach. \\
SFT & flow-ja-face & ifno or boundname & ifno or -- & Mass flow between two reaches. If a boundname is specified for ID1, then the result is the total mass flow for all reaches. If a boundname is specified for ID1 then ID2 is not used.\\
SFT & storage & ifno or boundname & -- & Simulated mass storage flow rate for a reach or group of reaches. \\
SFT & constant & ifno or boundname & -- & Simulated mass constant-flow rate for a reach or group of reaches. \\
SFT & from-mvr & ifno or boundname & -- & Simulated mass inflow into a reach or group of reaches from the MVT package. Mass inflow is calculated as the product of provider concentration and the mover flow rate. \\
SFT & to-mvr & ifno or boundname & -- & Mass outflow from a reach, or a group of reaches 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 reach is observed. \\
SFT & sft & ifno or boundname & -- & Mass flow rate for a reach or group of reaches and its aquifer connection(s). \\

%observations specific to the stream transport package
% rainfall evaporation runoff ext-inflow withdrawal outflow
SFT & rainfall & rno or boundname & -- & Rainfall rate applied to a reach or group of reaches multiplied by the rainfall concentration. \\
SFT & evaporation & rno or boundname & -- & Simulated evaporation rate from a reach or group of reaches multiplied by the evaporation concentration. \\
SFT & runoff & rno or boundname & -- & Runoff rate applied to a reach or group of reaches multiplied by the runoff concentration. \\
SFT & ext-inflow & rno or boundname & -- & Mass inflow into a reach or group of reaches calculated as the external inflow rate multiplied by the inflow concentration. \\
SFT & ext-outflow & rno or boundname & -- & External outflow from a reach or group of reaches to an external boundary. If boundname is not specified for ID, then the external outflow from a specific reach is observed. In this case, ID is the reach rno.
SFT & rainfall & ifno or boundname & -- & Rainfall rate applied to a reach or group of reaches multiplied by the rainfall concentration. \\
SFT & evaporation & ifno or boundname & -- & Simulated evaporation rate from a reach or group of reaches multiplied by the evaporation concentration. \\
SFT & runoff & ifno or boundname & -- & Runoff rate applied to a reach or group of reaches multiplied by the runoff concentration. \\
SFT & ext-inflow & ifno or boundname & -- & Mass inflow into a reach or group of reaches calculated as the external inflow rate multiplied by the inflow concentration. \\
SFT & ext-outflow & ifno or boundname & -- & External outflow from a reach or group of reaches to an external boundary. If boundname is not specified for ID, then the external outflow from a specific reach is observed. In this case, ID is the reach ifno.
Loading

0 comments on commit 8d48ad6

Please sign in to comment.