EAMxx: pass mach name rather than type in a few places

Author: bartgol

components/eamxx/scripts/gather_all_data.py

@@ -26,7 +26,7 @@ def formulate_command(self, machine):
         # gather-all runs on login, not compute nodes, so we cannot rely on
         # probed values to be accurate, so we should not set CTEST_PARALLEL_LEVEL
         # based on these potentially wrong values.
-        env_setup    = get_mach_env_setup_command(machine, ctest_j=-1)
+        env_setup    = get_mach_env_setup_command(machine.name, ctest_j=-1)
 
         env_setup_str = " && ".join(env_setup)
 

components/eamxx/scripts/machines_specs.py

@@ -397,20 +397,21 @@ def get_mach_env_setup_command(machine, ctest_j=None):
     ctest_j=-1   -> Skip CTEST_PARALLEL_LEVEL
     """
 
-    mach_custom_env = machine.env_setup
+    mach = get_machine(machine)
+    mach_custom_env = mach.env_setup
     if ctest_j != -1:
-        ctest_j = machine.num_run_res if ctest_j is None else ctest_j
+        ctest_j = mach.num_run_res if ctest_j is None else ctest_j
         mach_custom_env.append("export CTEST_PARALLEL_LEVEL={}".format(ctest_j))
 
-    if not machine.uses_gpu():
+    if not mach.uses_gpu():
         mach_custom_env.append("export OMP_PROC_BIND=spread")
 
     return mach_custom_env
 
 ###############################################################################
 def setup_mach_env(machine, ctest_j=None):
 ###############################################################################
-    assert_machine_supported(machine.name)
+    assert_machine_supported(machine)
 
     env_setup = get_mach_env_setup_command(machine, ctest_j=ctest_j)
 

components/eamxx/scripts/scripts_ctest_driver.py

@@ -1,5 +1,5 @@
 from utils import run_cmd, expect, check_minimum_python_version
-from machines_specs import is_machine_supported, setup_mach_env
+from machines_specs import is_machine_supported, setup_mach_env, get_machine
 
 check_minimum_python_version(3, 4)
 
@@ -51,7 +51,7 @@ def __init__(self, submit=False, machine=None, root_dir=None, work_dir=None, dry
 
         # Load env, but do not set CTEST_PARALLEL_JOBS. This code runs on login
         # nodes, so resource probing will not always be accurate.
-        setup_mach_env(self._machine, ctest_j=-1)
+        setup_mach_env(get_machine(self._machine), ctest_j=-1)
 
     ###############################################################################
     def generate_ctest_config(self, extra_configs):

components/eamxx/scripts/test_all_scream.py

@@ -173,7 +173,7 @@ def __init__(self, cxx_compiler=None, f90_compiler=None, c_compiler=None,
         # Need to happen before compiler probing
         if not self._preserve_env:
             # Setup the env on this machine
-            setup_mach_env(self._machine, ctest_j=ctest_max_jobs)
+            setup_mach_env(self._machine.name, ctest_j=ctest_max_jobs)
 
         ############################################
         #           Check repo status              #