From 154283ba9c79e0915b2d582ced25ddace98b2cd7 Mon Sep 17 00:00:00 2001 From: Gaelle DELAUTIER <gaelle.delautier@meteo.fr> Date: Fri, 15 Sep 2017 16:06:54 +0200 Subject: [PATCH] Christine 09/2017 : correction on drag tree --- src/SURFEX/get_vegn.F90 | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/src/SURFEX/get_vegn.F90 b/src/SURFEX/get_vegn.F90 index da4340427..28d2044a9 100644 --- a/src/SURFEX/get_vegn.F90 +++ b/src/SURFEX/get_vegn.F90 @@ -69,7 +69,6 @@ REAL, DIMENSION(KI), INTENT(OUT) :: PLAI ! INTEGER :: JI,JJ ! loop index over tiles INTEGER :: ILUOUT ! unit numberi -REAL, DIMENSION(U%NSIZE_FULL) :: ZH_TREE_FULL, ZLAI_FULL REAL, DIMENSION(U%NSIZE_NATURE) :: ZH_TREE, ZLAI,ZWORK INTEGER:: IPATCH_TRBE, IPATCH_TRBD, IPATCH_TEBE, IPATCH_TEBD, IPATCH_TENE, & IPATCH_BOBD, IPATCH_BONE, IPATCH_BOND @@ -85,10 +84,6 @@ INTEGER:: IPATCH_TRBE, IPATCH_TRBD, IPATCH_TEBE, IPATCH_TEBD, IPATCH_TENE, & !* 1. Passage dur le masque global ! ------------------------------- - -ZH_TREE_FULL(:) = 0. -ZLAI_FULL (:) = XUNDEF - IPATCH_TRBE = VEGTYPE_TO_PATCH(NVT_TRBE, I%NPATCH) IPATCH_TRBD = VEGTYPE_TO_PATCH(NVT_TRBD, I%NPATCH) IPATCH_TEBE = VEGTYPE_TO_PATCH(NVT_TEBE, I%NPATCH) @@ -131,38 +126,36 @@ DO JJ=1,U%NSIZE_NATURE ( I%XLAI(JJ,IPATCH_BONE) * I%XVEGTYPE(JJ,NVT_BONE) )+ & ( I%XLAI(JJ,IPATCH_BOND) * I%XVEGTYPE(JJ,NVT_BOND) ) - ZH_TREE_FULL(U%NR_NATURE(JJ)) = ZH_TREE(JJ) - ZLAI_FULL (U%NR_NATURE(JJ)) = ZLAI(JJ) ! END IF ! END DO ! -ZLAI_FULL(:) = U%XNATURE(:) * ZLAI_FULL(:) +ZLAI(:) = U%XNATURE(:) * ZLAI(:) ! !* 2. Envoi les variables vers mesonH ! ------------------------------ -IF ( SIZE(PVH) /= SIZE(ZH_TREE_FULL) ) THEN +IF ( SIZE(PVH) /= SIZE(ZH_TREE) ) THEN WRITE(ILUOUT,*) 'try to get VH field from atmospheric model, but size is not correct' WRITE(ILUOUT,*) 'size of field expected by the atmospheric model (PVH) :', SIZE(PVH) - WRITE(ILUOUT,*) 'size of field inthe surface (XVH) :', SIZE(ZH_TREE_FULL) + WRITE(ILUOUT,*) 'size of field inthe surface (XVH) :', SIZE(ZH_TREE) CALL ABOR1_SFX('GET_VHN: VH SIZE NOT CORRECT') ELSE - PVH = ZH_TREE_FULL + PVH = ZH_TREE END IF ! !============================================================================== ! !------------------------------------------------------------------------------- ! -IF ( SIZE(PLAI) /= SIZE(ZLAI_FULL) ) THEN +IF ( SIZE(PLAI) /= SIZE(ZLAI) ) THEN WRITE(ILUOUT,*) 'try to get LAI field from atmospheric model, but size is not correct' WRITE(ILUOUT,*) 'size of field expected by the atmospheric model (PLAI) :', SIZE(PLAI) - WRITE(ILUOUT,*) 'size of field inthe surface (XLAI) :', SIZE(ZLAI_FULL) + WRITE(ILUOUT,*) 'size of field inthe surface (XLAI) :', SIZE(ZLAI) CALL ABOR1_SFX('GET_LAIN: LAI SIZE NOT CORRECT') ELSE - PLAI = ZLAI_FULL + PLAI = ZLAI END IF ! !============================================================================== -- GitLab