Skip to content

Commit 8538a39

Browse files
committed
start deprecating old cross_section
1 parent 982b4f5 commit 8538a39

8 files changed

Lines changed: 737 additions & 597 deletions

File tree

test/test_cross_sections.py

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -16,22 +16,6 @@
1616
from uxarray.grid.intersections import constant_lat_intersections_face_bounds
1717

1818

19-
def test_repr():
20-
uxds = ux.open_dataset(quad_hex_grid_path, quad_hex_data_path)
21-
22-
# grid repr
23-
grid_repr = uxds.uxgrid.cross_section.__repr__()
24-
assert "constant_latitude" in grid_repr
25-
assert "constant_longitude" in grid_repr
26-
assert "constant_latitude_interval" in grid_repr
27-
assert "constant_longitude_interval" in grid_repr
28-
29-
# data array repr
30-
da_repr = uxds['t2m'].cross_section.__repr__()
31-
assert "constant_latitude" in da_repr
32-
assert "constant_longitude" in da_repr
33-
assert "constant_latitude_interval" in da_repr
34-
assert "constant_longitude_interval" in da_repr
3519

3620

3721

uxarray/core/dataarray.py

Lines changed: 1 addition & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,11 @@
55
from typing import TYPE_CHECKING, Any, Hashable, Literal, Mapping, Optional
66
from warnings import warn
77

8-
import numpy as np
98
import xarray as xr
109
from cartopy.mpl.geoaxes import GeoAxes
1110
from xarray.core import dtypes
1211
from xarray.core.options import OPTIONS
13-
from xarray.core.types import InterpOptions
14-
from xarray.core.utils import UncachedAccessor, either_dict_or_kwargs
12+
from xarray.core.utils import UncachedAccessor
1513

1614
import uxarray
1715
from uxarray.core.aggregation import _uxda_grid_aggregate
@@ -23,10 +21,6 @@
2321
from uxarray.core.utils import _map_dims_to_ugrid
2422
from uxarray.core.zonal import _compute_non_conservative_zonal_mean
2523
from uxarray.cross_sections import UxDataArrayCrossSectionAccessor
26-
from uxarray.cross_sections.interpolate import (
27-
interpolate_along_constant_latitude,
28-
interpolate_along_constant_longitude,
29-
)
3024
from uxarray.formatting_html import array_repr
3125
from uxarray.grid import Grid
3226
from uxarray.grid.dual import construct_dual
@@ -1288,36 +1282,6 @@ def isel(
12881282
missing_dims=missing_dims,
12891283
)
12901284

1291-
def interp(
1292-
self,
1293-
coords: Mapping[Any, Any] | None = None,
1294-
method: InterpOptions = "linear",
1295-
assume_sorted: bool = False,
1296-
kwargs: Mapping[str, Any] | None = None,
1297-
**coords_kwargs: Any,
1298-
):
1299-
"""Docstring TODO"""
1300-
1301-
# TODO: Handle case where multiple dimensions are trying to be interpolated
1302-
1303-
# Special interpolate case for the output of cross-sections
1304-
if self.attrs.get("cross_section", False):
1305-
_coords = either_dict_or_kwargs(coords, coords_kwargs, "interp")
1306-
1307-
if self.attrs.get("constant_latitude", False):
1308-
if "lon" in _coords:
1309-
return interpolate_along_constant_latitude(
1310-
self, self.attrs["constant_latitude"], _coords["lon"]
1311-
)
1312-
1313-
elif self.attrs.get("constant_longitude", False):
1314-
if "lat" in _coords:
1315-
return interpolate_along_constant_longitude(
1316-
self, self.attrs["constant_longitude"], _coords["lat"]
1317-
)
1318-
1319-
return super().interp(coords, method, assume_sorted, kwargs, **coords_kwargs)
1320-
13211285
@classmethod
13221286
def from_xarray(cls, da: xr.DataArray, uxgrid: Grid, ugrid_dims: dict = None):
13231287
"""

0 commit comments

Comments
 (0)