diff --git a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/ConvPar_GF2020.F90 b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/ConvPar_GF2020.F90 index e80231802..f53aab095 100644 --- a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/ConvPar_GF2020.F90 +++ b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/ConvPar_GF2020.F90 @@ -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) @@ -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) @@ -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