Skip to content

v11: Fix for SRF_TYPE #1124

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
sdrabenh merged 7 commits into from
Sep 23, 2025
Merged

v11: Fix for SRF_TYPE #1124

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b2b46ef
v11: Fix for SRF_TYPE
mathomp4 Jun 30, 2025
d927ee6
Merge branch 'develop' into bugfix/1122-srftypefix-v11
sdrabenh Aug 25, 2025
4ce8537
Update Process_Library.F90
sdrabenh Aug 27, 2025
accd726
Use nint() for safety
mathomp4 Aug 29, 2025
e047a45
Use select case
mathomp4 Sep 2, 2025
0cd271c
Merge branch 'develop' into bugfix/1122-srftypefix-v11
sdrabenh Sep 23, 2025
8e05081
Merge branch 'develop' into bugfix/1122-srftypefix-v11
sdrabenh Sep 23, 2025
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
24 changes: 18 additions & 6 deletions GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/Process_Library.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,13 @@ module GEOSmoist_Process_Library
module procedure ICE_FRACTION_1D
module procedure ICE_FRACTION_SC
end interface ICE_FRACTION

! SRF_TYPE constants
integer, parameter :: SRF_TYPE_LAND = 1
integer, parameter :: SRF_TYPE_SNOW = 2
integer, parameter :: SRF_TYPE_ICE = 3
integer, parameter :: SRF_TYPE_OCEAN = 0

! ICE_FRACTION constants
! In anvil/convective clouds
real, parameter :: aT_ICE_ALL = 252.16
Expand Down Expand Up @@ -403,7 +410,8 @@ function ICE_FRACTION_SC (TEMP,CNV_FRACTION,SRF_TYPE) RESULT(ICEFRCT)
ICEFRCT_C = MAX(ICEFRCT_C,0.00)
ICEFRCT_C = ICEFRCT_C**aICEFRPWR
! Sigmoidal functions like figure 6b/6c of Hu et al 2010, doi:10.1029/2009JD012384
if (SRF_TYPE >= 2.0) then
select case (nint(SRF_TYPE))
case (SRF_TYPE_SNOW, SRF_TYPE_ICE)
! Over snow (SRF_TYPE == 2.0) and ice (SRF_TYPE == 3.0)
if (ICE_RADII_PARAM == 1) then
! Jason formula
Expand All @@ -424,8 +432,8 @@ function ICE_FRACTION_SC (TEMP,CNV_FRACTION,SRF_TYPE) RESULT(ICEFRCT)
ICEFRCT_M = MIN(ICEFRCT_M,1.00)
ICEFRCT_M = MAX(ICEFRCT_M,0.00)
ICEFRCT_M = ICEFRCT_M**iICEFRPWR
else if (SRF_TYPE > 1.0) then
! Over Land
case (SRF_TYPE_LAND)
! Over Land (SRF_TYPE == 1)
ICEFRCT_M = 0.00
if ( TEMP <= lT_ICE_ALL ) then
ICEFRCT_M = 1.000
Expand All @@ -435,8 +443,8 @@ function ICE_FRACTION_SC (TEMP,CNV_FRACTION,SRF_TYPE) RESULT(ICEFRCT)
ICEFRCT_M = MIN(ICEFRCT_M,1.00)
ICEFRCT_M = MAX(ICEFRCT_M,0.00)
ICEFRCT_M = ICEFRCT_M**lICEFRPWR
else
! Over Oceans
case (SRF_TYPE_OCEAN)
! Over Oceans (SRF_TYPE == 0)
ICEFRCT_M = 0.00
if ( TEMP <= oT_ICE_ALL ) then
ICEFRCT_M = 1.000
Expand All @@ -446,7 +454,11 @@ function ICE_FRACTION_SC (TEMP,CNV_FRACTION,SRF_TYPE) RESULT(ICEFRCT)
ICEFRCT_M = MIN(ICEFRCT_M,1.00)
ICEFRCT_M = MAX(ICEFRCT_M,0.00)
ICEFRCT_M = ICEFRCT_M**oICEFRPWR
endif
case default
! You should not be here
print *, 'ICE_FRACTION_SC: Unknown SRF_TYPE = ',SRF_TYPE
error stop
end select
! Combine the Convective and MODIS functions
ICEFRCT = ICEFRCT_M*(1.0-CNV_FRACTION) + ICEFRCT_C*(CNV_FRACTION)
#endif
Expand Down