diff --git a/src/MNH/lima_adjust.f90 b/src/MNH/lima_adjust.f90 index 02450c1334b0ddd439a9a21a4a2a211ccb932a0a..1c2032fd957fc4efc657ef23b872577d6a07637e 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 f0140287162aa39ee162601accc9cffe6df11223..44a356d6c805db0e18a783a98014c850ab33f2cb 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.