From 5f8910c9eac4a8a5b16443da62c98301bf817b02 Mon Sep 17 00:00:00 2001 From: Quentin Rodier <quentin.rodier@meteo.fr> Date: Thu, 24 Aug 2023 14:13:18 +0200 Subject: [PATCH] Quentin 24/08/2023: merge SURFEX v9 for MEGAN : VEGTYPE_TO_PATCH is now a routine (was a function) --- src/SURFEX/init_megann.F90 | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/SURFEX/init_megann.F90 b/src/SURFEX/init_megann.F90 index bc40cc3ef..a532d8747 100644 --- a/src/SURFEX/init_megann.F90 +++ b/src/SURFEX/init_megann.F90 @@ -296,15 +296,15 @@ ENDDO ! ! Passage des type de végétation isba/vegtype avec ceux de Megan ! -IP_TRBE = VEGTYPE_TO_PATCH(NVT_TRBE, IO%NPATCH) -IP_TRBD = VEGTYPE_TO_PATCH(NVT_TRBD, IO%NPATCH) -IP_TEBE = VEGTYPE_TO_PATCH(NVT_TEBE, IO%NPATCH) -IP_TEBD = VEGTYPE_TO_PATCH(NVT_TEBD, IO%NPATCH) -IP_TENE = VEGTYPE_TO_PATCH(NVT_TENE, IO%NPATCH) -IP_BOBD = VEGTYPE_TO_PATCH(NVT_BOBD, IO%NPATCH) -IP_BONE = VEGTYPE_TO_PATCH(NVT_BONE, IO%NPATCH) -IP_BOND = VEGTYPE_TO_PATCH(NVT_BOND, IO%NPATCH) -IP_SHRB = VEGTYPE_TO_PATCH(NVT_SHRB, IO%NPATCH) +CALL VEGTYPE_TO_PATCH(NVT_TRBE, IO%NPATCH, IP_TRBE) +CALL VEGTYPE_TO_PATCH(NVT_TRBD, IO%NPATCH, IP_TRBD) +CALL VEGTYPE_TO_PATCH(NVT_TEBE, IO%NPATCH, IP_TEBE) +CALL VEGTYPE_TO_PATCH(NVT_TEBD, IO%NPATCH, IP_TEBD) +CALL VEGTYPE_TO_PATCH(NVT_TENE, IO%NPATCH, IP_TENE) +CALL VEGTYPE_TO_PATCH(NVT_BOBD, IO%NPATCH, IP_BOBD) +CALL VEGTYPE_TO_PATCH(NVT_BONE, IO%NPATCH, IP_BONE) +CALL VEGTYPE_TO_PATCH(NVT_BOND, IO%NPATCH, IP_BOND) +CALL VEGTYPE_TO_PATCH(NVT_SHRB, IO%NPATCH, IP_SHRB) ! MGN%XPFT(:,:) = 0. ! -- GitLab