adapt to new remap_restart

GEOS-ESM · Dec 4, 2023 · 82a1b90 · gmao-rreichle · Dec 4, 2023 · 82a1b90
1 parent a47ea97
commit 82a1b90
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 6 deletions.
diff --git a/src/Applications/LDAS_App/ldas_setup b/src/Applications/LDAS_App/ldas_setup
@@ -838,12 +838,17 @@ class LDASsetup:
         mk_outdir = self.exphome+'/'+exp_id+'/mk_restarts/' 
 
         if (RESTART_str != '1'):
+           bcs_path = self.rqdExeInp['BCS_PATH']
+           while bcs_path[-1] == '/' : bcs_path = bcs_path[0:-1]
+           bc_base    = os.path.dirname(bcs_path)
+           bc_version = os.path.basename(bcs_path)
+
            remap_tpl = os.path.dirname(os.path.realpath(__file__)) + '/remap_params.tpl'
            config = yaml_to_config(remap_tpl)
 
            config['slurm']['account'] = self.rqdRmInp['account'] 
            config['slurm']['qos'] = 'debug' 
-           config['slurm']['qos'] =  'cas'
+           config['slurm']['partition'] =  'cas|sky'
 
            config['input']['surface']['catch_tilefile']  = self.in_tilefile
            config['input']['shared']['expid']            = self.rqdExeInp['RESTART_ID']
@@ -855,7 +860,10 @@ class LDASsetup:
            config['output']['shared']['out_dir']         = mk_outdir
            config['output']['surface']['catch_remap']    = True
            config['output']['surface']['catch_tilefile'] = self.rqdExeInp['TILING_FILE']
-           config['output']['shared']['bcs_dir']         = self.bcs_land
+           config['output']['shared']['bc_base']         = bc_base
+           config['output']['shared']['bc_version']      = bc_version
+           config['output']['surface']['EASE_grid']      = self.rqdExeInp['BCS_RESOLUTION']
+
            config['output']['shared']['expid']           = self.rqdExeInp['EXP_ID']
            config['output']['surface']['surflay']        = dzsf
            config['output']['surface']['wemin']          = wemin_out

diff --git a/src/Applications/LDAS_App/remap_config_ldas.py b/src/Applications/LDAS_App/remap_config_ldas.py
@@ -16,8 +16,12 @@ def remap_config_ldas(config, RESTART_str, RESTART_PATH, RESTART_ID):
      config['input']['shared'] = merra2_expid(config['input']['shared'])
      config['input']['shared']['rst_dir'] = out_dir+ '/merra2_tmp_'+ yyyymmddhh
      config['input']['surface']['wemin'] = 26
-     config['input']['shared']['bcs_dir'] = '/discover/nobackup/projects/gmao/bcs_shared/fvInput/ExtData/esm/tiles/GM4/land/CF0180x6C_DE1440xPE0720/'
-
+     config['input']['shared']['bc_base'] = '/discover/nobackup/projects/gmao/bcs_shared/fvInput/ExtData/esm/tiles'
+     config['input']['shared']['bc_version'] = 'GM4'
+     config['input']['shared']['agrid'] = 'C180'
+     config['input']['shared']['ogrid'] = '1440x720'
+     config['input']['shared']['omodel'] = 'data'
+
    if RESTART_str == "G" :
      # WY note: it is a bad idea to overload restart_path and restart_id
      config['input']['surface']['catch_tilefile'] = os.path.realpath(RESTART_ID+'scratch/tile.data')
@@ -39,15 +43,23 @@ def remap_config_ldas(config, RESTART_str, RESTART_PATH, RESTART_ID):
        print( "          Please select RESTART: M and use MERRA-2, instead.")
        sys.exit(1)
 
-     config['input']['shared']['bcs_dir'] = '/discover/nobackup/projects/gmao/bcs_shared/fvInput/ExtData/esm/tiles/ICA/land/CF0720x6C_CF0720x6C/'
+     config['input']['shared']['bc_base'] = '/discover/nobackup/projects/gmao/bcs_shared/fvInput/ExtData/esm/tiles'
+     config['input']['shared']['bc_version'] = 'ICA'
+     config['input']['shared']['agrid'] = 'C720'
+     config['input']['shared']['ogrid'] = 'C720'
+
      config['input']['surface']['wemin'] = 26
      config['input']['shared']['rst_dir'] = out_dir+'/InData'+ '/'
      suffix = '_21z.tar'
 
      if ((date_16 <= expdate) and (expdate < date_17)):
         fpver = 'GEOS-5.16/GEOSadas-5_16/'
         fplab = 'f516_fp'
-        config['input']['shared']['bcs_dir'] = '/discover/nobackup/projects/gmao/bcs_shared/fvInput/ExtData/esm/tiles/GM4/land/CF0720x6C_DE2880xPE1440/'
+        config['input']['shared']['bc_base'] = '/discover/nobackup/projects/gmao/bcs_shared/fvInput/ExtData/esm/tiles'
+        config['input']['shared']['bc_version'] = 'GM4'
+        config['input']['shared']['agrid'] = 'C720'
+        config['input']['shared']['ogrid'] = '2880x1440'
+
         suffix = '_21z.bin'
 
      if ((date_17 <= expdate) and (expdate < date_21)):