Add config option for number of inactive layers

Author: cbegeman

compass/ocean/tests/global_ocean/configure.py

@@ -26,6 +26,7 @@ def configure_global_ocean(test_case, mesh, init=None):
             config.get('global_ocean', 'prefix')))
 
     if init is not None and init.with_inactive_top_cells:
+        config.set('vertical_grid', 'inactive_top_cells', '1')
         config.set('vertical_grid', 'vert_levels', '{}'.format(
             config.getint('vertical_grid', 'vert_levels')+1))
 

compass/ocean/tests/global_ocean/mesh/qu240/qu240.cfg

@@ -16,6 +16,7 @@ min_layer_thickness = 3.0
 # The maximum layer thickness
 max_layer_thickness = 500.0
 
+inactive_top_cells = 0
 
 # options for global ocean testcases
 [global_ocean]

compass/ocean/vertical/grid_1d.py

@@ -46,6 +46,10 @@ def generate_1d_grid(config):
         bottom_depth = section.getfloat('bottom_depth')
         # renormalize to the requested range
         interfaces = (bottom_depth/interfaces[-1]) * interfaces
+    if config.has_option('vertical_grid', 'inactive_top_cells'): 
+        offset = config.getint('vertical_grid', 'inactive_top_cells')
+        if offset > 0:
+            interfaces[offset:] = interfaces[:0-offset]
 
     return interfaces