From 8eb48a1e69937a44dfe66594831cdc93ae00950d Mon Sep 17 00:00:00 2001
From: Gaelle TANGUY <gaelle.tanguy@meteo.fr>
Date: Tue, 15 Nov 2016 10:52:54 +0100
Subject: [PATCH] C.lac 15/11/2016 : New KHKO output fields + Add max values
---
src/MNH/ini_modeln.f90 | 28 ++++++++++++++++++++--------
1 file changed, 20 insertions(+), 8 deletions(-)
diff --git a/src/MNH/ini_modeln.f90 b/src/MNH/ini_modeln.f90
index 1cd8f65af..08bd05c1e 100644
--- a/src/MNH/ini_modeln.f90
+++ b/src/MNH/ini_modeln.f90
@@ -258,15 +258,17 @@ END MODULE MODI_INI_MODEL_n
!! June 2011 (P.Aumond) Drag of the vegetation
!! + Mean fields
!! July 2013 (Bosseur & Filippi) Adds Forefire
-!! P. Tulet Nov 2014 accumulated moles of aqueous species that fall at the surface
+!! P. Tulet Nov 2014 accumulated moles of aqueous species that fall at the surface
!! JAn. 2015 (F. Brosse) bug in allocate XACPRAQ
!! Dec 2014 (C.Lac) : For reproducibility START/RESTA
!! J.Escobar : 15/09/2015 : WENO5 & JPHEXT <> 1
-!! V. Masson Feb 2015 replaces, for aerosols, cover fractions by sea, town, bare soil fractions
+!! V. Masson Feb 2015 replaces, for aerosols, cover fractions by sea, town, bare soil fractions
!! J.Escobar : 19/04/2016 : Pb IOZ/NETCDF , missing OPARALLELIO=.FALSE. for PGD files
-!! 06/2016 (G.Delautier) phasage surfex 8
-!! Modification 01/2016 (JP Pinty) Add LIMA
+!! 06/2016 (G.Delautier) phasage surfex 8
+!! Modification 01/2016 (JP Pinty) Add LIMA
!! M.Leriche 2016 Chemistry
+!! 10/2016 M.Mazoyer New KHKO output fields
+!! 10/2016 (C.Lac) Add max values
!---------------------------------------------------------------------------------
!
!* 0. DECLARATIONS
@@ -666,7 +668,10 @@ IF (LMEAN_FIELD) THEN
ALLOCATE(XWM_MEAN(IIU,IJU,IKU)) ; XWM_MEAN = 0.0
ALLOCATE(XTHM_MEAN(IIU,IJU,IKU)) ; XTHM_MEAN = 0.0
ALLOCATE(XTEMPM_MEAN(IIU,IJU,IKU)) ; XTEMPM_MEAN = 0.0
- ALLOCATE(XTKEM_MEAN(IIU,IJU,IKU)) ; XTKEM_MEAN = 0.0
+ IF (CTURB/='NONE') THEN
+ ALLOCATE(XTKEM_MEAN(IIU,IJU,IKU))
+ XTKEM_MEAN = 0.0
+ END IF
ALLOCATE(XPABSM_MEAN(IIU,IJU,IKU)) ; XPABSM_MEAN = 0.0
!
ALLOCATE(XU2_MEAN(IIU,IJU,IKU)) ; XU2_MEAN = 0.0
@@ -678,7 +683,7 @@ IF (LMEAN_FIELD) THEN
!
END IF
!
-IF (CUVW_ADV_SCHEME(1:3)=='CEN') THEN
+IF ((CUVW_ADV_SCHEME(1:3)=='CEN') .AND. (CTEMP_SCHEME == 'LEFR') ) THEN
ALLOCATE(XUM(IIU,IJU,IKU))
ALLOCATE(XVM(IIU,IJU,IKU))
ALLOCATE(XWM(IIU,IJU,IKU))
@@ -1436,6 +1441,13 @@ ELSE
ALLOCATE(XCIT(0,0,0))
END IF
!
+IF ( CCLOUD == 'KHKO') THEN
+ ALLOCATE(XSUPSAT(IIU,IJU,IKU))
+ ALLOCATE(XNACT(IIU,IJU,IKU))
+ ALLOCATE(XNPRO(IIU,IJU,IKU))
+ ALLOCATE(XSSPRO(IIU,IJU,IKU))
+END IF
+!
!* 3.12 Module MODD_TURB_CLOUD
!
IF (.NOT.(ALLOCATED(XCEI))) ALLOCATE(XCEI(0,0,0))
@@ -1471,7 +1483,7 @@ IF ( CBUTYPE /= "NONE" .AND. NBUMOD == KMI ) THEN
LNUMDIFU,LNUMDIFTH,LNUMDIFSV, &
LHORELAX_UVWTH,LHORELAX_RV, LHORELAX_RC,LHORELAX_RR, &
LHORELAX_RI,LHORELAX_RS,LHORELAX_RG, LHORELAX_RH,LHORELAX_TKE, &
- LHORELAX_SV,LVE_RELAX,LCHTRANS,LNUDGING,LDRAGTREE, &
+ LHORELAX_SV,LVE_RELAX,LCHTRANS,LNUDGING,LDRAGTREE,LDEPOTREE, &
CRAD,CDCONV,CSCONV,CTURB,CTURBDIM,CCLOUD )
END IF
!
@@ -1550,7 +1562,7 @@ CALL READ_FIELD(HINIFILE,HLUOUT,IMASDEV, IIU,IJU,IKU,XTSTEP, &
CGETTKET,CGETRVT,CGETRCT,CGETRRT,CGETRIT,CGETCIT, &
CGETRST,CGETRGT,CGETRHT,CGETSVT,CGETSRCT,CGETSIGS,CGETCLDFR, &
CGETBL_DEPTH,CGETSBL_DEPTH,CGETPHC,CGETPHR,CUVW_ADV_SCHEME, &
- NSIZELBX_ll,NSIZELBXU_ll,NSIZELBY_ll,NSIZELBYV_ll, &
+ CTEMP_SCHEME,NSIZELBX_ll,NSIZELBXU_ll,NSIZELBY_ll,NSIZELBYV_ll,&
NSIZELBXTKE_ll,NSIZELBYTKE_ll, &
NSIZELBXR_ll,NSIZELBYR_ll,NSIZELBXSV_ll,NSIZELBYSV_ll, &
XUM,XVM,XWM,XDUM,XDVM,XDWM, &
--
GitLab