diff --git a/src/common/micro/condensation.F90 b/src/common/micro/condensation.F90 index 7a4c45e393a7da5bed0a027939647d96e9e86f54..999b5fa332b2d6bc09da122929c62bf3deea9a90 100644 --- a/src/common/micro/condensation.F90 +++ b/src/common/micro/condensation.F90 @@ -7,7 +7,7 @@ SUBROUTINE CONDENSATION(D, CST, ICEP, NEB, & &HFRAC_ICE, HCONDENS, HLAMBDA3, & &PPABS, PZZ, PRHODREF, PT, PRV_IN, PRV_OUT, PRC_IN, PRC_OUT, PRI_IN, PRI_OUT, & - &PRS, PRG, PSIGS, LMFCONV, PMFCONV, PCLDFR, PSIGRC, OUSERI, & + &PRR, PRS, PRG, PSIGS, LMFCONV, PMFCONV, PCLDFR, PSIGRC, OUSERI, & &OSIGMAS, OCND2, PSIGQSAT, & &PLV, PLS, PCPH, & &PHLC_HRC, PHLC_HCF, PHLI_HRI, PHLI_HCF, & @@ -122,6 +122,7 @@ LOGICAL, INTENT(IN) :: OCND2 ! logical switch to sparat ! more rigid (DEFALT value : .FALSE.) REAL, DIMENSION(D%NIT,D%NJT), INTENT(IN) :: PSIGQSAT ! use an extra "qsat" variance contribution (OSIGMAS case) ! multiplied by PSIGQSAT +REAL, DIMENSION(D%NIT,D%NJT,D%NKT), INTENT(IN) :: PRR ! grid scale mixing ration of rain (kg/kg) REAL, DIMENSION(D%NIT,D%NJT,D%NKT), INTENT(IN) :: PRS ! grid scale mixing ration of snow (kg/kg) REAL, DIMENSION(D%NIT,D%NJT,D%NKT), INTENT(IN) :: PRG ! grid scale mixing ration of graupel (kg/kg) REAL, DIMENSION(D%NIT,D%NJT,D%NKT), INTENT(IN) :: PSIGS ! Sigma_s from turbulence scheme @@ -244,6 +245,9 @@ ELSE DO JJ=D%NJB,D%NJE DO JI=D%NIB,D%NIE ZCPD(JI,JJ,JK) = CST%XCPD + CST%XCPV*PRV_IN(JI,JJ,JK) + CST%XCL*PRC_IN(JI,JJ,JK) + CST%XCI*PRI_IN(JI,JJ,JK) + & +#ifndef REPRO48 + CST%XCL*PRR(JI,JJ,JK) + +#endif CST%XCI*(PRS(JI,JJ,JK) + PRG(JI,JJ,JK) ) ENDDO ENDDO diff --git a/src/common/micro/ice_adjust.F90 b/src/common/micro/ice_adjust.F90 index 29b6de043296fd111abadc8dd5ea1c74aecec8bc..9e775df6d87f8aeb94c17ab4ed9f7711ea7e9f8c 100644 --- a/src/common/micro/ice_adjust.F90 +++ b/src/common/micro/ice_adjust.F90 @@ -474,7 +474,7 @@ IF ( OSUBG_COND ) THEN CALL CONDENSATION(D, CST, ICEP, NEB, & HFRAC_ICE, HCONDENS, HLAMBDA3, & PPABST, PZZ, PRHODREF, ZT, PRV_IN, PRV_OUT, PRC_IN, PRC_OUT, PRI_IN, PRI_OUT, & - PRS, PRG, PSIGS, LMFCONV, PMFCONV, PCLDFR, & + PRR, PRS, PRG, PSIGS, LMFCONV, PMFCONV, PCLDFR, & PSRCS, .TRUE., OSIGMAS, & OCND2, PSIGQSAT, & PLV=ZLV, PLS=ZLS, PCPH=ZCPH, & @@ -493,7 +493,7 @@ ELSE CALL CONDENSATION(D, CST, ICEP, NEB, & HFRAC_ICE, HCONDENS, HLAMBDA3, & PPABST, PZZ, PRHODREF, ZT, PRV_IN, PRV_OUT, PRC_IN, PRC_OUT, PRI_IN, PRI_OUT, & - PRS, PRG, ZSIGS, LMFCONV, PMFCONV, PCLDFR, & + PRR, PRS, PRG, ZSIGS, LMFCONV, PMFCONV, PCLDFR, & ZSRCS, .TRUE., OSIGMAS=.TRUE., & OCND2=OCND2, PSIGQSAT=ZSIGQSAT, & PLV=ZLV, PLS=ZLS, PCPH=ZCPH, & diff --git a/src/common/micro/modi_condensation.F90 b/src/common/micro/modi_condensation.F90 index bbcd3328399bde5cabb45446ade8651c723695a0..5bb6b163d166c83934ad4fb14e350353dd5ccd39 100644 --- a/src/common/micro/modi_condensation.F90 +++ b/src/common/micro/modi_condensation.F90 @@ -7,7 +7,7 @@ INTERFACE SUBROUTINE CONDENSATION(D, CST, ICEP, NEB, & &HFRAC_ICE, HCONDENS, HLAMBDA3, & &PPABS, PZZ, PRHODREF, PT, PRV_IN, PRV_OUT, PRC_IN, PRC_OUT, PRI_IN, PRI_OUT, & - &PRS, PRG, PSIGS, LMFCONV, PMFCONV, PCLDFR, PSIGRC, OUSERI,& + &PRR, PRS, PRG, PSIGS, LMFCONV, PMFCONV, PCLDFR, PSIGRC, OUSERI,& &OSIGMAS, OCND2, PSIGQSAT, & &PLV, PLS, PCPH, & &PHLC_HRC, PHLC_HCF, PHLI_HRI, PHLI_HCF, PICE_CLD_WGT) @@ -43,6 +43,7 @@ LOGICAL, INTENT(IN) :: OCND2 ! logical switch to sparat ! more rigid (DEFALT value : .FALSE.) REAL, DIMENSION(D%NIT,D%NJT), INTENT(IN) :: PSIGQSAT ! use an extra "qsat" variance contribution (OSIGMAS case) ! multiplied by PSIGQSAT +REAL, DIMENSION(D%NIT,D%NJT,D%NKT), INTENT(IN) :: PRR ! grid scale mixing ration of rain (kg/kg) REAL, DIMENSION(D%NIT,D%NJT,D%NKT), INTENT(IN) :: PRS ! grid scale mixing ration of snow (kg/kg) REAL, DIMENSION(D%NIT,D%NJT,D%NKT), INTENT(IN) :: PRG ! grid scale mixing ration of graupel (kg/kg) REAL, DIMENSION(D%NIT,D%NJT,D%NKT), INTENT(IN) :: PSIGS ! Sigma_s from turbulence scheme