++

Author: PhilipDeegan

tests/functional/harris/harris_2d.py

@@ -180,7 +180,7 @@ def test_run(self, diag_dir=None, sim=None):
         return self
 
     def plot(self, timestamps, diag_dir, plot_dir):
-        run = self.run(diag_dir)
+        run = self.getRun(diag_dir)
         for time in timestamps:
             run.GetDivB(time).plot(
                 filename=plot_file_for_qty(plot_dir, "divb", time),

tests/functional/harris/harris_2d_100_x_100_slow.py

@@ -47,8 +47,6 @@ def config():
         final_time=final_time,
         cells=cells,
         dl=(0.40, 0.40),
-        # refinement="tagging",
-        # max_nbr_levels=1,
         nesting_buffer=1,
         clustering="tile",
         tag_buffer="1",

tests/simulator/__init__.py

@@ -204,7 +204,6 @@ class SimulatorTestRunInterop(run.Run):
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
-        self.dummies = {}
 
     @staticmethod
     def _wrapper(func, func_name):
@@ -213,7 +212,7 @@ def wrapped(*args, **kwargs):
             try:
                 return func(*args, **kwargs)
             except FileNotFoundError:
-                print("File not found, maybe diagnostic is not active")
+                print(f"{func_name} : file not found, maybe diagnostic is not active")
 
         return wrapped
 
@@ -271,7 +270,7 @@ def __init__(self, *args, **kwargs):
         self.diag_dirs = []  # cleanup after tests
         self.success = True
 
-    def run(self, result=None):
+    def run(self, result=None):  # override superclass function
         self._outcome = result
         super().run(result)
 
@@ -294,5 +293,5 @@ def clean_up_diags_dirs(self):
                     shutil.rmtree(diag_dir)
         cpp_lib().mpi_barrier()
 
-    def run(self, diag_dir):
+    def getRun(self, diag_dir):
         return SimulatorTestRunInterop(diag_dir)