From f971c503b468b448b07a50e8f420be23988d0e91 Mon Sep 17 00:00:00 2001 From: Eric Morway Date: Sat, 3 Dec 2022 09:53:36 -0800 Subject: [PATCH] fix(BoundaryPackage): bnd_store_user_cond function already uses reduced node number (#1100) * Remove invalid node check in bnd_store_user_cond * Clean-up unused variables * Update ReleaseNotes.tex * Close #1098 Co-authored-by: langevin-usgs --- doc/ReleaseNotes/ReleaseNotes.tex | 2 +- src/Model/ModelUtilities/BoundaryPackage.f90 | 19 +++---------------- 2 files changed, 4 insertions(+), 17 deletions(-) diff --git a/doc/ReleaseNotes/ReleaseNotes.tex b/doc/ReleaseNotes/ReleaseNotes.tex index 20341ea0bf1..6d9a145b1cc 100644 --- a/doc/ReleaseNotes/ReleaseNotes.tex +++ b/doc/ReleaseNotes/ReleaseNotes.tex @@ -214,7 +214,7 @@ \section{Changes Introduced in this Release} \underline{INTERNAL FLOW PACKAGES} \begin{itemize} - \item - + \item - The Viscosity (VSC) Package introduced in version 6.4.0 would report an error for certain types of stress packages if the IDOMAIN capability was activated by the user. In some cases, the error message would indicate that a boundary was not assigned to a valid cell. This invalid error would prevent the simulation from proceeding. The error was corrected by removing the invalid check so that the program can proceed normally. % \item xxx \end{itemize} diff --git a/src/Model/ModelUtilities/BoundaryPackage.f90 b/src/Model/ModelUtilities/BoundaryPackage.f90 index e602b2436ed..c0f3d54ac7d 100644 --- a/src/Model/ModelUtilities/BoundaryPackage.f90 +++ b/src/Model/ModelUtilities/BoundaryPackage.f90 @@ -374,8 +374,7 @@ subroutine bnd_rp(this) ! ! -- save user-specified conductance if vsc package is active if (this%ivsc == 1) then - call this%bnd_store_user_cond(nlist, this%nodelist, this%bound, & - this%condinput) + call this%bnd_store_user_cond(nlist, this%bound, this%condinput) end if ! ! Define the tsLink%Text value(s) appropriately. @@ -1507,37 +1506,25 @@ end subroutine bnd_read_dimensions !! recalculated every stress period/time step !! !< - subroutine bnd_store_user_cond(this, nlist, nodelist, rlist, condinput) + subroutine bnd_store_user_cond(this, nlist, rlist, condinput) ! -- modules use SimModule, only: store_error ! -- dummy variables class(BndType), intent(inout) :: this !< BndType object integer(I4B), intent(in) :: nlist - integer(I4B), dimension(:), pointer, contiguous, intent(inout) :: nodelist real(DP), dimension(:, :), pointer, contiguous, intent(in) :: rlist real(DP), dimension(:), pointer, contiguous, intent(inout) :: condinput ! -- local variables integer(I4B) :: l - integer(I4B) :: nodeu, noder - character(len=LINELENGTH) :: nodestr ! ! -- store backup copy of conductance values do l = 1, nlist - nodeu = nodelist(l) - noder = this%dis%get_nodenumber(nodeu, 0) - if (noder <= 0) then - call this%dis%nodeu_to_string(nodeu, nodestr) - write (errmsg, *) & - ' Cell is outside active grid domain: '// & - trim(adjustl(nodestr)) - call store_error(errmsg) - end if condinput(l) = rlist(2, l) end do ! ! -- return return - end subroutine + end subroutine bnd_store_user_cond !> @ brief Read initial parameters for package !!