From 1516d7ce744df6aeb1ba5b799cf4c4a18bca7e02 Mon Sep 17 00:00:00 2001
From: Gaelle DELAUTIER <gaelle.delautier@meteo.fr>
Date: Fri, 8 Jun 2018 14:52:47 +0200
Subject: [PATCH] Gaelle 8/6/18 : bug where
---
src/MNH/ice4_compute_pdf.f90 | 38 +++++++++++++++++-------------------
1 file changed, 18 insertions(+), 20 deletions(-)
diff --git a/src/MNH/ice4_compute_pdf.f90 b/src/MNH/ice4_compute_pdf.f90
index 6b6b836ab..c09e47fb5 100644
--- a/src/MNH/ice4_compute_pdf.f90
+++ b/src/MNH/ice4_compute_pdf.f90
@@ -109,26 +109,24 @@ IF(HSUBG_AUCV=='NONE') THEN
ELSEIF(HSUBG_AUCV=='CLFR') THEN
!Cloud water is only in the cloudy part and entirely in low or high part
- WHERE(PCF(:)>0.)
- WHERE(PRCT(:)/PCF(:)>ZRCRAUTC(:))
- PHLC_HCF(:)=PCF(:)
- PHLC_LCF(:)=0.
- PHLC_HRC(:)=PRCT(:)
- PHLC_LRC(:)=0.
- PRF(:) =PCF(:)
- ELSEWHERE(PRCT(:)>XRTMIN(2))
- PHLC_HCF(:)=0.
- PHLC_LCF(:)=PCF(:)
- PHLC_HRC(:)=0.0
- PHLC_LRC(:)=PRCT(:)
- PRF(:) =0.
- ELSEWHERE
- PHLC_HCF(:)=0.
- PHLC_LCF(:)=0.
- PHLC_HRC(:)=0.
- PHLC_LRC(:)=0.
- PRF(:) =0.
- END WHERE
+ WHERE(PCF(:) > 0. .AND. PRCT(:)>ZRCRAUTC(:)*PCF(:))
+ PHLC_HCF(:)=PCF(:)
+ PHLC_LCF(:)=0.
+ PHLC_HRC(:)=PRCT(:)
+ PHLC_LRC(:)=0.
+ PRF(:) =PCF(:)
+ ELSEWHERE(PCF(:) > 0. .AND. PRCT(:)>XRTMIN(2))
+ PHLC_HCF(:)=0.
+ PHLC_LCF(:)=PCF(:)
+ PHLC_HRC(:)=0.0
+ PHLC_LRC(:)=PRCT(:)
+ PRF(:) =0.
+ ELSEWHERE (PCF(:) > 0.)
+ PHLC_HCF(:)=0.
+ PHLC_LCF(:)=0.
+ PHLC_HRC(:)=0.
+ PHLC_LRC(:)=0.
+ PRF(:) =0.
ELSEWHERE
PHLC_HCF(:)=0.
PHLC_LCF(:)=0.
--
GitLab