Quentin 11/02/2022: Merge->MNH from commit main 5e5d89b0

src/mesonh/micro/ice4_tendencies.f90

@@ -189,7 +189,7 @@ 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 MODE_ICE4_NUCLEATION
 USE MODE_ICE4_RAINFR_VERT
 USE MODE_ICE4_RIMLTC
 USE MODE_ICE4_RRHONG
@@ -358,10 +358,13 @@ ELSE
   !
   !*       2.     COMPUTES THE SLOW COLD PROCESS SOURCES
   !               --------------------------------------
-  CALL ICE4_NUCLEATION(KSIZE, ODSOFT, PCOMPUTE==1., &
+  CALL ICE4_NUCLEATION(KSIZE, PCOMPUTE==1., &
                        ZTHT, PPRES, PRHODREF, PEXN, PLSFACT, ZT, &
                        ZRVT, &
-                       PCIT, PRVHENI_MR,PB_TH, PB_RV, PB_RI)
+                       PCIT, PRVHENI_MR)
+  PB_RI(:)=PB_RI(:) + PRVHENI_MR(:)
+  PB_RV(:)=PB_RV(:) - PRVHENI_MR(:)
+  PB_TH(:)=PB_TH(:) + PRVHENI_MR(:)*PLSFACT(:)
   DO JL=1, KSIZE
     ZRIT(JL)=ZRIT(JL) + PRVHENI_MR(JL)
     ZRVT(JL)=ZRVT(JL) - PRVHENI_MR(JL)
@@ -371,7 +374,7 @@ ELSE
   !
   !*       3.3     compute the spontaneous freezing source: RRHONG
   !
-  CALL ICE4_RRHONG(KSIZE, ODSOFT, PCOMPUTE, &
+  CALL ICE4_RRHONG(KSIZE, PCOMPUTE, &
                   &PEXN, PLVFACT, PLSFACT, &
                   &ZT,   ZRRT, &
                   &ZTHT, &
@@ -390,7 +393,7 @@ ELSE
   !
   !*       7.1    cloud ice melting
   !
-  CALL ICE4_RIMLTC(KSIZE, ODSOFT, PCOMPUTE, &
+  CALL ICE4_RIMLTC(KSIZE, PCOMPUTE, &
                   &PEXN, PLVFACT, PLSFACT, &
                   &ZT, &
                   &ZTHT, ZRIT, &

src/mesonh/micro/rain_ice_red.f90

@@ -281,7 +281,7 @@ USE MODE_ll
 USE MODE_MSG
 use mode_tools,          only: Countjv
 
-USE MODI_ICE4_NUCLEATION_WRAPPER
+USE MODE_ICE4_NUCLEATION_WRAPPER
 USE MODE_ICE4_RAINFR_VERT
 USE MODI_ICE4_SEDIMENTATION_STAT
 USE MODI_ICE4_SEDIMENTATION_SPLIT
@@ -1199,7 +1199,7 @@ ENDIF
 !               ----------------------------------------------------------------
 !
 CALL ICE4_NUCLEATION_WRAPPER(KIT, KJT, KKT, .NOT. ODMICRO, &
-                             PTHT, PPABST, PRHODREF, PEXN, ZZ_LSFACT/PEXN, ZT, &
+                             PTHT, PPABST, PRHODREF, PEXN, ZZ_LSFACT, ZT, &
                              PRVT, &
                              PCIT, ZZ_RVHENI_MR)
 DO JK = 1, KKT