From d5bdd52d096e002b7c27648c488a27ea1036ed8c Mon Sep 17 00:00:00 2001
From: Quentin Rodier <quentin.rodier@meteo.fr>
Date: Tue, 3 Mar 2020 10:49:56 +0100
Subject: [PATCH] Benoit V. 03/03/2020: minor corrections on activation of
water deposition on the ground and restrict a test for depot
---
src/MNH/lima.f90 | 2 +-
src/MNH/lima_warm.f90 | 11 +++--------
2 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/src/MNH/lima.f90 b/src/MNH/lima.f90
index a0a8d4ca2..cd26cee34 100644
--- a/src/MNH/lima.f90
+++ b/src/MNH/lima.f90
@@ -623,7 +623,7 @@ END IF
IF (LWARM .AND. LDEPOC) THEN
PINDEP(:,:)=0.
GDEP(:,:) = .FALSE.
- GDEP(:,:) = ZRCS(:,:,IKB) >0 .AND. ZCCS(:,:,IKB) >0
+ GDEP(:,:) = ZRCS(:,:,IKB) >0 .AND. ZCCS(:,:,IKB) >0 .AND. ZRCT(:,:,IKB) >0 .AND. ZCCT(:,:,IKB) >0
WHERE (GDEP)
ZRCS(:,:,IKB) = ZRCS(:,:,IKB) - XVDEPOC * ZRCT(:,:,IKB) / PDZZ(:,:,IKB)
ZCCS(:,:,IKB) = ZCCS(:,:,IKB) - XVDEPOC * ZCCT(:,:,IKB) / PDZZ(:,:,IKB)
diff --git a/src/MNH/lima_warm.f90 b/src/MNH/lima_warm.f90
index a82361d91..2701cd8fb 100644
--- a/src/MNH/lima_warm.f90
+++ b/src/MNH/lima_warm.f90
@@ -127,7 +127,7 @@ END MODULE MODI_LIMA_WARM
!! C. Barthe * LACy * jan. 2014 add budgets
!! J. Escobar : for real*4 , use XMNH_HUGE
!! Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
-!!
+!! B.Vié 03/02/2020 : correction of activation of water deposition on the ground
!-------------------------------------------------------------------------------
!
!* 0. DECLARATIONS
@@ -231,7 +231,7 @@ REAL, DIMENSION(:,:,:,:), ALLOCATABLE :: ZNAS ! Cloud C. nuclei C. source
!
!
REAL, DIMENSION(SIZE(PRHODREF,1),SIZE(PRHODREF,2),SIZE(PRHODREF,3)) &
- :: ZT, ZTM
+ :: ZT
REAL, DIMENSION(SIZE(PRHODREF,1),SIZE(PRHODREF,2),SIZE(PRHODREF,3)) &
:: ZWLBDR,ZWLBDR3,ZWLBDC,ZWLBDC3
INTEGER :: JL
@@ -305,11 +305,6 @@ WHERE (PRRT(:,:,:)>XRTMIN(3) .AND. PCRT(:,:,:)>XCTMIN(3))
ZWLBDR(:,:,:) = ZWLBDR3(:,:,:)**XLBEXR
END WHERE
ZT(:,:,:) = PTHT(:,:,:) * (PPABST(:,:,:)/XP00)**(XRD/XCPD)
-IF( OACTIT ) THEN
- ZTM(:,:,:) = PTHM(:,:,:) * (PPABSM(:,:,:)/XP00)**(XRD/XCPD)
-ELSE
- ZTM(:,:,:) = ZT(:,:,:)
-END IF
!
!-------------------------------------------------------------------------------
!
@@ -338,7 +333,7 @@ END IF
IF (LDEPOC) THEN
PINDEP(:,:)=0.
GDEP(:,:) = .FALSE.
- GDEP(:,:) = PRCS(:,:,2) >0 .AND. PCCS(:,:,2) >0
+ GDEP(:,:) = PRCS(:,:,2) >0 .AND. PCCS(:,:,2) >0 .AND. PRCT(:,:,2) >0 .AND. PCCT(:,:,2) >0
WHERE (GDEP)
PRCS(:,:,2) = PRCS(:,:,2) - XVDEPOC * PRCT(:,:,2) / ( PZZ(:,:,3) - PZZ(:,:,2))
PCCS(:,:,2) = PCCS(:,:,2) - XVDEPOC * PCCT(:,:,2) / ( PZZ(:,:,3) - PZZ(:,:,2))
--
GitLab