Skip to content

GF2020 bug fix #1113

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

GF2020 bug fix #1113

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c013340
GF2020 bug fix
afahadabdullah Jun 5, 2025
c3cd183
Merge branch 'develop' into feature/bugfix_gf2020
sdrabenh Aug 25, 2025
c897f10
Merge branch 'develop' into feature/bugfix_gf2020
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
17 changes: 9 additions & 8 deletions GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/ConvPar_GF2020.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3514,9 +3514,9 @@ SUBROUTINE CUP_gf(its,ite,kts,kte ,itf,ktf, mtp, nmp &
zdo(i,k )*(hcdo(i,k )-heo_cup(i,k ) ) )*g/dp*edto(i)

!---meltglac-------------------------------------------------
dellah(i,k) = dellah(i,k) + xlf*((1.-p_liq_ice(i,k))*0.5*(qrco(i,k+1)+qrco(i,k)) &
- melting(i,k))*g/dp

!dellah(i,k) = dellah(i,k) + xlf*((1.-p_liq_ice(i,k))*0.5*(qrco(i,k+1)+qrco(i,k)) &
! - melting(i,k))*g/dp
dellah(i,k) = dellah(i,k) - xlf*melting(i,k)*g/dp
!-- for output only
subten_H(i,k) = -(zuo(i,k+1)*(-heo_cup(i,k+1)) - zuo(i,k)*(-heo_cup(i,k)))*g/dp &
+(zdo(i,k+1)*(-heo_cup(i,k+1)) - zdo(i,k)*(-heo_cup(i,k)))*g/dp*edto(i)
Expand Down Expand Up @@ -3678,9 +3678,9 @@ SUBROUTINE CUP_gf(its,ite,kts,kte ,itf,ktf, mtp, nmp &
+(zdo(i,k+1)*(hcdo(i,k+1)-heo_cup(i,k+1) ) - &
zdo(i,k )*(hcdo(i,k )-heo_cup(i,k ) ) )*g/dp*edto(i)

dellah(i,k) = dellah(i,k) + xlf*((1.-p_liq_ice(i,k))* &
0.5*(qrco(i,k+1)+qrco(i,k)) - melting(i,k))*g/dp

!dellah(i,k) = dellah(i,k) + xlf*((1.-p_liq_ice(i,k))* &
! 0.5*(qrco(i,k+1)+qrco(i,k)) - melting(i,k))*g/dp
dellah(i,k) = dellah(i,k) - xlf*melting(i,k)*g/dp
!--- for output only
subten_H(i,k) = -(zuo(i,k+1)*(-heo_cup(i,k+1)) - zuo(i,k)*(-heo_cup(i,k)))*g/dp &
+(zdo(i,k+1)*(-heo_cup(i,k+1)) - zdo(i,k)*(-heo_cup(i,k)))*g/dp*edto(i)
Expand All @@ -3707,8 +3707,9 @@ SUBROUTINE CUP_gf(its,ite,kts,kte ,itf,ktf, mtp, nmp &
dellah(i,k) =-( zuo(i,k+1)*hco (i,k+1) - zuo(i,k)*hco (i,k) )*g/dp &
+( zdo(i,k+1)*hcdo(i,k+1) - zdo(i,k)*hcdo(i,k) )*g/dp*edto(i)

dellah(i,k) = dellah(i,k) + xlf*((1.-p_liq_ice(i,k))* &
0.5*(qrco(i,k+1)+qrco(i,k)) - melting(i,k))*g/dp
!dellah(i,k) = dellah(i,k) + xlf*((1.-p_liq_ice(i,k))* &
! 0.5*(qrco(i,k+1)+qrco(i,k)) - melting(i,k))*g/dp
dellah(i,k) = dellah(i,k) - xlf*melting(i,k)*g/dp
!- update with subsidence term from the FCT scheme
dellah(i,k) = dellah(i,k) + sub_tend(1,k)
!--- for output only
Expand Down