Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor(lak/maw/sfr): for CONSTANT features write fixed value instead of DHNOFLO to binary file #329

Merged
merged 2 commits into from
Mar 4, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions doc/ReleaseNotes/ReleaseNotes.tex
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,7 @@ \section{History}
\item Added a storage term to the SFR Package binary output file. This term is always zero with the present implementation. An auxiliary variable, called VOLUME, is also written with the storage budget term. This term contains the calculated water volume in the reach.
\item Added additional error trapping in the MAW Package to catch divide by zero errors when calculating the saturated conductance for wells using the SKIN CONDEQN in connections where the cell transmissivity (the product of geometric mean of the horizontal hydraulic conductivity and cell thickness) and well transmissivity (the product of HK\_SKIN and screen thickness) is equal to one. Also add error trapping for well connections using the 1) SKIN CONDEQN where the contrast between the cell and well transmissivities are less than one and 2) SKIN and MEAN CONDEQN where the calculated connection saturated conductance is less than zero.
\item For the Lake Package, the outlet number was written as ID1 and ID2 for the TO-MVR record in the binary budget file. This has been changed so that the lake number of the connected outlet is written to ID1 and ID2. This change was implemented so that lake budgets can be calculated using the information in the lake budget file.
\item The Lake, Streamflow Routing, and Multi-Aquifer Well Packages were modified to save the user-specified stage or head to the binary output file for lakes, reaches, or wells that are specified as being CONSTANT. Prior to this change, a no-flow value was written to the package binary output files for constant stage lakes and streams and constant head multi-aquifer wells. The no-flow value is still written for those lakes, streams, or wells that are specified by the user as being inactive. This change should make it easier to post-process the results from these packages.
\end{itemize}

\underline{SOLUTION}
Expand Down
2 changes: 1 addition & 1 deletion src/Model/GroundWaterFlow/gwf3lak8.f90
Original file line number Diff line number Diff line change
Expand Up @@ -4076,7 +4076,7 @@ subroutine lak_bd(this, x, idvfl, icbcfl, ibudfl, icbcun, iprobs, &
do n = 1, this%nlakes
v = this%xnewpak(n)
d = v - this%lakebot(n)
if (this%iboundpak(n) < 1) then
if (this%iboundpak(n) == 0) then
v = DHNOFLO
else if (d <= DZERO) then
v = DHDRY
Expand Down
2 changes: 1 addition & 1 deletion src/Model/GroundWaterFlow/gwf3maw8.f90
Original file line number Diff line number Diff line change
Expand Up @@ -2562,7 +2562,7 @@ subroutine maw_bd(this, x, idvfl, icbcfl, ibudfl, icbcun, iprobs, &
do n = 1, this%nmawwells
v = this%xnewpak(n)
d = v - this%mawwells(n)%bot
if (this%iboundpak(n) < 1) then
if (this%iboundpak(n) == 0) then
v = DHNOFLO
else if (d <= DZERO) then
v = DHDRY
Expand Down
2 changes: 1 addition & 1 deletion src/Model/GroundWaterFlow/gwf3sfr8.f90
Original file line number Diff line number Diff line change
Expand Up @@ -1748,7 +1748,7 @@ subroutine sfr_bd(this, x, idvfl, icbcfl, ibudfl, icbcun, iprobs, &
do n = 1, this%maxbound
d = this%depth(n)
v = this%stage(n)
if (this%iboundpak(n) < 1) then
if (this%iboundpak(n) == 0) then
v = DHNOFLO
else if (d == DZERO) then
v = DHDRY
Expand Down