From fa12e9fcf4a32339cb35fc23ae5fd6c1e5a3376f Mon Sep 17 00:00:00 2001
From: Quentin Rodier <quentin.rodier@meteo.fr>
Date: Thu, 23 Feb 2023 13:58:32 +0100
Subject: [PATCH] Quentin 23/02/2023: remove REPRO55 flags
---
src/arome/micro/ini_rain_ice.F90 | 22 +++++++++----------
src/common/micro/condensation.F90 | 15 ++-----------
src/common/micro/ini_rain_ice.F90 | 22 +++++++++----------
src/common/micro/mode_ice4_budgets.F90 | 13 +++++------
src/common/micro/mode_ice4_fast_rg.F90 | 2 +-
src/common/micro/mode_ice4_fast_rh.F90 | 2 +-
src/common/micro/mode_ice4_fast_rs.F90 | 18 +++++++--------
src/common/micro/mode_ice4_rsrimcg_old.F90 | 2 +-
.../micro/mode_ice4_sedimentation_split.F90 | 4 ++--
.../micro/mode_ice4_sedimentation_stat.F90 | 2 +-
src/common/micro/mode_ice4_slow.F90 | 4 ++--
src/common/micro/mode_ice4_stepping.F90 | 4 ----
src/common/micro/mode_ice4_warm.F90 | 12 ++--------
src/common/micro/mode_rrcolss.F90 | 4 ++--
src/common/micro/mode_rscolrg.F90 | 4 ++--
src/common/micro/mode_rzcolx.F90 | 2 +-
src/common/micro/rain_ice.F90 | 21 ------------------
src/common/turb/mode_compute_updraft.F90 | 4 ----
src/mesonh/micro/ini_rain_ice.f90 | 22 +++++++++----------
src/mesonh/micro/rain_ice_fast_rg.f90 | 2 +-
src/mesonh/micro/rain_ice_fast_rh.f90 | 2 +-
src/mesonh/micro/rain_ice_fast_rs.f90 | 10 ++++-----
src/mesonh/micro/rain_ice_slow.f90 | 4 ++--
23 files changed, 73 insertions(+), 124 deletions(-)
diff --git a/src/arome/micro/ini_rain_ice.F90 b/src/arome/micro/ini_rain_ice.F90
index 709e2fd71..bae21e677 100644
--- a/src/arome/micro/ini_rain_ice.F90
+++ b/src/arome/micro/ini_rain_ice.F90
@@ -428,7 +428,7 @@ XLBR = ( XAR*XCCR*MOMG(XALPHAR,XNUR,XBR) )**(-XLBEXR)
XLBEXI = 1.0/(-XBI)
XLBI = ( XAI*MOMG(XALPHAI,XNUI,XBI) )**(-XLBEXI)
!
-#if defined(REPRO48) || defined(REPRO55)
+#if defined(REPRO48)
#else
XNS = 1.0/(XAS*MOMG(XALPHAS,XNUS,XBS))
#endif
@@ -448,7 +448,7 @@ XLBDAS_MAX = 100000.0
XLBDAG_MAX = 100000.0
!
ZCONC_MAX = 1.E6 ! Maximal concentration for falling particules set to 1 per cc
-#if defined(REPRO48) || defined(REPRO55)
+#if defined(REPRO48)
IF(XCCS>0. .AND. XCXS>0. )XLBDAS_MAX = ( ZCONC_MAX/XCCS )**(1./XCXS)
#else
XLBDAS_MAX = 1.E6
@@ -506,7 +506,7 @@ XEXCSEDI =-0.9324*3.0
WRITE (KLUOUT,FMT=*)' PRISTINE ICE SEDIMENTATION for columns XFSEDI =',XFSEDI
!
!
-#if defined(REPRO48) || defined(REPRO55)
+#if defined(REPRO48)
XEXSEDS = (XBS+XDS-XCXS)/(XBS-XCXS)
XFSEDS = XCS*XAS*XCCS*MOMG(XALPHAS,XNUS,XBS+XDS)* &
(XAS*XCCS*MOMG(XALPHAS,XNUS,XBS))**(-XEXSEDS)*(ZRHO00)**XCEXVT
@@ -593,7 +593,7 @@ XSCFAC = (0.63**(1./3.))*SQRT((ZRHO00)**XCEXVT) ! One assumes Sc=0.63
X0DEPI = (4.0*XPI)*XC1I*XF0I*MOMG(XALPHAI,XNUI,1.)
X2DEPI = (4.0*XPI)*XC1I*XF2I*XC_I*MOMG(XALPHAI,XNUI,XDI+2.0)
!
-#if defined(REPRO48) || defined(REPRO55)
+#if defined(REPRO48)
X0DEPS = (4.0*XPI)*XCCS*XC1S*XF0S*MOMG(XALPHAS,XNUS,1.)
X1DEPS = (4.0*XPI)*XCCS*XC1S*XF1S*SQRT(XCS)*MOMG(XALPHAS,XNUS,0.5*XDS+1.5)
XEX0DEPS = XCXS-1.0
@@ -653,7 +653,7 @@ END IF
!
XCOLIS = 0.25 ! Collection efficiency of I+S
XCOLEXIS = 0.05 ! Temperature factor of the I+S collection efficiency
-#if defined(REPRO48) || defined(REPRO55)
+#if defined(REPRO48)
XFIAGGS = (XPI/4.0)*XCOLIS*XCCS*XCS*(ZRHO00**XCEXVT)*MOMG(XALPHAS,XNUS,XDS+2.0)
XEXIAGGS = XCXS-XDS-2.0
#else
@@ -710,7 +710,7 @@ XEX1EVAR = -1.0-0.5*(XDR+3.0)
!
XDCSLIM = 0.007 ! D_cs^lim = 7 mm as suggested by Farley et al. (1989)
XCOLCS = 1.0
-#if defined(REPRO48) || defined(REPRO55)
+#if defined(REPRO48)
XEXCRIMSS= XCXS-XDS-2.0
XCRIMSS = (XPI/4.0)*XCOLCS*XCCS*XCS*(ZRHO00**XCEXVT)*MOMG(XALPHAS,XNUS,XDS+2.0)
#else
@@ -719,7 +719,7 @@ XCRIMSS = XNS * (XPI/4.0)*XCOLCS*XCS*(ZRHO00**XCEXVT)*MOMG(XALPHAS,XNUS,XDS+2.0
#endif
XEXCRIMSG= XEXCRIMSS
XCRIMSG = XCRIMSS
-#if defined(REPRO48) || defined(REPRO55)
+#if defined(REPRO48)
XSRIMCG = XCCS*XAS*MOMG(XALPHAS,XNUS,XBS)
XEXSRIMCG= XCXS-XBS
XSRIMCG2 = XCCS*XAG*MOMG(XALPHAS,XNUS,XBG)
@@ -761,7 +761,7 @@ RAIN_ICE_PARAM%XRIMINTP2 = 1.0 + RAIN_ICE_PARAM%XRIMINTP1*LOG( XDCSLIM/(RAIN_ICE
!
!* 7.2 Constants for the accretion of raindrops onto aggregates
!
-#if defined(REPRO48) || defined(REPRO55)
+#if defined(REPRO48)
XFRACCSS = ((XPI**2)/24.0)*XCCS*XCCR*XRHOLW*(ZRHO00**XCEXVT)
#else
XFRACCSS = XNS*((XPI**2)/24.0)*XCCR*XRHOLW*(ZRHO00**XCEXVT)
@@ -771,7 +771,7 @@ XLBRACCS1 = MOMG(XALPHAS,XNUS,2.)*MOMG(XALPHAR,XNUR,3.)
XLBRACCS2 = 2.*MOMG(XALPHAS,XNUS,1.)*MOMG(XALPHAR,XNUR,4.)
XLBRACCS3 = MOMG(XALPHAR,XNUR,5.)
!
-#if defined(REPRO48) || defined(REPRO55)
+#if defined(REPRO48)
XFSACCRG = (XPI/4.0)*XAS*XCCS*XCCR*(ZRHO00**XCEXVT)
#else
XFSACCRG = XNS*(XPI/4.0)*XAS*XCCR*(ZRHO00**XCEXVT)
@@ -971,7 +971,7 @@ XCOLSG = 0.01 ! Collection efficiency of S+G
XCOLEXSG = 0.1 ! Temperature factor of the S+G collection efficiency
WRITE (KLUOUT, FMT=*) ' NEW Constants for the aggregate collection by the graupeln'
WRITE (KLUOUT, FMT=*) ' XCOLSG, XCOLEXSG = ',XCOLSG,XCOLEXSG
-#if defined(REPRO48) || defined(REPRO55)
+#if defined(REPRO48)
XFSDRYG = (XPI/4.0)*XCOLSG*XCCG*XCCS*XAS*(ZRHO00**XCEXVT)
#else
XFSDRYG = XNS*(XPI/4.0)*XCOLSG*XCCG*XAS*(ZRHO00**XCEXVT)
@@ -1193,7 +1193,7 @@ XFWETH = (XPI/4.0)*XCCH*XCH*(ZRHO00**XCEXVT)*MOMG(XALPHAH,XNUH,XDH+2.0)
!
XCOLSH = 0.01 ! Collection efficiency of S+H
XCOLEXSH = 0.1 ! Temperature factor of the S+H collection efficiency
-#if defined(REPRO48) || defined(REPRO55)
+#if defined(REPRO48)
XFSWETH = (XPI/4.0)*XCCH*XCCS*XAS*(ZRHO00**XCEXVT)
#else
XFSWETH = XNS*(XPI/4.0)*XCCH*XAS*(ZRHO00**XCEXVT) ! Wurtz
diff --git a/src/common/micro/condensation.F90 b/src/common/micro/condensation.F90
index 31fda664b..3504e967a 100644
--- a/src/common/micro/condensation.F90
+++ b/src/common/micro/condensation.F90
@@ -234,18 +234,7 @@ ZCLDINI = -1. ! Dummy Initialized cloud input to icecloud routine
PIFR = 10. ! ratio of cloud ice water mixing ratio wet to dry
! part of a gridbox
ZDZREF = ICEP%XFRMIN(25) ! Thickness for unchanged vqsigsat (only used for LHGT_QS)
-! Init of the HALO (should be on HALO points only)
-#ifdef REPRO55
-PRC_OUT = PRC_IN
-PRV_OUT = PRV_IN
-PRI_OUT = PRI_IN
-IF(PRESENT(PHLC_HRC)) THEN
- PHLC_HRC = 0.
- PHLC_HCF = 0.
- PHLI_HRI = 0.
- PHLI_HCF = 0.
-END IF
-#endif
+!
IF(OCND2)ZPRIFACT = 0.
!
!
@@ -277,7 +266,7 @@ ELSE
DO JK=IKTB,IKTE
DO JIJ=IIJB,IIJE
ZCPD(JIJ,JK) = CST%XCPD + CST%XCPV*PRV_IN(JIJ,JK) + CST%XCL*PRC_IN(JIJ,JK) + CST%XCI*PRI_IN(JIJ,JK) + &
-#if defined(REPRO48) || defined(REPRO55)
+#if defined(REPRO48)
#else
CST%XCL*PRR(JIJ,JK) + &
#endif
diff --git a/src/common/micro/ini_rain_ice.F90 b/src/common/micro/ini_rain_ice.F90
index 2287dfbc5..1eecbaf21 100644
--- a/src/common/micro/ini_rain_ice.F90
+++ b/src/common/micro/ini_rain_ice.F90
@@ -392,7 +392,7 @@ XLBR = ( XAR*XCCR*MOMG(XALPHAR,XNUR,XBR) )**(-XLBEXR)
XLBEXI = 1.0/(-XBI)
XLBI = ( XAI*MOMG(XALPHAI,XNUI,XBI) )**(-XLBEXI)
!
-#if defined(REPRO48) || defined(REPRO55)
+#if defined(REPRO48)
#else
XNS = 1.0/(XAS*MOMG(XALPHAS,XNUS,XBS))
#endif
@@ -412,7 +412,7 @@ XLBDAS_MAX = 100000.0
XLBDAG_MAX = 100000.0
!
ZCONC_MAX = 1.E6 ! Maximal concentration for falling particules set to 1 per cc
-#if defined(REPRO48) || defined(REPRO55)
+#if defined(REPRO48)
IF(XCCS>0. .AND. XCXS>0. )XLBDAS_MAX = ( ZCONC_MAX/XCCS )**(1./XCXS)
#else
XLBDAS_MAX = 1.E6
@@ -470,7 +470,7 @@ XEXCSEDI =-0.9324*3.0
WRITE (KLUOUT,FMT=*)' PRISTINE ICE SEDIMENTATION for columns XFSEDI =',XFSEDI
!
!
-#if defined(REPRO48) || defined(REPRO55)
+#if defined(REPRO48)
XEXSEDS = (XBS+XDS-XCXS)/(XBS-XCXS)
XFSEDS = XCS*XAS*XCCS*MOMG(XALPHAS,XNUS,XBS+XDS)* &
(XAS*XCCS*MOMG(XALPHAS,XNUS,XBS))**(-XEXSEDS)*(ZRHO00)**XCEXVT
@@ -557,7 +557,7 @@ XSCFAC = (0.63**(1./3.))*SQRT((ZRHO00)**XCEXVT) ! One assumes Sc=0.63
X0DEPI = (4.0*XPI)*XC1I*XF0I*MOMG(XALPHAI,XNUI,1.)
X2DEPI = (4.0*XPI)*XC1I*XF2I*XC_I*MOMG(XALPHAI,XNUI,XDI+2.0)
!
-#if defined(REPRO48) || defined(REPRO55)
+#if defined(REPRO48)
X0DEPS = (4.0*XPI)*XCCS*XC1S*XF0S*MOMG(XALPHAS,XNUS,1.)
X1DEPS = (4.0*XPI)*XCCS*XC1S*XF1S*SQRT(XCS)*MOMG(XALPHAS,XNUS,0.5*XDS+1.5)
XEX0DEPS = XCXS-1.0
@@ -617,7 +617,7 @@ END IF
!
XCOLIS = 0.25 ! Collection efficiency of I+S
XCOLEXIS = 0.05 ! Temperature factor of the I+S collection efficiency
-#if defined(REPRO48) || defined(REPRO55)
+#if defined(REPRO48)
XFIAGGS = (XPI/4.0)*XCOLIS*XCCS*XCS*(ZRHO00**XCEXVT)*MOMG(XALPHAS,XNUS,XDS+2.0)
XEXIAGGS = XCXS-XDS-2.0
#else
@@ -674,7 +674,7 @@ XEX1EVAR = -1.0-0.5*(XDR+3.0)
!
XDCSLIM = 0.007 ! D_cs^lim = 7 mm as suggested by Farley et al. (1989)
XCOLCS = 1.0
-#if defined(REPRO48) || defined(REPRO55)
+#if defined(REPRO48)
XEXCRIMSS= XCXS-XDS-2.0
XCRIMSS = (XPI/4.0)*XCOLCS*XCCS*XCS*(ZRHO00**XCEXVT)*MOMG(XALPHAS,XNUS,XDS+2.0)
#else
@@ -683,7 +683,7 @@ XCRIMSS = XNS * (XPI/4.0)*XCOLCS*XCS*(ZRHO00**XCEXVT)*MOMG(XALPHAS,XNUS,XDS+2.0
#endif
XEXCRIMSG= XEXCRIMSS
XCRIMSG = XCRIMSS
-#if defined(REPRO48) || defined(REPRO55)
+#if defined(REPRO48)
XSRIMCG = XCCS*XAS*MOMG(XALPHAS,XNUS,XBS)
XEXSRIMCG= XCXS-XBS
XSRIMCG2 = XCCS*XAG*MOMG(XALPHAS,XNUS,XBG)
@@ -725,7 +725,7 @@ XRIMINTP2 = 1.0 + XRIMINTP1*LOG( XDCSLIM/(XGAMINC_BOUND_MIN)**(1.0/XALPHAS) )
!
!* 7.2 Constants for the accretion of raindrops onto aggregates
!
-#if defined(REPRO48) || defined(REPRO55)
+#if defined(REPRO48)
XFRACCSS = ((XPI**2)/24.0)*XCCS*XCCR*XRHOLW*(ZRHO00**XCEXVT)
#else
XFRACCSS = XNS*((XPI**2)/24.0)*XCCR*XRHOLW*(ZRHO00**XCEXVT)
@@ -735,7 +735,7 @@ XLBRACCS1 = MOMG(XALPHAS,XNUS,2.)*MOMG(XALPHAR,XNUR,3.)
XLBRACCS2 = 2.*MOMG(XALPHAS,XNUS,1.)*MOMG(XALPHAR,XNUR,4.)
XLBRACCS3 = MOMG(XALPHAR,XNUR,5.)
!
-#if defined(REPRO48) || defined(REPRO55)
+#if defined(REPRO48)
XFSACCRG = (XPI/4.0)*XAS*XCCS*XCCR*(ZRHO00**XCEXVT)
#else
XFSACCRG = XNS*(XPI/4.0)*XAS*XCCR*(ZRHO00**XCEXVT)
@@ -932,7 +932,7 @@ XCOLSG = 0.01 ! Collection efficiency of S+G
XCOLEXSG = 0.1 ! Temperature factor of the S+G collection efficiency
WRITE (KLUOUT, FMT=*) ' NEW Constants for the aggregate collection by the graupeln'
WRITE (KLUOUT, FMT=*) ' XCOLSG, XCOLEXSG = ',XCOLSG,XCOLEXSG
-#if defined(REPRO48) || defined(REPRO55)
+#if defined(REPRO48)
XFSDRYG = (XPI/4.0)*XCOLSG*XCCG*XCCS*XAS*(ZRHO00**XCEXVT)
#else
XFSDRYG = XNS*(XPI/4.0)*XCOLSG*XCCG*XAS*(ZRHO00**XCEXVT)
@@ -1152,7 +1152,7 @@ XFWETH = (XPI/4.0)*XCCH*XCH*(ZRHO00**XCEXVT)*MOMG(XALPHAH,XNUH,XDH+2.0)
!
XCOLSH = 0.01 ! Collection efficiency of S+H
XCOLEXSH = 0.1 ! Temperature factor of the S+H collection efficiency
-#if defined(REPRO48) || defined(REPRO55)
+#if defined(REPRO48)
XFSWETH = (XPI/4.0)*XCCH*XCCS*XAS*(ZRHO00**XCEXVT)
#else
XFSWETH = XNS*(XPI/4.0)*XCCH*XAS*(ZRHO00**XCEXVT) ! Wurtz
diff --git a/src/common/micro/mode_ice4_budgets.F90 b/src/common/micro/mode_ice4_budgets.F90
index 03c550d31..e2d91bd8c 100644
--- a/src/common/micro/mode_ice4_budgets.F90
+++ b/src/common/micro/mode_ice4_budgets.F90
@@ -339,7 +339,7 @@ IF(KRR==7) THEN
IF (BUCONF%LBUDGET_RH) CALL BUDGET_STORE_ADD_PHY(D, TBUDGETS(NBUDGET_RH), 'WETH', (ZW1(:, :)+ZW2(:, :)+ZW3(:, :)+ &
&ZW4(:, :)+ZW5(:, : )) *PRHODJ(:, :))
-#if defined(REPRO48) || defined(REPRO55)
+#if defined(REPRO48)
ZW1(:,:) = 0.
DO JL=1, KSIZE
ZW1(K1(JL), K2(JL)) = PBU_PACK(JL, IRGWETH) * ZINV_TSTEP
@@ -348,10 +348,7 @@ IF(KRR==7) THEN
#ifdef REPRO48
IF (BUCONF%LBUDGET_RG) CALL BUDGET_STORE_ADD_PHY(D, TBUDGETS(NBUDGET_RG), 'HGCV', (-ZW5(:, :)-ZW1(:, :))*PRHODJ(:, :))
#endif
-#ifdef REPRO55
- IF (BUCONF%LBUDGET_RG) CALL BUDGET_STORE_ADD_PHY(D, TBUDGETS(NBUDGET_RG), 'HGCV', -ZW1(:, :)*PRHODJ(:, :))
-#endif
-#if defined(REPRO48) || defined(REPRO55)
+#if defined(REPRO48)
IF (BUCONF%LBUDGET_RH) CALL BUDGET_STORE_ADD_PHY(D, TBUDGETS(NBUDGET_RH), 'HGCV', ZW1(:, :)*PRHODJ(:, :))
#endif
@@ -376,7 +373,7 @@ IF(KRR==7) THEN
ZW5(K1(JL), K2(JL)) = PBU_PACK(JL, IRGDRYH) * ZINV_TSTEP
END DO
ZW6(:,:) = 0.
-#if defined(REPRO48) || defined(REPRO55)
+#if defined(REPRO48)
!ZW6 must be removed when REPRO* will be suppressed
DO JL=1, KSIZE
ZW6(K1(JL), K2(JL)) = PBU_PACK(JL, IRDRYHG) * ZINV_TSTEP
@@ -393,10 +390,10 @@ IF(KRR==7) THEN
&ZW4(:, :)+ZW5(:, :)-ZW6(:, :)) &
& *PRHODJ(:, :))
-#if defined(REPRO48) || defined(REPRO55)
+#if defined(REPRO48)
#else
!When REPRO48 will be suppressed, ZW6 must be removed
- ZW(:,:) = 0.
+ ZW1(:,:) = 0.
DO JL=1, KSIZE
ZW1(K1(JL), K2(JL)) = PBU_PACK(JL, IRDRYHG) * ZINV_TSTEP
END DO
diff --git a/src/common/micro/mode_ice4_fast_rg.F90 b/src/common/micro/mode_ice4_fast_rg.F90
index e861b521e..0b7a6ef50 100644
--- a/src/common/micro/mode_ice4_fast_rg.F90
+++ b/src/common/micro/mode_ice4_fast_rg.F90
@@ -191,7 +191,7 @@ IF(.NOT. LDSOFT) THEN
WHERE(GDRY(1:KSIZE))
PRG_TEND(1:KSIZE, IRSWETG)=ICEP%XFSDRYG*ZZW(1:KSIZE) & ! RSDRYG
/ ICEP%XCOLSG &
-#if defined(REPRO48) || defined(REPRO55)
+#if defined(REPRO48)
*(PLBDAS(1:KSIZE)**(ICED%XCXS-ICED%XBS))*( PLBDAG(1:KSIZE)**ICED%XCXG ) &
*(PRHODREF(1:KSIZE)**(-ICED%XCEXVT-1.)) &
#else
diff --git a/src/common/micro/mode_ice4_fast_rh.F90 b/src/common/micro/mode_ice4_fast_rh.F90
index c35275a39..8ac5a7b7e 100644
--- a/src/common/micro/mode_ice4_fast_rh.F90
+++ b/src/common/micro/mode_ice4_fast_rh.F90
@@ -152,7 +152,7 @@ IF(.NOT. LDSOFT) THEN
!$mnh_expand_where(JL=1:KSIZE)
WHERE(GWET(1:KSIZE))
PRH_TEND(1:KSIZE, IRSWETH)=ICEP%XFSWETH*ZZW(1:KSIZE) & ! RSWETH
-#if defined(REPRO48) || defined(REPRO55)
+#if defined(REPRO48)
*( PLBDAS(1:KSIZE)**(ICED%XCXS-ICED%XBS) )*( PLBDAH(1:KSIZE)**ICED%XCXH ) &
*( PRHODREF(1:KSIZE)**(-ICED%XCEXVT-1.) ) &
#else
diff --git a/src/common/micro/mode_ice4_fast_rs.F90 b/src/common/micro/mode_ice4_fast_rs.F90
index d79105d0c..5e4dabf6e 100644
--- a/src/common/micro/mode_ice4_fast_rs.F90
+++ b/src/common/micro/mode_ice4_fast_rs.F90
@@ -111,7 +111,7 @@ DO JL=1, KSIZE
PRS_TEND(JL, IFREEZ1)=PKA(JL)*(CST%XTT-PT(JL)) + &
&(PDV(JL)*(CST%XLVTT+(CST%XCPV-CST%XCL)*(PT(JL)-CST%XTT)) &
&*(CST%XESTT-PRS_TEND(JL, IFREEZ1))/(CST%XRV*PT(JL)) )
-#if defined(REPRO48) || defined(REPRO55)
+#if defined(REPRO48)
PRS_TEND(JL, IFREEZ1)=PRS_TEND(JL, IFREEZ1)* (ICEP%X0DEPS* PLBDAS(JL)**ICEP%XEX0DEPS + &
& ICEP%X1DEPS*PCJ(JL)*PLBDAS(JL)**ICEP%XEX1DEPS )/ &
#else
@@ -139,7 +139,7 @@ ENDDO
!
DO JL=1, KSIZE
IF (PRCT(JL)>ICED%XRTMIN(2) .AND. PRST(JL)>ICED%XRTMIN(5) .AND. LDCOMPUTE(JL)) THEN
-#if defined(REPRO48) || defined(REPRO55)
+#if defined(REPRO48)
ZZW(JL) = PLBDAS(JL)
#else
ZZW(JL) = (PLBDAS(JL)**ICED%XALPHAS + ICED%XFVELOS**ICED%XALPHAS)**(1./ICED%XALPHAS)
@@ -166,7 +166,7 @@ IF(.NOT. LDSOFT) THEN
!$mnh_expand_where(JL=1:KSIZE)
WHERE (GRIM(1:KSIZE))
PRS_TEND(1:KSIZE, IRCRIMSS) = ICEP%XCRIMSS * ZZW1(1:KSIZE) * PRCT(1:KSIZE) & ! RCRIMSS
-#if defined(REPRO48) || defined(REPRO55)
+#if defined(REPRO48)
* PLBDAS(1:KSIZE)**ICEP%XEXCRIMSS &
* PRHODREF(1:KSIZE)**(-ICED%XCEXVT)
#else
@@ -184,7 +184,7 @@ IF(.NOT. LDSOFT) THEN
!$mnh_expand_where(JL=1:KSIZE)
WHERE(GRIM(1:KSIZE))
PRS_TEND(1:KSIZE, IRCRIMS)=ICEP%XCRIMSG * PRCT(1:KSIZE) & ! RCRIMS
-#if defined(REPRO48) || defined(REPRO55)
+#if defined(REPRO48)
* PLBDAS(1:KSIZE)**ICEP%XEXCRIMSG &
* PRHODREF(1:KSIZE)**(-ICED%XCEXVT)
#else
@@ -201,7 +201,7 @@ IF(.NOT. LDSOFT) THEN
!$mnh_expand_where(JL=1:KSIZE)
WHERE(GRIM(1:KSIZE))
ZZW(1:KSIZE) = PRS_TEND(1:KSIZE, IRCRIMS) - PRS_TEND(1:KSIZE, IRCRIMSS) ! RCRIMSG
-#if defined(REPRO48) || defined(REPRO55)
+#if defined(REPRO48)
PRS_TEND(1:KSIZE, IRSRIMCG)=ICEP%XSRIMCG * PLBDAS(1:KSIZE)**ICEP%XEXSRIMCG*(1.0-ZZW2(1:KSIZE))
#else
PRS_TEND(1:KSIZE, IRSRIMCG)=ICEP%XSRIMCG * PRST(1:KSIZE)*PRHODREF(1:KSIZE) &
@@ -209,7 +209,7 @@ IF(.NOT. LDSOFT) THEN
#endif
PRS_TEND(1:KSIZE, IRSRIMCG)=ZZW(1:KSIZE)*PRS_TEND(1:KSIZE, IRSRIMCG)/ &
MAX(1.E-20, &
-#if defined(REPRO48) || defined(REPRO55)
+#if defined(REPRO48)
ICEP%XSRIMCG3*ICEP%XSRIMCG2*PLBDAS(1:KSIZE)**ICEP%XEXSRIMCG2*(1.-ZZW3(1:KSIZE)) - &
#else
ICEP%XSRIMCG3*ICEP%XSRIMCG2*PRST(1:KSIZE)*PRHODREF(1:KSIZE) &
@@ -270,7 +270,7 @@ IF(.NOT. LDSOFT) THEN
!$mnh_expand_where(JL=1:KSIZE)
WHERE(GACC(1:KSIZE))
ZZW(1:KSIZE) = & !! coef of RRACCS
-#if defined(REPRO48) || defined(REPRO55)
+#if defined(REPRO48)
ICEP%XFRACCSS*( PLBDAS(1:KSIZE)**ICED%XCXS )*( PRHODREF(1:KSIZE)**(-ICED%XCEXVT-1.) ) &
#else
ICEP%XFRACCSS*( PRST(1:KSIZE)*PLBDAS(1:KSIZE)**ICED%XBS )*( PRHODREF(1:KSIZE)**(-ICED%XCEXVT) ) &
@@ -294,7 +294,7 @@ IF(.NOT. LDSOFT) THEN
!$mnh_expand_where(JL=1:KSIZE)
WHERE(GACC(1:KSIZE))
PRS_TEND(1:KSIZE, IRSACCRG) = ICEP%XFSACCRG*ZZW3(1:KSIZE)* & ! RSACCRG
-#if defined(REPRO48) || defined(REPRO55)
+#if defined(REPRO48)
( PLBDAS(1:KSIZE)**(ICED%XCXS-ICED%XBS) )*( PRHODREF(1:KSIZE)**(-ICED%XCEXVT-1.) ) &
#else
( PRST(1:KSIZE))*( PRHODREF(1:KSIZE)**(-ICED%XCEXVT) ) &
@@ -343,7 +343,7 @@ DO JL=1, KSIZE
! compute RSMLT
!
PRSMLTG(JL) = ICEP%XFSCVMG*MAX(0., (-PRSMLTG(JL) * &
-#if defined(REPRO48) || defined(REPRO55)
+#if defined(REPRO48)
(ICEP%X0DEPS* PLBDAS(JL)**ICEP%XEX0DEPS + &
ICEP%X1DEPS*PCJ(JL)*PLBDAS(JL)**ICEP%XEX1DEPS) &
#else
diff --git a/src/common/micro/mode_ice4_rsrimcg_old.F90 b/src/common/micro/mode_ice4_rsrimcg_old.F90
index 970f214f3..a273dbd94 100644
--- a/src/common/micro/mode_ice4_rsrimcg_old.F90
+++ b/src/common/micro/mode_ice4_rsrimcg_old.F90
@@ -87,7 +87,7 @@ IF(.NOT. LDSOFT) THEN
!$mnh_expand_where(JL=1:KSIZE)
WHERE(GRIM(1:KSIZE))
PRSRIMCG_MR(1:KSIZE) = ICEP%XSRIMCG * PLBDAS(1:KSIZE)**ICEP%XEXSRIMCG & ! RSRIMCG
-#if defined(REPRO48) || defined(REPRO55)
+#if defined(REPRO48)
* (1.0 - ZZW(1:KSIZE) )/PRHODREF(1:KSIZE)
#else
* (1.0 - ZZW(1:KSIZE) )*PRST(1:KSIZE)
diff --git a/src/common/micro/mode_ice4_sedimentation_split.F90 b/src/common/micro/mode_ice4_sedimentation_split.F90
index 6534e7043..6a10f8d39 100644
--- a/src/common/micro/mode_ice4_sedimentation_split.F90
+++ b/src/common/micro/mode_ice4_sedimentation_split.F90
@@ -387,7 +387,7 @@ DO WHILE (ANY(ZREMAINT>0.))
ENDIF
ENDDO
ENDDO
-#if defined(REPRO48) || defined(REPRO55)
+#if defined(REPRO48)
#else
ELSEIF(KSPE==5) THEN
! ******* for snow
@@ -418,7 +418,7 @@ DO WHILE (ANY(ZREMAINT>0.))
CASE(3)
ZFSED=ICEP%XFSEDR
ZEXSED=ICEP%XEXSEDR
-#if defined(REPRO48) || defined(REPRO55)
+#if defined(REPRO48)
CASE(5)
ZFSED=ICEP%XFSEDS
ZEXSED=ICEP%XEXSEDS
diff --git a/src/common/micro/mode_ice4_sedimentation_stat.F90 b/src/common/micro/mode_ice4_sedimentation_stat.F90
index 52183c854..ba8e117d1 100644
--- a/src/common/micro/mode_ice4_sedimentation_stat.F90
+++ b/src/common/micro/mode_ice4_sedimentation_stat.F90
@@ -99,7 +99,7 @@ REAL :: FWSED1, FWSED2, PWSEDW, PWSEDWSUP, PINVTSTEP, PTSTEP1, PDZZ1, PRHODREF1,
REAL(KIND=JPRB) :: ZHOOK_HANDLE
!
-#if defined(REPRO48) || defined(REPRO55)
+#if defined(REPRO48)
! 5 multiplications + 1 division => cost = 7X
FWSED1(PWSEDW,PTSTEP1,PDZZ1,PRHODREF1,PRXT1,PINVTSTEP)=MIN(1.,PWSEDW*PTSTEP1/PDZZ1 )*PRHODREF1*PDZZ1*PRXT1*PINVTSTEP
#else
diff --git a/src/common/micro/mode_ice4_slow.F90 b/src/common/micro/mode_ice4_slow.F90
index e81b2f529..78aa35289 100644
--- a/src/common/micro/mode_ice4_slow.F90
+++ b/src/common/micro/mode_ice4_slow.F90
@@ -113,7 +113,7 @@ ENDDO
DO JL=1, KSIZE
IF(PRVT(JL)>ICED%XRTMIN(1) .AND. PRST(JL)>ICED%XRTMIN(5) .AND. LDCOMPUTE(JL)) THEN
IF(.NOT. LDSOFT) THEN
-#if defined(REPRO48) || defined(REPRO55)
+#if defined(REPRO48)
PRVDEPS(JL) = ( PSSI(JL)/(PRHODREF(JL)*PAI(JL)) ) * &
( ICEP%X0DEPS*PLBDAS(JL)**ICEP%XEX0DEPS + ICEP%X1DEPS*PCJ(JL)*PLBDAS(JL)**ICEP%XEX1DEPS )
#else
@@ -135,7 +135,7 @@ DO JL=1, KSIZE
IF(.NOT. LDSOFT) THEN
PRIAGGS(JL) = ICEP%XFIAGGS * EXP( ICEP%XCOLEXIS*(PT(JL)-CST%XTT) ) &
* PRIT(JL) &
-#if defined(REPRO48) || defined(REPRO55)
+#if defined(REPRO48)
* PLBDAS(JL)**ICEP%XEXIAGGS &
* PRHODREF(JL)**(-ICED%XCEXVT)
#else
diff --git a/src/common/micro/mode_ice4_stepping.F90 b/src/common/micro/mode_ice4_stepping.F90
index 8a438a799..b4879faa5 100644
--- a/src/common/micro/mode_ice4_stepping.F90
+++ b/src/common/micro/mode_ice4_stepping.F90
@@ -371,11 +371,7 @@ DO WHILE(ANY(ZTIME(1:KMICRO)<PTSTEP)) ! Loop to *really* compute tendencies
ENDDO
ENDDO
DO JL=1, KMICRO
-#ifdef REPRO55
- PCIT(JL)=PCIT(JL) * MAX(0., -SIGN(1., -PVART(JL,IRI)))
-#else
IF (PVART(JL,IRI)<=0. .AND. LDMICRO(JL)) PCIT(JL) = 0.
-#endif
ZTIME(JL)=ZTIME(JL)+ZMAXTIME(JL)
ENDDO
!-------------------------------------------------------------------------------
diff --git a/src/common/micro/mode_ice4_warm.F90 b/src/common/micro/mode_ice4_warm.F90
index dddbfc42e..317b57839 100644
--- a/src/common/micro/mode_ice4_warm.F90
+++ b/src/common/micro/mode_ice4_warm.F90
@@ -92,13 +92,9 @@ IF (LHOOK) CALL DR_HOOK('ICE4_WARM', 0, ZHOOK_HANDLE)
!* 4.2 compute the autoconversion of r_c for r_r production: RCAUTR
!
DO JL=1, KSIZE
-#ifdef REPRO55
- IF(PHLC_HRC(JL)>ICED%XRTMIN(2) .AND. PHLC_HCF(JL)>1.E-20 .AND. LDCOMPUTE(JL)) THEN
-#else
IF(PHLC_HRC(JL)>ICED%XRTMIN(2) .AND. PHLC_HCF(JL)>0. .AND. LDCOMPUTE(JL)) THEN
-#endif
IF(.NOT. LDSOFT) THEN
-#if defined(REPRO48) || defined(REPRO55)
+#if defined(REPRO48)
PRCAUTR(JL) = ICEP%XTIMAUTC*MAX(PHLC_HRC(JL)/PHLC_HCF(JL) - ICEP%XCRIAUTC/PRHODREF(JL), 0.0)
PRCAUTR(JL) = PHLC_HCF(JL)*PRCAUTR(JL)
#else
@@ -138,11 +134,7 @@ ELSEIF (HSUBG_RC_RR_ACCR=='PRFR') THEN
! => min(PCF, PRF)-PHLC_HCF
DO JL=1, KSIZE
LMASK = PRCT(JL)>ICED%XRTMIN(2) .AND. PRRT(JL)>ICED%XRTMIN(3) .AND. LDCOMPUTE(JL)
-#ifdef REPRO55
- LMASK1 = LMASK .AND. PHLC_HRC(JL)>ICED%XRTMIN(2) .AND. PHLC_HCF(JL)>1.E-20
-#else
LMASK1 = LMASK .AND. PHLC_HRC(JL)>ICED%XRTMIN(2) .AND. PHLC_HCF(JL)>0.
-#endif
#ifdef REPRO48
LMASK2 = LMASK .AND. PHLC_LRC(JL)>ICED%XRTMIN(2) .AND. PHLC_LCF(JL)>0.
#else
@@ -152,7 +144,7 @@ ELSEIF (HSUBG_RC_RR_ACCR=='PRFR') THEN
IF(.NOT. LDSOFT) THEN
IF(LMASK1) THEN
!Accretion due to rain falling in high cloud content
-#if defined(REPRO48) || defined(REPRO55)
+#if defined(REPRO48)
PRCACCR(JL) = ICEP%XFCACCR * ( PHLC_HRC(JL)/PHLC_HCF(JL) ) &
&*PLBDAR_RF(JL)**ICEP%XEXCACCR &
&*PRHODREF(JL)**(-ICED%XCEXVT) &
diff --git a/src/common/micro/mode_rrcolss.F90 b/src/common/micro/mode_rrcolss.F90
index abb1b3d59..bfeaa1adb 100644
--- a/src/common/micro/mode_rrcolss.F90
+++ b/src/common/micro/mode_rrcolss.F90
@@ -244,7 +244,7 @@ DO JLBDAS = 1,SIZE(PRRCOLSS(:,:),1)
DO JDR = 1,INR-1
ZDR = ZDDCOLLR * REAL(JDR)
ZCOLLR = ZCOLLR + (ZDS+ZDR)**2 * ZDR**PEXMASSR &
-#if defined(REPRO48) || defined(REPRO55)
+#if defined(REPRO48)
* PESR * ABS(PFALLS*ZDS**PEXFALLS-PFALLR*ZDR**PEXFALLR) &
#else
* PESR * ABS(PFALLS*ZDS**PEXFALLS * EXP(-(PFALLEXPS*ZDS)**PALPHAS)-PFALLR*ZDR**PEXFALLR) &
@@ -252,7 +252,7 @@ DO JLBDAS = 1,SIZE(PRRCOLSS(:,:),1)
* GENERAL_GAMMA(PALPHAR,PNUR,ZLBDAR,ZDR)
END DO
ZCOLLDRMAX = (ZDS+ZDRMAX)**2 * ZDRMAX**PEXMASSR &
-#if defined(REPRO48) || defined(REPRO55)
+#if defined(REPRO48)
* PESR * ABS(PFALLS*ZDS**PEXFALLS-PFALLR*ZDRMAX**PEXFALLR) &
#else
* PESR * ABS(PFALLS*ZDS**PEXFALLS* EXP(-(PFALLEXPS*ZDS)**PALPHAS)-PFALLR*ZDRMAX**PEXFALLR) &
diff --git a/src/common/micro/mode_rscolrg.F90 b/src/common/micro/mode_rscolrg.F90
index 0ec4020b6..77e00251f 100644
--- a/src/common/micro/mode_rscolrg.F90
+++ b/src/common/micro/mode_rscolrg.F90
@@ -238,7 +238,7 @@ DO JLBDAR = 1,SIZE(PRSCOLRG(:,:),1)
ZDR = ZDDCOLLR * REAL(JDR) + ZDRMIN
ZCOLLR = ZCOLLR + (ZDS+ZDR)**2 &
* GENERAL_GAMMA(PALPHAR,PNUR,ZLBDAR,ZDR) &
-#if defined(REPRO48) || defined(REPRO55)
+#if defined(REPRO48)
* PESR * ABS(PFALLS*ZDS**PEXFALLS-PFALLR*ZDR**PEXFALLR)
#else
* PESR * ABS(PFALLS*ZDS**PEXFALLS*EXP(-(ZDS*PFALLEXPS)**PALPHAS)-PFALLR*ZDR**PEXFALLR)
@@ -247,7 +247,7 @@ DO JLBDAR = 1,SIZE(PRSCOLRG(:,:),1)
IF( ZDRMIN>0.0 ) THEN
ZCOLLDRMIN = (ZDS+ZDRMIN)**2 &
* GENERAL_GAMMA(PALPHAR,PNUR,ZLBDAR,ZDRMIN) &
-#if defined(REPRO48) || defined(REPRO55)
+#if defined(REPRO48)
* PESR * ABS(PFALLS*ZDS**PEXFALLS-PFALLR*ZDRMIN**PEXFALLR)
#else
* PESR * ABS(PFALLS*ZDS**PEXFALLS*EXP(-(ZDS*PFALLEXPS)**PALPHAS)-PFALLR*ZDRMIN**PEXFALLR)
diff --git a/src/common/micro/mode_rzcolx.F90 b/src/common/micro/mode_rzcolx.F90
index c765515d2..3370bc01f 100644
--- a/src/common/micro/mode_rzcolx.F90
+++ b/src/common/micro/mode_rzcolx.F90
@@ -215,7 +215,7 @@ DO JLBDAX = 1,SIZE(PRZCOLX(:,:),1)
!* 1.7 Compute the scaled fall speed difference by integration over
! the dimensional spectrum of specy Z
!
-#if defined(REPRO48) || defined(REPRO55)
+#if defined(REPRO48)
ZCOLLZ = ZCOLLZ + ZFUNC &
* PEXZ * ABS(PFALLX*ZDX**PEXFALLX-PFALLZ*ZDZ**PEXFALLZ)
#else
diff --git a/src/common/micro/rain_ice.F90 b/src/common/micro/rain_ice.F90
index c17b5c3cd..a07d16b21 100644
--- a/src/common/micro/rain_ice.F90
+++ b/src/common/micro/rain_ice.F90
@@ -341,29 +341,12 @@ DO JK = IKTB,IKTE
PRST(JIJ,JK)>ICED%XRTMIN(5) .OR. &
PRGT(JIJ,JK)>ICED%XRTMIN(6) .OR. &
PRHT(JIJ,JK)>ICED%XRTMIN(7)
-#ifdef REPRO55
- LLMICRO(JIJ,JK)=LLMICRO(JIJ,JK) .OR. &
- PRCS(JIJ,JK)>ZRSMIN(2) .OR. &
- PRRS(JIJ,JK)>ZRSMIN(3) .OR. &
- PRIS(JIJ,JK)>ZRSMIN(4) .OR. &
- PRSS(JIJ,JK)>ZRSMIN(5) .OR. &
- PRGS(JIJ,JK)>ZRSMIN(6) .OR. &
- PRHS(JIJ,JK)>ZRSMIN(7)
-#endif
ELSE
LLMICRO(JIJ,JK)=PRCT(JIJ,JK)>ICED%XRTMIN(2) .OR. &
PRRT(JIJ,JK)>ICED%XRTMIN(3) .OR. &
PRIT(JIJ,JK)>ICED%XRTMIN(4) .OR. &
PRST(JIJ,JK)>ICED%XRTMIN(5) .OR. &
PRGT(JIJ,JK)>ICED%XRTMIN(6)
-#ifdef REPRO55
- LLMICRO(JIJ,JK)=LLMICRO(JIJ,JK) .OR. &
- PRCS(JIJ,JK)>ZRSMIN(2) .OR. &
- PRRS(JIJ,JK)>ZRSMIN(3) .OR. &
- PRIS(JIJ,JK)>ZRSMIN(4) .OR. &
- PRSS(JIJ,JK)>ZRSMIN(5) .OR. &
- PRGS(JIJ,JK)>ZRSMIN(6)
-#endif
ENDIF
ENDDO
ENDDO
@@ -426,11 +409,7 @@ DO JK=IKTB,IKTE
IF (.NOT. LLMICRO(JIJ, JK)) THEN
LLW3D(JIJ, JK)=.TRUE.
ZW3D(JIJ, JK)=ZZ_LSFACT(JIJ, JK)/PEXN(JIJ, JK)
-#ifdef REPRO55
-#else
PCIT(JIJ,JK)=0. !ri=0 because where are in the not odmicro case
-#endif
-
ELSE
LLW3D(JIJ, JK)=.FALSE.
ENDIF
diff --git a/src/common/turb/mode_compute_updraft.F90 b/src/common/turb/mode_compute_updraft.F90
index 5e9389b85..7e4a36ebe 100644
--- a/src/common/turb/mode_compute_updraft.F90
+++ b/src/common/turb/mode_compute_updraft.F90
@@ -1021,11 +1021,7 @@ DO JIJ=IIJB,IIJE
(PRTM(JIJ,KK)-ZDZ*(PRTM(JIJ,KK)-PRTM(JIJ,JKLIM))/PDZZ(JIJ,KK)) + &
(1. - ZKIC_INIT)*PRT_UP(JIJ)
ELSE
-#ifdef REPRO55
- ZMIXTHL(JIJ) = 0.1
-#else
ZMIXTHL(JIJ) = 300.
-#endif
ZMIXRT(JIJ) = 0.1
ENDIF
ENDDO
diff --git a/src/mesonh/micro/ini_rain_ice.f90 b/src/mesonh/micro/ini_rain_ice.f90
index 2f3b2b1c4..1118b9aaf 100644
--- a/src/mesonh/micro/ini_rain_ice.f90
+++ b/src/mesonh/micro/ini_rain_ice.f90
@@ -424,7 +424,7 @@ XLBR = ( XAR*XCCR*MOMG(XALPHAR,XNUR,XBR) )**(-XLBEXR)
XLBEXI = 1.0/(-XBI)
XLBI = ( XAI*MOMG(XALPHAI,XNUI,XBI) )**(-XLBEXI)
!
-#if defined(REPRO48) || defined(REPRO55)
+#if defined(REPRO48)
#else
XNS = 1.0/(XAS*MOMG(XALPHAS,XNUS,XBS))
#endif
@@ -443,7 +443,7 @@ XLBDAS_MAX = 100000.0
!
ZCONC_MAX = 1.E6 ! Maximal concentration for falling particules set to 1 per cc
IF(XCCS>0. .AND. XCXS>0. )XLBDAS_MAX = ( ZCONC_MAX/XCCS )**(1./XCXS)
-#if defined(REPRO48) || defined(REPRO55)
+#if defined(REPRO48)
#else
IF (LSNOW_T) XLBDAS_MAX = 1.E6
XLBDAS_MIN = 1.E-10
@@ -500,7 +500,7 @@ XEXCSEDI =-0.9324*3.0
WRITE (KLUOUT,FMT=*)' PRISTINE ICE SEDIMENTATION for columns XFSEDI =',XFSEDI
!
!
-#if defined(REPRO48) || defined(REPRO55)
+#if defined(REPRO48)
XEXSEDS = (XBS+XDS-XCXS)/(XBS-XCXS)
XFSEDS = XCS*XAS*XCCS*MOMG(XALPHAS,XNUS,XBS+XDS)* &
(XAS*XCCS*MOMG(XALPHAS,XNUS,XBS))**(-XEXSEDS)*(ZRHO00)**XCEXVT
@@ -587,7 +587,7 @@ XSCFAC = (0.63**(1./3.))*SQRT((ZRHO00)**XCEXVT) ! One assumes Sc=0.63
X0DEPI = (4.0*XPI)*XC1I*XF0I*MOMG(XALPHAI,XNUI,1.)
X2DEPI = (4.0*XPI)*XC1I*XF2I*XC_I*MOMG(XALPHAI,XNUI,XDI+2.0)
!
-#if defined(REPRO48) || defined(REPRO55)
+#if defined(REPRO48)
X0DEPS = (4.0*XPI)*XCCS*XC1S*XF0S*MOMG(XALPHAS,XNUS,1.)
X1DEPS = (4.0*XPI)*XCCS*XC1S*XF1S*SQRT(XCS)*MOMG(XALPHAS,XNUS,0.5*XDS+1.5)
XEX0DEPS = XCXS-1.0
@@ -647,7 +647,7 @@ END IF
!
XCOLIS = 0.25 ! Collection efficiency of I+S
XCOLEXIS = 0.05 ! Temperature factor of the I+S collection efficiency
-#if defined(REPRO48) || defined(REPRO55)
+#if defined(REPRO48)
XFIAGGS = (XPI/4.0)*XCOLIS*XCCS*XCS*(ZRHO00**XCEXVT)*MOMG(XALPHAS,XNUS,XDS+2.0)
XEXIAGGS = XCXS-XDS-2.0
#else
@@ -704,7 +704,7 @@ XEX1EVAR = -1.0-0.5*(XDR+3.0)
!
XDCSLIM = 0.007 ! D_cs^lim = 7 mm as suggested by Farley et al. (1989)
XCOLCS = 1.0
-#if defined(REPRO48) || defined(REPRO55)
+#if defined(REPRO48)
XEXCRIMSS= XCXS-XDS-2.0
XCRIMSS = (XPI/4.0)*XCOLCS*XCCS*XCS*(ZRHO00**XCEXVT)*MOMG(XALPHAS,XNUS,XDS+2.0)
#else
@@ -713,7 +713,7 @@ XCRIMSS = XNS * (XPI/4.0)*XCOLCS*XCS*(ZRHO00**XCEXVT)*MOMG(XALPHAS,XNUS,XDS+2.0
#endif
XEXCRIMSG= XEXCRIMSS
XCRIMSG = XCRIMSS
-#if defined(REPRO48) || defined(REPRO55)
+#if defined(REPRO48)
XSRIMCG = XCCS*XAS*MOMG(XALPHAS,XNUS,XBS)
XEXSRIMCG= XCXS-XBS
XSRIMCG2 = XCCS*XAG*MOMG(XALPHAS,XNUS,XBG)
@@ -755,7 +755,7 @@ XRIMINTP2 = 1.0 + XRIMINTP1*LOG( XDCSLIM/(XGAMINC_BOUND_MIN)**(1.0/XALPHAS) )
!
!* 7.2 Constants for the accretion of raindrops onto aggregates
!
-#if defined(REPRO48) || defined(REPRO55)
+#if defined(REPRO48)
XFRACCSS = ((XPI**2)/24.0)*XCCS*XCCR*XRHOLW*(ZRHO00**XCEXVT)
#else
XFRACCSS = XNS*((XPI**2)/24.0)*XCCR*XRHOLW*(ZRHO00**XCEXVT)
@@ -765,7 +765,7 @@ XLBRACCS1 = MOMG(XALPHAS,XNUS,2.)*MOMG(XALPHAR,XNUR,3.)
XLBRACCS2 = 2.*MOMG(XALPHAS,XNUS,1.)*MOMG(XALPHAR,XNUR,4.)
XLBRACCS3 = MOMG(XALPHAR,XNUR,5.)
!
-#if defined(REPRO48) || defined(REPRO55)
+#if defined(REPRO48)
XFSACCRG = (XPI/4.0)*XAS*XCCS*XCCR*(ZRHO00**XCEXVT)
#else
XFSACCRG = XNS*(XPI/4.0)*XAS*XCCR*(ZRHO00**XCEXVT)
@@ -962,7 +962,7 @@ XCOLSG = 0.01 ! Collection efficiency of S+G
XCOLEXSG = 0.1 ! Temperature factor of the S+G collection efficiency
WRITE (KLUOUT, FMT=*) ' NEW Constants for the aggregate collection by the graupeln'
WRITE (KLUOUT, FMT=*) ' XCOLSG, XCOLEXSG = ',XCOLSG,XCOLEXSG
-#if defined(REPRO48) || defined(REPRO55)
+#if defined(REPRO48)
XFSDRYG = (XPI/4.0)*XCOLSG*XCCG*XCCS*XAS*(ZRHO00**XCEXVT)
#else
XFSDRYG = XNS*(XPI/4.0)*XCOLSG*XCCG*XAS*(ZRHO00**XCEXVT)
@@ -1182,7 +1182,7 @@ XFWETH = (XPI/4.0)*XCCH*XCH*(ZRHO00**XCEXVT)*MOMG(XALPHAH,XNUH,XDH+2.0)
!
XCOLSH = 0.01 ! Collection efficiency of S+H
XCOLEXSH = 0.1 ! Temperature factor of the S+H collection efficiency
-#if defined(REPRO48) || defined(REPRO55)
+#if defined(REPRO48)
XFSWETH = (XPI/4.0)*XCCH*XCCS*XAS*(ZRHO00**XCEXVT)
#else
XFSWETH = XNS*(XPI/4.0)*XCCH*XAS*(ZRHO00**XCEXVT) ! Wurtz
diff --git a/src/mesonh/micro/rain_ice_fast_rg.f90 b/src/mesonh/micro/rain_ice_fast_rg.f90
index 4d4c4ec29..0799d824a 100644
--- a/src/mesonh/micro/rain_ice_fast_rg.f90
+++ b/src/mesonh/micro/rain_ice_fast_rg.f90
@@ -204,7 +204,7 @@ REAL, DIMENSION(size(PRHODREF),7) :: ZZW1 ! Work arrays
JL = I1(JJ)
ZZW1(JL,3) = MIN( PRSS(JL),XFSDRYG*ZVEC3(JJ) & ! RSDRYG
* EXP( XCOLEXSG*(PZT(JL)-XTT) ) &
-#if defined(REPRO48) || defined(REPRO55)
+#if defined(REPRO48)
*( ZVECLBDAS(JJ)**(XCXS-XBS) )*( ZVECLBDAG(JJ)**XCXG ) &
*( PRHODREF(JL)**(-XCEXVT-1.) ) &
#else
diff --git a/src/mesonh/micro/rain_ice_fast_rh.f90 b/src/mesonh/micro/rain_ice_fast_rh.f90
index b86db34ae..d41b61143 100644
--- a/src/mesonh/micro/rain_ice_fast_rh.f90
+++ b/src/mesonh/micro/rain_ice_fast_rh.f90
@@ -186,7 +186,7 @@ REAL, DIMENSION(size(PRHODREF),6) :: ZZW1 ! Work arrays
DO JJ = 1, IGWET
JL = I1W(JJ)
ZZW1(JL,3) = MIN( PRSS(JL),XFSWETH*ZVEC3(JJ) & ! RSWETH
-#if defined(REPRO48) || defined(REPRO55)
+#if defined(REPRO48)
*( ZVECLBDAS(JJ)**(XCXS-XBS) )*( ZVECLBDAH(JJ)**XCXH ) &
*( PRHODREF(JL)**(-XCEXVT-1.) ) &
#else
diff --git a/src/mesonh/micro/rain_ice_fast_rs.f90 b/src/mesonh/micro/rain_ice_fast_rs.f90
index 8b7dbdc3d..682a1ba3f 100644
--- a/src/mesonh/micro/rain_ice_fast_rs.f90
+++ b/src/mesonh/micro/rain_ice_fast_rs.f90
@@ -136,7 +136,7 @@ REAL, DIMENSION(:), ALLOCATABLE :: ZZW1, ZZW2, ZZW3, ZZW4 ! Work arrays
DO JJ = 1, IGRIM
JL = I1(JJ)
ZZW1(JJ) = MIN( PRCS(JL), &
-#if defined(REPRO48) || defined(REPRO55)
+#if defined(REPRO48)
XCRIMSS * ZVEC1(JJ) * PRCT(JL) & ! RCRIMSS
* ZVECLBDAS(JJ)**XEXCRIMSS &
* PRHODREF(JL)**(-XCEXVT) )
@@ -163,7 +163,7 @@ REAL, DIMENSION(:), ALLOCATABLE :: ZZW1, ZZW2, ZZW3, ZZW4 ! Work arrays
JL = I1(JJ)
IF ( PRSS(JL) > 0.0 ) THEN
ZZW2(JJ) = MIN( PRCS(JL), &
-#if defined(REPRO48) || defined(REPRO55)
+#if defined(REPRO48)
XCRIMSG * PRCT(JL) & ! RCRIMSG
* ZVECLBDAS(JJ)**XEXCRIMSG &
* PRHODREF(JL)**(-XCEXVT) &
@@ -275,7 +275,7 @@ REAL, DIMENSION(:), ALLOCATABLE :: ZZW1, ZZW2, ZZW3, ZZW4 ! Work arrays
DO JJ = 1, IGACC
JL = I1(JJ)
ZZW2(JJ) = & !! coef of RRACCS
-#if defined(REPRO48) || defined(REPRO55)
+#if defined(REPRO48)
XFRACCSS*( ZVECLBDAS(JJ)**XCXS )*( PRHODREF(JL)**(-XCEXVT-1.) ) &
#else
XFRACCSS*( PRST(JL)*ZVECLBDAS(JJ)**XBS )*( PRHODREF(JL)**(-XCEXVT) ) &
@@ -325,7 +325,7 @@ REAL, DIMENSION(:), ALLOCATABLE :: ZZW1, ZZW2, ZZW3, ZZW4 ! Work arrays
ZZW2(JJ) = MAX( MIN( PRRS(JL),ZZW2(JJ)-ZZW4(JJ) ),0.0 ) ! RRACCSG
IF ( ZZW2(JJ) > 0.0 ) THEN
ZZW3(JJ) = MIN( PRSS(JL),XFSACCRG*ZVEC3(JJ)* & ! RSACCRG
-#if defined(REPRO48) || defined(REPRO55)
+#if defined(REPRO48)
( ZVECLBDAS(JJ)**(XCXS-XBS) )*( PRHODREF(JL)**(-XCEXVT-1.) ) &
#else
PRST(JL)*( PRHODREF(JL)**(-XCEXVT) ) &
@@ -376,7 +376,7 @@ REAL, DIMENSION(:), ALLOCATABLE :: ZZW1, ZZW2, ZZW3, ZZW4 ! Work arrays
!
! compute RSMLT
!
-#if defined(REPRO48) || defined(REPRO55)
+#if defined(REPRO48)
ZZW(:) = MIN( PRSS(:), XFSCVMG*MAX( 0.0,( -ZZW(:) * &
( X0DEPS* PLBDAS(:)**XEX0DEPS + &
X1DEPS*PCJ(:)*PLBDAS(:)**XEX1DEPS ) ) / &
diff --git a/src/mesonh/micro/rain_ice_slow.f90 b/src/mesonh/micro/rain_ice_slow.f90
index 10120d3cd..4f590c70d 100644
--- a/src/mesonh/micro/rain_ice_slow.f90
+++ b/src/mesonh/micro/rain_ice_slow.f90
@@ -147,7 +147,7 @@ real, dimension(size(plsfact)) :: zz_diff
END WHERE
ZZW(:) = 0.0
WHERE ( (PRST(:)>XRTMIN(5)) .AND. (PRSS(:)>0.0) )
-#if defined(REPRO48) || defined(REPRO55)
+#if defined(REPRO48)
ZZW(:) = ( PSSI(:)/(PRHODREF(:)*PAI(:)) ) * &
#else
ZZW(:) = ( PRST(:) * PLBDAS(:)**XBS * PSSI(:)/PAI(:) ) * &
@@ -173,7 +173,7 @@ real, dimension(size(plsfact)) :: zz_diff
WHERE ( (PRIT(:)>XRTMIN(4)) .AND. (PRST(:)>XRTMIN(5)) .AND. (PRIS(:)>0.0) )
ZZW(:) = MIN( PRIS(:),XFIAGGS * EXP( XCOLEXIS*(PZT(:)-XTT) ) &
* PRIT(:) &
-#if defined(REPRO48) || defined(REPRO55)
+#if defined(REPRO48)
* PLBDAS(:)**XEXIAGGS &
* PRHODREF(:)**(-XCEXVT) )
#else
--
GitLab