Merge pull request #137 from GEOS-ESM/feature/wjiang/filename

remap_restarts package: bug fix and minor change to accommodate GEOSldas requirements

Author: sdrabenh

CHANGELOG.md

@@ -11,6 +11,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+- remap_restarts package: bug fix and minor change to accommodate GEOSldas requirements (#137)
+
 ### Fixed
 
 ### Removed

pre/remap_restart/remap_catchANDcn.py

@@ -41,8 +41,11 @@ def remap(self):
      in_rstfiles = glob.glob(rst_dir+'/*'+model+'_*'+time+'*')
      if len(in_rstfiles) == 0:
         print('\n try catch[cn] restart file without time stamp')
-        in_rstfiles = glob.glob(rst_dir+'/*'+model+'_*')
+        in_rstfiles = glob.glob(rst_dir+'/*'+model+'_internal_rst')
      if len(in_rstfiles) == 0:
+        print("Can not find restart file in " + rst_dir)
+        print("Please use the name format as *"  + model+'_*'+time+'*')
+        print(" Or *"+model+"_internal_rst")
         return
      in_rstfile = in_rstfiles[0]
 

pre/remap_restart/remap_lake_landice_saltwater.py

@@ -51,15 +51,19 @@ def remap(self):
      ogrid         = config['input']['shared']['ogrid']
      omodel        = config['input']['shared']['omodel']
      stretch       = config['input']['shared']['stretch']
-     in_geomdir    = get_geomdir(in_bc_base, in_bc_version, agrid=agrid, ogrid=ogrid, omodel=omodel, stretch=stretch)
-     in_tile_file  = glob.glob(in_geomdir+ '/*-Pfafstetter.til')[0]
+     in_tile_file  = config['input']['surface']['catch_tilefile']
+     if not in_tile_file :
+       in_geomdir    = get_geomdir(in_bc_base, in_bc_version, agrid=agrid, ogrid=ogrid, omodel=omodel, stretch=stretch)
+       in_tile_file  = glob.glob(in_geomdir+ '/*-Pfafstetter.til')[0]
 
      agrid         = config['output']['shared']['agrid']
      ogrid         = config['output']['shared']['ogrid']
      omodel        = config['output']['shared']['omodel']
      stretch       = config['output']['shared']['stretch']
-     out_geomdir   = get_geomdir(out_bc_base, out_bc_version, agrid=agrid, ogrid=ogrid, omodel=omodel, stretch=stretch)
-     out_tile_file = glob.glob(out_geomdir+ '/*-Pfafstetter.til')[0]
+     out_tile_file = config['output']['surface']['catch_tilefile']
+     if not out_tile_file :
+       out_geomdir   = get_geomdir(out_bc_base, out_bc_version, agrid=agrid, ogrid=ogrid, omodel=omodel, stretch=stretch)
+       out_tile_file = glob.glob(out_geomdir+ '/*-Pfafstetter.til')[0]
 
      types = '.bin'
      type_str = sp.check_output(['file','-b', os.path.realpath(restarts_in[0])])