Quentin 10/02/2022: Merge->MNH ice4_tendencies with rrhong and rimltc from common +

bugfix for bit-repro of mesonh test case from commit main a1e7305d

src/mesonh/micro/ice4_tendencies.f90

@@ -184,15 +184,15 @@ USE MODD_PARAM_ICE,      ONLY: CSNOWRIMING
 USE MODD_RAIN_ICE_DESCR, ONLY: XLBDAS_MAX,XLBEXG,XLBEXH,XLBEXR,XLBEXS,XLBG,XLBH,XLBR,XLBS,XRTMIN
 USE MODD_RAIN_ICE_PARAM, ONLY: XSCFAC
 !
-USE MODI_ICE4_COMPUTE_PDF
+USE MODE_ICE4_COMPUTE_PDF
 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 MODE_ICE4_RAINFR_VERT
+USE MODE_ICE4_RIMLTC
+USE MODE_ICE4_RRHONG
 USE MODE_ICE4_RSRIMCG_OLD
 USE MODE_ICE4_SLOW
 USE MODE_ICE4_WARM
@@ -361,7 +361,7 @@ ELSE
   CALL ICE4_NUCLEATION(KSIZE, ODSOFT, PCOMPUTE==1., &
                        ZTHT, PPRES, PRHODREF, PEXN, PLSFACT, ZT, &
                        ZRVT, &
-                       PCIT, PRVHENI_MR, PB_TH, PB_RV, PB_RI)
+                       PCIT, PRVHENI_MR,PB_TH, PB_RV, PB_RI)
   DO JL=1, KSIZE
     ZRIT(JL)=ZRIT(JL) + PRVHENI_MR(JL)
     ZRVT(JL)=ZRVT(JL) - PRVHENI_MR(JL)
@@ -375,7 +375,12 @@ ELSE
                   &PEXN, PLVFACT, PLSFACT, &
                   &ZT,   ZRRT, &
                   &ZTHT, &
-                  &PRRHONG_MR, PB_TH, PB_RR, PB_RG)
+                  &PRRHONG_MR)
+  DO JL=1, KSIZE
+    PB_RG(JL) = PB_RG(JL) + PRRHONG_MR(JL)
+    PB_RR(JL) = PB_RR(JL) - PRRHONG_MR(JL)
+    PB_TH(JL) = PB_TH(JL) + PRRHONG_MR(JL)*(PLSFACT(JL)-PLVFACT(JL))
+  END DO
   DO JL=1, KSIZE
     ZRGT(JL) = ZRGT(JL) + PRRHONG_MR(JL)
     ZRRT(JL) = ZRRT(JL) - PRRHONG_MR(JL)
@@ -389,7 +394,12 @@ ELSE
                   &PEXN, PLVFACT, PLSFACT, &
                   &ZT, &
                   &ZTHT, ZRIT, &
-                  &PRIMLTC_MR, PB_TH, PB_RC, PB_RI)
+                  &PRIMLTC_MR)
+  DO JL=1, KSIZE
+    PB_RC(JL) = PB_RC(JL) + PRIMLTC_MR(JL)
+    PB_RI(JL) = PB_RI(JL) - PRIMLTC_MR(JL)
+    PB_TH(JL) = PB_TH(JL) - PRIMLTC_MR(JL)*(PLSFACT(JL)-PLVFACT(JL))
+  END DO
   DO JL=1, KSIZE
     ZRCT(JL) = ZRCT(JL) + PRIMLTC_MR(JL)
     ZRIT(JL) = ZRIT(JL) - PRIMLTC_MR(JL)

src/mesonh/micro/rain_ice.f90

@@ -245,7 +245,7 @@ use MODE_RAIN_ICE_WARM,                only: RAIN_ICE_WARM
 use mode_tools,                        only: Countjv
 use mode_tools_ll,                     only: GET_INDICE_ll
 
-USE MODI_ICE4_RAINFR_VERT
+USE MODE_ICE4_RAINFR_VERT
 
 IMPLICIT NONE
 !

src/mesonh/micro/rain_ice_red.f90

@@ -282,7 +282,7 @@ USE MODE_MSG
 use mode_tools,          only: Countjv
 
 USE MODI_ICE4_NUCLEATION_WRAPPER
-USE MODI_ICE4_RAINFR_VERT
+USE MODE_ICE4_RAINFR_VERT
 USE MODI_ICE4_SEDIMENTATION_STAT
 USE MODI_ICE4_SEDIMENTATION_SPLIT
 USE MODI_ICE4_TENDENCIES