Merge pull request #116 from GEOS-ESM/feature/borescan_fix_v12_branch

Add missing commits to GCMv12 branch

Author: sdrabenh

pre/remap_restart/remap_command_line.py

@@ -82,6 +82,7 @@ def parse_args(program_description):
     account = get_account()
     p_command.add_argument('-account',    default=account,    help="slurm_pbs account")
     p_command.add_argument('-partition',  default='',       help="slurm_pbs partition")
+
     p_command.add_argument('-rs',         default='3',        help="Flag indicating which restarts to regrid: 1 (upper air); 2 (surface); 3 (both)", choices=['1','2','3'])
 
     # Parse using parse_known_args so we can pass the rest to the remap scripts

pre/remap_restart/remap_questions.py

@@ -36,10 +36,10 @@ def echo_bcs(x,opt):
   return False
 
 def default_partition(x):
-   if x['slurm_pbs:qos'] == 'debug':
-      x['slurm_pbs:partition'] = 'compute'
-      return False
-   return True
+    if x['slurm_pbs:qos'] == 'debug':
+        x['slurm_pbs:partition'] = 'compute'
+        return False
+    return True
 
 def validate_merra2_time(text):
    if len(text) == 10 :
@@ -121,6 +121,13 @@ def ask_questions():
             "validate": lambda text: validate_geosit_time(text),
             "when": lambda x: x.get("input:shared:GEOS-IT", False) and not x.get("input:shared:MERRA-2", False),
         },
+        {
+            "type": "confirm",
+            "name": "input:air:hydrostatic",
+            "message": "Is the upper air input hydrostatic? (If you are not sure, don't change the default 'True')\n",
+            "default": True,
+            "when": lambda x: not x['input:shared:MERRA-2'],
+        },
         {
             "type": "path",
             "name": "output:shared:out_dir",
@@ -465,6 +472,7 @@ def ask_questions():
    answers["output:surface:remap_water"] = answers["output:surface:remap"]
    answers["output:surface:remap_catch"] = answers["output:surface:remap"]
    del answers["output:surface:remap"]
+   if answers["input:shared:MERRA-2"] : answers["input:air:hydrostatic"] = True
 
    return answers
 

pre/remap_restart/remap_upper.py

@@ -423,7 +423,8 @@ def find_rst(self):
         if len(files) >0:
           restarts_in.append(files[0])
      if (len(restarts_in) == 0) :
-        print("\n try restart file names without time stamp\n")
+        print("\n Try restart file names without time stamp or suffix (e.g., .nc4)\n")
+        print("\n It expects restart file names as xx_internal_rst, e.g., fvcore_internal_rst \n")
         for f in self.air_restarts :
            fname = rst_dir+ '/'+f
            if os.path.exists(fname):

pre/remap_restart/remap_utils.py

@@ -119,7 +119,7 @@
 
 message_ogrid_new   = "Select data ocean grid/resolution of output restarts:\n"
 
-message_qos        = "SLURM or PBS quality-of-service (qos)?  (If resolution is c1440 or higher, enter 'allnccs' for NCCS or 'normal' for NAS.)\n"
+message_qos        = "SLURM or PBS quality-of-service (qos)?      (Use default 'debug' to get resource faster; or Enter 'allnccs' for NCCS or 'normal' for NAS if resolution is c1440 or higher; or leave it blank)\n"
 
 message_account    = "Select/enter SLURM or PBS account:\n"