dev

Author: davidhassell

cf/data/dask_utils.py

@@ -917,7 +917,7 @@ def cf_healpix_increase_refinement_indices(a, refinement_level, ncells):
 
 
 def cf_healpix_indexing_scheme(
-    a, indexing_scheme, new_indexing_scheme, refinement_level=None
+    a, indexing_scheme, new_indexing_scheme, refinement_level
 ):
     """Change the indexing scheme of HEALPix indices.
 
@@ -954,7 +954,7 @@ def cf_healpix_indexing_scheme(
             cells. Must be an `int` for *indexing_scheme* ``'nested'``
             or ``'ring'``, but is ignored for *indexing_scheme*
             ``'nested_unique'`` (in which case *refinement_level* may
-            be `None`).
+            be `None`). TODOHEALPIX
 
     :Returns:
 
@@ -1020,22 +1020,19 @@ def cf_healpix_indexing_scheme(
                     if refinement_levels.size > 1:
                         raise ValueError(
                             "Can't change HEALPix indexing scheme from "
-                            f"'nested_unique' to {new_indexing_scheme!r} "
-                            "when the HEALPix indices span multiple "
-                            "refinement levels (at least levels "
-                            f"{refinement_levels.tolist()})"
+                            f"{indexing_scheme!r} to {new_indexing_scheme!r}: "
+                            "HEALPix indices span multiple refinement levels "
+                            f"(at least levels {refinement_levels.tolist()})"
                         )
 
                     return a
 
-        case _:
-            raise ValueError(
-                "Can't calculate HEALPix cell coordinates: Unknown "
-                f"'indexing_scheme': {indexing_scheme!r}"
-            )
-
+    # Still here?
     raise RuntimeError(
-        "cf_healpix_indexing_scheme: Failed during Dask computation"
+        "cf_healpix_indexing_scheme: Failed during Dask computation: "
+        f"indexing_scheme={indexing_scheme!r}, "
+        f"new_indexing_scheme={new_indexing_schemer!r}, "
+        f"refinement_level={refinement_level!r}"
     )
 
 

cf/field.py

@@ -5360,8 +5360,8 @@ def healpix_increase_refinement_level(self, refinement_level, quantity):
             healpix_max_refinement_level,
         )
 
-        # Increasing the refinement level requires the nested indexing
-        # scheme
+        # Increasing the refinement level requires the "nested"
+        # indexing scheme
         try:
             f = self.healpix_indexing_scheme("nested", sort=False)
         except ValueError as e:

cf/healpix.py

@@ -305,7 +305,9 @@ def _healpix_increase_refinement_level_indices(
         data._set_cached_elements({-1: x})
 
 
-def _healpix_indexing_scheme(healpix_index, hp, new_indexing_scheme):
+def _healpix_indexing_scheme(
+    healpix_index, indexing_scheme, new_indexing_scheme, refinement_level
+):
     """Change the indexing scheme of HEALPix indices in-place.
 
     K. Gorski, Eric Hivon, A. Banday, B. Wandelt, M. Bartelmann, et
@@ -341,9 +343,6 @@ def _healpix_indexing_scheme(healpix_index, hp, new_indexing_scheme):
     """
     from .data.dask_utils import cf_healpix_indexing_scheme
 
-    indexing_scheme = hp["indexing_scheme"]
-    refinement_level = hp.get("refinement_level")
-
     # Change the HEALPix indices
     dx = healpix_index.data.to_dask_array(
         _force_mask_hardness=False, _force_to_memory=False

cf/mixin/fielddomain.py

@@ -2095,34 +2095,40 @@ def healpix_indexing_scheme(self, new_indexing_scheme, sort=False):
             and new_indexing_scheme != indexing_scheme
         ):
             refinement_level = hp.get("refinement_level")
-            if (
-                indexing_scheme in ("nested", "ring")
-                and refinement_level is None
-            ):
+            if refinement_level is None:
                 raise ValueError(
                     f"Can't change HEALPix indexing scheme of {f!r} from "
-                    f"{indexing_scheme!r} to {new_indexing_scheme!r} when "
+                    f"{indexing_scheme!r} to {new_indexing_scheme!r}: "
                     "refinement_level has not been set in the healpix grid "
                     "mapping coordinate reference"
                 )
 
+            if (
+                new_indexing_scheme in ("nested", "ring")
+                and np.array(refinement_level).size > 1
+            ):
+                raise ValueError(
+                    f"Can't change HEALPix indexing scheme of {f!r} from "
+                    f"{indexing_scheme!r} to {new_indexing_scheme!r}: "
+                    "Multiple refinement levels are set in the healpix grid "
+                    f"mapping coordinate reference: {refinement_level!r}"
+                )
+
             # Update the Coordinate Reference
             cr = hp["grid_mapping_name:healpix"]
             cr.coordinate_conversion.set_parameter(
                 "indexing_scheme", new_indexing_scheme
             )
-            if new_indexing_scheme == "nested_unique":
-                cr.coordinate_conversion.del_parameter("refinement_level")
-            elif indexing_scheme == "nested_unique":
-                raise ValueError(
-                    f"Can't change HEALPix indexing scheme of {f!r} from "
-                    f"{indexing_scheme!r} to {new_indexing_scheme!r}"
-                )
 
             # Change the HEALPix indices
             from ..healpix import _healpix_indexing_scheme
 
-            _healpix_indexing_scheme(healpix_index, hp, new_indexing_scheme)
+            _healpix_indexing_scheme(
+                healpix_index,
+                indexing_scheme,
+                new_indexing_scheme,
+                refinement_level,
+            )
 
         if sort:
             # Sort the HEALPix axis so that the HEALPix indices are