From e6a3f850ca35f8701a492083c597db0256df3a52 Mon Sep 17 00:00:00 2001
From: Quentin Rodier <quentin.rodier@meteo.fr>
Date: Thu, 10 Feb 2022 11:56:35 +0100
Subject: [PATCH] Quentin Merge->MNH ice4_tendencies (temporary adaptation)

---
 src/mesonh/micro/ice4_tendencies.f90 | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/mesonh/micro/ice4_tendencies.f90 b/src/mesonh/micro/ice4_tendencies.f90
index 49cd59923..3f3bd35ec 100644
--- a/src/mesonh/micro/ice4_tendencies.f90
+++ b/src/mesonh/micro/ice4_tendencies.f90
@@ -185,17 +185,17 @@ USE MODD_RAIN_ICE_DESCR, ONLY: XLBDAS_MAX,XLBEXG,XLBEXH,XLBEXR,XLBEXS,XLBG,XLBH,
 USE MODD_RAIN_ICE_PARAM, ONLY: XSCFAC
 !
 USE MODI_ICE4_COMPUTE_PDF
-USE MODI_ICE4_FAST_RG
-USE MODI_ICE4_FAST_RH
-USE MODI_ICE4_FAST_RI
-USE MODI_ICE4_FAST_RS
+USE MODE_ICE4_FAST_RG
+USE MODE_ICE4_FAST_RH
+USE MODE_ICE4_FAST_RI
+USE MODE_ICE4_FAST_RS
 USE MODI_ICE4_NUCLEATION
 USE MODI_ICE4_RAINFR_VERT
 USE MODI_ICE4_RIMLTC
 USE MODI_ICE4_RRHONG
-USE MODI_ICE4_RSRIMCG_OLD
-USE MODI_ICE4_SLOW
-USE MODI_ICE4_WARM
+USE MODE_ICE4_RSRIMCG_OLD
+USE MODE_ICE4_SLOW
+USE MODE_ICE4_WARM
 !
 IMPLICIT NONE
 !
@@ -537,7 +537,7 @@ END IF
 !*       4.     COMPUTES THE FAST COLD PROCESS SOURCES FOR r_s
 !               ----------------------------------------------
 !
-CALL ICE4_FAST_RS(KSIZE, ODSOFT, PCOMPUTE, &
+CALL ICE4_FAST_RS(KSIZE, KSIZE, ODSOFT, PCOMPUTE, &
                  &PRHODREF, PLVFACT, PLSFACT, PPRES, &
                  &ZDV, ZKA, ZCJ, &
                  &ZLBDAR, ZLBDAS, &
@@ -560,7 +560,7 @@ DO JL=1, KSIZE
            & PRSACCRG(JL) + PRCRIMSG(JL) + PRSRIMCG(JL)
   ZRGSI_MR(JL) = PRRHONG_MR(JL) + PRSRIMCG_MR(JL)
 ENDDO
-CALL ICE4_FAST_RG(KSIZE, ODSOFT, PCOMPUTE, KRR, &
+CALL ICE4_FAST_RG(KSIZE, KSIZE, ODSOFT, PCOMPUTE, KRR, &
                  &PRHODREF, PLVFACT, PLSFACT, PPRES, &
                  &ZDV, ZKA, ZCJ, PCIT, &
                  &ZLBDAR, ZLBDAS, ZLBDAG, &
@@ -579,7 +579,7 @@ CALL ICE4_FAST_RG(KSIZE, ODSOFT, PCOMPUTE, KRR, &
 !               ----------------------------------------------
 !
 IF (KRR==7) THEN
-  CALL ICE4_FAST_RH(KSIZE, ODSOFT, PCOMPUTE, ZWETG, &
+  CALL ICE4_FAST_RH(KSIZE, KSIZE, ODSOFT, PCOMPUTE, ZWETG, &
                    &PRHODREF, PLVFACT, PLSFACT, PPRES, &
                    &ZDV, ZKA, ZCJ, &
                    &ZLBDAS, ZLBDAG, ZLBDAR, ZLBDAH, &
-- 
GitLab