More updates.

ufs-community · Apr 15, 2022 · 59c4fb2 · 59c4fb2
1 parent d9bdaca
commit 59c4fb2
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 17 deletions.
diff --git a/ush/config_defaults.yaml b/ush/config_defaults.yaml
@@ -413,11 +413,11 @@ FV3_NML_YAML_CONFIG_FN: "FV3.input.yml"
 FV3_NML_BASE_ENS_FN: "input.nml.base_ens"
 FV3_EXEC_FN: "ufs_model"
 
-DATA_TABLE_FN: ""
-DIAG_TABLE_FN: ""
-FIELD_TABLE_FN: ""
-MODEL_CONFIG_FN: ""
-NEMS_CONFIG_FN: ""
+DATA_TABLE_TMPL_FN: ""
+DIAG_TABLE_TMPL_FN: ""
+FIELD_TABLE_TMPL_FN: ""
+MODEL_CONFIG_TMPL_FN: ""
+NEMS_CONFIG_TMPL_FN: ""
 
 FCST_MODEL: "ufs-weather-model"
 WFLOW_XML_FN: "FV3LAM_wflow.xml"

diff --git a/ush/generate_FV3LAM_wflow.py b/ush/generate_FV3LAM_wflow.py
@@ -458,8 +458,8 @@ def generate_FV3LAM_wflow():
           crontab_backup_fp = \"{crontab_backup_fp}\"''',verbose=VERBOSE)
 
       global called_from_cron
-      try: called_from_cron
-      except: called_from_cron = False
+      if called_from_cron is None:
+         called_from_cron = False
 
       crontab_cmd,crontab_contents = get_crontab_contents(called_from_cron=called_from_cron)
       # To create the backup crontab file and add a new job to the user's 

diff --git a/ush/setup.py b/ush/setup.py
@@ -903,16 +903,16 @@ def setup():
     NEMS_CONFIG_FN = "nems.configure"
     #----------------------------------
 
-    try: DATA_TABLE_TMPL_FN
-    except:  DATA_TABLE_TMPL_FN = DATA_TABLE_FN
-    try: DIAG_TABLE_TMPL_FN
-    except: DIAG_TABLE_TMPL_FN = f"{DIAG_TABLE_FN}{dot_ccpp_phys_suite_or_null}"
-    try: FIELD_TABLE_TMPL_FN
-    except: FIELD_TABLE_TMPL_FN = f"{FIELD_TABLE_FN}{dot_ccpp_phys_suite_or_null}"
-    try: MODEL_CONFIG_TMPL_FN
-    except: MODEL_CONFIG_TMPL_FN = MODEL_CONFIG_FN
-    try: NEMS_CONFIG_TMPL_FN
-    except: NEMS_CONFIG_TMPL_FN = NEMS_CONFIG_FN
+    if DATA_TABLE_TMPL_FN is None:
+       DATA_TABLE_TMPL_FN = DATA_TABLE_FN
+    if DIAG_TABLE_TMPL_FN is None:
+       DIAG_TABLE_TMPL_FN = f"{DIAG_TABLE_FN}{dot_ccpp_phys_suite_or_null}"
+    if FIELD_TABLE_TMPL_FN is None:
+       FIELD_TABLE_TMPL_FN = f"{FIELD_TABLE_FN}{dot_ccpp_phys_suite_or_null}"
+    if MODEL_CONFIG_TMPL_FN is None:
+       MODEL_CONFIG_TMPL_FN = MODEL_CONFIG_FN
+    if NEMS_CONFIG_TMPL_FN is None:
+       NEMS_CONFIG_TMPL_FN = NEMS_CONFIG_FN
 
     DATA_TABLE_TMPL_FP = os.path.join(TEMPLATE_DIR,DATA_TABLE_TMPL_FN)
     DIAG_TABLE_TMPL_FP = os.path.join(TEMPLATE_DIR,DIAG_TABLE_TMPL_FN)
@@ -1614,6 +1614,7 @@ def setup():
     #
     #-----------------------------------------------------------------------
     #
+    global RUN_TASK_RUN_POST
     if WRITE_DOPOST:
       # Turn off run_post
       RUN_TASK_RUN_POST=False