From 000f6178e8c91aeab0a78c1f7577dcc02df87bb8 Mon Sep 17 00:00:00 2001
From: Gaelle DELAUTIER <gaelle.delautier@meteo.fr>
Date: Thu, 1 Dec 2016 16:15:01 +0100
Subject: [PATCH] Gaelle 01/12/2016 : bug KHKO C2R2
---
src/MNH/default_desfmn.f90 | 2 +-
src/MNH/ini_modeln.f90 | 2 +-
src/MNH/rain_c2r2_khko.f90 | 1 +
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/MNH/default_desfmn.f90 b/src/MNH/default_desfmn.f90
index aa4039877..7dcb9e023 100644
--- a/src/MNH/default_desfmn.f90
+++ b/src/MNH/default_desfmn.f90
@@ -1071,7 +1071,7 @@ IF (KMI == 1) THEN
LSUPSAT = .FALSE.
LDEPOC = .FALSE.
XVDEPOC = 0.02 ! 2 cm/s
- LACTTKE = .FALSE.
+ LACTTKE = .TRUE.
!
HPARAM_CCN = 'XXX'
HINI_CCN = 'XXX'
diff --git a/src/MNH/ini_modeln.f90 b/src/MNH/ini_modeln.f90
index 252290fdf..571adc46e 100644
--- a/src/MNH/ini_modeln.f90
+++ b/src/MNH/ini_modeln.f90
@@ -1448,7 +1448,7 @@ ELSE
ALLOCATE(XCIT(0,0,0))
END IF
!
-IF ( CCLOUD == 'KHKO') THEN
+IF ( CCLOUD == 'KHKO' .OR. CCLOUD == 'C2R2') THEN
ALLOCATE(XSUPSAT(IIU,IJU,IKU))
ALLOCATE(XNACT(IIU,IJU,IKU))
ALLOCATE(XNPRO(IIU,IJU,IKU))
diff --git a/src/MNH/rain_c2r2_khko.f90 b/src/MNH/rain_c2r2_khko.f90
index 671f1d8aa..834f410cb 100644
--- a/src/MNH/rain_c2r2_khko.f90
+++ b/src/MNH/rain_c2r2_khko.f90
@@ -1808,6 +1808,7 @@ DO JN = 1 , KSPLITR
END WHERE
ZWSEDR(:,:,:) = UNPACK( ZZW1(:),MASK=GSEDIM(:,:,:),FIELD=0.0 )
ZWSEDC(:,:,:) = UNPACK( ZZW2(:),MASK=GSEDIM(:,:,:),FIELD=0.0 )
+ DEALLOCATE(ZRCT)
DEALLOCATE(ZCCT)
DEALLOCATE(ZLBDC)
END IF
--
GitLab