Add an init step to ISOMIP+

Author: xylar

polaris/ocean/tasks/isomip_plus/__init__.py

@@ -45,9 +45,25 @@ def add_isomip_plus_tasks(component, mesh_type):
         shared_steps = _get_shared_steps(
             mesh_type, resolution, mesh_name, resdir, component, config)
 
-        for experiment in ['ocean0', 'ocean1', 'ocean2', 'ocean3', 'ocean4',
-                           'inception', 'wetting', 'drying']:
-            for vertical_coordinate in ['z-star']:
+        basic_expts = ['ocean0', 'ocean1', 'ocean2', 'ocean3', 'ocean4']
+        extra_expts = ['inception', 'wetting', 'drying']
+        vert_coords = ['z-star', 'sigma', 'single-layer']
+
+        for experiment in basic_expts:
+            vertical_coordinate = 'z-star'
+            task = IsomipPlusTest(
+                component=component,
+                resdir=resdir,
+                resolution=resolution,
+                experiment=experiment,
+                vertical_coordinate=vertical_coordinate,
+                planar=planar,
+                shared_steps=shared_steps[experiment])
+            component.add_task(task)
+
+        if planar and resolution >= 2.:
+            for experiment in extra_expts:
+                vertical_coordinate = 'z-star'
                 task = IsomipPlusTest(
                     component=component,
                     resdir=resdir,
@@ -58,6 +74,19 @@ def add_isomip_plus_tasks(component, mesh_type):
                     shared_steps=shared_steps[experiment])
                 component.add_task(task)
 
+            for vertical_coordinate in vert_coords:
+                for experiment in ['ocean0'] + extra_expts:
+                    task = IsomipPlusTest(
+                        component=component,
+                        resdir=resdir,
+                        resolution=resolution,
+                        experiment=experiment,
+                        vertical_coordinate=vertical_coordinate,
+                        planar=planar,
+                        shared_steps=shared_steps[experiment],
+                        thin_film=True)
+                    component.add_task(task)
+
 
 def _get_shared_steps(mesh_type, resolution, mesh_name, resdir, component,
                       config):

polaris/ocean/tasks/isomip_plus/init/__init__.py

@@ -0,0 +1 @@
+from polaris.ocean.tasks.isomip_plus.init.init import Init