all srt now passing on derecho

ESMCI · Jan 26, 2024 · 8cc3571 · 8cc3571
1 parent ee70089
commit 8cc3571
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 10 deletions.
diff --git a/config/cesm/machines/config_machines.xml b/config/cesm/machines/config_machines.xml
@@ -996,7 +996,7 @@ This allows using a different mpirun command to launch unit tests
     <DESC>NCAR AMD EPYC </DESC>
     <NODENAME_REGEX>de.*.hpc.ucar.edu</NODENAME_REGEX>
     <OS>CNL</OS>
-    <COMPILERS>intel</COMPILERS>
+    <COMPILERS>intel,gnu</COMPILERS>
 <!--    <COMPILERS>intel,gnu,cray,nvhpc,intel-oneapi,intel-classic</COMPILERS> -->
     <MPILIBS>mpich</MPILIBS>
     <CIME_OUTPUT_ROOT>$ENV{SCRATCH}</CIME_OUTPUT_ROOT>

diff --git a/scripts/fortran_unit_testing/run_tests.py b/scripts/fortran_unit_testing/run_tests.py
@@ -130,7 +130,7 @@ def parse_command_line(args):
 
     args = CIME.utils.parse_args_and_handle_standard_logging_options(args, parser)
     output = Printer(color=args.color)
-
+    # pylint: disable=broad-exception-raised
     if args.xml_test_list is None and args.test_spec_dir is None:
         output.print_error(
             "You must specify either --test-spec-dir or --xml-test-list."

diff --git a/scripts/lib/CIME/SystemTests/system_tests_common.py b/scripts/lib/CIME/SystemTests/system_tests_common.py
@@ -399,6 +399,7 @@ def _compare_baseline(self):
         """
         compare the current test output to a baseline result
         """
+        memlist = None
         with self._test_status:
             # compare baseline
             success, comments = compare_baseline(self._case)

diff --git a/scripts/lib/CIME/XML/machines.py b/scripts/lib/CIME/XML/machines.py
@@ -252,7 +252,7 @@ def is_valid_compiler(self,compiler):
         """
         Check the compiler is valid for the current machine
 
-        >>> machobj = Machines(machine="cori-haswell")
+        >>> machobj = Machines(machine="derecho")
         >>> machobj.get_default_compiler()
         'intel'
         >>> machobj.is_valid_compiler("gnu")
@@ -266,7 +266,7 @@ def is_valid_MPIlib(self, mpilib, attributes=None):
         """
         Check the MPILIB is valid for the current machine
 
-        >>> machobj = Machines(machine="cori-haswell")
+        >>> machobj = Machines(machine="derecho")
         >>> machobj.is_valid_MPIlib("mpi-serial")
         True
         >>> machobj.is_valid_MPIlib("fake-mpi")
@@ -279,7 +279,7 @@ def has_batch_system(self):
         """
         Return if this machine has a batch system
 
-        >>> machobj = Machines(machine="cori-haswell")
+        >>> machobj = Machines(machine="derecho")
         >>> machobj.has_batch_system()
         True
         >>> machobj.set_machine("melvin")

diff --git a/scripts/lib/CIME/code_checker.py b/scripts/lib/CIME/code_checker.py
@@ -15,24 +15,26 @@
 ###############################################################################
 def _run_pylint(on_file, interactive):
 ###############################################################################
-    pylint = find_executable("pylint")
+    pylintstr = find_executable("pylint")
 
     cmd_options = " --disable=I,C,R,logging-not-lazy,wildcard-import,unused-wildcard-import"
     cmd_options += ",fixme,broad-except,bare-except,eval-used,exec-used,global-statement"
     cmd_options += ",logging-format-interpolation,no-name-in-module,unspecified-encoding"
     cmd_options += ",arguments-renamed,no-member,redefined-outer-name"
-    cimeroot = get_cime_root()
+    cmd_options += ",deprecated-module,deprecated-class"
 
-    if "scripts/Tools" in on_file:
-        cmd_options +=",relative-import"
+    cimeroot = get_cime_root()
+
+#    if "scripts/Tools" in on_file:
+#        cmd_options +=",relative-import"
 
     # add init-hook option
     cmd_options += " --init-hook='sys.path.extend((\"%s\",\"%s\",\"%s\"))'"%\
         (os.path.join(cimeroot,"scripts","lib"),
          os.path.join(cimeroot,"scripts","Tools"),
          os.path.join(cimeroot,"scripts","fortran_unit_testing","python"))
 
-    cmd = "%s %s %s" % (pylint, cmd_options, on_file)
+    cmd = "%s %s %s" % (pylintstr, cmd_options, on_file)
     logger.debug("pylint command is %s"%cmd)
     stat, out, err = run_cmd(cmd, verbose=False, from_dir=cimeroot)
     if stat != 0:

diff --git a/scripts/lib/CIME/namelist.py b/scripts/lib/CIME/namelist.py
@@ -863,6 +863,7 @@ def shouldRaise(eclass, method, *args, **kw):
         if not isinstance(e, eclass):
             raise
         return
+    # pylint: disable=broad-exception-raised
     raise Exception("Expected exception %s not raised" %
                     str(eclass))