Skip to content

fix(npf): fix newton under_relaxation in confined cells #2606

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

Draft
jdhughes-dev wants to merge 1 commit into
base: develop
Choose a base branch
from
Draft

fix(npf): fix newton under_relaxation in confined cells #2606

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
19 changes: 15 additions & 4 deletions src/Model/GroundWaterFlow/gwf-npf.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -757,27 +757,38 @@ subroutine npf_nur(this, neqmod, x, xtemp, dx, inewtonur, dxmax, locmax)
integer(I4B), intent(inout) :: locmax
! -- local
integer(I4B) :: n
integer(I4B) :: ibot
real(DP) :: botm
real(DP) :: xx
real(DP) :: dxx
!
! -- Newton-Raphson under-relaxation
do n = 1, this%dis%nodes
if (this%ibound(n) < 1) cycle
if (this%icelltype(n) > 0) then
botm = this%dis%bot(this%ibotnode(n))
ibot = this%ibotnode(n)
! if (this%icelltype(n) > 0) then
if (this%icelltype(n) > 0 .and. this%icelltype(ibot) > 0) then
botm = this%dis%bot(ibot)
! if (this%icelltype(ibot) > 0) then
! botm = this%dis%bot(ibot)
! else
! botm = x(ibot)
! endif
! -- only apply Newton-Raphson under-relaxation if
! solution head is below the bottom of the model
if (x(n) < botm) then
inewtonur = 1
xx = xtemp(n) * (DONE - DP9) + botm * DP9
dxx = x(n) - xx
! dxx = x(n) - xx
dxx = xx - xtemp(n)
if (abs(dxx) > abs(dxmax)) then
locmax = n
dxmax = dxx
end if
x(n) = xx
dx(n) = DZERO
dx(n) = xtemp(n) - x(n) !DZERO !
! write(*,'(a,i0,6(f10.2))') &
! 'nur', n, x(n), xtemp(n), botm, xx, dxx, dx(n)
end if
end if
end do
Expand Down
Loading