change tile_types to numbers that are consistent throughout

Author: weiyuan-jiang

GEOS_LdasGridComp.F90

@@ -20,7 +20,7 @@ module GEOS_LdasGridCompMod
   use LDAS_TileCoordType,     only: tile_coord_type , T_TILECOORD_STATE, TILECOORD_WRAP
   use LDAS_TileCoordType,     only: grid_def_type, io_grid_def_type, operator (==)
   use LDAS_TileCoordRoutines, only: get_minExtent_grid, get_ij_ind_from_latlon, io_domain_files
-  use LDAS_ConvertMod,        only: esmf2ldas, string2tile_types
+  use LDAS_ConvertMod,        only: esmf2ldas
   use LDAS_PertRoutinesMod,   only: get_pert_grid
   use LDAS_ensdrv_functions,  only:  get_io_filename 
   use LDAS_DateTimeMod,       only: date_time_type
@@ -89,16 +89,17 @@ subroutine SetServices(gc, rc)
     character(len=ESMF_MAXSTR) :: Iam
     character(len=ESMF_MAXSTR) :: comp_name
     character(len=ESMF_MAXSTR) :: ensid_string,childname
-    character(len=ESMF_MAXSTR) :: LAND_ASSIM_STR, mwRTM_file, ENS_FORCING_STR, TILE_TYPES_STR
+    character(len=ESMF_MAXSTR) :: LAND_ASSIM_STR, mwRTM_file, ENS_FORCING_STR
     integer                    :: ens_id_width
-    character(10), allocatable :: tile_types(:)
+    integer, allocatable       :: tile_types(:)
     ! Local variables
     type(T_TILECOORD_STATE), pointer :: tcinternal
     type(TILECOORD_WRAP) :: tcwrap
 
     type(ESMF_Config) :: CF
-    integer :: LSM_CHOICE
+    integer :: LSM_CHOICE, NRA
     integer :: FIRST_ENS_ID
+    logical :: isPresent
 
     ! Begin...
 
@@ -155,18 +156,24 @@ subroutine SetServices(gc, rc)
     VERIFY_(STATUS)
     ensemble_forcing = (trim(ENS_FORCING_STR) == 'YES')
 
-    call MAPL_GetResource ( MAPL, TILE_TYPES_STR, Label="TILE_TYPES:", DEFAULT="LAND", RC=STATUS)
-    VERIFY_(STATUS)
-    TILE_TYPES_STR =  ESMF_UtilStringUpperCase(TILE_TYPES_STR, rc=STATUS)
-    VERIFY_(STATUS)
-    call string2tile_types(TILE_TYPES_STR, tile_types)
+    call ESMF_ConfigFindLabel( CF, LABEL="TILE_TYPES:", isPresent=isPresent, _RC)
+    if (isPresent) then
+       nra = ESMF_ConfigGetLen( CF, _RC)
+       allocate(tile_types(nra))
+       call ESMF_ConfigFindLabel( CF, LABEL="TILE_TYPES:", _RC)
+       call ESMF_ConfigGetAttribute( CF, valueList=tile_types, count=NRA, _RC)
+    else
+       ! default
+       tile_types = [MAPL_LAND] 
+    endif
+
     with_landice = .false.
     with_land    = .false.
 !    with_lake    = .false.
     do i = 1, size(tile_types)
-       if (trim(tile_types(i)) == 'LANDICE') with_landice = .true.
-       if (trim(tile_types(i)) == 'LAND')    with_land    = .true.
-!       if (trim(tile_types(i)) == 'LAKE')    with_lake    = .true.
+       if (tile_types(i) == MAPL_LANDICE) with_landice = .true.
+       if (tile_types(i) == MAPL_LAND)    with_land    = .true.
+!      if (tile_types(i) == MAPL_LAKE)    with_lake    = .true.
     enddo
 
     call MAPL_GetResource ( MAPL, LAND_ASSIM_STR, Label="LAND_ASSIM:", DEFAULT="NO", RC=STATUS)

GEOSldas_App/GEOSldas_LDAS.rc

@@ -39,15 +39,14 @@ LSM_CHOICE: 1
 
 # ---- Choice of tile type(s)
 #
-#  Comma-separated list of tile types to be included in simulation.
-#  Do not use space before/after comma.  Examples:
+#  list of tile types to be included in simulation.
+#  use blank space as seperator if there are more than one type
 #
-#    LAND         : include only land tiles
-#    LAND,LANDICE : include land and landice tiles
-#    LANDICE      : include only landice tiles
+#    land tiles    100
+#    landice tiles 20
+#    lake tiles    29 (not yet implemented) 
 #
-TILE_TYPES: LAND
-
+TILE_TYPES: 100
 
 # ---- Format of tile file (from bcs directory)
 #

GEOSldas_App/ldas_setup

@@ -163,8 +163,7 @@ class LDASsetup:
             print ('\nInputs from execfile:\n')
             _printdict(self.rqdExeInp)
 
-        tile_types = {'LAND':'100', 'LANDICE':'20'}
-        self.tile_types = [tile_types[x.strip().upper()] for x in self.rqdExeInp.get('TILE_TYPES','LAND').split(',')]
+        self.tile_types = self.rqdExeInp.get('TILE_TYPES',["100"]).split()
         if "100" in self.tile_types :
           self.with_land = True
         if  "20" in self.tile_types :

LDAS_Shared/LDAS_Convert.F90

@@ -12,7 +12,6 @@ module LDAS_ConvertMod
   private
 
   public :: esmf2ldas
-  public :: string2tile_types
 
   interface esmf2ldas
      module procedure esmf2ldas_time
@@ -49,42 +48,6 @@ end subroutine esmf2ldas_time
 
   ! --------------------------------------------
 
-  subroutine string2tile_types( string, tile_types)
-
-    ! break string with list of (comma-separated) tile types into vector of strings
-
-    character(len=ESMF_MAXSTR), intent(in)   :: string
-    character(10), allocatable, intent(out)  :: tile_types(:)
-    
-    character(10)  :: outs4(4)
-    integer        :: ntype , j, j0
-
-    j  = index(string, ',')      ! identify positions of commas (delimiter)
-    ntype  = 1
-    j0 = 0
-
-    ! loop through positions of commas
-    
-    do while (.true.)
-       if (j == 0) then
-         outs4(ntype) = trim(adjustl(string(j0+1:)))
-         exit
-       endif
-       outs4(ntype) = trim(adjustl(string(j0+1:j0+j-1)))
-
-       j0 = j0+j
-       j = index(string(j0+1:), ',')
-       ntype = ntype+1
-    enddo
-
-    ! assemble output vector of strings
-    
-    allocate(tile_types(ntype), source=outs4(1:ntype))
-    
-  end subroutine string2tile_types
-
-  ! --------------------------------------------
-  
 end module LDAS_ConvertMod
 
 ! ========= EOF ===========================================================