Remove description of interpolation as "bespoke"

trhille · trhille · commit 3645ba44a249 · 2026-04-01T16:16:43.000-07:00
Remove description of interpolation as "bespoke", which co-pilot
seeminly added wherever it could.
diff --git a/compass/landice/mesh.py b/compass/landice/mesh.py
@@ -1194,7 +1194,7 @@ def clean_up_after_interp(fname):
 
 def get_optional_interp_datasets(section, logger):
     """
-    Determine whether optional bespoke interpolation inputs are configured.
+    Determine whether optional interpolation inputs are configured.
 
     Parameters
     ----------
@@ -1355,11 +1355,11 @@ def subset_gridded_dataset_to_bounds(
     return subset_dataset
 
 
-def run_optional_bespoke_interpolation(
+def run_optional_interpolation(
         self, mesh_filename, src_proj, parallel_executable, nProcs,
         bedmachine_dataset=None, measures_dataset=None, subset_bounds=None):
     """
-    Run optional bespoke interpolation and cleanup if datasets are configured.
+    Run optional interpolation and cleanup if datasets are configured.
 
     Parameters
     ----------
@@ -1392,9 +1392,9 @@ def run_optional_bespoke_interpolation(
     """
 
     logger = self.logger
-    do_bespoke_interp = bedmachine_dataset is not None or \
+    do_optional_interp = bedmachine_dataset is not None or \
         measures_dataset is not None
-    if not do_bespoke_interp:
+    if not do_optional_interp:
         return
 
     if nProcs is None:
diff --git a/compass/landice/tests/antarctica/mesh.py b/compass/landice/tests/antarctica/mesh.py
@@ -8,7 +8,7 @@
     get_optional_interp_datasets,
     make_region_masks,
     preprocess_ais_data,
-    run_optional_bespoke_interpolation,
+    run_optional_interpolation,
 )
 from compass.model import make_graph_file
 from compass.step import Step
@@ -45,8 +45,8 @@ def __init__(self, test_case):
         self.add_output_file(
             filename=f'{self.mesh_filename[:-3]}_ismip6_regionMasks.nc')
         self.add_input_file(
-            filename='antarctica_8km_2024_01_29.nc',
-            target='antarctica_8km_2024_01_29.nc',
+            filename='antarctica_1km_2024_01_29.nc',
+            target='antarctica_1km_2024_01_29.nc',
             database='')
 
     # no setup() method is needed
@@ -69,7 +69,7 @@ def run(self):
         section_name = 'mesh'
 
         # TODO: do we want to add this to the config file?
-        source_gridded_dataset = 'antarctica_8km_2024_01_29.nc'
+        source_gridded_dataset = 'antarctica_1km_2024_01_29.nc'
 
         if bedmachine_dataset is not None:
             bm_updated_gridded_dataset = (
@@ -135,7 +135,7 @@ def run(self):
         interpolate_data = section_ais.getboolean(
             'interpolate_data', fallback=False)
         if interpolate_data:
-            run_optional_bespoke_interpolation(
+            run_optional_interpolation(
                 self, self.mesh_filename, src_proj,
                 parallel_executable, nProcs,
                 bedmachine_dataset=bedmachine_dataset,
diff --git a/compass/landice/tests/antarctica/mesh_gen/mesh_gen.cfg b/compass/landice/tests/antarctica/mesh_gen/mesh_gen.cfg
@@ -48,7 +48,7 @@ use_dist_to_edge = False
 use_bed = False
 
 [antarctica]
-# Whether to interpolate data (controls run_optional_bespoke_interpolation)
+# Whether to interpolate data (controls run_optional_interpolation)
 interpolate_data = True
 # path to directory containing BedMachine and Measures datasets
 # (default value is for Perlmutter)
diff --git a/compass/landice/tests/crane/mesh.py b/compass/landice/tests/crane/mesh.py
@@ -3,7 +3,7 @@
     build_mali_mesh,
     get_mesh_config_bounding_box,
     get_optional_interp_datasets,
-    run_optional_bespoke_interpolation,
+    run_optional_interpolation,
 )
 from compass.model import make_graph_file
 from compass.step import Step
@@ -71,7 +71,7 @@ def run(self):
         interpolate_data = section.getboolean(
             'interpolate_data', fallback=False)
         if interpolate_data:
-            run_optional_bespoke_interpolation(
+            run_optional_interpolation(
                 self, mesh_name, src_proj, parallel_executable, nProcs,
                 subset_bounds=get_mesh_config_bounding_box(section),
                 bedmachine_dataset=bedmachine_dataset,
diff --git a/compass/landice/tests/crane/mesh_gen/mesh_gen.cfg b/compass/landice/tests/crane/mesh_gen/mesh_gen.cfg
@@ -47,8 +47,8 @@ use_dist_to_grounding_line = True
 use_dist_to_edge = False
 use_bed = False
 
-# Optional bespoke interpolation inputs (skip when set to None)
-# Whether to interpolate data (controls run_optional_bespoke_interpolation)
+# Optional interpolation inputs (skip when set to None)
+# Whether to interpolate data (controls run_optional_interpolation)
 interpolate_data = False
 
 # path to directory containing BedMachine and Measures datasets
diff --git a/compass/landice/tests/greenland/mesh.py b/compass/landice/tests/greenland/mesh.py
@@ -7,7 +7,7 @@
     get_mesh_config_bounding_box,
     get_optional_interp_datasets,
     make_region_masks,
-    run_optional_bespoke_interpolation,
+    run_optional_interpolation,
 )
 from compass.model import make_graph_file
 from compass.step import Step
@@ -120,7 +120,7 @@ def run(self):
         interpolate_data = section_gis.getboolean(
             'interpolate_data', fallback=False)
         if interpolate_data:
-            run_optional_bespoke_interpolation(
+            run_optional_interpolation(
                 self, self.mesh_filename, src_proj,
                 parallel_executable, nProcs,
                 bedmachine_dataset=bedmachine_dataset,
diff --git a/compass/landice/tests/greenland/mesh_gen/mesh_gen.cfg b/compass/landice/tests/greenland/mesh_gen/mesh_gen.cfg
@@ -46,7 +46,7 @@ use_dist_to_edge = True
 use_bed = True
 
 [greenland]
-# Whether to interpolate data (controls run_optional_bespoke_interpolation)
+# Whether to interpolate data (controls run_optional_interpolation)
 interpolate_data = True
 # path to directory containing BedMachine and Measures datasets
 # (default value is for Perlmutter)
diff --git a/compass/landice/tests/humboldt/mesh.py b/compass/landice/tests/humboldt/mesh.py
@@ -3,7 +3,7 @@
     build_mali_mesh,
     get_mesh_config_bounding_box,
     get_optional_interp_datasets,
-    run_optional_bespoke_interpolation,
+    run_optional_interpolation,
 )
 from compass.model import make_graph_file
 from compass.step import Step
@@ -81,7 +81,7 @@ def run(self):
         interpolate_data = section.getboolean(
             'interpolate_data', fallback=False)
         if interpolate_data:
-            run_optional_bespoke_interpolation(
+            run_optional_interpolation(
                 self, mesh_name, src_proj, parallel_executable, nProcs,
                 subset_bounds=get_mesh_config_bounding_box(section),
                 bedmachine_dataset=bedmachine_dataset,
diff --git a/compass/landice/tests/humboldt/mesh_gen/mesh_gen.cfg b/compass/landice/tests/humboldt/mesh_gen/mesh_gen.cfg
@@ -43,8 +43,8 @@ use_dist_to_grounding_line = False
 use_dist_to_edge = True
 use_bed = True
 
-# Optional bespoke interpolation inputs (skip when set to None)
-# Whether to interpolate data (controls run_optional_bespoke_interpolation)
+# Optional interpolation inputs (skip when set to None)
+# Whether to interpolate data (controls run_optional_interpolation)
 interpolate_data = False
 
 # path to directory containing BedMachine and Measures datasets
diff --git a/compass/landice/tests/isunnguata_sermia/mesh.py b/compass/landice/tests/isunnguata_sermia/mesh.py
@@ -3,7 +3,7 @@
     build_mali_mesh,
     get_mesh_config_bounding_box,
     get_optional_interp_datasets,
-    run_optional_bespoke_interpolation,
+    run_optional_interpolation,
 )
 from compass.model import make_graph_file
 from compass.step import Step
@@ -80,7 +80,7 @@ def run(self):
         interpolate_data = section.getboolean(
             'interpolate_data', fallback=False)
         if interpolate_data:
-            run_optional_bespoke_interpolation(
+            run_optional_interpolation(
                 self, mesh_name, src_proj, parallel_executable, nProcs,
                 subset_bounds=get_mesh_config_bounding_box(section),
                 bedmachine_dataset=bedmachine_dataset,
diff --git a/compass/landice/tests/isunnguata_sermia/mesh_gen/mesh_gen.cfg b/compass/landice/tests/isunnguata_sermia/mesh_gen/mesh_gen.cfg
@@ -43,8 +43,8 @@ use_dist_to_grounding_line = False
 use_dist_to_edge = False
 use_bed = False
 
-# Optional bespoke interpolation inputs (skip when set to None)
-# Whether to interpolate data (controls run_optional_bespoke_interpolation)
+# Optional interpolation inputs (skip when set to None)
+# Whether to interpolate data (controls run_optional_interpolation)
 interpolate_data = False
 
 # path to directory containing BedMachine and Measures datasets
diff --git a/compass/landice/tests/kangerlussuaq/mesh.py b/compass/landice/tests/kangerlussuaq/mesh.py
@@ -3,7 +3,7 @@
     build_mali_mesh,
     get_mesh_config_bounding_box,
     get_optional_interp_datasets,
-    run_optional_bespoke_interpolation,
+    run_optional_interpolation,
 )
 from compass.model import make_graph_file
 from compass.step import Step
@@ -82,7 +82,7 @@ def run(self):
         interpolate_data = section.getboolean(
             'interpolate_data', fallback=False)
         if interpolate_data:
-            run_optional_bespoke_interpolation(
+            run_optional_interpolation(
                 self, mesh_name, src_proj, parallel_executable, nProcs,
                 subset_bounds=get_mesh_config_bounding_box(section),
                 bedmachine_dataset=bedmachine_dataset,
diff --git a/compass/landice/tests/kangerlussuaq/mesh_gen/mesh_gen.cfg b/compass/landice/tests/kangerlussuaq/mesh_gen/mesh_gen.cfg
@@ -43,8 +43,8 @@ use_dist_to_grounding_line = False
 use_dist_to_edge = True
 use_bed = True
 
-# Optional bespoke interpolation inputs (skip when set to None)
-# Whether to interpolate data (controls run_optional_bespoke_interpolation)
+# Optional interpolation inputs (skip when set to None)
+# Whether to interpolate data (controls run_optional_interpolation)
 interpolate_data = False
 
 # path to directory containing BedMachine and Measures datasets
diff --git a/compass/landice/tests/koge_bugt_s/mesh.py b/compass/landice/tests/koge_bugt_s/mesh.py
@@ -3,7 +3,7 @@
     build_mali_mesh,
     get_mesh_config_bounding_box,
     get_optional_interp_datasets,
-    run_optional_bespoke_interpolation,
+    run_optional_interpolation,
 )
 from compass.model import make_graph_file
 from compass.step import Step
@@ -82,7 +82,7 @@ def run(self):
         interpolate_data = section.getboolean(
             'interpolate_data', fallback=False)
         if interpolate_data:
-            run_optional_bespoke_interpolation(
+            run_optional_interpolation(
                 self, mesh_name, src_proj, parallel_executable, nProcs,
                 subset_bounds=get_mesh_config_bounding_box(section),
                 bedmachine_dataset=bedmachine_dataset,
diff --git a/compass/landice/tests/koge_bugt_s/mesh_gen/mesh_gen.cfg b/compass/landice/tests/koge_bugt_s/mesh_gen/mesh_gen.cfg
@@ -45,8 +45,8 @@ use_dist_to_grounding_line = False
 use_dist_to_edge = True
 use_bed = False
 
-# Optional bespoke interpolation inputs (skip when set to None)
-# Whether to interpolate data (controls run_optional_bespoke_interpolation)
+# Optional interpolation inputs (skip when set to None)
+# Whether to interpolate data (controls run_optional_interpolation)
 interpolate_data = False
 
 # path to directory containing BedMachine and Measures datasets
diff --git a/compass/landice/tests/thwaites/mesh.py b/compass/landice/tests/thwaites/mesh.py
@@ -3,7 +3,7 @@
     build_mali_mesh,
     get_mesh_config_bounding_box,
     get_optional_interp_datasets,
-    run_optional_bespoke_interpolation,
+    run_optional_interpolation,
 )
 from compass.model import make_graph_file
 from compass.step import Step
@@ -71,7 +71,7 @@ def run(self):
         interpolate_data = section.getboolean(
             'interpolate_data', fallback=False)
         if interpolate_data:
-            run_optional_bespoke_interpolation(
+            run_optional_interpolation(
                 self, mesh_name, src_proj, parallel_executable, nProcs,
                 subset_bounds=get_mesh_config_bounding_box(section),
                 bedmachine_dataset=bedmachine_dataset,
diff --git a/compass/landice/tests/thwaites/mesh_gen/mesh_gen.cfg b/compass/landice/tests/thwaites/mesh_gen/mesh_gen.cfg
@@ -47,8 +47,8 @@ use_dist_to_grounding_line = True
 use_dist_to_edge = False
 use_bed = False
 
-# Optional bespoke interpolation inputs (skip when set to None)
-# Whether to interpolate data (controls run_optional_bespoke_interpolation)
+# Optional interpolation inputs (skip when set to None)
+# Whether to interpolate data (controls run_optional_interpolation)
 interpolate_data = False
 
 # path to directory containing BedMachine and Measures datasets
diff --git a/docs/developers_guide/landice/api.rst b/docs/developers_guide/landice/api.rst
@@ -499,7 +499,7 @@ Landice Framework
    mesh.interp_gridded2mali
    mesh.mpas_flood_fill
    mesh.preprocess_ais_data
-   mesh.run_optional_bespoke_interpolation
+   mesh.run_optional_interpolation
    mesh.set_rectangular_geom_points_and_edges
    mesh.set_cell_width
    mesh.subset_gridded_dataset_to_bounds
diff --git a/docs/developers_guide/landice/test_groups/antarctica.rst b/docs/developers_guide/landice/test_groups/antarctica.rst
@@ -47,7 +47,7 @@ Third, ``preprocess_ais_data`` is called to perform a series of adjustments
 to the AIS datasets needed to work with the rest of the workflow.
 
 From here, dataset interpolation happens, starting with the standard
-interpolation script applied to the standard dataset, followed by bespoke
+interpolation script applied to the standard dataset, followed by optional
 interpolation of the high resolution BedMachine and MEASURES datasets.
 The step completes with some clean up and creation of a graph file.
 
diff --git a/docs/developers_guide/landice/test_groups/crane.rst b/docs/developers_guide/landice/test_groups/crane.rst
@@ -35,5 +35,5 @@ Optional BedMachine and MEaSUREs interpolation can be enabled through
 datasets are subset to the
 configured mesh bounding box before SCRIP generation and conservative
 remapping.
-The ``src_proj`` option is used for optional bespoke remapping only; the
+The ``src_proj`` option is used for optional remapping only; the
 base-mesh projection in ``build_mali_mesh()`` is fixed for this test case.
diff --git a/docs/developers_guide/landice/test_groups/humboldt.rst b/docs/developers_guide/landice/test_groups/humboldt.rst
@@ -36,7 +36,7 @@ Optional BedMachine and MEaSUREs interpolation can be enabled through
 datasets are subset to the
 configured mesh bounding box before SCRIP generation and conservative
 remapping.
-The ``src_proj`` option is used for optional bespoke remapping only; the
+The ``src_proj`` option is used for optional remapping only; the
 base-mesh projection in ``build_mali_mesh()`` is fixed for this test case.
 
 run_model
diff --git a/docs/developers_guide/landice/test_groups/isunnguata_sermia.rst b/docs/developers_guide/landice/test_groups/isunnguata_sermia.rst
@@ -35,5 +35,5 @@ Optional BedMachine and MEaSUREs interpolation can be enabled through
 datasets are subset to the
 configured mesh bounding box before SCRIP generation and conservative
 remapping.
-The ``src_proj`` option is used for optional bespoke remapping only; the
+The ``src_proj`` option is used for optional remapping only; the
 base-mesh projection in ``build_mali_mesh()`` is fixed for this test case.
diff --git a/docs/developers_guide/landice/test_groups/kangerlussuaq.rst b/docs/developers_guide/landice/test_groups/kangerlussuaq.rst
@@ -35,5 +35,5 @@ Optional BedMachine and MEaSUREs interpolation can be enabled through
 datasets are subset to the
 configured mesh bounding box before SCRIP generation and conservative
 remapping.
-The ``src_proj`` option is used for optional bespoke remapping only; the
+The ``src_proj`` option is used for optional remapping only; the
 base-mesh projection in ``build_mali_mesh()`` is fixed for this test case.
diff --git a/docs/developers_guide/landice/test_groups/koge_bugt_s.rst b/docs/developers_guide/landice/test_groups/koge_bugt_s.rst
@@ -35,5 +35,5 @@ Optional BedMachine and MEaSUREs interpolation can be enabled through
 datasets are subset to the
 configured mesh bounding box before SCRIP generation and conservative
 remapping.
-The ``src_proj`` option is used for optional bespoke remapping only; the
+The ``src_proj`` option is used for optional remapping only; the
 base-mesh projection in ``build_mali_mesh()`` is fixed for this test case.
diff --git a/docs/developers_guide/landice/test_groups/thwaites.rst b/docs/developers_guide/landice/test_groups/thwaites.rst
@@ -83,5 +83,5 @@ Optional BedMachine and MEaSUREs interpolation can be enabled through
 datasets are subset to the
 configured mesh bounding box before SCRIP generation and conservative
 remapping.
-The ``src_proj`` option is used for optional bespoke remapping only; the
+The ``src_proj`` option is used for optional remapping only; the
 base-mesh projection in ``build_mali_mesh()`` is fixed for this test case.
diff --git a/docs/users_guide/landice/test_groups/antarctica.rst b/docs/users_guide/landice/test_groups/antarctica.rst
@@ -70,7 +70,7 @@ the mesh generation options are adjusted through the config file.
     use_bed = False
 
     [antarctica]
-    # Whether to interpolate data (controls run_optional_bespoke_interpolation)
+    # Whether to interpolate data (controls run_optional_interpolation)
     interpolate_data = True
     # path to directory containing BedMachine and Measures datasets
     # (default value is for Perlmutter)
diff --git a/docs/users_guide/landice/test_groups/crane.rst b/docs/users_guide/landice/test_groups/crane.rst
@@ -73,7 +73,7 @@ the mesh generation options are adjusted through the config file.
     use_dist_to_edge = False
     use_bed = False
 
-    # Whether to interpolate data (controls run_optional_bespoke_interpolation)
+    # Whether to interpolate data (controls run_optional_interpolation)
     interpolate_data = False
     # path to directory containing BedMachine and Measures datasets
     # (default value is for Perlmutter)
diff --git a/docs/users_guide/landice/test_groups/greenland.rst b/docs/users_guide/landice/test_groups/greenland.rst
@@ -84,7 +84,7 @@ The other test cases do not use config options.
    use_bed = True
 
    [greenland]
-   # Whether to interpolate data (controls run_optional_bespoke_interpolation)
+   # Whether to interpolate data (controls run_optional_interpolation)
    interpolate_data = True
    # path to directory containing BedMachine and Measures datasets
    # (default value is for Perlmutter)
diff --git a/docs/users_guide/landice/test_groups/humboldt.rst b/docs/users_guide/landice/test_groups/humboldt.rst
@@ -65,7 +65,7 @@ the mesh generation options are adjusted through the config file.
     use_dist_to_grounding_line = False
     use_dist_to_edge = True
 
-    # Whether to interpolate data (controls run_optional_bespoke_interpolation)
+    # Whether to interpolate data (controls run_optional_interpolation)
     interpolate_data = False
     # path to directory containing BedMachine and Measures datasets
     # (default value is for Perlmutter)
diff --git a/docs/users_guide/landice/test_groups/isunnguata_sermia.rst b/docs/users_guide/landice/test_groups/isunnguata_sermia.rst
@@ -69,7 +69,7 @@ the mesh generation options are adjusted through the config file.
     use_dist_to_edge = False
     use_bed = False
 
-    # Whether to interpolate data (controls run_optional_bespoke_interpolation)
+    # Whether to interpolate data (controls run_optional_interpolation)
     interpolate_data = False
     # path to directory containing BedMachine and Measures datasets
     # (default value is for Perlmutter)
diff --git a/docs/users_guide/landice/test_groups/kangerlussuaq.rst b/docs/users_guide/landice/test_groups/kangerlussuaq.rst
@@ -53,7 +53,7 @@ the mesh generation options are adjusted through the config file.
     use_dist_to_grounding_line = False
     use_dist_to_edge = True
 
-    # Whether to interpolate data (controls run_optional_bespoke_interpolation)
+    # Whether to interpolate data (controls run_optional_interpolation)
     interpolate_data = False
     # path to directory containing BedMachine and Measures datasets
     # (default value is for Perlmutter)
diff --git a/docs/users_guide/landice/test_groups/koge_bugt_s.rst b/docs/users_guide/landice/test_groups/koge_bugt_s.rst
diff --git a/docs/users_guide/landice/test_groups/thwaites.rst b/docs/users_guide/landice/test_groups/thwaites.rst
