diff --git a/src/arome/aux/mode_budget_phy.F90 b/src/arome/aux/mode_budget_phy.F90
index cb081ae07d3b3a281252c107079290a03a2c3741..4bd4706fcd9c127a3f427866676a03f02c0c4519 100644
--- a/src/arome/aux/mode_budget_phy.F90
+++ b/src/arome/aux/mode_budget_phy.F90
@@ -44,36 +44,11 @@ SUBROUTINE BUDGET_STORE_ADD_PHY(D,TPBUDGET, HSOURCE, PVARS)
END SUBROUTINE BUDGET_STORE_ADD_PHY
!
SUBROUTINE BUDGET_STORE_ADD(TPBUDGET, HSOURCE, PVARS)
-#ifdef REPRO48
-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
- REAL, DIMENSION(SIZE(PVARS, 1), SIZE(PVARS, 2), SIZE(PVARS, 3)) :: ZVARS
- INTEGER :: JLON, JLEV, IOFF
- IF (SIZE(PVARS,3)==NFLEVGDDH+2) THEN
- IOFF=1
- ELSE
- IOFF=0
- ENDIF
- ZVARS=PVARS
- DO JLEV=1, NFLEVGDDH
- DO JLON=1, SIZE(PVARS,1)
- IF (TPBUDGET%YDLDDH%LDDH_OMP) THEN
- ZVARS(JLON,1,JLEV+IOFF)=TPBUDGET%YDDDH%RVARSM(JLON,1,JLEV,TPBUDGET%NBUDGET)+ZVARS(JLON,1,JLEV+IOFF)
- ELSE
- ZVARS(JLON,1,JLEV+IOFF)=TVARSM(JLON,1,JLEV,TPBUDGET%NBUDGET)+ZVARS(JLON,1,JLEV+IOFF)
- ENDIF
- ENDDO
- ENDDO
- CALL BUDGET_DDH(ZVARS, TPBUDGET%NBUDGET, HSOURCE, TPBUDGET%YDDDH, TPBUDGET%YDLDDH, TPBUDGET%YDMDDH)
-#else
CALL BUDGET_DDH(PVARS, TPBUDGET%NBUDGET, HSOURCE, TPBUDGET%YDDDH, TPBUDGET%YDLDDH, TPBUDGET%YDMDDH, &
&LDISDIFF=.TRUE.)
-#endif
END SUBROUTINE BUDGET_STORE_ADD
SUBROUTINE BUDGET_DDH(PVARS,KBUDN,HBUVAR,YDDDH, YDLDDH, YDMDDH, LDISDIFF)
diff --git a/src/common/micro/mode_ice4_budgets.F90 b/src/common/micro/mode_ice4_budgets.F90
index d82f4ad004e52317884f8802f706c4a5b2c0bda6..6011aef21571077ec8ec99016c9eee2a9625579e 100644
--- a/src/common/micro/mode_ice4_budgets.F90
+++ b/src/common/micro/mode_ice4_budgets.F90
@@ -57,7 +57,7 @@ REAL(KIND=JPHOOK) :: ZHOOK_HANDLE
!
INTEGER :: JIJ, JK, JL
INTEGER :: IKTB, IKTE, IKB, IIJB, IIJE
-REAL, DIMENSION(D%NIJT, D%NKT) :: ZW1, ZW2, ZW3, ZW4, ZW5, ZW6 ! work array
+REAL, DIMENSION(D%NIJT, D%NKT) :: ZW1, ZW2, ZW3, ZW4, ZW5 ! work array
REAL, DIMENSION(D%NIJT, D%NKT) :: ZZ_DIFF, ZZ_LVFACT, ZZ_LSFACT
REAL :: ZINV_TSTEP
!
@@ -91,15 +91,9 @@ DO JK = IKTB, IKTE
ZW1(JIJ,JK)=ZW1(JIJ,JK)+PRVHENI(JIJ,JK)
ENDDO
ENDDO
-#ifdef REPRO48
-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(:, :))
-#else
IF (BUCONF%LBUDGET_TH) CALL BUDGET_STORE_ADD_PHY(D, TBUDGETS(NBUDGET_TH), 'HIN', ZW1(:, :)*ZZ_LSFACT(:, :)*PRHODJ(:, :))
IF (BUCONF%LBUDGET_RV) CALL BUDGET_STORE_ADD_PHY(D, TBUDGETS(NBUDGET_RV), 'HIN', -ZW1(:, :) *PRHODJ(:, :))
IF (BUCONF%LBUDGET_RI) CALL BUDGET_STORE_ADD_PHY(D, TBUDGETS(NBUDGET_RI), 'HIN', ZW1(:, :) *PRHODJ(:, :))
-#endif
ZW1(:,:) = 0.
DO JL=1, KSIZE
ZW1(K1(JL), K2(JL)) = PBU_PACK(JL, IRCHONI) * ZINV_TSTEP
@@ -331,26 +325,10 @@ 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
-#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(:, :))
-#ifdef REPRO48
- ZW1(:,:) = 0.
- DO JL=1, KSIZE
- ZW1(K1(JL), K2(JL)) = PBU_PACK(JL, IRGWETH) * ZINV_TSTEP
- END DO
-#endif
-#ifdef REPRO48
- IF (BUCONF%LBUDGET_RG) CALL BUDGET_STORE_ADD_PHY(D, TBUDGETS(NBUDGET_RG), 'HGCV', (-ZW5(:, :)-ZW1(:, :))*PRHODJ(:, :))
-#endif
-#ifdef REPRO48
- IF (BUCONF%LBUDGET_RH) CALL BUDGET_STORE_ADD_PHY(D, TBUDGETS(NBUDGET_RH), 'HGCV', ZW1(:, :)*PRHODJ(:, :))
-#endif
-
ZW1(:,:) = 0.
DO JL=1, KSIZE
ZW1(K1(JL), K2(JL)) = PBU_PACK(JL, IRCDRYH) * ZINV_TSTEP
@@ -371,34 +349,23 @@ IF(KRR==7) THEN
DO JL=1, KSIZE
ZW5(K1(JL), K2(JL)) = PBU_PACK(JL, IRGDRYH) * ZINV_TSTEP
END DO
- ZW6(:,:) = 0.
-#ifdef 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
- END DO
-#endif
IF (BUCONF%LBUDGET_TH) &
CALL BUDGET_STORE_ADD_PHY(D, TBUDGETS(NBUDGET_TH), 'DRYH', (ZW1(:, :)+ZW2(:, :))*ZZ_DIFF(:, :)*PRHODJ(:, :))
IF (BUCONF%LBUDGET_RC) CALL BUDGET_STORE_ADD_PHY(D, TBUDGETS(NBUDGET_RC), 'DRYH', -ZW1(:, :) *PRHODJ(:, :))
IF (BUCONF%LBUDGET_RR) CALL BUDGET_STORE_ADD_PHY(D, TBUDGETS(NBUDGET_RR), 'DRYH', -ZW2(:, :) *PRHODJ(:, :))
IF (BUCONF%LBUDGET_RI) CALL BUDGET_STORE_ADD_PHY(D, TBUDGETS(NBUDGET_RI), 'DRYH', -ZW3(:, :) *PRHODJ(:, :))
IF (BUCONF%LBUDGET_RS) CALL BUDGET_STORE_ADD_PHY(D, TBUDGETS(NBUDGET_RS), 'DRYH', -ZW4(:, :) *PRHODJ(:, :))
- IF (BUCONF%LBUDGET_RG) CALL BUDGET_STORE_ADD_PHY(D, TBUDGETS(NBUDGET_RG), 'DRYH', (-ZW5(:, :)+ZW6(:, :)) *PRHODJ(:, :))
+ IF (BUCONF%LBUDGET_RG) CALL BUDGET_STORE_ADD_PHY(D, TBUDGETS(NBUDGET_RG), 'DRYH', -ZW5(:, :) *PRHODJ(:, :))
IF (BUCONF%LBUDGET_RH) CALL BUDGET_STORE_ADD_PHY(D, TBUDGETS(NBUDGET_RH), 'DRYH', (ZW1(:, :)+ZW2(:, :)+ZW3(:, :)+ &
- &ZW4(:, :)+ZW5(:, :)-ZW6(:, :)) &
+ &ZW4(:, :)+ZW5(:, :)) &
& *PRHODJ(:, :))
-#ifdef REPRO48
-#else
- !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
END DO
IF (BUCONF%LBUDGET_RG) CALL BUDGET_STORE_ADD_PHY(D, TBUDGETS(NBUDGET_RG), 'HGCV', -ZW1(:, :)*PRHODJ(:, :))
IF (BUCONF%LBUDGET_RH) CALL BUDGET_STORE_ADD_PHY(D, TBUDGETS(NBUDGET_RH), 'HGCV', ZW1(:, :)*PRHODJ(:, :))
-#endif
ZW1(:,:) = 0.
DO JL=1, KSIZE
diff --git a/src/common/turb/shallow_mf.F90 b/src/common/turb/shallow_mf.F90
index c21ef7f1b5970ad3544335252e4262fba890c734..faf9c4452bc0af8b378d6988f0d3da7813205ebd 100644
--- a/src/common/turb/shallow_mf.F90
+++ b/src/common/turb/shallow_mf.F90
@@ -333,8 +333,6 @@ IF( PARAMMF%CMF_UPDRAFT == 'DUAL') THEN
! PDVDT_MF=0.
ENDIF
!
-#ifdef REPRO48
-#else
IF(PRESENT(BUCONF)) THEN
IF( BUCONF%LBUDGET_U ) THEN
!$mnh_expand_array(JIJ=IIJB:IIJE,JK=1:IKT)
@@ -383,7 +381,6 @@ IF(PRESENT(BUCONF)) THEN
END DO
END IF
END IF
-#endif
!
IF (LHOOK) CALL DR_HOOK('SHALLOW_MF',1,ZHOOK_HANDLE)
!
diff --git a/src/common/turb/turb.F90 b/src/common/turb/turb.F90
index dae5cbb3dd6eed125b5fa51f8a44a82c30ef075a..c878b7a82c6a2f370adc1651feb792bd55c4a60d 100644
--- a/src/common/turb/turb.F90
+++ b/src/common/turb/turb.F90
@@ -1060,12 +1060,7 @@ IF( BUCONF%LBUDGET_SV ) THEN
END DO
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
-#else
IF( TURBN%CTURBDIM == '3DIM' ) THEN
-#endif
IF( BUCONF%LBUDGET_U ) CALL BUDGET_STORE_INIT_PHY(D, TBUDGETS(NBUDGET_U ), 'HTURB', PRUS (:,:) )
IF( BUCONF%LBUDGET_V ) CALL BUDGET_STORE_INIT_PHY(D, TBUDGETS(NBUDGET_V ), 'HTURB', PRVS (:,:) )
IF( BUCONF%LBUDGET_W ) CALL BUDGET_STORE_INIT_PHY(D, TBUDGETS(NBUDGET_W ), 'HTURB', PRWS (:,:) )
@@ -1099,9 +1094,6 @@ 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 ifndef PHYEXMERGE validé
-#ifdef REPRO48
-#else
CALL TURB_HOR_SPLT(D,CST,CSTURB, TURBN, NEBN, TLES, &
KSPLIT, KRR, KRRL, KRRI, KSV,KSV_LGBEG,KSV_LGEND, &
PTSTEP,HLBCX,HLBCY, OFLAT,O2D, ONOMIXLG, &
@@ -1119,7 +1111,6 @@ IF( TURBN%CTURBDIM == '3DIM' ) THEN
PDP,PTP,PSIGS, &
ZTRH, &
PRUS,PRVS,PRWS,PRTHLS,PRRS,PRSVS )
-#endif
!
! IF (HCLOUD == 'LIMA') THEN
! IF (KSV_LIMA_NR.GT.0) PRSVS(:,:,KSV_LIMA_NR) = ZRSVS(:,:,KSV_LIMA_NR)
@@ -1161,10 +1152,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
-#else
END IF
-#endif
!----------------------------------------------------------------------------
!
!* 6. EVOLUTION OF THE TKE AND ITS DISSIPATION