From bbf65fd45fad84fc06fb4262cc9cbc2a4028f0ea Mon Sep 17 00:00:00 2001
From: Quentin Rodier <quentin.rodier@meteo.fr>
Date: Fri, 11 Feb 2022 10:39:03 +0100
Subject: [PATCH] Quentin 11/02/2022: Merge->MNH from commit main 5e5d89b
---
src/mesonh/micro/ice4_tendencies.f90 | 13 ++++++++-----
src/mesonh/micro/rain_ice_red.f90 | 4 ++--
2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/src/mesonh/micro/ice4_tendencies.f90 b/src/mesonh/micro/ice4_tendencies.f90
index 8d3d324ea..b7de7efd3 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 e6e352880..e64e2cc95 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
--
GitLab