Fix irregular grid detection in to_rect

shom-fr · Jun 25, 2024 · f9a3a92 · f9a3a92
1 parent 1478f3d
commit f9a3a92
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -20,6 +20,7 @@ Deprecations
 
 Bug fixes
 ---------
+- Fix :func:`xoa.grid.to_rect` raising of errors and handling of missing data in coordinates.
 - Fix string formatting in :func:`xoa.filter.tidal_filter` warning.
 
 Documentation

diff --git a/xoa/__init__.py b/xoa/__init__.py
@@ -106,10 +106,6 @@ def _get_cache_():
 
     return _XOA_CACHE
 
-    # if not hasattr(__init__, "_XOA_CACHE"):
-    #     __init__._XOA_CACHE = {}
-    # return __init__._XOA_CACHE
-
 
 def load_options(cfgfile=None):
     """Load specified options

diff --git a/xoa/grid.py b/xoa/grid.py
@@ -583,7 +583,7 @@ def to_rect(da, tol=1e-5, errors="warn"):
     ------
     xarray.DataArray, xarray.Dataset
     """
-    #da = da.copy()
+    # da = da.copy()
     new_coords = {}
     rename_args = {}
     da = cf.infer_coords(da)
@@ -599,7 +599,7 @@ def to_rect(da, tol=1e-5, errors="warn"):
             continue
         dims = [odim] if odim else coord.dims
         for odim in dims:
-            if np.allclose(coord.min(odim), coord.max(odim), atol=tol):
+            if np.allclose(coord.min(odim), coord.max(odim), atol=tol, equal_nan=True):
                 new_coords[name] = xr.DataArray(
                     coord.isel({odim: 0}).values, dims=name, attrs=coord.attrs
                 )