From 2c33536eb8389bc409253997b725f7aa97c6580d Mon Sep 17 00:00:00 2001
From: Gaelle TANGUY <gaelle.tanguy@meteo.fr>
Date: Tue, 15 Nov 2016 11:44:26 +0100
Subject: [PATCH] B.Vie 15/11/2016 : bug LIMA division by zero
---
src/MNH/lima_cold_hom_nucl.f90 | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/src/MNH/lima_cold_hom_nucl.f90 b/src/MNH/lima_cold_hom_nucl.f90
index a8e8c6f94..fb50b8ace 100644
--- a/src/MNH/lima_cold_hom_nucl.f90
+++ b/src/MNH/lima_cold_hom_nucl.f90
@@ -90,6 +90,7 @@ END MODULE MODI_LIMA_COLD_HOM_NUCL
!! -------------
!! Original ??/??/13
!! C. Barthe * LACy* jan. 2014 add budgets
+!! B.Vie 10/2016 Bug zero division
!!
!-------------------------------------------------------------------------------
!
@@ -419,14 +420,15 @@ IF (INEGT.GT.0) THEN
ZZW(:) = MIN( XRCOEF_HONH*ZZX(:)*(ZTAU(:)/ZBFACT(:))**1.5 , ZRVS(:) )
END WHERE
!
-! Apply the changes to ZNFS,
- DO JMOD_CCN = 1, NMOD_CCN
- ZCCNFROZEN(:) = ZZX(:) * ZNFS(:,JMOD_CCN)/ZFREECCN(:)
- ZNFS(:,JMOD_CCN) = ZNFS(:,JMOD_CCN) - ZCCNFROZEN(:)
- ZW(:,:,:) = PNFS(:,:,:,JMOD_CCN)
- PNFS(:,:,:,JMOD_CCN)=UNPACK( ZNFS(:,JMOD_CCN), MASK=GNEGT(:,:,:),FIELD=ZW(:,:,:))
- END DO
-!
+! Apply the changes to ZNFS,
+ DO JMOD_CCN = 1, NMOD_CCN
+ WHERE(ZFREECCN(:)>1.)
+ ZCCNFROZEN(:) = ZZX(:) * ZNFS(:,JMOD_CCN)/ZFREECCN(:)
+ ZNFS(:,JMOD_CCN) = ZNFS(:,JMOD_CCN) - ZCCNFROZEN(:)
+ END WHERE
+ ZW(:,:,:) = PNFS(:,:,:,JMOD_CCN)
+ PNFS(:,:,:,JMOD_CCN)=UNPACK( ZNFS(:,JMOD_CCN), MASK=GNEGT(:,:,:),FIELD=ZW(:,:,:))
+ END DO
ZZNHS(:) = ZZNHS(:) + ZZX(:)
ZNHS(:,:,:) = ZNHS(:,:,:) + UNPACK( ZZNHS(:), MASK=GNEGT(:,:,:),FIELD=0.0)
PNHS(:,:,:) = ZNHS(:,:,:)
--
GitLab