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.

Sign up for GitHub

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

fix(dis): corrected connection vector error in DIS package #308

Merged
merged 1 commit into from
Feb 13, 2020
Merged

fix(dis): corrected connection vector error in DIS package #308

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions doc/ReleaseNotes/ReleaseNotes.tex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,9 @@ \section{History}
\underline{NEW FUNCTIONALITY}

\underline{BASIC FUNCTIONALITY}
\begin{itemize}
\item Corrected an error in how the discretization package (for regular MODFLOW grids) calculates the distance between two cells when one or both of the cells are unconfined. The error in the code would have only affected XT3D simulations with a regular grid, unconfined conditions, and specification of ANGLE2 in the NPF Package.
\end{itemize}

\underline{STRESS PACKAGES}
\begin{itemize}
Expand Down
10 changes: 4 additions & 6 deletions src/Model/GroundWaterFlow/gwf3dis8.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1343,10 +1343,6 @@ subroutine connection_vector(this, noden, nodem, nozee, satn, satm, ihc, &
integer(I4B) :: i1, i2, j1, j2, k1, k2
integer(I4B) :: nodeu1, nodeu2, ipos
! ------------------------------------------------------------------------------
!
! -- Calculate cell center z values
z1 = this%bot(noden) + DHALF * (this%top(noden) - this%bot(noden))
z2 = this%bot(nodem) + DHALF * (this%top(nodem) - this%bot(nodem))
!
! -- Set vector components based on ihc
if(ihc == 0) then
Expand All @@ -1359,15 +1355,17 @@ subroutine connection_vector(this, noden, nodem, nozee, satn, satm, ihc, &
else
zcomp = -DONE
endif
z1 = this%bot(noden) + DHALF * (this%top(noden) - this%bot(noden))
z2 = this%bot(nodem) + DHALF * (this%top(nodem) - this%bot(nodem))
conlen = abs(z2 - z1)
else
!
if(nozee) then
z1 = DZERO
z2 = DZERO
else
z1 = z1 * satn
z2 = z2 * satm
z1 = this%bot(noden) + DHALF * satn * (this%top(noden) - this%bot(noden))
z2 = this%bot(nodem) + DHALF * satm * (this%top(nodem) - this%bot(nodem))
endif
ipos = this%con%getjaindex(noden, nodem)
ds = this%con%cl1(this%con%jas(ipos)) + this%con%cl2(this%con%jas(ipos))
Expand Down