add 2 to ens_id_width for "_e"

GEOS-ESM · Oct 6, 2022 · a045efd · a045efd
1 parent e5d4b65
commit a045efd
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/Applications/LDAS_App/ldas_setup b/src/Applications/LDAS_App/ldas_setup
@@ -113,7 +113,7 @@ class LDASsetup:
         self.ladas_coupling = 0
         self.in_rstfile = None
         self.in_tilefile = 'None' # default string
-        self.ens_id_width = 4  # _exxxx
+        self.ens_id_width = 6  # _exxxx
         # ------
         # Read exe input file which is required to set up the dir
         # ------
@@ -161,7 +161,7 @@ class LDASsetup:
            self.perturb = 1
         self.ensdirs  = ['ens%04d'%iens for iens in range(self.first_ens_id, self.nens  + self.first_ens_id)]
         # if self.ens_id_width = 4, _width = '_e%04d'
-        _width = '_e%0{}d'.format(self.ens_id_width)
+        _width = '_e%0{}d'.format(self.ens_id_width-2)
         # self.ensids will be a list of [_e0000, _e0001, ...] 
         self.ensids   = [ _width%iens for iens in range(self.first_ens_id, self.nens  + self.first_ens_id)]
         if (self.nens == 1) :

diff --git a/src/Components/GEOSldas_GridComp/GEOS_LdasGridComp.F90 b/src/Components/GEOSldas_GridComp/GEOS_LdasGridComp.F90
@@ -176,8 +176,8 @@ subroutine SetServices(gc, rc)
     allocate(LAND(NUM_ENSEMBLE),LANDPERT(NUM_ENSEMBLE))
 
     if (NUM_ENSEMBLE > 1) then
-       _ASSERT( ens_id_width < 10, "need 1 billion ensemble members? increase ens_id_width first")
-       _ASSERT( ens_id_width >= 3, "need at least 3 for hard coded ensemble forcing")
+       _ASSERT( ens_id_width < 12, "need 1 billion ensemble members? increase ens_id_width first")
+       _ASSERT( ens_id_width >= 5, "need at least 5 (_exxx) for hard coded ensemble forcing ( 3, xxx)")
     endif
 
     do i=1,NUM_ENSEMBLE

diff --git a/src/Components/GEOSldas_GridComp/Shared/LDAS_ensdrv_Globals.F90 b/src/Components/GEOSldas_GridComp/Shared/LDAS_ensdrv_Globals.F90
@@ -160,11 +160,11 @@ subroutine get_ensid_string(ensid_string, id, ens_id_width, num_ensemble)
         return
      endif
 
-     if (ens_id_width <=0) then
+     if (ens_id_width < 5) then
        call ldas_abort(LDAS_GENERIC_ERROR, 'get_ensid_string', 'ens_id_width should be greater than 1')
      endif
 
-     write (fmt_str, "(A2,I1,A1,I1,A1)") "(I", ens_id_width,".",ens_id_width,")"
+     write (fmt_str, "(A2,I1,A1,I1,A1)") "(I", ens_id_width-2,".",ens_id_width-2,")"
      write (ensid_string, fmt_str) id
      ensid_string = '_e'//trim(ensid_string)