remove restart options F and G

CHANGELOG.md

@@ -17,6 +17,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Removed
 
+- Remove restart options F and G
+
 ### Deprecated
 
 -----------------------------

GEOSldas_App/CMakeLists.txt

@@ -21,7 +21,6 @@ ecbuild_add_executable (
 
 set (scripts
    process_hist.csh 
-   remap_config_ldas.py 
    ens_forcing/average_ensemble_forcing.py 
    ens_forcing/ensemble_forc.py 
    ens_forcing/regrid_forc.csh 

GEOSldas_App/ldas_setup

@@ -20,7 +20,6 @@ from collections import OrderedDict
 from dateutil.relativedelta import relativedelta
 from remap_utils import *
 from remap_catchANDcn  import *
-from remap_config_ldas import *
 from lenkf_j_template import *
 """
 This script is intended to be run from any installed directory with GEOSldas.x and ldas_setup
@@ -881,8 +880,31 @@ class LDASsetup:
            config['output']['surface']['surflay']        = dzsf
            config['output']['surface']['wemin']          = wemin_out
 
-           config = remap_config_ldas( config, RESTART_str, self.rqdExeInp['RESTART_PATH'], self.rqdExeInp['RESTART_ID'])
-
+           if RESTART_str == "M" : # restart from merra2
+             yyyymm = int(YYYYMMDDHH[0:6])
+             merra2_expid = "d5124_m2_jan10"
+             if yyyymm < 197901 :
+                exit("Error. MERRA-2 data < 1979 not available\n")
+             elif (yyyymm < 199201):
+                merra2_expid = "d5124_m2_jan79"
+             elif (yyyymm < 200106):
+                merra2_expid = "d5124_m2_jan91"
+             elif (yyyymm < 201101):
+                merra2_expid = "d5124_m2_jan00"
+             elif (yyyymm < 202106):
+                merra2_expid = "d5124_m2_jan10"
+             # There was a rewind in MERRA2 from Jun 2021 to Sept 2021
+             elif (yyyymm < 202110):
+                merra2_expid = "d5124_m2_jun21"
+             config['input']['shared']['expid']      = merra2_expid
+             config['input']['shared']['rst_dir']    = mk_outdir+ '/merra2_tmp_'+ YYYYMMDDHH
+             config['input']['surface']['wemin']     = 26
+             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'
+
            catch_obj = catchANDcn(config_obj = config)
            catch_obj.remap()
 
@@ -1444,12 +1466,6 @@ def _printExeInputKeys(rqdExeInpKeys):
     print ('# RESTART: M                                               #')
     print ('#   Re-tile from archived MERRA-2 restart file.            #')
     print ('#                                                          #')
-    print ('# RESTART: F                                               #')
-    print ('#   Re-tile from FP (Forward Processing) restart file.     #')
-    print ('#                                                          #')
-    print ('# RESTART: G                                               #')
-    print ('#   Re-tile from any AGCM catch[cnclmxx]_internal_rst file.#')
-    print ('#                                                          #')
     print ('# -------------------------------------------------------- #')
     print ('# IMPORTANT:                                               #')
     print ('#   Except for RESTART=1, SPIN-UP is REQUIRED in almost    #')
@@ -1464,15 +1480,10 @@ def _printExeInputKeys(rqdExeInpKeys):
     print ('#   restarts stored as follows:                            #')
     print ('#     RESTART_PATH/RESTART_ID/output/RESTART_DOMAIN/rs/    #')
     print ('#                                                          #')
-    print ('# For RESTART=0 or RESTART=M or RESTART=F:                 #')
+    print ('# For RESTART=0 or RESTART=M:                              #')
     print ('#   There is no need to specify RESTART_ID, RESTART_PATH,  #')
     print ('#   and RESTART_DOMAIN.                                    #')
     print ('#                                                          #')
-    print ('# For RESTART=G:                                           #')
-    print ('#   RESTART_ID   : full_path_to_AGCM_experiment_directory  #')
-    print ('#   RESTART_PATH : full_path_of_the_AGCM_restart_file      #')
-    print ('#   RESTART_DOMAIN is NOT required.                        #')
-    print ('#                                                          #')
     print ('############################################################')
     print ()
     print ('RESTART:')