Refactor land-ice mesh generation test cases

.github/workflows/build_workflow.yml

@@ -36,7 +36,7 @@ jobs:
           python-version: "3.10"
       - if: ${{ steps.skip_check.outputs.should_skip != 'true' }}
         id: file_changes
-        uses: trilom/[email protected].3
+        uses: trilom/[email protected].4
         with:
           output: ' '
       - if: ${{ steps.skip_check.outputs.should_skip != 'true' }}

compass/landice/tests/antarctica/mesh.py

@@ -1,20 +1,11 @@
 from shutil import copyfile
 
-import matplotlib.pyplot as plt
-import mpas_tools
 import netCDF4
-import xarray
-from geometric_features import FeatureCollection, GeometricFeatures
-from mpas_tools.io import write_netcdf
-from mpas_tools.logging import check_call
-from mpas_tools.mesh.conversion import convert, cull
-from mpas_tools.mesh.creation import build_planar_mesh
 
 from compass.landice.mesh import (
-    get_dist_to_edge_and_GL,
-    gridded_flood_fill,
-    set_cell_width,
-    set_rectangular_geom_points_and_edges,
+    build_cell_width,
+    build_mali_mesh,
+    make_region_masks,
 )
 from compass.model import make_graph_file
 from compass.step import Step
@@ -62,29 +53,13 @@ def run(self):
         Run this step of the test case
         """
         logger = self.logger
-        config = self.config
-        section = config['antarctica']
+        section_name = 'mesh'
 
         logger.info('calling build_cell_width')
         cell_width, x1, y1, geom_points, geom_edges, floodFillMask = \
-            self.build_cell_width()
-        logger.info('calling build_planar_mesh')
-        build_planar_mesh(cell_width, x1, y1, geom_points,
-                          geom_edges, logger=logger)
-        dsMesh = xarray.open_dataset('base_mesh.nc')
-        logger.info('culling mesh')
-        dsMesh = cull(dsMesh, logger=logger)
-        logger.info('converting to MPAS mesh')
-        dsMesh = convert(dsMesh, logger=logger)
-        logger.info('writing grid_converted.nc')
-        write_netcdf(dsMesh, 'grid_converted.nc')
-        levels = section.get('levels')
-        logger.info('calling create_landice_grid_from_generic_MPAS_grid.py')
-        args = ['create_landice_grid_from_generic_MPAS_grid.py',
-                '-i', 'grid_converted.nc',
-                '-o', 'ais_8km_preCull.nc',
-                '-l', levels, '-v', 'glimmer']
-        check_call(args, logger=logger)
+            build_cell_width(
+                self, section_name=section_name,
+                gridded_dataset='antarctica_8km_2020_10_20.nc')
 
         # Apply floodFillMask to thickness field to help with culling
         copyfile('antarctica_8km_2020_10_20.nc',
@@ -96,159 +71,25 @@ def run(self):
         gg.variables['vy'][0, :, :] *= floodFillMask
         gg.close()
 
-        logger.info('calling interpolate_to_mpasli_grid.py')
-        args = ['interpolate_to_mpasli_grid.py', '-s',
-                'antarctica_8km_2020_10_20_floodFillMask.nc', '-d',
-                'ais_8km_preCull.nc', '-m', 'b', '-t']
-
-        check_call(args, logger=logger)
-
-        # Cull a certain distance from the ice margin
-        cullDistance = section.get('cull_distance')
-        if float(cullDistance) > 0.:
-            logger.info('calling define_cullMask.py')
-            args = ['define_cullMask.py', '-f',
-                    'ais_8km_preCull.nc', '-m',
-                    'distance', '-d', cullDistance]
-
-            check_call(args, logger=logger)
-        else:
-            logger.info('cullDistance <= 0 in config file. '
-                        'Will not cull by distance to margin. \n')
-
-        dsMesh = xarray.open_dataset('ais_8km_preCull.nc')
-        dsMesh = cull(dsMesh, logger=logger)
-        write_netcdf(dsMesh, 'antarctica_culled.nc')
-
-        logger.info('Marking horns for culling')
-        args = ['mark_horns_for_culling.py', '-f', 'antarctica_culled.nc']
-        check_call(args, logger=logger)
-
-        logger.info('culling and converting')
-        dsMesh = xarray.open_dataset('antarctica_culled.nc')
-        dsMesh = cull(dsMesh, logger=logger)
-        dsMesh = convert(dsMesh, logger=logger)
-        write_netcdf(dsMesh, 'antarctica_dehorned.nc')
-
-        mesh_filename = self.mesh_filename
-        logger.info('calling create_landice_grid_from_generic_MPAS_grid.py')
-        args = ['create_landice_grid_from_generic_MPAS_grid.py', '-i',
-                'antarctica_dehorned.nc', '-o',
-                mesh_filename, '-l', levels, '-v', 'glimmer',
-                '--beta', '--thermal', '--obs', '--diri']
-
-        check_call(args, logger=logger)
-
-        logger.info('calling interpolate_to_mpasli_grid.py')
-        args = ['interpolate_to_mpasli_grid.py', '-s',
-                'antarctica_8km_2020_10_20.nc',
-                '-d', mesh_filename, '-m', 'b']
-        check_call(args, logger=logger)
-
-        logger.info('Marking domain boundaries dirichlet')
-        args = ['mark_domain_boundaries_dirichlet.py',
-                '-f', mesh_filename]
-        check_call(args, logger=logger)
-
-        logger.info('calling set_lat_lon_fields_in_planar_grid.py')
-        args = ['set_lat_lon_fields_in_planar_grid.py', '-f',
-                mesh_filename, '-p', 'ais-bedmap2']
-        check_call(args, logger=logger)
+        build_mali_mesh(
+            self, cell_width, x1, y1, geom_points, geom_edges,
+            mesh_name=self.mesh_filename, section_name=section_name,
+            gridded_dataset='antarctica_8km_2020_10_20_floodFillMask.nc',
+            projection='ais-bedmap2', geojson_file=None)
 
         logger.info('creating graph.info')
-        make_graph_file(mesh_filename=mesh_filename,
+        make_graph_file(mesh_filename=self.mesh_filename,
                         graph_filename='graph.info')
 
         # create a region mask
-        mask_filename = f'{mesh_filename[:-3]}_imbie_regionMasks.nc'
-        self._make_region_masks(mesh_filename, mask_filename,
-                                self.cpus_per_task,
-                                tags=['EastAntarcticaIMBIE',
-                                      'WestAntarcticaIMBIE',
-                                      'AntarcticPeninsulaIMBIE'])
-
-        mask_filename = f'{mesh_filename[:-3]}_ismip6_regionMasks.nc'
-        self._make_region_masks(mesh_filename, mask_filename,
-                                self.cpus_per_task,
-                                tags=['ISMIP6_Basin'])
-
-    def build_cell_width(self):
-        """
-        Determine MPAS mesh cell size based on user-defined density function.
-
-        This includes hard-coded definition of the extent of the regional
-        mesh and user-defined mesh density functions based on observed flow
-        speed and distance to the ice margin.
-        """
-        # get needed fields from AIS dataset
-        f = netCDF4.Dataset('antarctica_8km_2020_10_20.nc', 'r')
-        f.set_auto_mask(False)  # disable masked arrays
-
-        x1 = f.variables['x1'][:]
-        y1 = f.variables['y1'][:]
-        thk = f.variables['thk'][0, :, :]
-        topg = f.variables['topg'][0, :, :]
-        vx = f.variables['vx'][0, :, :]
-        vy = f.variables['vy'][0, :, :]
-
-        # Define extent of region to mesh.
-        # These coords are specific to the Antarctica mesh.
-        xx0 = -3333500
-        xx1 = 3330500
-        yy0 = -3333500
-        yy1 = 3330500
-        geom_points, geom_edges = set_rectangular_geom_points_and_edges(
-            xx0, xx1, yy0, yy1)
-
-        # Remove ice not connected to the ice sheet.
-        floodMask = gridded_flood_fill(thk)
-        thk[floodMask == 0] = 0.0
-        vx[floodMask == 0] = 0.0
-        vy[floodMask == 0] = 0.0
-
-        # Calculate distance from each grid point to ice edge
-        # and grounding line, for use in cell spacing functions.
-        distToEdge, distToGL = get_dist_to_edge_and_GL(self, thk, topg, x1, y1,
-                                                       section='antarctica',
-                                                       window_size=1.e5)
-        # optional - plot distance calculation
-        # plt.pcolor(distToEdge/1000.0); plt.colorbar(); plt.show()
-
-        # Set cell widths based on mesh parameters set in config file
-        cell_width = set_cell_width(self, section='antarctica', thk=thk,
-                                    vx=vx, vy=vy, dist_to_edge=distToEdge,
-                                    dist_to_grounding_line=distToGL)
-        # plt.pcolor(cell_width); plt.colorbar(); plt.show()
-
-        return (cell_width.astype('float64'), x1.astype('float64'),
-                y1.astype('float64'), geom_points, geom_edges, floodMask)
-
-    def _make_region_masks(self, mesh_filename, mask_filename, cores, tags):
-        logger = self.logger
-        gf = GeometricFeatures()
-        fcMask = FeatureCollection()
-
-        for tag in tags:
-            fc = gf.read(componentName='landice', objectType='region',
-                         tags=[tag])
-            fc.plot('southpole')
-            plt.savefig(f'plot_basins_{tag}.png')
-            fcMask.merge(fc)
-
-        geojson_filename = 'regionMask.geojson'
-        fcMask.to_geojson(geojson_filename)
-
-        # these defaults may have been updated from config options -- pass them
-        # along to the subprocess
-        netcdf_format = mpas_tools.io.default_format
-        netcdf_engine = mpas_tools.io.default_engine
-
-        args = ['compute_mpas_region_masks',
-                '-m', mesh_filename,
-                '-g', geojson_filename,
-                '-o', mask_filename,
-                '-t', 'cell',
-                '--process_count', f'{cores}',
-                '--format', netcdf_format,
-                '--engine', netcdf_engine]
-        check_call(args, logger=logger)
+        mask_filename = f'{self.mesh_filename[:-3]}_imbie_regionMasks.nc'
+        make_region_masks(self, self.mesh_filename, mask_filename,
+                          self.cpus_per_task,
+                          tags=['EastAntarcticaIMBIE',
+                                'WestAntarcticaIMBIE',
+                                'AntarcticPeninsulaIMBIE'])
+
+        mask_filename = f'{self.mesh_filename[:-3]}_ismip6_regionMasks.nc'
+        make_region_masks(self, self.mesh_filename, mask_filename,
+                          self.cpus_per_task,
+                          tags=['ISMIP6_Basin'])

compass/landice/tests/antarctica/antarctica.cfg → compass/landice/tests/antarctica/mesh_gen/mesh_gen.cfg

@@ -1,9 +1,15 @@
 # config options for antarctica test cases
-[antarctica]
+[mesh]
 
 # number of levels in the mesh
 levels = 5
 
+# Bounds of Antarctic mesh
+x_min = -3333500.
+x_max = 3330500.
+y_min = -3333500.
+y_max = 3330500.
+
 # distance from ice margin to cull (km).
 # Set to a value <= 0 if you do not want
 # to cull based on distance from margin.
@@ -22,10 +28,18 @@ low_log_speed = 0.75
 high_dist = 1.e5
 # distance to ice edge or grounding line within which cell spacing = min_spac (meters)
 low_dist = 1.e4
+
+# These will not be applied unless use_bed = True.
+# They are taken from the humboldt.mesh_gen test case
+# and have not been evaluated for Antarctica.
 # distance at which bed topography has no effect
 high_dist_bed = 1.e5
 # distance within which bed topography has maximum effect
 low_dist_bed = 7.5e4
+# Bed elev beneath which cell spacing is minimized
+low_bed = 50.0
+# Bed elev above which cell spacing is maximized
+high_bed = 100.0
 
 # mesh density functions
 use_speed = True

compass/landice/tests/greenland/__init__.py

@@ -1,8 +1,10 @@
-from compass.testgroup import TestGroup
-from compass.landice.tests.greenland.smoke_test import SmokeTest
-from compass.landice.tests.greenland.decomposition_test import DecompositionTest
+from compass.landice.tests.greenland.decomposition_test import (
+    DecompositionTest,
+)
+from compass.landice.tests.greenland.mesh_gen import MeshGen
 from compass.landice.tests.greenland.restart_test import RestartTest
-from compass.landice.tests.greenland.high_res_mesh import HighResMesh
+from compass.landice.tests.greenland.smoke_test import SmokeTest
+from compass.testgroup import TestGroup
 
 
 class Greenland(TestGroup):
@@ -27,4 +29,4 @@ def __init__(self, mpas_core):
                 RestartTest(test_group=self, velo_solver=velo_solver))
 
         self.add_test_case(
-            HighResMesh(test_group=self))
+            MeshGen(test_group=self))