Fix typo and crontab issue on wcoss dell in workflow python scripts (#…

…750) * Fix typo and failure on wcoss * fix new line issue on wcoss dell * remove capture_output * Get USER from environment Co-authored-by: Daniel Abdi <[email protected]>
ufs-community · Apr 28, 2022 · e2fa6fc · e2fa6fc
1 parent bf0fae9
commit e2fa6fc
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/ush/generate_FV3LAM_wflow.py b/ush/generate_FV3LAM_wflow.py
@@ -512,7 +512,7 @@ def generate_FV3LAM_wflow():
               CRONTAB_LINE = \"{CRONTAB_LINE}\"''',verbose=VERBOSE)
 
         if MACHINE == "WCOSS_DELL_P3":
-          run_command(f'''printf "%s" '{CRONTAB_LINE}' >> f"/u/{USER}/cron/mycrontab"''')
+          run_command(f'''printf "%s\n" '{CRONTAB_LINE}' >> "/u/{USER}/cron/mycrontab"''')
         else:
           # Add a newline to the end of crontab_contents only if it is not empty.
           # This is needed so that when CRONTAB_LINE is printed out, it appears on

diff --git a/ush/get_crontab_contents.py b/ush/get_crontab_contents.py
@@ -38,9 +38,9 @@ def get_crontab_contents(called_from_cron):
     print_input_args(locals())
 
     #import all env vars
-    IMPORTS = ["MACHINE"]
+    IMPORTS = ["MACHINE", "USER"]
     import_vars(env_vars=IMPORTS)
-  
+
     #
     # Make sure called_from_cron is set to a valid value.
     #
@@ -79,5 +79,5 @@ def test_get_crontab_contents(self):
         self.assertEqual(crontab_cmd, "crontab")
     def setUp(self):
         define_macos_utilities();
-        set_env_var('DEBUG','FALSE')
+        set_env_var('DEBUG',False)
         set_env_var('MACHINE', 'HERA')
diff --git a/ush/retrieve_data.py b/ush/retrieve_data.py
@@ -716,7 +716,6 @@ def parse_args():
             output = subprocess.run('which hsi',
                                     check=True,
                                     shell=True,
-                                    capture_output=True,
                                     )
         except subprocess.CalledProcessError:
             logging.error('You requested the hpss data store, but ' \

diff --git a/ush/setup.py b/ush/setup.py
@@ -428,7 +428,7 @@ def setup():
     #
     #-----------------------------------------------------------------------
     global USE_MERRA_CLIMO
-    if USE_MERRA_CLIMO == "FV3_GFS_v15_thompson_mynn_lam3km":
+    if CCPP_PHYS_SUITE == "FV3_GFS_v15_thompson_mynn_lam3km":
       USE_MERRA_CLIMO=True
     #
     #-----------------------------------------------------------------------