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(sfr): Remove upstream_fraction check from PACKAGEDATA block #334

Merged
merged 1 commit into from
Mar 9, 2020
Merged

fix(sfr): Remove upstream_fraction check from PACKAGEDATA block #334

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
20 changes: 9 additions & 11 deletions src/Model/GroundWaterFlow/gwf3sfr8.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -661,10 +661,6 @@ subroutine sfr_ar(this)
call this%sfr_check_diversions()
end if
!
! -- calculate the total fraction of connected reaches that are
! not diversions
call this%sfr_check_ustrf()
!
! -- terminate if errors were detected in any of the static sfr data
ierr = count_errors()
if (ierr > 0) then
Expand Down Expand Up @@ -1249,8 +1245,10 @@ subroutine sfr_rp(this)
! ------------------------------------------------------------------------------
!
! -- initialize flags
ichkustrm = 0
!isfirst = 1
ichkustrm = 0
if (kper == 1) then
ichkustrm = 1
end if
!
! -- set nbound to maxbound
this%nbound = this%maxbound
Expand Down Expand Up @@ -1329,17 +1327,17 @@ subroutine sfr_rp(this)
if (this%iprpak /= 0) then
call this%inputtab%finalize_table()
end if
!
! -- check upstream fraction values
if (ichkustrm /= 0) then
call this%sfr_check_ustrf()
end if

! -- Reuse data from last stress period
else
write(this%iout,fmtlsp) trim(this%filtyp)
endif
!
! -- check upstream fraction values
if (ichkustrm /= 0) then
call this%sfr_check_ustrf()
end if
!
! -- write summary of package block error messages
if (count_errors() > 0) then
call this%parser%StoreErrorUnit()
Expand Down