Skip to content

Sync with develop branch #116

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

Merged
cenlinhe merged 12 commits into from
Mar 6, 2024
Merged

Sync with develop branch #116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
e9b85a0
merge
tslin2 Jan 18, 2024
074a66e
negative theta_1500 in PedoTransferSR2006Mod.F90
tslin2 Jan 18, 2024
53767f4
update
tslin2 Jan 18, 2024
75cd9a4
update theta
tslin2 Jan 18, 2024
2ba002a
update for value
tslin2 Jan 18, 2024
8a9543a
Merge pull request #111 from tslin2/develop
cenlinhe Jan 18, 2024
c27b868
Add files via upload
RAbolafiaRosenzweig Feb 1, 2024
8569cc6
Add files via upload
RAbolafiaRosenzweig Feb 1, 2024
7e302f6
Add files via upload
RAbolafiaRosenzweig Feb 1, 2024
50c3657
Add files via upload
RAbolafiaRosenzweig Feb 1, 2024
8138618
Add files via upload
RAbolafiaRosenzweig Feb 2, 2024
c7a04d8
Merge pull request #112 from RAbolafiaRosenzweig/develop
cenlinhe Feb 2, 2024
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
3 changes: 3 additions & 0 deletions drivers/hrldas/PedoTransferSR2006Mod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,9 @@ subroutine PedoTransferSR2006(NoahmpIO, noahmp, Sand, Clay, Orgm)
+ sr2006_psi_e_b*psi_et &
+ sr2006_psi_e_c

theta_33 = max(10.0**-3.0,theta_33) ! For numerical stability
theta_1500 = max(10.0**-5.0,theta_1500) ! For numerical stability

! assign property values
smcwlt = theta_1500
smcref = theta_33
Expand Down
33 changes: 19 additions & 14 deletions src/AtmosForcingMod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,21 +151,26 @@ subroutine ProcessAtmosForcing(noahmp)
endif
endif

! wet-bulb scheme (Wang et al., 2019 GRL), C.He, 12/18/2020
! wet-bulb scheme (Wang et al., 2019 GRL), C.He, 12/18/2020, R. Abolafia-Rosnezweig, 02/01/2024
if ( OptRainSnowPartition == 5 ) then
TemperatureDegC = min( 50.0, max(-50.0,(TemperatureAirRefHeight-ConstFreezePoint)) ) ! Kelvin to degree Celsius with limit -50 to +50
if ( TemperatureAirRefHeight > ConstFreezePoint ) then
LatHeatVap = ConstLatHeatEvap
else
LatHeatVap = ConstLatHeatSublim
endif
PsychConst = ConstHeatCapacAir * PressureAirRefHeight / (0.622 * LatHeatVap)
TemperatureWetBulb = TemperatureDegC - 5.0 ! first guess wetbulb temperature
do LoopInd = 1, LoopNum
VapPresSat = 610.8 * exp( (17.27*TemperatureWetBulb) / (237.3+TemperatureWetBulb) )
TemperatureWetBulb = TemperatureWetBulb - (VapPresSat - PressureVaporRefHeight) / PsychConst ! Wang et al., 2019 GRL Eq.2
enddo
FrozenPrecipFrac = 1.0 / (1.0 + 6.99e-5 * exp(2.0*(TemperatureWetBulb+3.97))) ! Wang et al., 2019 GRL Eq. 1

if ( TemperatureAirRefHeight >= (ConstFreezePoint+10) ) then !avoid numerical errors when temperature is high
FrozenPrecipFrac = 0.0
else
TemperatureDegC = min( 50.0, max(-50.0,(TemperatureAirRefHeight-ConstFreezePoint)) ) ! Kelvin to degree Celsius with limit -50 to +50
if ( TemperatureAirRefHeight > ConstFreezePoint ) then
LatHeatVap = ConstLatHeatEvap
else
LatHeatVap = ConstLatHeatSublim
endif
PsychConst = ConstHeatCapacAir * PressureAirRefHeight / (0.622 * LatHeatVap)
TemperatureWetBulb = TemperatureDegC - 5.0 ! first guess wetbulb temperature
do LoopInd = 1, LoopNum
VapPresSat = 610.8 * exp( (17.27*TemperatureWetBulb) / (237.3+TemperatureWetBulb) )
TemperatureWetBulb = TemperatureWetBulb - (VapPresSat - PressureVaporRefHeight) / PsychConst ! Wang et al., 2019 GRL Eq.2
enddo
FrozenPrecipFrac = 1.0 / (1.0 + 6.99e-5 * exp(2.0*(TemperatureWetBulb+3.97))) ! Wang et al., 2019 GRL Eq. 1
endif
endif

! rain-snow partitioning
Expand Down