From 71693a7b2d552b5c16c6aae844e6e90804cf19b7 Mon Sep 17 00:00:00 2001
From: Jean-Pierre Chaboureau <jean-pierre.chaboureau@aero.obs-mip.fr>
Date: Fri, 24 Mar 2017 15:51:16 +0100
Subject: [PATCH] Jean-Pierre 24/03/2017: LIMA bug fixes
---
src/MNH/lima_adjust.f90 | 3 ++-
src/MNH/read_exsegn.f90 | 16 ++++++++++++++++
2 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/src/MNH/lima_adjust.f90 b/src/MNH/lima_adjust.f90
index 02450c133..1c2032fd9 100644
--- a/src/MNH/lima_adjust.f90
+++ b/src/MNH/lima_adjust.f90
@@ -128,6 +128,7 @@ END MODULE MODI_LIMA_ADJUST
!! -------------
!! Original ??/??/13
!! C. Barthe * LACy* jan. 2014 add budgets
+!! JP Chaboureau *LA* March 2014 fix the calculation of icy cloud fraction
!!
!-------------------------------------------------------------------------------
!
@@ -1105,7 +1106,7 @@ DEALLOCATE(ZCTMIN)
!* 5.2 compute the cloud fraction PCLDFR (binary !!!!!!!)
!
IF ( .NOT. OSUBG_COND ) THEN
- WHERE (PRCS(:,:,:) > 1.E-12 / ZDT)
+ WHERE (PRCS(:,:,:) + PRIS(:,:,:) + PRSS(:,:,:) > 1.E-12 / ZDT)
ZW(:,:,:) = 1.
ELSEWHERE
ZW(:,:,:) = 0.
diff --git a/src/MNH/read_exsegn.f90 b/src/MNH/read_exsegn.f90
index f01402871..44a356d6c 100644
--- a/src/MNH/read_exsegn.f90
+++ b/src/MNH/read_exsegn.f90
@@ -284,6 +284,8 @@ END MODULE MODI_READ_EXSEG_n
!! Modification 02/2016 (M.Leriche) treat gas and aq. chemicals separately
!! Modification 10/2016 (C.LAC) Add OSPLIT_WENO + Add droplet
!! deposition + Add max values
+!! Modification 03/2017 (JP Chaboureau) Fix the initialization of
+!! LUSERx-type variables for LIMA
!!------------------------------------------------------------------------------
!
!* 0. DECLARATIONS
@@ -871,6 +873,20 @@ SELECT CASE ( CCLOUD )
WRITE(UNIT=ILUOUT,FMT='("YOU WANT TO USE THE C3R5 MICROPHYS. SCHEME.",&
&" YOU WILL HAVE VAPOR, CLOUD WATER/ICE, RAIN, SNOW AND GRAUPEL ",/, &
&"LUSERV, LUSERC, LUSERR, LUSERI, LUSERS, LUSERG ARE SET TO TRUE")' )
+!
+ LUSERV=.TRUE. ; LUSERC=.TRUE. ; LUSERR=.TRUE.
+ LUSERI=.TRUE. ; LUSECI=.TRUE.
+ LUSERS=.TRUE. ; LUSERG=.TRUE.
+ LUSERH=.FALSE.
+ END IF
+ ELSE IF (CCLOUD == 'LIMA') THEN
+ IF (.NOT. ( LUSERV .AND. LUSERC .AND. LUSERR .AND. LUSERI .AND. &
+ LUSERS .AND. LUSERG .AND. (.NOT. LUSERH) &
+ ) ) THEN
+ WRITE(UNIT=ILUOUT,FMT=9002) KMI
+ WRITE(UNIT=ILUOUT,FMT='("YOU WANT TO USE THE LIMA MICROPHYS. SCHEME.",&
+ &" YOU WILL HAVE VAPOR, CLOUD WATER/ICE, RAIN, SNOW AND GRAUPEL ",/, &
+ &"LUSERV, LUSERC, LUSERR, LUSERI, LUSERS, LUSERG ARE SET TO TRUE")' )
!
LUSERV=.TRUE. ; LUSERC=.TRUE. ; LUSERR=.TRUE.
LUSERI=.TRUE. ; LUSECI=.TRUE.
--
GitLab