Skip to content

Commit

Permalink
back out two answer changers
Browse files Browse the repository at this point in the history
  • Loading branch information
swensosc committed Sep 11, 2023
1 parent 3f4b9a8 commit 3034da1
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions src/biogeophys/SoilHydrologyMod.F90
Original file line number Diff line number Diff line change
Expand Up @@ -2447,7 +2447,7 @@ subroutine SubsurfaceLateralFlow(bounds, &
do j = jwt(c)+1,1,-1

! ensure water is not added to frozen layers
if (zi(c,j) < frost_table(c)) then
!scs if (zi(c,j) < frost_table(c)) then
! analytical expression for specific yield
s_y = watsat(c,j) &
* ( 1. - (1.+1.e3*zwt(c)/sucsat(c,j))**(-1./bsw(c,j)))
Expand All @@ -2466,7 +2466,7 @@ subroutine SubsurfaceLateralFlow(bounds, &
else
zwt(c) = zi(c,j-1)
endif
endif
!scs endif

enddo

Expand Down
12 changes: 6 additions & 6 deletions src/biogeophys/SoilWaterMovementMod.F90
Original file line number Diff line number Diff line change
Expand Up @@ -1395,12 +1395,12 @@ subroutine soilwater_moisture_form(bounds, num_hydrologyc, &
! save number of adaptive substeps used during time step
nsubsteps(c) = nsubstep

! check for over-saturated layers
do j = nlayers,2,-1
over_saturation = max(h2osoi_liq(c,j)-(watsat(c,j)*m_to_mm*dz(c,j)),0._r8)
h2osoi_liq(c,j) = min(watsat(c,j)*m_to_mm*dz(c,j), h2osoi_liq(c,j))
h2osoi_liq(c,j-1) = h2osoi_liq(c,j-1) + over_saturation
end do
!!$ ! check for over-saturated layers
!!$ do j = nlayers,2,-1
!!$ over_saturation = max(h2osoi_liq(c,j)-(watsat(c,j)*m_to_mm*dz(c,j)),0._r8)
!!$ h2osoi_liq(c,j) = min(watsat(c,j)*m_to_mm*dz(c,j), h2osoi_liq(c,j))
!!$ h2osoi_liq(c,j-1) = h2osoi_liq(c,j-1) + over_saturation
!!$ end do

! check for negative moisture values
do j = 2, nlayers
Expand Down

0 comments on commit 3034da1

Please sign in to comment.