From 8b07064446b23d3ea4e2e77089c2f87cde598608 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 --- 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 85a23d777..3854c5433 100644 --- a/src/MNH/lima_ccn_activation.f90 +++ b/src/MNH/lima_ccn_activation.f90 @@ -180,7 +180,6 @@ TYPE(TFIELDDATA) :: TZFIELD !------------------------------------------------------------------------------- ! ILUOUT = TLUOUT%NLU -ZW(:,:,:)=0. ! !* 1. PREPARE COMPUTATIONS - PACK ! --------------------------- @@ -458,6 +457,11 @@ IF( INUCT >= 1 ) THEN END IF ! INUCT ! IF ( tpfile%lopened ) 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 5bf129f55..a0e6ac692 100644 --- a/src/MNH/lima_warm_nucl.f90 +++ b/src/MNH/lima_warm_nucl.f90 @@ -205,7 +205,6 @@ TYPE(TFIELDDATA) :: TZFIELD !------------------------------------------------------------------------------- ! ILUOUT = TLUOUT%NLU -ZW(:,:,:)=0. ! !* 1. PREPARE COMPUTATIONS - PACK ! --------------------------- @@ -518,6 +517,11 @@ END IF ! INUCT DEALLOCATE(ZCTMIN) !--cb-- IF ( tpfile%lopened ) THEN + IF ( INUCT == 0 ) THEN + ZW (:,:,:) = 0. + ZW2(:,:,:) = 0. + END IF + TZFIELD%CMNHNAME ='SMAX' TZFIELD%CSTDNAME = '' TZFIELD%CLONGNAME = TRIM(TZFIELD%CMNHNAME) -- GitLab