Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
83 commits
Select commit Hold shift + click to select a range
1034d4f
fix(readme): links needed further patching
emorway-usgs Jun 3, 2026
b994a0b
Merge branch 'develop' of https://github.com/emorway-usgs/modflow6 in…
emorway-usgs Jun 3, 2026
fa4783a
Merge branch 'develop' of https://github.com/MODFLOW-ORG/modflow6 int…
emorway-usgs Jun 16, 2026
b802e8c
Merge branch 'develop' of https://github.com/MODFLOW-ORG/modflow6 int…
emorway-usgs Jun 17, 2026
a286739
Merge branch 'develop' of https://github.com/MODFLOW-ORG/modflow6 int…
emorway-usgs Jun 22, 2026
ee2233d
Merge branch 'develop' of https://github.com/MODFLOW-ORG/modflow6 int…
emorway-usgs Jun 30, 2026
2e3a707
Merge branch 'develop' of https://github.com/MODFLOW-ORG/modflow6 int…
emorway-usgs Jul 2, 2026
ccaa8d3
Merge branch 'develop' of https://github.com/MODFLOW-ORG/modflow6 int…
emorway-usgs Jul 7, 2026
4ae3e2f
updating abc autotest
emorway-usgs Nov 20, 2025
938de2a
Abc 3 (#22)
skfogg Aug 22, 2025
9039544
read shf options block; will need to circle back and test TS function…
emorway-usgs Mar 6, 2025
21a48f5
changes now through _rp() routine, _ad() up next
emorway-usgs Mar 13, 2025
befbeba
A new and very basic autotest for SHF
emorway-usgs Apr 24, 2025
6b1527b
Better explain the new autotest
emorway-usgs Apr 24, 2025
ebb9b11
spelling
emorway-usgs Apr 27, 2025
b90e179
ruff
emorway-usgs May 1, 2025
8372609
new test problem swr (#15)
skfogg May 13, 2025
5bdd789
add swr to options block of sfe (#16)
skfogg May 21, 2025
3a58c26
Preliminary test of ABC now working (#21)
skfogg Aug 8, 2025
1c60466
recovering from a painful rebase
emorway-usgs Aug 26, 2025
654c915
cleanup double allocation of variables
emorway-usgs Aug 27, 2025
91cf095
Abc lhf work (#23)
skfogg Sep 4, 2025
b8a33bc
Abc lhf 2 (#24)
skfogg Sep 9, 2025
f20d968
change sign of the latent heat flux contribution to abc
emorway-usgs Sep 15, 2025
b9105ba
clean up new autotest for latent heat flux - more clean-up probably n…
emorway-usgs Sep 16, 2025
6ab8dbe
Shf lwr (#25)
skfogg Oct 28, 2025
b46c31e
Attempting to do some clean-up in ABC
emorway-usgs Oct 31, 2025
5eb5bd1
ruff
emorway-usgs Oct 31, 2025
5315b8d
clean up some circular calls that were messing with the memory. More…
emorway-usgs Nov 4, 2025
5bae906
code clean up and need to initialize lwr variables
emorway-usgs Nov 5, 2025
98c4a1c
renaming of ABC autotest
emorway-usgs Nov 5, 2025
60c9e3a
bump an autotest to a different name
emorway-usgs Nov 5, 2025
e8b2905
A bit more futzing around
emorway-usgs Nov 14, 2025
7f70c25
address some of the current failures on CI
emorway-usgs Nov 14, 2025
698c26a
build files required updating
emorway-usgs Nov 14, 2025
d745b05
remove unused variable
emorway-usgs Nov 15, 2025
9ec79b5
clean up, 2
emorway-usgs Nov 15, 2025
2207cf7
clean up, 3
emorway-usgs Nov 15, 2025
49fdec0
clean up latex (will likely be more as development continues)
emorway-usgs Nov 17, 2025
c226452
reorganization of variables associated with ABC utility; also updatin…
emorway-usgs Dec 9, 2025
f1f3be3
Minor fixes
emorway-usgs Dec 16, 2025
07d7b41
minor change to a constant value.
emorway-usgs Dec 23, 2025
04c3ee9
starting to implement changes to an autotest
emorway-usgs Dec 30, 2025
fb36435
some more work on an autotest
emorway-usgs Jan 7, 2026
5609e59
Lwr autotest (#26)
skfogg Jan 8, 2026
2ff0557
Adding keywords to deactivate the various energy flux types available…
emorway-usgs Jan 9, 2026
3151e91
ABC utility updates
emorway-usgs Jan 9, 2026
78befd1
Lwr autotest 2 (#27)
skfogg Jan 12, 2026
aa3c49e
Initialize the uninitialized
emorway-usgs Jan 12, 2026
4e41a9d
Starting to work on support for 'observations' of the 4 ABC heat flux…
emorway-usgs Jan 15, 2026
b7a58bb
continuing to add support for ABC obs
emorway-usgs Jan 15, 2026
81cac3d
More ABC work
emorway-usgs Jan 15, 2026
2c46065
Lwr autotest 3 (#28)
skfogg Jan 16, 2026
efdeb70
touch-up in lwr calcs
emorway-usgs Jan 16, 2026
b1207c7
fixed swr00 autotest (#29)
skfogg Jan 16, 2026
f0c0e11
minor touch-up
emorway-usgs Jan 27, 2026
b198eb1
checking in some minor updates
emorway-usgs Feb 13, 2026
2aeb0d6
A couple of additional updates
emorway-usgs Feb 17, 2026
7fefb0f
adding (1) latent and (2) latent + sensible autotests
emorway-usgs Feb 17, 2026
88ebd6b
fprettify and spelling cleanup
emorway-usgs Feb 18, 2026
6af8247
cleanup for ci
emorway-usgs Feb 18, 2026
9c173fd
more cleanup
emorway-usgs Feb 18, 2026
4ec5a57
Have ran ruff locally on this file, but it still seems to be failing …
emorway-usgs Feb 18, 2026
cd43798
more cleanup
emorway-usgs Feb 18, 2026
2b9ff85
remove unused variable
emorway-usgs Feb 18, 2026
2f0b13e
cleaning up two new autotests
emorway-usgs Feb 19, 2026
5ba6801
updating an autotest
emorway-usgs Mar 3, 2026
947edce
use pixi to run ruff, don't run ruff manually
emorway-usgs Mar 11, 2026
8cc0b6a
check in some updates, more to do
emorway-usgs Mar 17, 2026
e0f379a
get one of the new ABC autotests straightened out
emorway-usgs Mar 18, 2026
f355ce5
changing one of the abc autotests
emorway-usgs Mar 23, 2026
a1213cc
more cleanup
emorway-usgs Mar 23, 2026
42e21e9
more cleanup
emorway-usgs Mar 24, 2026
39f8dc6
some minor tweaks
emorway-usgs Apr 6, 2026
924e8ba
get another autotest working
emorway-usgs Apr 10, 2026
adcbad0
spelling
emorway-usgs Apr 10, 2026
584f50f
clean-up on two other autotests
emorway-usgs Apr 10, 2026
f510d14
Another autotest for new ABC funtionality. This one is designed to fail
emorway-usgs Apr 13, 2026
e498efd
MSVS files were overwritten during the last rebase, restoring some br…
emorway-usgs Apr 16, 2026
ce40d68
get the time series functionality working in ABC and a new autotest t…
emorway-usgs Apr 21, 2026
5ff4301
minor spot fixes
emorway-usgs May 7, 2026
f6965b4
another file with minor spot fixes
emorway-usgs May 7, 2026
f1429e2
early work on generalized units, patterned after LENGTH_CONVERSION in…
emorway-usgs Jun 22, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
522 changes: 522 additions & 0 deletions autotest/test_gwe_sfe_abc00.py

Large diffs are not rendered by default.

494 changes: 494 additions & 0 deletions autotest/test_gwe_sfe_abc01.py

Large diffs are not rendered by default.

690 changes: 690 additions & 0 deletions autotest/test_gwe_sfe_abc02.py

Large diffs are not rendered by default.

545 changes: 545 additions & 0 deletions autotest/test_gwe_sfe_abc03.py

Large diffs are not rendered by default.

530 changes: 530 additions & 0 deletions autotest/test_gwe_sfe_lhf00.py

Large diffs are not rendered by default.

544 changes: 544 additions & 0 deletions autotest/test_gwe_sfe_lwr00.py

Large diffs are not rendered by default.

601 changes: 601 additions & 0 deletions autotest/test_gwe_sfe_shf00.py

Large diffs are not rendered by default.

663 changes: 663 additions & 0 deletions autotest/test_gwe_sfe_shf01.py

Large diffs are not rendered by default.

481 changes: 481 additions & 0 deletions autotest/test_gwe_sfe_swr00.py

Large diffs are not rendered by default.

7 changes: 6 additions & 1 deletion doc/Common/gwe-sfeobs.tex
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,9 @@
SFE & runoff & rno or boundname & -- & Runoff rate applied to a reach or group of reaches multiplied by the runoff temperature. \\
SFE & ext-inflow & rno or boundname & -- & Energy inflow into a reach or group of reaches calculated as the external inflow rate multiplied by the inflow temperature. \\
SFE & 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. \\
SFE & strmbd-cond & rno or boundname & -- & Amount of heat conductively exchanged with the streambed material.
SFE & strmbd-cond & rno or boundname & -- & Amount of heat conductively exchanged with the streambed material. \\
SFE & swr & rno or boundname & -- & Amount of energy entering the stream reach from shortwave radiation. \\
SFE & lwr & rno or boundname & -- & Net amount of longwave radiation energy exchanged with the stream reach. \\
SFE & lhf & rno or boundname & -- & Amount of energy lost from the stream reach owing to evaporative cooling. \\
SFE & shf & rno or boundname & -- & Amount of sensible heat exchanged with the atmosphere. \\
SFE & surfevap & rno & -- & Evaporation rate for a given stream reach. \\
23 changes: 23 additions & 0 deletions doc/mf6io/gwe/abc.tex
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
Input to the Atmospheric Boundary Condition (ABC) Package is read from the file that is specified in the ABC6 record of the OPTIONS block in the SFE package. There can only be one ABC utility activated for each instance of SFE. The ABC utility cannot be used without a corresponding SFE Package.

The ABC utility does not have a dimensions block; instead, dimensions for the ABC utility are set using the dimensions from the corresponding SFE Package. For example, an SFR Package corresponding to an instance of SFE requires specification of the number of reaches (NREACHES). ABC sets the number of reaches equal to NREACHES. Therefore, the PERIOD block below cannot contain boundary information for a reach with an index greater than NREACHES.

\vspace{5mm}
\subsubsection{Structure of Blocks}
\vspace{5mm}

\noindent \textit{FOR EACH SIMULATION}
\lstinputlisting[style=blockdefinition]{./mf6ivar/tex/utl-abc-options.dat}
\vspace{5mm}
\noindent \textit{FOR ANY STRESS PERIOD}
\lstinputlisting[style=blockdefinition]{./mf6ivar/tex/utl-abc-period.dat}

\vspace{5mm}
\subsubsection{Explanation of Variables}
\begin{description}
\input{./mf6ivar/tex/utl-abc-desc.tex}
\end{description}

\vspace{5mm}
\subsubsection{Example Input File}
\lstinputlisting[style=inputfile]{./mf6ivar/examples/utl-abc-example.dat}
4 changes: 4 additions & 0 deletions doc/mf6io/gwe/gwe.tex
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,10 @@ \subsection{Energy Source Loading (ESL) Package}
\subsection{Streamflow Energy Transport (SFE) Package}
\input{gwe/sfe}

\newpage
\subsection{Atmospheric Boundary Conditions (ABC) Package}
\input{gwe/abc}

\newpage
\subsection{Lake Energy Transport (LKE) Package}
\input{gwe/lke}
Expand Down
21 changes: 21 additions & 0 deletions doc/mf6io/gwe/shf.tex
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
Input to the Sensible Heat Flux (SHF) Package is read from the file that is specified in the SHF6 record of the OPTIONS block in the SFE package.

\vspace{5mm}
\subsubsection{Structure of Blocks}
\vspace{5mm}

\noindent \textit{FOR EACH SIMULATION}
\lstinputlisting[style=blockdefinition]{./mf6ivar/tex/utl-shf-options.dat}
\vspace{5mm}
\noindent \textit{FOR ANY STRESS PERIOD}
\lstinputlisting[style=blockdefinition]{./mf6ivar/tex/utl-shf-period.dat}

\vspace{5mm}
\subsubsection{Explanation of Variables}
\begin{description}
\input{./mf6ivar/tex/utl-shf-desc.tex}
\end{description}

\vspace{5mm}
\subsubsection{Example Input File}
\lstinputlisting[style=inputfile]{./mf6ivar/examples/utl-shf-example.dat}
21 changes: 21 additions & 0 deletions doc/mf6io/gwe/swr.tex
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
Input to the Shortwave Radiation (SWR) Package is read from the file that is specified in the SWR6 record of the OPTIONS block in the SFE package.

\vspace{5mm}
\subsubsection{Structure of Blocks}
\vspace{5mm}

\noindent \textit{FOR EACH SIMULATION}
\lstinputlisting[style=blockdefinition]{./mf6ivar/tex/utl-swr-options.dat}
\vspace{5mm}
\noindent \textit{FOR ANY STRESS PERIOD}
\lstinputlisting[style=blockdefinition]{./mf6ivar/tex/utl-swr-period.dat}

\vspace{5mm}
\subsubsection{Explanation of Variables}
\begin{description}
\input{./mf6ivar/tex/utl-swr-desc.tex}
\end{description}

\vspace{5mm}
\subsubsection{Example Input File}
\lstinputlisting[style=inputfile]{./mf6ivar/examples/utl-swr-example.dat}
31 changes: 31 additions & 0 deletions doc/mf6io/mf6ivar/dfn/gwe-sfe.dfn
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,37 @@ optional false
longname obs6 input filename
description REPLACE obs6_filename {'{#1}': 'SFE', '{#2}': '\\ref{table:gwe-obstypetable}'}

block options
name abc_filerecord
type record abc6 filein abc6_filename
shape
reader urword
tagged true
optional true
longname
description

block options
name abc6
type keyword
shape
in_record true
reader urword
tagged true
optional false
longname abc keyword
description keyword to specify that record corresponds to the atmospheric boundary condition (ABC) file. The behavior of the ABC utility and a description of the input file is provided separately.

block options
name abc6_filename
type string
preserve_case true
in_record true
reader urword
optional false
tagged false
longname file name of ABC information
description defines a sensible heat flux (ABC) input file. Records in the ABC file are used to calculate the flux of thermal energy in or out of a stream reach resulting from sensible heat exchange.

# --------------------- gwe sfe packagedata ---------------------

Expand Down
Loading
Loading