Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
30c8efc
updating abc autotest
emorway-usgs Nov 20, 2025
dcdff28
Abc 3 (#22)
skfogg Aug 22, 2025
de08a46
read shf options block; will need to circle back and test TS function…
emorway-usgs Mar 6, 2025
03d6013
changes now through _rp() routine, _ad() up next
emorway-usgs Mar 13, 2025
9a05048
A new and very basic autotest for SHF
emorway-usgs Apr 24, 2025
aad9a29
Better explain the new autotest
emorway-usgs Apr 24, 2025
56ffa23
spelling
emorway-usgs Apr 27, 2025
c8589c0
ruff
emorway-usgs May 1, 2025
49e4571
new test problem swr (#15)
skfogg May 13, 2025
8c7e66a
add swr to options block of sfe (#16)
skfogg May 21, 2025
eaf5bf3
Preliminary test of ABC now working (#21)
skfogg Aug 8, 2025
8dbe425
recovering from a painful rebase
emorway-usgs Aug 26, 2025
187b5dd
cleanup double allocation of variables
emorway-usgs Aug 27, 2025
56ba3f9
Abc lhf work (#23)
skfogg Sep 4, 2025
1e62bdd
Abc lhf 2 (#24)
skfogg Sep 9, 2025
8ef128c
update make file and mf6core.vfproj again
emorway-usgs Sep 9, 2025
4bdd172
change sign of the latent heat flux contribution to abc
emorway-usgs Sep 15, 2025
af952ec
clean up new autotest for latent heat flux - more clean-up probably n…
emorway-usgs Sep 16, 2025
b169522
Shf lwr (#25)
skfogg Oct 28, 2025
c2d6f82
Attempting to do some clean-up in ABC
emorway-usgs Oct 31, 2025
dbee59c
ruff
emorway-usgs Oct 31, 2025
dbd6fb0
clean up some circular calls that were messing with the memory. More…
emorway-usgs Nov 4, 2025
b7f3a35
code clean up and need to initialize lwr variables
emorway-usgs Nov 5, 2025
ace45d5
renaming of ABC autotest
emorway-usgs Nov 5, 2025
b3cad76
bump an autotest to a different name
emorway-usgs Nov 5, 2025
63ae8d8
A bit more futzing around
emorway-usgs Nov 14, 2025
3546ada
address some of the current failures on CI
emorway-usgs Nov 14, 2025
f4abfe2
build files required updating
emorway-usgs Nov 14, 2025
ce6d735
remove unused variable
emorway-usgs Nov 15, 2025
6d7323d
clean up, 2
emorway-usgs Nov 15, 2025
c745a5d
clean up, 3
emorway-usgs Nov 15, 2025
775fe2e
clean up latex (will likely be more as development continues)
emorway-usgs Nov 17, 2025
619b737
reorganization of variables associated with ABC utility; also updatin…
emorway-usgs Dec 9, 2025
80f387f
Minor fixes
emorway-usgs Dec 16, 2025
f801b33
minor change to a constant value.
emorway-usgs Dec 23, 2025
5f794b1
starting to implement changes to an autotest
emorway-usgs Dec 30, 2025
d8ab400
some more work on an autotest
emorway-usgs Jan 7, 2026
f5c25ee
Lwr autotest (#26)
skfogg Jan 8, 2026
58792cf
Adding keywords to deactivate the various energy flux types available…
emorway-usgs Jan 9, 2026
74017c4
ABC utility updates
emorway-usgs Jan 9, 2026
77d9624
Lwr autotest 2 (#27)
skfogg Jan 12, 2026
e4ac330
Initialize the uninitialized
emorway-usgs Jan 12, 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
521 changes: 521 additions & 0 deletions autotest/test_gwe_sfe_abc00.py

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion doc/Common/gwe-sfeobs.tex
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,6 @@
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 & shf & rno or boundname & -- & Amount of sensible heat exchanged with the atmosphere. \\
SFE & swr & rno or boundname & -- & Amount of shortwave radiation on stream reach.
21 changes: 21 additions & 0 deletions doc/mf6io/gwe/abc.tex
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
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.

\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 @@ -127,6 +127,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 @@ -254,6 +254,37 @@ optional false
longname obs6 input filename
description REPLACE obs6_filename {'{#1}': 'SFE'}

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