Skip to content
Snippets Groups Projects
Commit 154283ba authored by Gaelle DELAUTIER's avatar Gaelle DELAUTIER
Browse files

Christine 09/2017 : correction on drag tree

parent 3377c0c8
No related branches found
No related tags found
No related merge requests found
...@@ -69,7 +69,6 @@ REAL, DIMENSION(KI), INTENT(OUT) :: PLAI ...@@ -69,7 +69,6 @@ REAL, DIMENSION(KI), INTENT(OUT) :: PLAI
! !
INTEGER :: JI,JJ ! loop index over tiles INTEGER :: JI,JJ ! loop index over tiles
INTEGER :: ILUOUT ! unit numberi INTEGER :: ILUOUT ! unit numberi
REAL, DIMENSION(U%NSIZE_FULL) :: ZH_TREE_FULL, ZLAI_FULL
REAL, DIMENSION(U%NSIZE_NATURE) :: ZH_TREE, ZLAI,ZWORK REAL, DIMENSION(U%NSIZE_NATURE) :: ZH_TREE, ZLAI,ZWORK
INTEGER:: IPATCH_TRBE, IPATCH_TRBD, IPATCH_TEBE, IPATCH_TEBD, IPATCH_TENE, & INTEGER:: IPATCH_TRBE, IPATCH_TRBD, IPATCH_TEBE, IPATCH_TEBD, IPATCH_TENE, &
IPATCH_BOBD, IPATCH_BONE, IPATCH_BOND IPATCH_BOBD, IPATCH_BONE, IPATCH_BOND
...@@ -85,10 +84,6 @@ INTEGER:: IPATCH_TRBE, IPATCH_TRBD, IPATCH_TEBE, IPATCH_TEBD, IPATCH_TENE, & ...@@ -85,10 +84,6 @@ INTEGER:: IPATCH_TRBE, IPATCH_TRBD, IPATCH_TEBE, IPATCH_TEBD, IPATCH_TENE, &
!* 1. Passage dur le masque global !* 1. Passage dur le masque global
! ------------------------------- ! -------------------------------
ZH_TREE_FULL(:) = 0.
ZLAI_FULL (:) = XUNDEF
IPATCH_TRBE = VEGTYPE_TO_PATCH(NVT_TRBE, I%NPATCH) IPATCH_TRBE = VEGTYPE_TO_PATCH(NVT_TRBE, I%NPATCH)
IPATCH_TRBD = VEGTYPE_TO_PATCH(NVT_TRBD, I%NPATCH) IPATCH_TRBD = VEGTYPE_TO_PATCH(NVT_TRBD, I%NPATCH)
IPATCH_TEBE = VEGTYPE_TO_PATCH(NVT_TEBE, I%NPATCH) IPATCH_TEBE = VEGTYPE_TO_PATCH(NVT_TEBE, I%NPATCH)
...@@ -131,38 +126,36 @@ DO JJ=1,U%NSIZE_NATURE ...@@ -131,38 +126,36 @@ DO JJ=1,U%NSIZE_NATURE
( I%XLAI(JJ,IPATCH_BONE) * I%XVEGTYPE(JJ,NVT_BONE) )+ & ( I%XLAI(JJ,IPATCH_BONE) * I%XVEGTYPE(JJ,NVT_BONE) )+ &
( I%XLAI(JJ,IPATCH_BOND) * I%XVEGTYPE(JJ,NVT_BOND) ) ( 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 IF
! !
END DO END DO
! !
ZLAI_FULL(:) = U%XNATURE(:) * ZLAI_FULL(:) ZLAI(:) = U%XNATURE(:) * ZLAI(:)
! !
!* 2. Envoi les variables vers mesonH !* 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,*) '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 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') CALL ABOR1_SFX('GET_VHN: VH SIZE NOT CORRECT')
ELSE ELSE
PVH = ZH_TREE_FULL PVH = ZH_TREE
END IF 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,*) '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 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') CALL ABOR1_SFX('GET_LAIN: LAI SIZE NOT CORRECT')
ELSE ELSE
PLAI = ZLAI_FULL PLAI = ZLAI
END IF END IF
! !
!============================================================================== !==============================================================================
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment