Merge pull request #515 from hollyhan/add_ismip6_forcing_shelf

Add a new testcase for processing ismip6 shelf-collapse mask data

ISMIP6-2300 experimental protocol provides ice-shelf collapse masks for their `Tier2 experiments` to investigate the effects of ice-shelf collapse on the dynamics of the Antarctic Ice Sheet. 

This PR adds a test case that processes the original ismip6 shelf mask to the existing compass `ismip6_forcing` test group.  It also refactors the operations for creating mapping files to simplify the code.

compass/landice/tests/ismip6_forcing/__init__.py

@@ -1,12 +1,14 @@
-from compass.testgroup import TestGroup
 from compass.landice.tests.ismip6_forcing.atmosphere import Atmosphere
-from compass.landice.tests.ismip6_forcing.ocean_thermal import OceanThermal
 from compass.landice.tests.ismip6_forcing.ocean_basal import OceanBasal
+from compass.landice.tests.ismip6_forcing.ocean_thermal import OceanThermal
+from compass.landice.tests.ismip6_forcing.shelf_collapse import ShelfCollapse
+from compass.testgroup import TestGroup
 
 
 class Ismip6Forcing(TestGroup):
     """
-    A test group for processing the ISMIP6 ocean and atmosphere forcing data
+    A test group for processing the ISMIP6 atmosphere, ocean and
+    shelf-collapse forcing data
     """
 
     def __init__(self, mpas_core):
@@ -24,3 +26,4 @@ def __init__(self, mpas_core):
         self.add_test_case(OceanBasal(test_group=self))
         self.add_test_case(OceanThermal(test_group=self, process_obs=True))
         self.add_test_case(OceanThermal(test_group=self, process_obs=False))
+        self.add_test_case(ShelfCollapse(test_group=self))

compass/landice/tests/ismip6_forcing/atmosphere/__init__.py

@@ -1,10 +1,13 @@
+from compass.landice.tests.ismip6_forcing.atmosphere.process_smb import (
+    ProcessSMB,
+)
+from compass.landice.tests.ismip6_forcing.atmosphere.process_smb_racmo import (
+    ProcessSmbRacmo,
+)
+from compass.landice.tests.ismip6_forcing.configure import (
+    configure as configure_testgroup,
+)
 from compass.testcase import TestCase
-from compass.landice.tests.ismip6_forcing.atmosphere.process_smb \
-    import ProcessSMB
-from compass.landice.tests.ismip6_forcing.atmosphere.process_smb_racmo \
-    import ProcessSmbRacmo
-from compass.landice.tests.ismip6_forcing.configure import configure as \
-    configure_testgroup
 
 
 class Atmosphere(TestCase):