From 06a43af312219e351d70a02df59ecba4dde35f80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Riette?= <sebastien.riette@meteo.fr>
Date: Tue, 13 Jun 2023 15:10:25 +0200
Subject: [PATCH] S. Riette 13 June 2023: change "ifdef REPRO48" into "ifndef
PHYEXMERGE"
---
src/arome/aux/mode_budget_phy.F90 | 4 ++--
src/arome/ext/aro_adjust.F90 | 4 ++--
src/common/micro/condensation.F90 | 4 ++--
src/common/micro/modd_param_icen.F90 | 6 ++---
src/common/micro/modd_param_lima.F90 | 2 +-
src/common/micro/mode_ice4_budgets.F90 | 16 +++++++-------
src/common/micro/mode_ice4_compute_pdf.F90 | 2 +-
src/common/micro/mode_ice4_fast_rg.F90 | 4 ++--
src/common/micro/mode_ice4_fast_rh.F90 | 4 ++--
src/common/micro/mode_ice4_fast_ri.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 | 4 ++--
src/common/micro/mode_ice4_slow.F90 | 6 ++---
src/common/micro/mode_ice4_tendencies.F90 | 3 ++-
src/common/micro/mode_ice4_warm.F90 | 6 ++---
src/common/micro/mode_ini_rain_ice.F90 | 22 +++++++++----------
.../micro/mode_rain_ice_old_icenumber2.F90 | 2 +-
src/common/micro/mode_rrcolss.F90 | 4 ++--
src/common/micro/mode_rscolrg.F90 | 4 ++--
src/common/micro/mode_rzcolx.F90 | 2 +-
src/common/turb/mode_bl89.F90 | 6 ++---
.../turb/mode_compute_mf_cloud_direct.F90 | 2 +-
src/common/turb/mode_compute_updraft.F90 | 4 ++--
src/common/turb/mode_prandtl.F90 | 16 +++++++-------
src/common/turb/mode_tke_eps_sources.F90 | 2 +-
src/common/turb/mode_turb_ver_thermo_corr.F90 | 2 +-
src/common/turb/mode_turb_ver_thermo_flux.F90 | 4 ++--
src/common/turb/shallow_mf.F90 | 2 +-
src/common/turb/turb.F90 | 10 ++++-----
31 files changed, 87 insertions(+), 86 deletions(-)
diff --git a/src/arome/aux/mode_budget_phy.F90 b/src/arome/aux/mode_budget_phy.F90
index cb081ae07..be1e09c03 100644
--- a/src/arome/aux/mode_budget_phy.F90
+++ b/src/arome/aux/mode_budget_phy.F90
@@ -44,14 +44,14 @@ SUBROUTINE BUDGET_STORE_ADD_PHY(D,TPBUDGET, HSOURCE, PVARS)
END SUBROUTINE BUDGET_STORE_ADD_PHY
!
SUBROUTINE BUDGET_STORE_ADD(TPBUDGET, HSOURCE, PVARS)
-#ifdef REPRO48
+#ifndef PHYEXMERGE
USE DDH_MIX, ONLY:NFLEVGDDH
USE MODDB_INTBUDGET, ONLY:TVARSM
#endif
TYPE(TBUDGETDATA), INTENT(INOUT) :: TPBUDGET ! Budget datastructure
CHARACTER(LEN=*), INTENT(IN) :: HSOURCE ! Name of the source term
REAL, DIMENSION(:,:,:), INTENT(IN) :: PVARS ! Current value to be stored
-#ifdef REPRO48
+#ifndef PHYEXMERGE
REAL, DIMENSION(SIZE(PVARS, 1), SIZE(PVARS, 2), SIZE(PVARS, 3)) :: ZVARS
INTEGER :: JLON, JLEV, IOFF
IF (SIZE(PVARS,3)==NFLEVGDDH+2) THEN
diff --git a/src/arome/ext/aro_adjust.F90 b/src/arome/ext/aro_adjust.F90
index 34ec5e5eb..ce72b61f6 100644
--- a/src/arome/ext/aro_adjust.F90
+++ b/src/arome/ext/aro_adjust.F90
@@ -298,7 +298,7 @@ SELECT CASE ( CMICRO )
DO JLON=KIDIA,KFDIA
LL(JLON) = (PRS(JLON,1,JLEV,1) <0.) .AND. (PRS(JLON,1,JLEV,2)> 0.)
IF (LL(JLON)) THEN
-#ifdef REPRO48
+#ifndef PHYEXMERGE
ZCOR(JLON)=PRS(JLON,1,JLEV,2)
#else
ZCOR(JLON)=MIN(-PRS(JLON,1,JLEV,1),PRS(JLON,1,JLEV,2))
@@ -309,7 +309,7 @@ SELECT CASE ( CMICRO )
IF (LL(JLON)) THEN
PRS(JLON,1,JLEV,1) = PRS(JLON,1,JLEV,1) + ZCOR(JLON)
PTHS(JLON,1,JLEV) = PTHS(JLON,1,JLEV) - ZCOR(JLON) * ZLV(JLON) / ZCPH(JLON) / PEXNREF(JLON,1,JLEV)
-#ifdef REPRO48
+#ifndef PHYEXMERGE
PRS(JLON,1,JLEV,2) = 0.
#else
PRS(JLON,1,JLEV,2) = PRS(JLON,1,JLEV,2) - ZCOR(JLON)
diff --git a/src/common/micro/condensation.F90 b/src/common/micro/condensation.F90
index 34015e1a1..940700bc1 100644
--- a/src/common/micro/condensation.F90
+++ b/src/common/micro/condensation.F90
@@ -267,7 +267,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)
+#ifndef PHYEXMERGE
#else
CST%XCL*PRR(JIJ,JK) + &
#endif
@@ -285,7 +285,7 @@ IF ( .NOT. OSIGMAS ) THEN
END DO
END DO
! Determine tropopause/inversion height from minimum temperature
-#ifdef REPRO48
+#ifndef PHYEXMERGE
ITPL(:) = IIJB+1
!I (Sébastien Riette) don't understand why tropopause level is set
!with the index of the second physical point on the horizontal (i.e. 2+JPHEXT)!!!
diff --git a/src/common/micro/modd_param_icen.F90 b/src/common/micro/modd_param_icen.F90
index ea2be341d..4b0ccb51e 100644
--- a/src/common/micro/modd_param_icen.F90
+++ b/src/common/micro/modd_param_icen.F90
@@ -363,10 +363,10 @@ IF(LLDEFAULTVAL) THEN
XFRMIN_NAM(26:38)=0.
XFRMIN_NAM(39)=0.25
XFRMIN_NAM(40)=0.15
-#ifdef REPRO48
- !In the original version, these array was filled in suparar. suparar is in a part of the model compiled without
+#ifndef PHYEXMERGE
+ !In the original version, this array was filled in suparar. suparar is in a part of the model compiled without
!defining implicit kind for reals whereas the current module is in phyex where the compilation options
- !set implicit kind for reals to 8 bytes.
+ !sets implicit kind for reals to 8 bytes.
!
!Only these 3 values must be set in simple precision to reproduce the old results. Why?
XFRMIN_NAM(13) =1.0E-15_4
diff --git a/src/common/micro/modd_param_lima.F90 b/src/common/micro/modd_param_lima.F90
index 04b5ff4ae..47c1387d5 100644
--- a/src/common/micro/modd_param_lima.F90
+++ b/src/common/micro/modd_param_lima.F90
@@ -695,7 +695,7 @@ IF(LLDEFAULTVAL) THEN
XMRSTEP = 0.005
XTSTEP_TS = 20.
-#ifdef REPRO48
+#ifndef PHYEXMERGE
LPTSPLIT=.FALSE.
XMRSTEP=0.
XTSTEP_TS=0.
diff --git a/src/common/micro/mode_ice4_budgets.F90 b/src/common/micro/mode_ice4_budgets.F90
index f4c90e05d..32591ee73 100644
--- a/src/common/micro/mode_ice4_budgets.F90
+++ b/src/common/micro/mode_ice4_budgets.F90
@@ -91,7 +91,7 @@ DO JK = IKTB, IKTE
ZW1(JIJ,JK)=ZW1(JIJ,JK)+PRVHENI(JIJ,JK)
ENDDO
ENDDO
-#ifdef REPRO48
+#ifndef PHYEXMERGE
IF (BUCONF%LBUDGET_TH) CALL BUDGET_STORE_ADD_PHY(D, TBUDGETS(NBUDGET_TH), 'HENU', ZW1(:, :)*ZZ_LSFACT(:, :)*PRHODJ(:, :))
IF (BUCONF%LBUDGET_RV) CALL BUDGET_STORE_ADD_PHY(D, TBUDGETS(NBUDGET_RV), 'HENU', -ZW1(:, :) *PRHODJ(:, :))
IF (BUCONF%LBUDGET_RI) CALL BUDGET_STORE_ADD_PHY(D, TBUDGETS(NBUDGET_RI), 'HENU', ZW1(:, :) *PRHODJ(:, :))
@@ -331,23 +331,23 @@ IF(KRR==7) THEN
IF (BUCONF%LBUDGET_RR) CALL BUDGET_STORE_ADD_PHY(D, TBUDGETS(NBUDGET_RR), 'WETH', -ZW2(:, :) *PRHODJ(:, :))
IF (BUCONF%LBUDGET_RI) CALL BUDGET_STORE_ADD_PHY(D, TBUDGETS(NBUDGET_RI), 'WETH', -ZW3(:, :) *PRHODJ(:, :))
IF (BUCONF%LBUDGET_RS) CALL BUDGET_STORE_ADD_PHY(D, TBUDGETS(NBUDGET_RS), 'WETH', -ZW4(:, :) *PRHODJ(:, :))
-#ifdef REPRO48
+#ifndef PHYEXMERGE
#else
IF (BUCONF%LBUDGET_RG) CALL BUDGET_STORE_ADD_PHY(D, TBUDGETS(NBUDGET_RG), 'WETH', -ZW5(:, :) *PRHODJ(:, :))
#endif
IF (BUCONF%LBUDGET_RH) CALL BUDGET_STORE_ADD_PHY(D, TBUDGETS(NBUDGET_RH), 'WETH', (ZW1(:, :)+ZW2(:, :)+ZW3(:, :)+ &
&ZW4(:, :)+ZW5(:, : )) *PRHODJ(:, :))
-#if defined(REPRO48)
+#ifndef PHYEXMERGE
ZW1(:,:) = 0.
DO JL=1, KSIZE
ZW1(K1(JL), K2(JL)) = PBU_PACK(JL, IRGWETH) * ZINV_TSTEP
END DO
#endif
-#ifdef REPRO48
+#ifndef PHYEXMERGE
IF (BUCONF%LBUDGET_RG) CALL BUDGET_STORE_ADD_PHY(D, TBUDGETS(NBUDGET_RG), 'HGCV', (-ZW5(:, :)-ZW1(:, :))*PRHODJ(:, :))
#endif
-#if defined(REPRO48)
+#ifndef PHYEXMERGE
IF (BUCONF%LBUDGET_RH) CALL BUDGET_STORE_ADD_PHY(D, TBUDGETS(NBUDGET_RH), 'HGCV', ZW1(:, :)*PRHODJ(:, :))
#endif
@@ -372,7 +372,7 @@ IF(KRR==7) THEN
ZW5(K1(JL), K2(JL)) = PBU_PACK(JL, IRGDRYH) * ZINV_TSTEP
END DO
ZW6(:,:) = 0.
-#if defined(REPRO48)
+#ifndef PHYEXMERGE
!ZW6 must be removed when REPRO* will be suppressed
DO JL=1, KSIZE
ZW6(K1(JL), K2(JL)) = PBU_PACK(JL, IRDRYHG) * ZINV_TSTEP
@@ -389,9 +389,9 @@ IF(KRR==7) THEN
&ZW4(:, :)+ZW5(:, :)-ZW6(:, :)) &
& *PRHODJ(:, :))
-#if defined(REPRO48)
+#ifndef PHYEXMERGE
#else
- !When REPRO48 will be suppressed, ZW6 must be removed
+ !When PHYEXMERGE will be suppressed, ZW6 must be removed
ZW1(:,:) = 0.
DO JL=1, KSIZE
ZW1(K1(JL), K2(JL)) = PBU_PACK(JL, IRDRYHG) * ZINV_TSTEP
diff --git a/src/common/micro/mode_ice4_compute_pdf.F90 b/src/common/micro/mode_ice4_compute_pdf.F90
index b207f55ae..2c209fb4b 100644
--- a/src/common/micro/mode_ice4_compute_pdf.F90
+++ b/src/common/micro/mode_ice4_compute_pdf.F90
@@ -318,7 +318,7 @@ ELSE
ENDIF
!
!$mnh_expand_where(JI=1:KSIZE)
-#ifdef REPRO48
+#ifndef PHYEXMERGE
PRF(:)=PHLC_HCF(:)
#else
PRF(:)=MAX(PHLC_HCF(:),PHLI_HCF(:))
diff --git a/src/common/micro/mode_ice4_fast_rg.F90 b/src/common/micro/mode_ice4_fast_rg.F90
index a66e47085..dee5a3de6 100644
--- a/src/common/micro/mode_ice4_fast_rg.F90
+++ b/src/common/micro/mode_ice4_fast_rg.F90
@@ -190,7 +190,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)
+#ifndef PHYEXMERGE
*(PLBDAS(1:KSIZE)**(ICED%XCXS-ICED%XBS))*( PLBDAG(1:KSIZE)**ICED%XCXG ) &
*(PRHODREF(1:KSIZE)**(-ICED%XCEXVT-1.)) &
#else
@@ -277,7 +277,7 @@ DO JL=1, KSIZE
LDWETG(JL) = LDWETG(JL) .AND. PT(JL)<CST%XTT
ENDIF
-#ifdef REPRO48
+#ifndef PHYEXMERGE
LLDRYG(JL)=PT(JL)<CST%XTT .AND. ZRDRYG_INIT(JL)>0. .AND. &
#else
LLDRYG(JL)=PT(JL)<CST%XTT .AND. ZRDRYG_INIT(JL)>1.E-20 .AND. &
diff --git a/src/common/micro/mode_ice4_fast_rh.F90 b/src/common/micro/mode_ice4_fast_rh.F90
index 0c0e8c5e3..8c87731bf 100644
--- a/src/common/micro/mode_ice4_fast_rh.F90
+++ b/src/common/micro/mode_ice4_fast_rh.F90
@@ -151,7 +151,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)
+#ifndef PHYEXMERGE
*( PLBDAS(1:KSIZE)**(ICED%XCXS-ICED%XBS) )*( PLBDAH(1:KSIZE)**ICED%XCXH ) &
*( PRHODREF(1:KSIZE)**(-ICED%XCEXVT-1.) ) &
#else
@@ -277,7 +277,7 @@ DO JL=1, KSIZE
ENDIF
!Dry case
-#ifdef REPRO48
+#ifndef PHYEXMERGE
LLDRYH(JL)=PT(JL)<CST%XTT .AND. ZRDRYH_INIT(JL)>0. .AND. &
#else
LLDRYH(JL)=PT(JL)<CST%XTT .AND. ZRDRYH_INIT(JL)>1.E-20 .AND. &
diff --git a/src/common/micro/mode_ice4_fast_ri.F90 b/src/common/micro/mode_ice4_fast_ri.F90
index 74bb50a08..ba848f99f 100644
--- a/src/common/micro/mode_ice4_fast_ri.F90
+++ b/src/common/micro/mode_ice4_fast_ri.F90
@@ -68,7 +68,7 @@ IF (LHOOK) CALL DR_HOOK('ICE4_FAST_RI',0,ZHOOK_HANDLE)
!
DO JL=1, KSIZE
IF(PSSI(JL)>0. .AND. PRCT(JL)>ICED%XRTMIN(2) .AND. PRIT(JL)>ICED%XRTMIN(4) &
-#ifdef REPRO48
+#ifndef PHYEXMERGE
.AND. PCIT(JL)>0. .AND. LDCOMPUTE(JL)) THEN
#else
.AND. PCIT(JL)>1.E-20 .AND. LDCOMPUTE(JL)) THEN
diff --git a/src/common/micro/mode_ice4_fast_rs.F90 b/src/common/micro/mode_ice4_fast_rs.F90
index df7b233d0..7ec837e50 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)
+#ifndef PHYEXMERGE
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)
+#ifndef PHYEXMERGE
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)
+#ifndef PHYEXMERGE
* 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)
+#ifndef PHYEXMERGE
* 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)
+#ifndef PHYEXMERGE
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)
+#ifndef PHYEXMERGE
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)
+#ifndef PHYEXMERGE
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)
+#ifndef PHYEXMERGE
( 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)
+#ifndef PHYEXMERGE
(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 487c97198..a01f147e9 100644
--- a/src/common/micro/mode_ice4_rsrimcg_old.F90
+++ b/src/common/micro/mode_ice4_rsrimcg_old.F90
@@ -86,7 +86,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)
+#ifndef PHYEXMERGE
* (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 531663747..3ae403c8d 100644
--- a/src/common/micro/mode_ice4_sedimentation_split.F90
+++ b/src/common/micro/mode_ice4_sedimentation_split.F90
@@ -386,7 +386,7 @@ DO WHILE (ANY(ZREMAINT>0.))
ENDIF
ENDDO
ENDDO
-#if defined(REPRO48)
+#ifndef PHYEXMERGE
#else
ELSEIF(KSPE==5) THEN
! ******* for snow
@@ -417,7 +417,7 @@ DO WHILE (ANY(ZREMAINT>0.))
CASE(3)
ZFSED=ICEP%XFSEDR
ZEXSED=ICEP%XEXSEDR
-#if defined(REPRO48)
+#ifndef PHYEXMERGE
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 009d712e5..4dec2a241 100644
--- a/src/common/micro/mode_ice4_sedimentation_stat.F90
+++ b/src/common/micro/mode_ice4_sedimentation_stat.F90
@@ -98,7 +98,7 @@ REAL :: FWSED1, FWSED2, PWSEDW, PWSEDWSUP, PINVTSTEP, PTSTEP1, PDZZ1, PRHODREF1,
REAL(KIND=JPHOOK) :: ZHOOK_HANDLE
!
-#if defined(REPRO48)
+#ifndef PHYEXMERGE
! 5 multiplications + 1 division => cost = 7X
FWSED1(PWSEDW,PTSTEP1,PDZZ1,PRHODREF1,PRXT1,PINVTSTEP)=MIN(1.,PWSEDW*PTSTEP1/PDZZ1 )*PRHODREF1*PDZZ1*PRXT1*PINVTSTEP
#else
@@ -179,7 +179,7 @@ DO JK = IKE , IKB, -1*IKL
ELSEIF (JRR==5) THEN
!* 2.4 for aggregates/snow
-#ifdef REPRO48
+#ifndef PHYEXMERGE
CALL OTHER_SPECIES(ICEP%XFSEDS,ICEP%XEXSEDS,PRST(:,JK))
#else
CALL SNOW(PRST(:,JK))
diff --git a/src/common/micro/mode_ice4_slow.F90 b/src/common/micro/mode_ice4_slow.F90
index b867f8692..9f455df66 100644
--- a/src/common/micro/mode_ice4_slow.F90
+++ b/src/common/micro/mode_ice4_slow.F90
@@ -111,7 +111,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)
+#ifndef PHYEXMERGE
PRVDEPS(JL) = ( PSSI(JL)/(PRHODREF(JL)*PAI(JL)) ) * &
( ICEP%X0DEPS*PLBDAS(JL)**ICEP%XEX0DEPS + ICEP%X1DEPS*PCJ(JL)*PLBDAS(JL)**ICEP%XEX1DEPS )
#else
@@ -133,7 +133,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)
+#ifndef PHYEXMERGE
* PLBDAS(JL)**ICEP%XEXIAGGS &
* PRHODREF(JL)**(-ICED%XCEXVT)
#else
@@ -151,7 +151,7 @@ ENDDO
!* 3.4.5 compute the autoconversion of r_i for r_s production: RIAUTS
!
DO JL=1, KSIZE
-#ifdef REPRO48
+#ifndef PHYEXMERGE
!This was wrong because, with this formulation and in the LDSOFT case, PRIAUTS
!was not set to 0 when ri is inferior to the autoconversion threshold
IF(PRIT(JL)>ICED%XRTMIN(4) .AND. LDCOMPUTE(JL)) THEN
diff --git a/src/common/micro/mode_ice4_tendencies.F90 b/src/common/micro/mode_ice4_tendencies.F90
index 9a1c22328..00e378cbd 100644
--- a/src/common/micro/mode_ice4_tendencies.F90
+++ b/src/common/micro/mode_ice4_tendencies.F90
@@ -260,7 +260,8 @@ IF (LLRFR) THEN
DO JL=1,KSIZE
PRAINFR(K1(JL), K2(JL)) = ZRAINFR(JL)
ZRRT3D (K1(JL), K2(JL)) = ZVART(JL,IRR)
-#ifndef REPRO48
+#ifndef PHYEXMERGE
+#else
ZRST3D (K1(JL), K2(JL)) = ZVART(JL,IRS)
ZRGT3D (K1(JL), K2(JL)) = ZVART(JL,IRG)
#endif
diff --git a/src/common/micro/mode_ice4_warm.F90 b/src/common/micro/mode_ice4_warm.F90
index 875ba62b2..00cf7bee8 100644
--- a/src/common/micro/mode_ice4_warm.F90
+++ b/src/common/micro/mode_ice4_warm.F90
@@ -93,7 +93,7 @@ IF (LHOOK) CALL DR_HOOK('ICE4_WARM', 0, ZHOOK_HANDLE)
DO JL=1, KSIZE
IF(PHLC_HRC(JL)>ICED%XRTMIN(2) .AND. PHLC_HCF(JL)>0. .AND. LDCOMPUTE(JL)) THEN
IF(.NOT. LDSOFT) THEN
-#if defined(REPRO48)
+#ifndef PHYEXMERGE
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
@@ -134,7 +134,7 @@ ELSEIF (HSUBG_RC_RR_ACCR=='PRFR') THEN
DO JL=1, KSIZE
LMASK = PRCT(JL)>ICED%XRTMIN(2) .AND. PRRT(JL)>ICED%XRTMIN(3) .AND. LDCOMPUTE(JL)
LMASK1 = LMASK .AND. PHLC_HRC(JL)>ICED%XRTMIN(2) .AND. PHLC_HCF(JL)>0.
-#ifdef REPRO48
+#ifndef PHYEXMERGE
LMASK2 = LMASK .AND. PHLC_LRC(JL)>ICED%XRTMIN(2) .AND. PHLC_LCF(JL)>0.
#else
LMASK2 = LMASK .AND. PHLC_LRC(JL)>ICED%XRTMIN(2) .AND. PHLC_LCF(JL)>1.E-20
@@ -143,7 +143,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)
+#ifndef PHYEXMERGE
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_ini_rain_ice.F90 b/src/common/micro/mode_ini_rain_ice.F90
index fd144da49..5a347c4f9 100644
--- a/src/common/micro/mode_ini_rain_ice.F90
+++ b/src/common/micro/mode_ini_rain_ice.F90
@@ -420,7 +420,7 @@ XLBR = ( XAR*XCCR*MOMG(XALPHAR,XNUR,XBR) )**(-XLBEXR)
XLBEXI = 1.0/(-XBI)
XLBI = ( XAI*MOMG(XALPHAI,XNUI,XBI) )**(-XLBEXI)
!
-#if defined(REPRO48)
+#ifndef PHYEXMERGE
#else
XNS = 1.0/(XAS*MOMG(XALPHAS,XNUS,XBS))
#endif
@@ -441,7 +441,7 @@ XLBDAG_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)
+#ifndef PHYEXMERGE
#else
IF (LSNOW_T) XLBDAS_MAX = 1.E6
XLBDAS_MIN = 1.E-10
@@ -497,7 +497,7 @@ XEXCSEDI =-0.9324*3.0
WRITE (KLUOUT,FMT=*)' PRISTINE ICE SEDIMENTATION for columns XFSEDI =',XFSEDI
!
!
-#if defined(REPRO48)
+#ifndef PHYEXMERGE
XEXSEDS = (XBS+XDS-XCXS)/(XBS-XCXS)
XFSEDS = XCS*XAS*XCCS*MOMG(XALPHAS,XNUS,XBS+XDS)* &
(XAS*XCCS*MOMG(XALPHAS,XNUS,XBS))**(-XEXSEDS)*(ZRHO00)**XCEXVT
@@ -584,7 +584,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)
+#ifndef PHYEXMERGE
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
@@ -651,7 +651,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)
+#ifndef PHYEXMERGE
XFIAGGS = (XPI/4.0)*XCOLIS*XCCS*XCS*(ZRHO00**XCEXVT)*MOMG(XALPHAS,XNUS,XDS+2.0)
XEXIAGGS = XCXS-XDS-2.0
#else
@@ -708,7 +708,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)
+#ifndef PHYEXMERGE
XEXCRIMSS= XCXS-XDS-2.0
XCRIMSS = (XPI/4.0)*XCOLCS*XCCS*XCS*(ZRHO00**XCEXVT)*MOMG(XALPHAS,XNUS,XDS+2.0)
#else
@@ -717,7 +717,7 @@ XCRIMSS = XNS * (XPI/4.0)*XCOLCS*XCS*(ZRHO00**XCEXVT)*MOMG(XALPHAS,XNUS,XDS+2.0
#endif
XEXCRIMSG= XEXCRIMSS
XCRIMSG = XCRIMSS
-#if defined(REPRO48)
+#ifndef PHYEXMERGE
XSRIMCG = XCCS*XAS*MOMG(XALPHAS,XNUS,XBS)
XEXSRIMCG= XCXS-XBS
XSRIMCG2 = XCCS*XAG*MOMG(XALPHAS,XNUS,XBG)
@@ -759,7 +759,7 @@ RAIN_ICE_PARAMN%XRIMINTP2 = 1.0 + RAIN_ICE_PARAMN%XRIMINTP1*LOG( XDCSLIM/(RAIN_I
!
!* 7.2 Constants for the accretion of raindrops onto aggregates
!
-#if defined(REPRO48)
+#ifndef PHYEXMERGE
XFRACCSS = ((XPI**2)/24.0)*XCCS*XCCR*XRHOLW*(ZRHO00**XCEXVT)
#else
XFRACCSS = XNS*((XPI**2)/24.0)*XCCR*XRHOLW*(ZRHO00**XCEXVT)
@@ -769,7 +769,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)
+#ifndef PHYEXMERGE
XFSACCRG = (XPI/4.0)*XAS*XCCS*XCCR*(ZRHO00**XCEXVT)
#else
XFSACCRG = XNS*(XPI/4.0)*XAS*XCCR*(ZRHO00**XCEXVT)
@@ -969,7 +969,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)
+#ifndef PHYEXMERGE
XFSDRYG = (XPI/4.0)*XCOLSG*XCCG*XCCS*XAS*(ZRHO00**XCEXVT)
#else
XFSDRYG = XNS*(XPI/4.0)*XCOLSG*XCCG*XAS*(ZRHO00**XCEXVT)
@@ -1176,7 +1176,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)
+#ifndef PHYEXMERGE
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_rain_ice_old_icenumber2.F90 b/src/common/micro/mode_rain_ice_old_icenumber2.F90
index a3ec0c187..dc9827567 100644
--- a/src/common/micro/mode_rain_ice_old_icenumber2.F90
+++ b/src/common/micro/mode_rain_ice_old_icenumber2.F90
@@ -12,7 +12,7 @@ MODULE MODE_RAIN_ICE_OLD_ICENUMBER2
REAL, INTENT(IN) :: T3D
REAL, PARAMETER:: ICE_DENSITY = 890.0
-#ifdef REPRO48
+#ifndef PHYEXMERGE
REAL, PARAMETER:: PI = 3.1415926536
#else
REAL, PARAMETER:: PI = 4.0*ATAN(1.)
diff --git a/src/common/micro/mode_rrcolss.F90 b/src/common/micro/mode_rrcolss.F90
index d24582132..d5dd969de 100644
--- a/src/common/micro/mode_rrcolss.F90
+++ b/src/common/micro/mode_rrcolss.F90
@@ -243,7 +243,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)
+#ifndef PHYEXMERGE
* PESR * ABS(PFALLS*ZDS**PEXFALLS-PFALLR*ZDR**PEXFALLR) &
#else
* PESR * ABS(PFALLS*ZDS**PEXFALLS * EXP(-(PFALLEXPS*ZDS)**PALPHAS)-PFALLR*ZDR**PEXFALLR) &
@@ -251,7 +251,7 @@ DO JLBDAS = 1,SIZE(PRRCOLSS(:,:),1)
* GENERAL_GAMMA(PALPHAR,PNUR,ZLBDAR,ZDR)
END DO
ZCOLLDRMAX = (ZDS+ZDRMAX)**2 * ZDRMAX**PEXMASSR &
-#if defined(REPRO48)
+#ifndef PHYEXMERGE
* 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 8b4dad8b2..6e28350c2 100644
--- a/src/common/micro/mode_rscolrg.F90
+++ b/src/common/micro/mode_rscolrg.F90
@@ -237,7 +237,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)
+#ifndef PHYEXMERGE
* PESR * ABS(PFALLS*ZDS**PEXFALLS-PFALLR*ZDR**PEXFALLR)
#else
* PESR * ABS(PFALLS*ZDS**PEXFALLS*EXP(-(ZDS*PFALLEXPS)**PALPHAS)-PFALLR*ZDR**PEXFALLR)
@@ -246,7 +246,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)
+#ifndef PHYEXMERGE
* 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 2b910d5fc..e5859e163 100644
--- a/src/common/micro/mode_rzcolx.F90
+++ b/src/common/micro/mode_rzcolx.F90
@@ -214,7 +214,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)
+#ifndef PHYEXMERGE
ZCOLLZ = ZCOLLZ + ZFUNC &
* PEXZ * ABS(PFALLX*ZDX**PEXFALLX-PFALLZ*ZDZ**PEXFALLZ)
#else
diff --git a/src/common/turb/mode_bl89.F90 b/src/common/turb/mode_bl89.F90
index 80e0dc0db..4df1099ee 100644
--- a/src/common/turb/mode_bl89.F90
+++ b/src/common/turb/mode_bl89.F90
@@ -248,7 +248,7 @@ DO JK=IKTB,IKTE
+ sqrt(abs( (CSTURB%XRM17*PSHEAR(JIJ,JKK)*ZSQRT_TKE(JIJ,JK) &
+ ( -ZG_O_THVREF(JIJ,JK) * (ZVPT(JIJ,JKK) - ZVPT(JIJ,JK)) ))**2.0 + &
2. * ZINTE(JIJ) * &
-#ifdef REPRO48
+#ifndef PHYEXMERGE
ZG_O_THVREF(JIJ,JK) * ZDELTVPT(JIJ,JKK)/ PDZZ(JIJ,JKK)))) / &
#else
(ZG_O_THVREF(JIJ,JK) * ZDELTVPT(JIJ,JKK)/ PDZZ(JIJ,JKK))))) / &
@@ -297,7 +297,7 @@ DO JK=IKTB,IKTE
(CSTURB%XRM17*PSHEAR(JIJ,JKK)*ZSQRT_TKE(JIJ,JK) &
+ ( ZG_O_THVREF(JIJ,JK) * (ZVPT(JIJ,JKK-IKL) - ZVPT(JIJ,JK))) )**2 &
+ 2. * ZINTE(JIJ) * &
-#ifdef REPRO48
+#ifndef PHYEXMERGE
ZG_O_THVREF(JIJ,JK)* ZDELTVPT(JIJ,JKK)/PDZZ(JIJ,JKK)))) / &
#else
(ZG_O_THVREF(JIJ,JK)* ZDELTVPT(JIJ,JKK)/PDZZ(JIJ,JKK))))) / &
@@ -317,7 +317,7 @@ DO JK=IKTB,IKTE
ZLWORK1=MAX(PLMDN(JIJ,JK),1.E-10_MNHREAL)
ZLWORK2=MAX(ZLWORK(JIJ),1.E-10_MNHREAL)
ZPOTE = ZLWORK1 / ZLWORK2
-#ifdef REPRO48
+#ifndef PHYEXMERGE
ZLWORK2=1.d0 + ZPOTE**(2./3.)
PLM(JIJ,JK) = Z2SQRT2*ZLWORK1/(ZLWORK2*SQRT(ZLWORK2))
#else
diff --git a/src/common/turb/mode_compute_mf_cloud_direct.F90 b/src/common/turb/mode_compute_mf_cloud_direct.F90
index 558b0e644..b0733f2f5 100644
--- a/src/common/turb/mode_compute_mf_cloud_direct.F90
+++ b/src/common/turb/mode_compute_mf_cloud_direct.F90
@@ -94,7 +94,7 @@ PRI_MF(:,:)=0.
PCF_MF(:,:)=0.
DO JI=IIJB,IIJE
-#ifdef REPRO48
+#ifndef PHYEXMERGE
JK0=KKLCL(JI)-IKL ! first mass level with cloud
JK0=MAX(JK0, MIN(IKB,IKE)) !protection if KKL=1
JK0=MIN(JK0, MAX(IKB,IKE)) !protection if KKL=-1
diff --git a/src/common/turb/mode_compute_updraft.F90 b/src/common/turb/mode_compute_updraft.F90
index 0f9ca09e4..b3e5ec533 100644
--- a/src/common/turb/mode_compute_updraft.F90
+++ b/src/common/turb/mode_compute_updraft.F90
@@ -390,7 +390,7 @@ IF (OENTR_DETR) THEN
ZSHEAR = 0. !no shear in bl89 mixing length
END IF
!
-#ifdef REPRO48
+#ifndef PHYEXMERGE
CALL COMPUTE_BL89_ML(D, CST, CSTURB, PDZZ,ZTKEM_F(:,IKB),&
&ZG_O_THVREF(:,IKB),ZTHVM,IKB,GLMIX,.TRUE.,ZSHEAR,ZLUP)
#else
@@ -518,7 +518,7 @@ DO JK=IKB,IKE-IKL,IKL
ZMIX2(JIJ) = (PZZ(JIJ,JK+IKL)-PZZ(JIJ,JK))*PENTR(JIJ,JK) !&
ZMIX3_CLD(JIJ) = (PZZ(JIJ,JK+IKL)-PZZ(JIJ,JK))*(1.-ZPART_DRY(JIJ))*ZDETR_CLD(JIJ,JK) !&
ZMIX2_CLD(JIJ) = (PZZ(JIJ,JK+IKL)-PZZ(JIJ,JK))*(1.-ZPART_DRY(JIJ))*ZENTR_CLD(JIJ,JK)
-#ifdef REPRO48
+#ifndef PHYEXMERGE
PTHL_UP(JIJ,JK+IKL)=(PTHL_UP(JIJ,JK)*(1.-0.5*ZMIX2(JIJ)) + PTHLM(JIJ,JK)*ZMIX2(JIJ)) &
/(1.+0.5*ZMIX2(JIJ))
PRT_UP(JIJ,JK+IKL) =(PRT_UP (JIJ,JK)*(1.-0.5*ZMIX2(JIJ)) + PRTM(JIJ,JK)*ZMIX2(JIJ)) &
diff --git a/src/common/turb/mode_prandtl.F90 b/src/common/turb/mode_prandtl.F90
index ca06510b2..858d6065c 100644
--- a/src/common/turb/mode_prandtl.F90
+++ b/src/common/turb/mode_prandtl.F90
@@ -918,7 +918,7 @@ IF (HTURBDIM=='3DIM') THEN
!* 3DIM case
IF (OUSERV) THEN
!$mnh_expand_where(JIJ=IIJB:IIJE,JK=1:IKT)
-#ifdef REPRO48
+#ifndef PHYEXMERGE
WHERE (PPHI3(IIJB:IIJE,1:IKT)/=CSTURB%XPHI_LIM)
#else
WHERE (PPHI3(IIJB:IIJE,1:IKT)<=CSTURB%XPHI_LIM)
@@ -942,7 +942,7 @@ IF (HTURBDIM=='3DIM') THEN
!
ELSE
!$mnh_expand_where(JIJ=IIJB:IIJE,JK=1:IKT)
-#ifdef REPRO48
+#ifndef PHYEXMERGE
WHERE (PPHI3(IIJB:IIJE,1:IKT)/=CSTURB%XPHI_LIM)
#else
WHERE (PPHI3(IIJB:IIJE,1:IKT)<=CSTURB%XPHI_LIM)
@@ -974,7 +974,7 @@ DO JK=1,IKT
ENDDO
END IF
!
-#ifdef REPRO48
+#ifndef PHYEXMERGE
#else
!* smoothing
CALL SMOOTH_TURB_FUNCT(D,CSTURB,TURBN,PPHI3,PPHI3,PD_PHI3DTDZ_O_DDTDZ)
@@ -1013,7 +1013,7 @@ IF (HTURBDIM=='3DIM') THEN
!* 3DIM case
IF (OUSERV) THEN
!$mnh_expand_where(JIJ=IIJB:IIJE,JK=1:IKT)
-#ifdef REPRO48
+#ifndef PHYEXMERGE
WHERE (PPHI3(IIJB:IIJE,1:IKT)/=CSTURB%XPHI_LIM)
#else
WHERE (PPHI3(IIJB:IIJE,1:IKT)<=CSTURB%XPHI_LIM)
@@ -1039,7 +1039,7 @@ IF (HTURBDIM=='3DIM') THEN
ELSE
!* 1DIM case
!$mnh_expand_where(JIJ=IIJB:IIJE,JK=1:IKT)
-#ifdef REPRO48
+#ifndef PHYEXMERGE
WHERE (PPHI3(IIJB:IIJE,1:IKT)/=CSTURB%XPHI_LIM)
#else
WHERE (PPHI3(IIJB:IIJE,1:IKT)<=CSTURB%XPHI_LIM)
@@ -1052,7 +1052,7 @@ ELSE
!$mnh_end_expand_where(JIJ=IIJB:IIJE,JK=1:IKT)
END IF
!
-#ifdef REPRO48
+#ifndef PHYEXMERGE
#else
!* smoothing
CALL SMOOTH_TURB_FUNCT(D,CSTURB,TURBN,PPHI3,PPHI3,PD_PHI3DRDZ_O_DDRDZ)
@@ -1099,7 +1099,7 @@ IF (HTURBDIM=='3DIM') THEN
ELSE
!* 1DIM case
!$mnh_expand_where(JIJ=IIJB:IIJE,JK=1:IKT)
-#ifdef REPRO48
+#ifndef PHYEXMERGE
WHERE (PPHI3(IIJB:IIJE,1:IKT)/=CSTURB%XPHI_LIM)
#else
WHERE (PPHI3(IIJB:IIJE,1:IKT)<=CSTURB%XPHI_LIM)
@@ -1112,7 +1112,7 @@ ELSE
!$mnh_end_expand_where(JIJ=IIJB:IIJE,JK=1:IKT)
END IF
!
-#ifdef REPRO48
+#ifndef PHYEXMERGE
#else
!* smoothing
CALL SMOOTH_TURB_FUNCT(D,CSTURB,TURBN,PPHI3,PPHI3*2.*PDTDZ,PD_PHI3DTDZ2_O_DDTDZ)
diff --git a/src/common/turb/mode_tke_eps_sources.F90 b/src/common/turb/mode_tke_eps_sources.F90
index 39127dead..09f56e0cb 100644
--- a/src/common/turb/mode_tke_eps_sources.F90
+++ b/src/common/turb/mode_tke_eps_sources.F90
@@ -406,7 +406,7 @@ END IF
!Should be in IF LBUDGET_TKE only. Was removed out for a correct comput. of PTDIFF in case of LBUDGET_TKE=F in AROME
!$mnh_expand_array(JIJ=IIJB:IIJE,JK=1:IKT)
-#ifdef REPRO48
+#ifndef PHYEXMERGE
IF (BUCONF%LBUDGET_TKE) THEN
PRTKES(IIJB:IIJE,1:IKT) = PRTKES(IIJB:IIJE,1:IKT) + PDP(IIJB:IIJE,1:IKT) * PRHODJ(IIJB:IIJE,1:IKT)
PRTKES(IIJB:IIJE,1:IKT) = PRTKES(IIJB:IIJE,1:IKT) + PTP(IIJB:IIJE,1:IKT) * PRHODJ(IIJB:IIJE,1:IKT)
diff --git a/src/common/turb/mode_turb_ver_thermo_corr.F90 b/src/common/turb/mode_turb_ver_thermo_corr.F90
index 6a54ba96e..2b3151499 100644
--- a/src/common/turb/mode_turb_ver_thermo_corr.F90
+++ b/src/common/turb/mode_turb_ver_thermo_corr.F90
@@ -1253,7 +1253,7 @@ ENDIF
PSIGS(IIJB:IIJE,IKU) = PSIGS(IIJB:IIJE,IKE)
!$mnh_end_expand_array(JIJ=IIJB:IIJE)
!$mnh_expand_array(JIJ=IIJB:IIJE,JK=1:IKT)
-#ifdef REPRO48
+#ifndef PHYEXMERGE
PSIGS(IIJB:IIJE,1:IKT) = MAX (PSIGS(IIJB:IIJE,1:IKT) , 0.)
PSIGS(IIJB:IIJE,1:IKT) = SQRT(PSIGS(IIJB:IIJE,1:IKT))
#else
diff --git a/src/common/turb/mode_turb_ver_thermo_flux.F90 b/src/common/turb/mode_turb_ver_thermo_flux.F90
index 55b516053..8d30e78b7 100644
--- a/src/common/turb/mode_turb_ver_thermo_flux.F90
+++ b/src/common/turb/mode_turb_ver_thermo_flux.F90
@@ -584,7 +584,7 @@ ELSE ! atmosp bottom
END IF
!
! atmos top
-#ifdef REPRO48
+#ifndef PHYEXMERGE
#else
ZF(IIJB:IIJE,IKE+1)=0.
#endif
@@ -988,7 +988,7 @@ IF (KRR /= 0) THEN
!$mnh_end_expand_array(JIJ=IIJB:IIJE)
END IF
! atmos top
-#ifdef REPRO48
+#ifndef PHYEXMERGE
#else
ZF(IIJB:IIJE,IKE+1)=0.
#endif
diff --git a/src/common/turb/shallow_mf.F90 b/src/common/turb/shallow_mf.F90
index c21ef7f1b..6d855e515 100644
--- a/src/common/turb/shallow_mf.F90
+++ b/src/common/turb/shallow_mf.F90
@@ -333,7 +333,7 @@ IF( PARAMMF%CMF_UPDRAFT == 'DUAL') THEN
! PDVDT_MF=0.
ENDIF
!
-#ifdef REPRO48
+#ifndef PHYEXMERGE
#else
IF(PRESENT(BUCONF)) THEN
IF( BUCONF%LBUDGET_U ) THEN
diff --git a/src/common/turb/turb.F90 b/src/common/turb/turb.F90
index 2e2e9b31b..c1aa95bc7 100644
--- a/src/common/turb/turb.F90
+++ b/src/common/turb/turb.F90
@@ -903,7 +903,7 @@ END IF
!
!$mnh_expand_array(JIJ=IIJB:IIJE)
ZCDUEFF(IIJB:IIJE) =-SQRT ( (PSFU(IIJB:IIJE)**2 + PSFV(IIJB:IIJE)**2) / &
-#ifdef REPRO48
+#ifndef PHYEXMERGE
(1.E-60 + ZUSLOPE(IIJB:IIJE)**2 + ZVSLOPE(IIJB:IIJE)**2 ) )
#else
(CST%XMNH_TINY + ZUSLOPE(IIJB:IIJE)**2 + ZVSLOPE(IIJB:IIJE)**2 ) )
@@ -1066,7 +1066,7 @@ END IF
!
!Les budgets des termes horizontaux de la turb sont présents dans AROME
! alors que ces termes ne sont pas calculés
-#ifdef REPRO48
+#ifndef PHYEXMERGE
#else
IF( TURBN%CTURBDIM == '3DIM' ) THEN
#endif
@@ -1103,8 +1103,8 @@ IF( TURBN%CTURBDIM == '3DIM' ) THEN
CALL BUDGET_STORE_INIT_PHY(D, TBUDGETS(NBUDGET_SV1 - 1 + JSV), 'HTURB', PRSVS(:,:, JSV) )
END DO
END IF
-!à supprimer une fois le précédent ifdef REPRO48 validé
-#ifdef REPRO48
+!à supprimer une fois le précédent ifndef PHYEXMERGE validé
+#ifndef PHYEXMERGE
#else
CALL TURB_HOR_SPLT(D,CST,CSTURB, TURBN, NEBN, TLES, &
KSPLIT, KRR, KRRL, KRRI, KSV,KSV_LGBEG,KSV_LGEND, &
@@ -1165,7 +1165,7 @@ IF( TURBN%CTURBDIM == '3DIM' ) THEN
CALL BUDGET_STORE_END_PHY(D, TBUDGETS(NBUDGET_SV1 - 1 + JSV), 'HTURB', PRSVS(:,:, JSV) )
END DO
END IF
-#ifdef REPRO48
+#ifndef PHYEXMERGE
#else
END IF
#endif
--
GitLab