From b210194540462675d8e47646811e51bdf9170725 Mon Sep 17 00:00:00 2001
From: Philippe WAUTELET <philippe.wautelet@aero.obs-mip.fr>
Date: Fri, 15 Jan 2021 10:37:45 +0100
Subject: [PATCH] Philippe 15/01/2021: bugfix: NACT was wrong (not initialized)
 if INUCT=0

(cherry picked from commit 8b07064446b23d3ea4e2e77089c2f87cde598608)
---
 src/MNH/lima_ccn_activation.f90 | 6 +++++-
 src/MNH/lima_warm_nucl.f90      | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/MNH/lima_ccn_activation.f90 b/src/MNH/lima_ccn_activation.f90
index 80750616a..3e11b34b5 100644
--- a/src/MNH/lima_ccn_activation.f90
+++ b/src/MNH/lima_ccn_activation.f90
@@ -181,7 +181,6 @@ TYPE(TFIELDDATA) :: TZFIELD
 !-------------------------------------------------------------------------------
 !
 ILUOUT = TLUOUT%NLU
-ZW(:,:,:)=0.
 !
 !*       1.     PREPARE COMPUTATIONS - PACK
 !   	        ---------------------------
@@ -459,6 +458,11 @@ IF( INUCT >= 1 ) THEN
 END IF ! INUCT
 !
 IF ( OCLOSE_OUT ) THEN
+  IF ( INUCT == 0 ) THEN
+    ZW (:,:,:) = 0.
+    ZW2(:,:,:) = 0.
+  END IF
+
   TZFIELD%CMNHNAME   ='SMAX'
   TZFIELD%CSTDNAME   = ''
   TZFIELD%CLONGNAME  = TRIM(TZFIELD%CMNHNAME)
diff --git a/src/MNH/lima_warm_nucl.f90 b/src/MNH/lima_warm_nucl.f90
index decd53aba..7cad9a508 100644
--- a/src/MNH/lima_warm_nucl.f90
+++ b/src/MNH/lima_warm_nucl.f90
@@ -207,7 +207,6 @@ TYPE(TFIELDDATA) :: TZFIELD
 !-------------------------------------------------------------------------------
 !
 ILUOUT = TLUOUT%NLU
-ZW(:,:,:)=0.
 !
 !*       1.     PREPARE COMPUTATIONS - PACK
 !   	        ---------------------------
@@ -520,6 +519,11 @@ END IF ! INUCT
 DEALLOCATE(ZCTMIN)
 !--cb--
 IF ( OCLOSE_OUT ) THEN
+  IF ( INUCT == 0 ) THEN
+    ZW (:,:,:) = 0.
+    ZW2(:,:,:) = 0.
+  END IF
+
   TZFIELD%CMNHNAME   ='SMAX'
   TZFIELD%CSTDNAME   = ''
   TZFIELD%CLONGNAME  = TRIM(TZFIELD%CMNHNAME)
-- 
GitLab