Skip to content

Commit

Permalink
Temporary commit (to be removed before merge)
Browse files Browse the repository at this point in the history
  • Loading branch information
SeanBryan51 committed Feb 11, 2025
1 parent db04538 commit 87aa062
Showing 1 changed file with 16 additions and 16 deletions.
32 changes: 16 additions & 16 deletions src/offline/cable_parameters.F90
Original file line number Diff line number Diff line change
Expand Up @@ -2302,22 +2302,22 @@ SUBROUTINE derived_parameters(soil, sum_flux, bal, ssnow, veg, rough)
endwhere

! ____________________ MMY comment out as we don't use hys ___________________________
do k=1,ms
do i=1,mp
if (ssnow%wb_hys(i,k) .lt. 0._r_2) then
ssnow%wb_hys(i,k) = ssnow%wb(i,k)
end if
ssnow%wb_hys(i,k) = max(soil%watr(i,k) ,min(soil%ssat_vec(i,k), ssnow%wb_hys(i,k)))

if (ssnow%smp_hys(i,k) .lt. -1.0e+30_r_2) then !set to missing, calc
ssnow%smp_hys(i,k) = -soil%sucs_vec(i,k)* &
( (ssnow%wb_hys(i,k)-ssnow%watr_hys(i,k))/&
(ssnow%ssat_hys(i,k)-ssnow%watr_hys(i,k)) )**&
(-1._r_2/soil%bch_vec(i,k) )
end if
ssnow%smp_hys(i,k) = max(-1.0e10,min(-soil%sucs_vec(i,k),ssnow%smp_hys(i,k) ))
end do
end do
! do k=1,ms
! do i=1,mp
! if (ssnow%wb_hys(i,k) .lt. 0._r_2) then
! ssnow%wb_hys(i,k) = ssnow%wb(i,k)
! end if
! ssnow%wb_hys(i,k) = max(soil%watr(i,k) ,min(soil%ssat_vec(i,k), ssnow%wb_hys(i,k)))

! if (ssnow%smp_hys(i,k) .lt. -1.0e+30_r_2) then !set to missing, calc
! ssnow%smp_hys(i,k) = -soil%sucs_vec(i,k)* &
! ( (ssnow%wb_hys(i,k)-ssnow%watr_hys(i,k))/&
! (ssnow%ssat_hys(i,k)-ssnow%watr_hys(i,k)) )**&
! (-1._r_2/soil%bch_vec(i,k) )
! end if
! ssnow%smp_hys(i,k) = max(-1.0e10,min(-soil%sucs_vec(i,k),ssnow%smp_hys(i,k) ))
! end do
! end do

! MMY note that after commenting out, wb_hys and smp_hys are not defined any more

Expand Down

0 comments on commit 87aa062

Please sign in to comment.