Jean Wurtz : Adding initialization of GARDEN with ECOSG in nesting

src/SURFEX/default_urban_frac_veg.F90

@@ -2,9 +2,42 @@
 !SFX_LIC This is part of the SURFEX software governed by the CeCILL-C licence
 !SFX_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !SFX_LIC for details. version 1.
-SUBROUTINE DEFAULT_URBAN_FRAC_VEG(PDATA_TOWN,PDATA_GARDEN,PDATA_VEGTYPE, &
+
+
+
+
+SUBROUTINE DEFAULT_URBAN_FRAC_VEG(PDATA_TOWN,PDATA_GARDEN,PDATA_VEGTYPE, LECOSG, &
          PDATA_FRAC_HVEG, PDATA_FRAC_LVEG, PDATA_FRAC_NVEG)
+!     #########################
 !
+!!**** *DEFAULT_URBAN_FRAC_VEG* initializes urban vegetation fractions
+!!
+!!    PURPOSE
+!!    -------
+!!
+!!    METHOD
+!!    ------
+!!
+!!
+!!    EXTERNAL
+!!    --------
+!!
+!!    IMPLICIT ARGUMENTS
+!!    ------------------
+!!
+!!    REFERENCE
+!!    ---------
+!!
+!!    AUTHOR
+!!    ------
+!!
+!!
+!!    MODIFICATION
+!!    ------------
+!!    J. Wurtz 17/01/2023 : Corrections in VEGTYPE to be able to run with ECO-SG
+
+
+
 USE MODD_TYPE_DATE_SURF  
 USE MODD_SURF_PAR
 USE MODD_DATA_COVER_PAR
@@ -15,6 +48,7 @@ IMPLICIT NONE
 REAL, DIMENSION(:), INTENT(IN)  :: PDATA_TOWN
 REAL, DIMENSION(:), INTENT(IN)  :: PDATA_GARDEN
 REAL, DIMENSION(:,:), INTENT(IN):: PDATA_VEGTYPE
+LOGICAL, INTENT(IN)  :: LECOSG
 REAL, DIMENSION(:), INTENT(OUT) :: PDATA_FRAC_HVEG
 REAL, DIMENSION(:), INTENT(OUT) :: PDATA_FRAC_LVEG
 REAL, DIMENSION(:), INTENT(OUT) :: PDATA_FRAC_NVEG
@@ -33,26 +67,64 @@ IF (LHOOK) CALL DR_HOOK('DEFAULT_URBAN_FRAC_VEG',0,ZHOOK_HANDLE)
 !-------------------------------------------------------------------                                                    
 ! computes no, low and high vegetation fractions in gardens from vegtypes.
 ! first estimates the fraction of garden that is no or low vegetation
+
+
+
+IF (LECOSG) THEN
+
+  ZFRAC_GROUND=PDATA_VEGTYPE(:,NVT_NO) + PDATA_VEGTYPE(:,NVT_ROCK) + PDATA_VEGTYPE(:,NVT_SNOW)   &
+              +PDATA_VEGTYPE(:,NVT_C3S)+PDATA_VEGTYPE(:,NVT_C3W) + PDATA_VEGTYPE(:,NVT_C4)      &
+              +PDATA_VEGTYPE(:,NVT_GRAS) + PDATA_VEGTYPE(:,NVT_TROG) &
+              +PDATA_VEGTYPE(:,NVT_BOGR) + PDATA_VEGTYPE(:,NVT_FLGR)
+ELSE
   ZFRAC_GROUND=PDATA_VEGTYPE(:,NVT_NO) + PDATA_VEGTYPE(:,NVT_ROCK) + PDATA_VEGTYPE(:,NVT_SNOW)   &
               +PDATA_VEGTYPE(:,NVT_C3) + PDATA_VEGTYPE(:,NVT_C4) + PDATA_VEGTYPE(:,NVT_IRR)      &
               +PDATA_VEGTYPE(:,NVT_GRAS) + PDATA_VEGTYPE(:,NVT_TROG) + PDATA_VEGTYPE(:,NVT_PARK) &
               +PDATA_VEGTYPE(:,NVT_BOGR)
+END IF
   ZFRAC_GROUND=MAX(ZFRAC_GROUND,1.E-6)
 
+
+
+
+
+
+
 ! as defined for garden, sum of no and low vegetation fractions equals to garden fraction (so it refers to the whole urban area).
 ! high vegetation is between 0 and road + garden fractions (here limited to garden), and is located above ground.
 ! note that park, in urban covers, is supposed composed by half of trees.
 !
-  WHERE (PDATA_TOWN>0.)
-    PDATA_FRAC_NVEG(:)= PDATA_GARDEN(:) *  &
-              MIN((PDATA_VEGTYPE(:,NVT_NO) + PDATA_VEGTYPE(:,NVT_ROCK) + PDATA_VEGTYPE(:,NVT_SNOW))/ZFRAC_GROUND,1.)
-    PDATA_FRAC_LVEG(:)= MAX(PDATA_GARDEN(:)-PDATA_FRAC_NVEG(:),0.)
+
+
+WHERE (PDATA_TOWN>0.)
+PDATA_FRAC_NVEG(:)= PDATA_GARDEN(:) *  &
+      MIN((PDATA_VEGTYPE(:,NVT_NO) + PDATA_VEGTYPE(:,NVT_ROCK) + PDATA_VEGTYPE(:,NVT_SNOW))/ZFRAC_GROUND,1.)
+PDATA_FRAC_LVEG(:)= MAX(PDATA_GARDEN(:)-PDATA_FRAC_NVEG(:),0.)
+END WHERE
+
+
+
+
+
+!IF ECOSG one may want to add flooded trees FLTR
+IF (LECOSG) THEN 
+	WHERE (PDATA_TOWN>0.)
+    PDATA_FRAC_HVEG(:)= PDATA_GARDEN(:) * (                                                          &
+	       PDATA_VEGTYPE(:,NVT_TEBD) + PDATA_VEGTYPE(:,NVT_BONE) + PDATA_VEGTYPE(:,NVT_TRBE)     &
+	      +PDATA_VEGTYPE(:,NVT_TRBD) + PDATA_VEGTYPE(:,NVT_TEBE)                                 &
+	      +PDATA_VEGTYPE(:,NVT_TENE) + PDATA_VEGTYPE(:,NVT_BOBD) + PDATA_VEGTYPE(:,NVT_BOND)     &
+	      +PDATA_VEGTYPE(:,NVT_SHRB) + PDATA_VEGTYPE(:,NVT_FLTR)  )
+	END WHERE
+ELSE
+	WHERE (PDATA_TOWN>0.)
     PDATA_FRAC_HVEG(:)= PDATA_GARDEN(:) * (                                                          &
-               PDATA_VEGTYPE(:,NVT_TEBD) + PDATA_VEGTYPE(:,NVT_BONE) + PDATA_VEGTYPE(:,NVT_TRBE)     &
-              +PDATA_VEGTYPE(:,NVT_TRBD) + PDATA_VEGTYPE(:,NVT_TEBE)                                 &
-              +PDATA_VEGTYPE(:,NVT_TENE) + PDATA_VEGTYPE(:,NVT_BOBD) + PDATA_VEGTYPE(:,NVT_BOND)     &
-              +PDATA_VEGTYPE(:,NVT_SHRB)  )
-  END WHERE
+	       PDATA_VEGTYPE(:,NVT_TEBD) + PDATA_VEGTYPE(:,NVT_BONE) + PDATA_VEGTYPE(:,NVT_TRBE)     &
+	      +PDATA_VEGTYPE(:,NVT_TRBD) + PDATA_VEGTYPE(:,NVT_TEBE)                                 &
+	      +PDATA_VEGTYPE(:,NVT_TENE) + PDATA_VEGTYPE(:,NVT_BOBD) + PDATA_VEGTYPE(:,NVT_BOND)     &
+	      +PDATA_VEGTYPE(:,NVT_SHRB))
+	END WHERE
+END IF
+
 !-------------------------------------------------------------------  
 !
 IF (LHOOK) CALL DR_HOOK('DEFAULT_URBAN_FRAC_VEG',1,ZHOOK_HANDLE) 

src/SURFEX/ini_data_cover.F90

@@ -42,7 +42,7 @@
 !!    V. Masson    04/2013 merges Arrange cover & garden use option in arrange_cover routine
 !!    R.Alkama     05/2015 Add 7 new vegtype (19 rather than 12)
 !!    A. Druel     02/2019 Change default values and add new parameter for irrigation
-!!
+!!    J. Wurtz     01/2023 Passing LECOSG key to default urban frac
 !----------------------------------------------------------------------------
 !
 !*    0.     DECLARATION
@@ -1278,7 +1278,7 @@ IF (.NOT.U%LECOSG) CALL COVER301_573
 !
 !-------------------------------------------------------------------------------
 ! new definition of vegetation fractions
-CALL DEFAULT_URBAN_FRAC_VEG(XDATA_TOWN, XDATA_GARDEN,XDATA_VEGTYPE,          &
+CALL DEFAULT_URBAN_FRAC_VEG(XDATA_TOWN, XDATA_GARDEN,XDATA_VEGTYPE, U%LECOSG,         &
                             XDATA_FRAC_HVEG, XDATA_FRAC_LVEG, XDATA_FRAC_NVEG)
 !-------------------------------------------------------------------------------
 !