uxarray 2026.2.0__tar.gz → 2026.4.0__tar.gz

{uxarray-2026.2.0 → uxarray-2026.4.0}/CONTRIBUTING.md

@@ -1,6 +1,6 @@
-# Contributing to Uxarray
+# Contributing to UXarray
 
-Anyone can contribute to and participate in the Uxarray project
+Anyone can contribute to and participate in the UXarray project
 at any levels of project development! We conduct all of our work
 in the open, and all of our work is Open Source Licensed.
 

{uxarray-2026.2.0 → uxarray-2026.4.0}/INSTALLATION.md

@@ -1,5 +1,5 @@
-# How to install Uxarray
+# How to install UXarray
 
 Please see our
-[Uxarray Installation](https://uxarray.readthedocs.io/en/latest/getting-started/installation.html)
+[UXarray Installation](https://uxarray.readthedocs.io/en/latest/getting-started/installation.html)
 instructions for detailed information!

{uxarray-2026.2.0 → uxarray-2026.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: uxarray
-Version: 2026.2.0
+Version: 2026.4.0
 Summary: Xarray extension for unstructured climate and global weather data analysis and visualization.
 License:                                  Apache License
                                    Version 2.0, January 2004
@@ -230,7 +230,7 @@ Requires-Dist: matplotlib
 Requires-Dist: matplotlib-inline
 Requires-Dist: netcdf4
 Requires-Dist: numba
-Requires-Dist: numpy<2.4
+Requires-Dist: numpy
 Requires-Dist: pandas
 Requires-Dist: pyarrow
 Requires-Dist: requests

{uxarray-2026.2.0 → uxarray-2026.4.0}/pyproject.toml

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

{uxarray-2026.2.0 → uxarray-2026.4.0}/uxarray/core/accessors.py

@@ -1,5 +1,5 @@
 """
-Delegation-based accessor classes for UxArray groupby operations.
+Delegation-based accessor classes for UXarray groupby operations.
 
 These classes wrap xarray's groupby/resample/etc objects and ensure that
 operations return UxDataArray/UxDataset objects with preserved uxgrid.
@@ -34,7 +34,7 @@ DATAARRAY_ACCESSOR_METHODS = {
 
 
 class BaseAccessor:
-    """Base class for all UxArray accessor classes."""
+    """Base class for all UXarray accessor classes."""
 
     # Default methods known to return DataArrays/Datasets - optimized for performance
     _DEFAULT_PRESERVE_METHODS = {

{uxarray-2026.2.0 → uxarray-2026.4.0}/uxarray/core/dataarray.py

@@ -573,7 +573,7 @@ class UxDataArray(xr.DataArray):
 
         Examples
         --------
-        Open a Uxarray dataset and compute the integral
+        Open a UXarray dataset and compute the integral
 
         >>> import uxarray as ux
         >>> uxds = ux.open_dataset("grid.ug", "centroid_pressure_data_ug")
@@ -691,10 +691,19 @@ class UxDataArray(xr.DataArray):
             dims = list(self.dims)
             dims[face_axis] = "latitudes"
 
+            # Assign coords from `self` to the result except one that corresponds to `dims[face_axis]`
+            new_coords = {
+                k: v
+                for k, v in self.coords.items()
+                if self.dims[face_axis] not in v.dims
+            }
+            # Add latitudes to the resulting coords
+            new_coords["latitudes"] = latitudes
+
             return xr.DataArray(
                 res,
                 dims=dims,
-                coords={"latitudes": latitudes},
+                coords=new_coords,
                 name=self.name + "_zonal_mean"
                 if self.name is not None
                 else "zonal_mean",
@@ -736,10 +745,19 @@ class UxDataArray(xr.DataArray):
             dims = list(self.dims)
             dims[face_axis] = "latitudes"
 
+            # Assign coords from `self` to the result except one that corresponds to `dims[face_axis]`
+            new_coords = {
+                k: v
+                for k, v in self.coords.items()
+                if self.dims[face_axis] not in v.dims
+            }
+            # Add latitudes to the resulting coords
+            new_coords["latitudes"] = centers
+
             return xr.DataArray(
                 res,
                 dims=dims,
-                coords={"latitudes": centers},
+                coords=new_coords,
                 name=self.name + "_zonal_mean"
                 if self.name is not None
                 else "zonal_mean",
@@ -853,10 +871,17 @@ class UxDataArray(xr.DataArray):
             data=hit_count, dims="radius", coords={"radius": radii_deg}
         )
 
+        # Assign coords from `self` to the result except one that corresponds to `dims[face_axis]`
+        new_coords = {
+            k: v for k, v in self.coords.items() if self.dims[face_axis] not in v.dims
+        }
+        # Add radii_deg to the resulting coords
+        new_coords["radius"] = radii_deg
+
         uxda = xr.DataArray(
             means,
             dims=dims,
-            coords={"radius": radii_deg},
+            coords=new_coords,
             name=self.name + "_azimuthal_mean"
             if self.name is not None
             else "azimuthal_mean",

{uxarray-2026.2.0 → uxarray-2026.4.0}/uxarray/core/dataset.py

@@ -90,6 +90,24 @@ class UxDataset(xr.Dataset):
         else:
             self._uxgrid = uxgrid
 
+        # As of xarray's 2026.4.0, `xr.Dataset(xr.Dataset)` is prohibited;
+        # hence this check, i.e. if we get `xr.Dataset` as input, use its `data_vars`
+        # as `dict` and handle `coords` and `attrs` properly as well
+        if args and isinstance(args[0], xr.Dataset):
+            ds = args[0]
+            # Replacee only args[0], `ds`, with `ds.data_vars` as `dict`
+            args = (dict(ds.data_vars),) + args[1:]
+            # coords not passed positionally
+            if len(args) < 2:
+                kwargs.setdefault(
+                    "coords", dict(ds.coords)
+                )  # Set it as kwarg only if not explicitly provided
+            # attrs not passed positionally
+            if len(args) < 3:
+                kwargs.setdefault(
+                    "attrs", ds.attrs
+                )  # Set it as kwarg only if not explicitly provided
+
         super().__init__(*args, **kwargs)
 
     # declare plotting accessor
@@ -567,7 +585,7 @@ class UxDataset(xr.Dataset):
 
         Examples
         --------
-        Open a Uxarray dataset
+        Open a UXarray dataset
 
         >>> import uxarray as ux
         >>> uxds = ux.open_dataset("grid.ug", "centroid_pressure_data_ug")
@@ -627,9 +645,9 @@ class UxDataset(xr.Dataset):
         """
         if grid_format == "HEALPix":
             ds = self.rename_dims({"n_face": "cell"})
-            return xr.Dataset(ds)
+            return xr.Dataset(ds.data_vars, coords=ds.coords, attrs=ds.attrs)
 
-        return xr.Dataset(self)
+        return xr.Dataset(self.data_vars, coords=self.coords, attrs=self.attrs)
 
     def get_dual(self):
         """Compute the dual mesh for a dataset, returns a new dataset object.

{uxarray-2026.2.0 → uxarray-2026.4.0}/uxarray/grid/coordinates.py

@@ -68,10 +68,6 @@ def _xyz_to_lonlat_rad_no_norm(
 def _xyz_to_lonlat_rad_scalar(x, y, z, normalize=True):
     if normalize:
         x, y, z = _normalize_xyz_scalar(x, y, z)
-        denom = abs(x * x + y * y + z * z)
-        x /= denom
-        y /= denom
-        z /= denom
 
     lon = np.arctan2(y, x)
     lat = np.asin(z)
@@ -121,10 +117,6 @@ def _xyz_to_lonlat_rad(
 
     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)
     lat = np.arcsin(z)

{uxarray-2026.2.0 → uxarray-2026.4.0}/uxarray/io/utils.py

@@ -7,51 +7,114 @@ from uxarray.io._mpas import _mpas_to_ugrid_dims
 from uxarray.io._ugrid import _is_ugrid, _read_ugrid
 
 
+def _is_exodus(dataset: xr.Dataset) -> bool:
+    """Check whether a dataset looks like an Exodus mesh."""
+    has_packed_coords = "coord" in dataset
+    has_split_coords = {"coordx", "coordy"}.issubset(dataset.variables)
+    has_connectivity = any(
+        name.startswith("connect") for name in dataset.variables
+    ) or any("num_nod_per_el" in dim for dim in dataset.dims)
+
+    return has_connectivity and (has_packed_coords or has_split_coords)
+
+
+def _is_scrip(dataset: xr.Dataset) -> bool:
+    """Check whether a dataset looks like an unstructured SCRIP grid."""
+    required_vars = {
+        "grid_center_lon",
+        "grid_center_lat",
+        "grid_corner_lon",
+        "grid_corner_lat",
+    }
+    unstructured_markers = {"grid_imask", "grid_rank", "grid_area"}
+
+    return required_vars.issubset(dataset.variables) and any(
+        marker in dataset for marker in unstructured_markers
+    )
+
+
+def _is_mpas(dataset: xr.Dataset) -> bool:
+    """Check whether a dataset looks like an MPAS grid."""
+    if "verticesOnCell" not in dataset:
+        return False
+
+    companion_groups = (
+        {"nEdgesOnCell"},
+        {"latCell", "lonCell"},
+        {"latVertex", "lonVertex"},
+        {"xCell", "yCell", "zCell"},
+        {"xVertex", "yVertex", "zVertex"},
+    )
+
+    return any(group.issubset(dataset.variables) for group in companion_groups)
+
+
+def _is_esmf(dataset: xr.Dataset) -> bool:
+    """Check whether a dataset looks like an ESMF mesh."""
+    return "maxNodePElement" in dataset.dims and "elementConn" in dataset
+
+
+def _is_geos_cs(dataset: xr.Dataset) -> bool:
+    """Check whether a dataset looks like a GEOS cube-sphere grid."""
+    required_dims = {"nf", "YCdim", "XCdim"}
+    required_vars = {"corner_lons", "corner_lats"}
+
+    return required_dims.issubset(dataset.sizes) and required_vars.issubset(
+        dataset.variables
+    )
+
+
+def _is_icon(dataset: xr.Dataset) -> bool:
+    """Check whether a dataset looks like an ICON grid."""
+    required_vars = {"vertex_of_cell", "clon", "clat", "vlon", "vlat"}
+    return required_vars.issubset(dataset.variables)
+
+
+def _is_fesom2(dataset: xr.Dataset) -> bool:
+    """Check whether a dataset looks like a FESOM2 grid."""
+    return "triag_nodes" in dataset
+
+
 def _parse_grid_type(dataset):
-    """Checks input and contents to determine grid type. Supports detection of
-    UGrid, SCRIP, Exodus, ESMF, and shape file.
+    """Determine the grid type represented by an input dataset.
 
     Parameters
     ----------
     dataset : Xarray dataset
-       Xarray dataset of the grid
+        Xarray dataset containing grid topology information.
 
     Returns
     -------
-    mesh_type : str
-        File type of the file, ug, exo, scrip or shp
+    tuple[str, str | None, str | None]
+        A 3-tuple of ``(mesh_type, lon_name, lat_name)``. ``mesh_type`` is one
+        of ``"Exodus"``, ``"Scrip"``, ``"UGRID"``, ``"MPAS"``, ``"ESMF"``,
+        ``"GEOS-CS"``, ``"ICON"``, ``"FESOM2"``, or ``"Structured"``. The
+        longitude and latitude coordinate names are only returned for structured
+        grids and are otherwise ``None``.
 
     Raises
     ------
     RuntimeError
-            If invalid file type
-    ValueError
-        If file is not in UGRID format
+        If the dataset format cannot be recognized.
     """
 
     _structured, lon_name, lat_name = _is_structured(dataset)
 
-    if "coord" in dataset:
-        # exodus with coord or coordx
-        mesh_type = "Exodus"
-    elif "coordx" in dataset:
+    if _is_exodus(dataset):
         mesh_type = "Exodus"
-    elif "grid_center_lon" in dataset:
-        # scrip with grid_center_lon
+    elif _is_scrip(dataset):
         mesh_type = "Scrip"
     elif _is_ugrid(dataset):
-        # ugrid topology is present
         mesh_type = "UGRID"
-    elif "verticesOnCell" in dataset:
+    elif _is_mpas(dataset):
         mesh_type = "MPAS"
-    elif "maxNodePElement" in dataset.dims:
+    elif _is_esmf(dataset):
         mesh_type = "ESMF"
-    elif all(key in dataset.sizes for key in ["nf", "YCdim", "XCdim"]):
-        # expected dimensions for a GEOS cube sphere grid
+    elif _is_geos_cs(dataset):
         mesh_type = "GEOS-CS"
-    elif "vertex_of_cell" in dataset:
+    elif _is_icon(dataset):
         mesh_type = "ICON"
-    elif "triag_nodes" in dataset:
+    elif _is_fesom2(dataset):
         mesh_type = "FESOM2"
     elif _structured:
         mesh_type = "Structured"

{uxarray-2026.2.0 → uxarray-2026.4.0}/uxarray/remap/bilinear.py

@@ -128,7 +128,7 @@ def _barycentric_weights(point_xyz, dual, data_size, source_grid):
         # there were rare cases where counts > 0, hence the newer condition at the end
         elif counts == 1:
             all_weights[i, 0] = 1.0
-            all_indices[i, 0] = int(cur_inds[0])
+            all_indices[i, 0] = int(cur_inds[0].squeeze())
         # 2/2/2026: For some `remap_to="nodes"` cases, `counts` happen to be bigger than 1. Not sure
         # if the best way to add weights from multiple faces is to take only the first face's though
         else:

{uxarray-2026.2.0 → uxarray-2026.4.0}/uxarray.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: uxarray
-Version: 2026.2.0
+Version: 2026.4.0
 Summary: Xarray extension for unstructured climate and global weather data analysis and visualization.
 License:                                  Apache License
                                    Version 2.0, January 2004
@@ -230,7 +230,7 @@ Requires-Dist: matplotlib
 Requires-Dist: matplotlib-inline
 Requires-Dist: netcdf4
 Requires-Dist: numba
-Requires-Dist: numpy<2.4
+Requires-Dist: numpy
 Requires-Dist: pandas
 Requires-Dist: pyarrow
 Requires-Dist: requests

{uxarray-2026.2.0 → uxarray-2026.4.0}/uxarray.egg-info/requires.txt

@@ -8,7 +8,7 @@ matplotlib
 matplotlib-inline
 netcdf4
 numba
-numpy<2.4
+numpy
 pandas
 pyarrow
 requests