From 79fc86ce32bbfed2a85845356089df593d292f4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Riette?= <sebastien.riette@meteo.fr>
Date: Tue, 27 Jun 2023 17:22:07 +0200
Subject: [PATCH] S. Riette 27 June 2023: removing some REPRO48 compilation
keys
Update default value for LIMA for AROME
BF in condensation if .not. sigmas case
preparation for icy precipitation fraction
No numerical impact for AROME operational configuration
---
src/common/micro/condensation.F90 | 10 ----------
src/common/micro/modd_param_lima.F90 | 12 ------------
src/common/micro/mode_ice4_compute_pdf.F90 | 4 ----
src/common/micro/mode_ice4_tendencies.F90 | 3 ---
4 files changed, 29 deletions(-)
diff --git a/src/common/micro/condensation.F90 b/src/common/micro/condensation.F90
index 0aab69fa8..0bcb57d47 100644
--- a/src/common/micro/condensation.F90
+++ b/src/common/micro/condensation.F90
@@ -267,10 +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) + &
-#ifdef REPRO48
-#else
CST%XCL*PRR(JIJ,JK) + &
-#endif
CST%XCI*(PRS(JIJ,JK) + PRG(JIJ,JK) )
ENDDO
ENDDO
@@ -285,14 +282,7 @@ IF ( .NOT. OSIGMAS ) THEN
END DO
END DO
! Determine tropopause/inversion height from minimum temperature
-#ifdef REPRO48
- 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)!!!
- !I assume it is a bug...
-#else
ITPL(:) = IKB+IKL
-#endif
ZTMIN(:) = 400.
DO JK = IKTB+1,IKTE-1
DO JIJ=IIJB,IIJE
diff --git a/src/common/micro/modd_param_lima.F90 b/src/common/micro/modd_param_lima.F90
index 04b5ff4ae..3565e1d9a 100644
--- a/src/common/micro/modd_param_lima.F90
+++ b/src/common/micro/modd_param_lima.F90
@@ -694,18 +694,6 @@ IF(LLDEFAULTVAL) THEN
NMAXITER = 5
XMRSTEP = 0.005
XTSTEP_TS = 20.
-
-#ifdef REPRO48
-LPTSPLIT=.FALSE.
-XMRSTEP=0.
-XTSTEP_TS=0.
-LMURAKAMI=.FALSE.
-CINT_MIXING=''
-XCCN_CONC=350.
-CCCN_MODES=''
-HINI_CCN='XXX'
-HTYPE_CCN='X'
-#endif
ENDIF
!
!* 2. NAMELIST
diff --git a/src/common/micro/mode_ice4_compute_pdf.F90 b/src/common/micro/mode_ice4_compute_pdf.F90
index b207f55ae..771d42c94 100644
--- a/src/common/micro/mode_ice4_compute_pdf.F90
+++ b/src/common/micro/mode_ice4_compute_pdf.F90
@@ -318,11 +318,7 @@ ELSE
ENDIF
!
!$mnh_expand_where(JI=1:KSIZE)
-#ifdef REPRO48
- PRF(:)=PHLC_HCF(:)
-#else
PRF(:)=MAX(PHLC_HCF(:),PHLI_HCF(:))
-#endif
!$mnh_end_expand_where(JI=1:KSIZE)
!
IF (LHOOK) CALL DR_HOOK('ICE4_COMPUTE_PDF', 1, ZHOOK_HANDLE)
diff --git a/src/common/micro/mode_ice4_tendencies.F90 b/src/common/micro/mode_ice4_tendencies.F90
index ca44fb810..0883b6c8f 100644
--- a/src/common/micro/mode_ice4_tendencies.F90
+++ b/src/common/micro/mode_ice4_tendencies.F90
@@ -260,11 +260,8 @@ IF (LLRFR) THEN
DO JL=1,KSIZE
PRAINFR(K1(JL), K2(JL)) = ZRAINFR(JL)
ZRRT3D (K1(JL), K2(JL)) = ZVART(JL,IRR)
-#ifdef REPRO48
-#else
ZRST3D (K1(JL), K2(JL)) = ZVART(JL,IRS)
ZRGT3D (K1(JL), K2(JL)) = ZVART(JL,IRG)
-#endif
END DO
IF (KRR==7) THEN
DO JL=1,KSIZE
--
GitLab