@@ -348,7 +348,7 @@ subroutine radiation_clouds_prop &
348
348
& iovr_dcorr, iovr_exp, iovr_exprand, idcor, idcor_con, &
349
349
& idcor_hogan, idcor_oreopoulos, lcrick, lcnorm, &
350
350
& imfdeepcnv, imfdeepcnv_gf, imfdeepcnv_c3, &
351
- & do_mynnedmf, lgfdlmprad, &
351
+ & do_mynnedmf, lgfdlmprad, xr_cnvcld, &
352
352
& uni_cld, lmfshal, lmfdeep2, cldcov, clouds1, &
353
353
& effrl, effri, effrr, effrs, effr_in, &
354
354
& effrl_inout, effri_inout, effrs_inout, &
@@ -538,7 +538,8 @@ subroutine radiation_clouds_prop &
538
538
539
539
540
540
logical , intent (in ) :: uni_cld, lmfshal, lmfdeep2, effr_in, &
541
- & do_mynnedmf, lgfdlmprad, top_at_1, lcrick, lcnorm
541
+ & do_mynnedmf, lgfdlmprad, top_at_1, lcrick, lcnorm, &
542
+ & xr_cnvcld
542
543
543
544
real (kind= kind_phys), dimension (:,:,:), intent (in ) :: ccnd, &
544
545
& tracer1
@@ -727,7 +728,7 @@ subroutine radiation_clouds_prop &
727
728
call progcld_thompson_wsm6 (plyr,plvl,tlyr,qlyr,qstl, & ! --- inputs
728
729
& rhly,tracer1,xlat,xlon,slmsk,dz,delp, &
729
730
& ntrac-1 , ntcw-1 ,ntiw-1 ,ntrw-1 , &
730
- & ntsw-1 ,ntgl-1 ,con_ttp, &
731
+ & ntsw-1 ,ntgl-1 ,con_ttp,xr_cnvcld, &
731
732
& IX, NLAY, NLP1, uni_cld, lmfshal, lmfdeep2, &
732
733
& cldcov(:,1 :NLAY), cnvw, effrl_inout, &
733
734
& effri_inout, effrs_inout, &
@@ -801,7 +802,7 @@ subroutine radiation_clouds_prop &
801
802
call progcld_thompson_wsm6 (plyr,plvl,tlyr,qlyr,qstl, & ! --- inputs
802
803
& rhly,tracer1,xlat,xlon,slmsk,dz,delp, &
803
804
& ntrac-1 , ntcw-1 ,ntiw-1 ,ntrw-1 , &
804
- & ntsw-1 ,ntgl-1 ,con_ttp, &
805
+ & ntsw-1 ,ntgl-1 ,con_ttp,xr_cnvcld, &
805
806
& IX, NLAY, NLP1, uni_cld, lmfshal, lmfdeep2, &
806
807
& cldcov(:,1 :NLAY), cnvw, effrl, effri, effrs, &
807
808
& lwp_ex, iwp_ex, lwp_fc, iwp_fc, &
@@ -1964,7 +1965,7 @@ subroutine progcld_thompson_wsm6 &
1964
1965
& ( plyr,plvl,tlyr,qlyr,qstl,rhly,clw, & ! --- inputs:
1965
1966
& xlat,xlon,slmsk,dz,delp, &
1966
1967
& ntrac,ntcw,ntiw,ntrw,ntsw,ntgl,con_ttp, &
1967
- & IX, NLAY, NLP1, &
1968
+ & xr_cnvcld, IX, NLAY, NLP1, &
1968
1969
& uni_cld, lmfshal, lmfdeep2, cldcov, cnvw, &
1969
1970
& re_cloud,re_ice,re_snow, &
1970
1971
& lwp_ex, iwp_ex, lwp_fc, iwp_fc, &
@@ -2051,7 +2052,8 @@ subroutine progcld_thompson_wsm6 &
2051
2052
integer, intent(in) :: IX, NLAY, NLP1
2052
2053
integer, intent(in) :: ntrac, ntcw, ntiw, ntrw, ntsw, ntgl
2053
2054
2054
- logical, intent(in) :: uni_cld, lmfshal, lmfdeep2, lcnorm
2055
+ logical, intent(in) :: uni_cld, lmfshal, lmfdeep2, lcnorm, &
2056
+ & xr_cnvcld
2055
2057
2056
2058
real (kind=kind_phys), dimension(:,:), intent(in) :: plvl, plyr, &
2057
2059
& tlyr, qlyr, qstl, rhly, cldcov, delp, dz, dzlay, &
@@ -2122,23 +2124,43 @@ subroutine progcld_thompson_wsm6 &
2122
2124
! enddo
2123
2125
! endif
2124
2126
2127
+ !> - Include grid-mean suspended cloud condensate in Xu-Randall cloud fraction
2128
+ !> if xr_cnvcld is true:
2129
+
2130
+ if(xr_cnvcld)then
2125
2131
do k = 1, NLAY
2126
2132
do i = 1, IX
2127
2133
clwf(i,k) = clw(i,k,ntcw) + clw(i,k,ntiw) + clw(i,k,ntsw)
2128
2134
& + clw(i,k,ntrw) + cnvw(i,k)
2129
2135
enddo
2130
2136
enddo
2137
+ else
2138
+ do k = 1, NLAY
2139
+ do i = 1, IX
2140
+ clwf(i,k) = clw(i,k,ntcw) + clw(i,k,ntiw) + clw(i,k,ntsw)
2141
+ & + clw(i,k,ntrw)
2142
+ enddo
2143
+ enddo
2144
+ endif
2131
2145
2132
2146
!> - Compute total-cloud liquid/ice condensate path in \f$ g/m^2 \f$.
2133
2147
!> The total condensate includes convective condensate.
2134
2148
do k = 1, NLAY-1
2135
2149
do i = 1, IX
2136
- tem1 = cnvw(i,k)*(1.-tem2d(i,k))
2150
+ if(xr_cnvcld)then
2151
+ tem1 = cnvw(i,k)*(1.-tem2d(i,k))
2152
+ else
2153
+ tem1 = 0.
2154
+ endif
2137
2155
cwp(i,k) = max(0.0, (clw(i,k,ntcw)+tem1) *
2138
2156
& gfac * delp(i,k))
2139
2157
if(tem1 > 1.e-12 .and. clw(i,k,ntcw) < 1.e-12)
2140
2158
& rew(i,k)=reliq_def
2141
- tem2 = cnvw(i,k)*tem2d(i,k)
2159
+ if(xr_cnvcld)then
2160
+ tem2 = cnvw(i,k)*tem2d(i,k)
2161
+ else
2162
+ tem2 = 0.
2163
+ endif
2142
2164
cip(i,k) = max(0.0, (clw(i,k,ntiw) +
2143
2165
& snow2ice*clw(i,k,ntsw) + tem2) *
2144
2166
& gfac * delp(i,k))
0 commit comments