|
7 | 7 | import numpy as np |
8 | 8 |
|
9 | 9 | import uxarray.core.dataarray |
10 | | - |
11 | 10 | from uxarray.remap.utils import ( |
12 | 11 | LABEL_TO_COORD, |
13 | 12 | _assert_dimension, |
@@ -44,8 +43,12 @@ def _get_lon_lat(grid, dim_kind: str) -> tuple[np.ndarray, np.ndarray]: |
44 | 43 | lon = getattr(grid, f"{prefix}_lon", None) |
45 | 44 | lat = getattr(grid, f"{prefix}_lat", None) |
46 | 45 | if lon is not None and lat is not None: |
47 | | - return np.asarray(lon, dtype=np.float64), np.asarray(lat, dtype=np.float64) |
48 | | - raise AttributeError("Grid has neither node_lon/node_lat nor vertex_lon/vertex_lat") |
| 46 | + return np.asarray(lon, dtype=np.float64), np.asarray( |
| 47 | + lat, dtype=np.float64 |
| 48 | + ) |
| 49 | + raise AttributeError( |
| 50 | + "Grid has neither node_lon/node_lat nor vertex_lon/vertex_lat" |
| 51 | + ) |
49 | 52 | if dim_kind == "edge": |
50 | 53 | lon = getattr(grid, "edge_lon", None) |
51 | 54 | lat = getattr(grid, "edge_lat", None) |
@@ -212,12 +215,8 @@ def _build_points(self, src_grid, tgt_grid, src_dim, tgt_dim, yac_method): |
212 | 215 | self._tgt_grid = yac.CloudGrid( |
213 | 216 | self._tgt_grid_name, np.deg2rad(tgt_lon), np.deg2rad(tgt_lat) |
214 | 217 | ) |
215 | | - src_points = self._src_grid.def_points( |
216 | | - np.deg2rad(src_lon), np.deg2rad(src_lat) |
217 | | - ) |
218 | | - tgt_points = self._tgt_grid.def_points( |
219 | | - np.deg2rad(tgt_lon), np.deg2rad(tgt_lat) |
220 | | - ) |
| 218 | + src_points = self._src_grid.def_points(np.deg2rad(src_lon), np.deg2rad(src_lat)) |
| 219 | + tgt_points = self._tgt_grid.def_points(np.deg2rad(tgt_lon), np.deg2rad(tgt_lat)) |
221 | 220 | return src_points, tgt_points |
222 | 221 |
|
223 | 222 | def remap(self, values: np.ndarray) -> np.ndarray: |
|
0 commit comments