Merge branch 'main' into rajeeja/issue_669

Author: rajeeja

.pre-commit-config.yaml

@@ -14,7 +14,7 @@ repos:
 
 - repo: https://github.com/astral-sh/ruff-pre-commit
   # Ruff version.
-  rev: v0.11.10
+  rev: v0.11.13
   hooks:
     - id: ruff
       name: lint with ruff

ci/asv.yml

@@ -13,7 +13,7 @@ dependencies:
   - healpix
   - netcdf4
   - numba
-  - numpy
+  - numpy<2.3
   - pandas
   - pathlib
   - pre_commit

ci/docs.yml

@@ -7,7 +7,7 @@ dependencies:
     - cmocean
     - netcdf4
     - numba
-    - numpy
+    - numpy<2.3
     - pathlib
     - pre_commit
     - pytest

ci/environment.yml

@@ -18,7 +18,7 @@ dependencies:
   - matplotlib-inline
   - netcdf4
   - numba
-  - numpy
+  - numpy<2.3
   - pandas
   - pathlib
   - pre_commit

pyproject.toml

@@ -31,7 +31,7 @@ dependencies = [
   "matplotlib-inline",
   "netcdf4",
   "numba",
-  "numpy",
+  "numpy<2.3",
   "pandas",
   "pyarrow",
   "requests",

test/test_healpix.py

@@ -4,6 +4,7 @@
 import pytest
 import os
 import xarray as xr
+import pandas as pd
 from pathlib import Path
 
 
@@ -38,6 +39,17 @@ def test_boundaries(resolution_level):
     # check for the correct number of boundary nodes
     assert (uxgrid.n_node == uxgrid.n_face + 2)
 
+@pytest.mark.parametrize("pixels_only", [True, False])
+def test_time_dimension_roundtrip(pixels_only):
+    ds = xr.open_dataset(ds_path)
+    dummy_time = pd.to_datetime(["2025-01-01T00:00:00"])
+    ds_time = ds.expand_dims(time=dummy_time)
+    uxds = ux.UxDataset.from_healpix(ds_time, pixels_only=pixels_only)
+
+    # Ensure time dimension is preserved and that the conversion worked
+    assert "time" in uxds.dims
+    assert uxds.sizes["time"] == 1
+
 def test_dataset():
     uxds = ux.UxDataset.from_healpix(ds_path)
 

uxarray/core/utils.py

@@ -44,21 +44,17 @@ def _map_dims_to_ugrid(
             # drop dimensions not present in the original dataset
             _source_dims_dict.pop(key)
 
-        # only check edge dimension if it is present (to avoid overhead of computing connectivity)
-        if "n_edge" in grid._ds.dims:
-            n_edge = grid._ds.sizes["n_edge"]
-        else:
-            n_edge = None
-
-        for dim in set(ds.dims) ^ _source_dims_dict.keys():
-            # obtain dimensions that were not parsed source_dims_dict and attempt to match to a grid element
-            if ds.sizes[dim] == grid.n_face:
-                _source_dims_dict[dim] = "n_face"
-            elif ds.sizes[dim] == grid.n_node:
-                _source_dims_dict[dim] = "n_node"
-            elif n_edge is not None:
-                if ds.sizes[dim] == n_edge:
-                    _source_dims_dict[dim] = "n_edge"
+        # build a reverse map
+        size_to_name = {
+            grid._ds.sizes[name]: name
+            for name in ("n_face", "n_node", "n_edge")
+            if name in grid._ds.dims
+        }
+
+        for dim in set(ds.dims) - _source_dims_dict.keys():
+            name = size_to_name.get(ds.sizes[dim])
+            if name:
+                _source_dims_dict[dim] = name
 
         # rename dimensions to follow the UGRID conventions
         ds = ds.swap_dims(_source_dims_dict)

uxarray/grid/coordinates.py

@@ -54,7 +54,7 @@ def _xyz_to_lonlat_rad_no_norm(
     lon = np.arctan2(y, x)
     lat = np.asin(z)
 
-    # set longitude range to [0, pi]
+    # set longitude range to [0, 2*pi]
     lon = np.mod(lon, 2 * np.pi)
 
     z_mask = np.abs(z) > 1.0 - ERROR_TOLERANCE
@@ -130,7 +130,7 @@ def _xyz_to_lonlat_rad(
     lon = np.arctan2(y, x)
     lat = np.arcsin(z)
 
-    # set longitude range to [0, pi]
+    # set longitude range to [0, 2*pi]
     lon = np.mod(lon, 2 * np.pi)
 
     z_mask = np.abs(z) > 1.0 - ERROR_TOLERANCE
@@ -182,7 +182,7 @@ def _normalize_xyz(
     y: Union[np.ndarray, float],
     z: Union[np.ndarray, float],
 ) -> tuple[np.ndarray, np.ndarray, np.ndarray]:
-    """Normalizes a set of Cartesiain coordinates."""
+    """Normalizes a set of Cartesian coordinates."""
     denom = np.linalg.norm(
         np.asarray(np.array([x, y, z]), dtype=np.float64), ord=2, axis=0
     )
@@ -699,155 +699,6 @@ def _set_desired_longitude_range(uxgrid):
                 uxgrid._ds[lon_name] = (uxgrid._ds[lon_name] + 180) % 360 - 180
 
 
-def _xyz_to_lonlat_rad(
-    x: Union[np.ndarray, float],
-    y: Union[np.ndarray, float],
-    z: Union[np.ndarray, float],
-    normalize: bool = True,
-) -> tuple[np.ndarray, np.ndarray, np.ndarray]:
-    """Converts Cartesian x, y, z coordinates in Spherical latitude and
-    longitude coordinates in degrees.
-
-    Parameters
-    ----------
-    x : Union[np.ndarray, float]
-        Cartesian x coordinates
-    y: Union[np.ndarray, float]
-        Cartesiain y coordinates
-    z: Union[np.ndarray, float]
-        Cartesian z coordinates
-    normalize: bool
-        Flag to select whether to normalize the coordinates
-
-    Returns
-    -------
-    lon : Union[np.ndarray, float]
-        Longitude in radians
-    lat: Union[np.ndarray, float]
-        Latitude in radians
-    """
-
-    if normalize:
-        x, y, z = _normalize_xyz(x, y, z)
-        denom = np.abs(x * x + y * y + z * z)
-        x /= denom
-        y /= denom
-        z /= denom
-
-    lon = np.arctan2(y, x, dtype=np.float64)
-    lat = np.arcsin(z, dtype=np.float64)
-
-    # set longitude range to [0, pi]
-    lon = np.mod(lon, 2 * np.pi)
-
-    z_mask = np.abs(z) > 1.0 - ERROR_TOLERANCE
-
-    lat = np.where(z_mask, np.sign(z) * np.pi / 2, lat)
-    lon = np.where(z_mask, 0.0, lon)
-
-    return lon, lat
-
-
-@njit(cache=True)
-def _xyz_to_lonlat_rad_no_norm(
-    x: Union[np.ndarray, float],
-    y: Union[np.ndarray, float],
-    z: Union[np.ndarray, float],
-):
-    """Converts a Cartesian x,y,z coordinates into Spherical latitude and
-    longitude without normalization, decorated with Numba.
-
-    Parameters
-    ----------
-    x : float
-        Cartesian x coordinate
-    y: float
-        Cartesiain y coordinate
-    z: float
-        Cartesian z coordinate
-
-
-    Returns
-    -------
-    lon : float
-        Longitude in radians
-    lat: float
-        Latitude in radians
-    """
-
-    lon = np.arctan2(y, x)
-    lat = np.asin(z)
-
-    # set longitude range to [0, pi]
-    lon = np.mod(lon, 2 * np.pi)
-
-    z_mask = np.abs(z) > 1.0 - ERROR_TOLERANCE
-
-    lat = np.where(z_mask, np.sign(z) * np.pi / 2, lat)
-    lon = np.where(z_mask, 0.0, lon)
-
-    return lon, lat
-
-
-@njit(cache=True)
-def _lonlat_rad_to_xyz(
-    lon: Union[np.ndarray, float],
-    lat: Union[np.ndarray, float],
-) -> tuple[np.ndarray, np.ndarray, np.ndarray]:
-    """Converts Spherical lon and lat coordinates into Cartesian x, y, z
-    coordinates."""
-    x = np.cos(lon) * np.cos(lat)
-    y = np.sin(lon) * np.cos(lat)
-    z = np.sin(lat)
-
-    return x, y, z
-
-
-def _xyz_to_lonlat_deg(
-    x: Union[np.ndarray, float],
-    y: Union[np.ndarray, float],
-    z: Union[np.ndarray, float],
-    normalize: bool = True,
-) -> tuple[np.ndarray, np.ndarray, np.ndarray]:
-    """Converts Cartesian x, y, z coordinates in Spherical latitude and
-    longitude coordinates in degrees.
-
-    Parameters
-    ----------
-    x : Union[np.ndarray, float]
-        Cartesian x coordinates
-    y: Union[np.ndarray, float]
-        Cartesiain y coordinates
-    z: Union[np.ndarray, float]
-        Cartesian z coordinates
-    normalize: bool
-        Flag to select whether to normalize the coordinates
-
-    Returns
-    -------
-    lon : Union[np.ndarray, float]
-        Longitude in degrees
-    lat: Union[np.ndarray, float]
-        Latitude in degrees
-    """
-    lon_rad, lat_rad = _xyz_to_lonlat_rad(x, y, z, normalize=normalize)
-
-    lon = np.rad2deg(lon_rad)
-    lat = np.rad2deg(lat_rad)
-
-    lon = (lon + 180) % 360 - 180
-    return lon, lat
-
-
-@njit(cache=True)
-def _normalize_xyz_scalar(x: float, y: float, z: float):
-    denom = np.linalg.norm(np.asarray(np.array([x, y, z]), dtype=np.float64), ord=2)
-    x_norm = x / denom
-    y_norm = y / denom
-    z_norm = z / denom
-    return x_norm, y_norm, z_norm
-
-
 def prepare_points(points, normalize):
     """Prepares points for use with ``Grid.from_points()``"""
     if len(points) == 2:

uxarray/grid/grid.py

@@ -817,6 +817,8 @@ def attrs(self) -> dict:
     @property
     def n_node(self) -> int:
         """Total number of nodes."""
+        if "face_node_connectivity" not in self._ds:
+            _ = self.face_node_connectivity
         return self._ds.sizes["n_node"]
 
     @property