diff --git a/src/mesonh/micro/ice4_tendencies.f90 b/src/mesonh/micro/ice4_tendencies.f90 index 8d3d324eae9113ee353e742e1e2560821d20d069..b7de7efd33a076a697204550d3233bc67e540b70 100644 --- a/src/mesonh/micro/ice4_tendencies.f90 +++ b/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, & diff --git a/src/mesonh/micro/rain_ice_red.f90 b/src/mesonh/micro/rain_ice_red.f90 index e6e352880a147b101eadb742b9bc32d72b72cd13..e64e2cc95c6b3fe97acdae03aeca5b8c4b3f24e6 100644 --- a/src/mesonh/micro/rain_ice_red.f90 +++ b/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