Make inactive top cells false by default and add inactive top cells performance test

Author: cbegeman

compass/ocean/tests/global_ocean/__init__.py

@@ -40,14 +40,8 @@ def __init__(self, mpas_core):
 
             init = Init(test_group=self, mesh=mesh,
                         initial_condition='PHC',
-                        with_bgc=False,
-                        with_inactive_top_cells=False)
+                        with_bgc=False)
             self.add_test_case(init)
-            init_inactive_top_cells = Init(test_group=self, mesh=mesh,
-                        initial_condition='PHC',
-                        with_bgc=False,
-                        with_inactive_top_cells=True)
-            self.add_test_case(init_inactive_top_cells)
 
             time_integrator = 'split_explicit'
             self.add_test_case(
@@ -106,8 +100,7 @@ def __init__(self, mpas_core):
             time_integrator = 'split_explicit'
             init = Init(test_group=self, mesh=mesh,
                         initial_condition='EN4_1900',
-                        with_bgc=False,
-                        with_inactive_top_cells=False)
+                        with_bgc=False)
             self.add_test_case(init)
             self.add_test_case(
                 PerformanceTest(
@@ -125,8 +118,18 @@ def __init__(self, mpas_core):
             # BGC tests
             init = Init(test_group=self, mesh=mesh,
                         initial_condition='PHC',
-                        with_bgc=True,
-                        with_inactive_top_cells=False)
+                        with_bgc=True)
+            self.add_test_case(init)
+            self.add_test_case(
+                PerformanceTest(
+                    test_group=self, mesh=mesh, init=init,
+                    time_integrator=time_integrator))
+
+            # Inactive top cells tests
+            init = Init(test_group=self, mesh=mesh,
+                        initial_condition='PHC',
+                        with_bgc=False,
+                        with_inactive_top_cells=True)
             self.add_test_case(init)
             self.add_test_case(
                 PerformanceTest(
@@ -140,8 +143,7 @@ def __init__(self, mpas_core):
 
             init = Init(test_group=self, mesh=mesh,
                         initial_condition='PHC',
-                        with_bgc=False,
-                        with_inactive_top_cells=False)
+                        with_bgc=False)
             self.add_test_case(init)
 
             time_integrator = 'split_explicit'
@@ -165,8 +167,7 @@ def __init__(self, mpas_core):
 
             init = Init(test_group=self, mesh=mesh,
                         initial_condition='PHC',
-                        with_bgc=False,
-                        with_inactive_top_cells=False)
+                        with_bgc=False)
             self.add_test_case(init)
             time_integrator = 'split_explicit'
             self.add_test_case(
@@ -189,8 +190,7 @@ def __init__(self, mpas_core):
 
             init = Init(test_group=self, mesh=mesh,
                         initial_condition='PHC',
-                        with_bgc=False,
-                        with_inactive_top_cells=False)
+                        with_bgc=False)
             self.add_test_case(init)
             time_integrator = 'split_explicit'
             self.add_test_case(

compass/ocean/tests/global_ocean/init/__init__.py

@@ -26,7 +26,7 @@ class Init(TestCase):
         The subdirectory within the test group for all test cases with this
         initial condition
     """
-    def __init__(self, test_group, mesh, initial_condition, with_bgc, with_inactive_top_cells):
+    def __init__(self, test_group, mesh, initial_condition, with_bgc, with_inactive_top_cells=False):
         """
         Create the test case
 
@@ -46,17 +46,19 @@ def __init__(self, test_group, mesh, initial_condition, with_bgc, with_inactive_
         """
         name = 'init'
         mesh_name = mesh.mesh_name
+        ic_dir = initial_condition
         if with_bgc:
-            ic_dir = '{}_BGC'.format(initial_condition)
-        else:
-            ic_dir = initial_condition
+            ic_dir = '{}_BGC'.format(ic_dir)
+        if with_inactive_top_cells:
+            ic_dir = '{}_inactive_top'.format(ic_dir)
         self.init_subdir = os.path.join(mesh_name, ic_dir)
         subdir = os.path.join(self.init_subdir, name)
         super().__init__(test_group=test_group, name=name, subdir=subdir)
 
         self.mesh = mesh
         self.initial_condition = initial_condition
         self.with_bgc = with_bgc
+        self.with_inactive_top_cells = with_inactive_top_cells
 
         self.add_step(
             InitialState(