Skip to content

Commit

Permalink
Update swap_lon_axis() to handle multiple lon dims and coords
Browse files Browse the repository at this point in the history
  • Loading branch information
@tomvothecoder
tomvothecoder committed Sep 20, 2022
1 parent 2463f03 commit 1371626
Show file tree
Hide file tree
Showing 2 changed files with 228 additions and 136 deletions.
118 changes: 100 additions & 18 deletions tests/test_axis.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -382,34 +382,81 @@ def test_swap_from_360_to_180_and_sorts(self):
data=np.array([60, 150, 271]),
dims=["lon"],
attrs={"units": "degrees_east", "axis": "X", "bounds": "lon_bnds"},
)
),
"lon2": xr.DataArray(
name="lon2",
data=np.array([60, 150, 271]),
dims=["lon"],
attrs={"units": "degrees_east", "axis": "X", "bounds": "lon_bnds"},
),
"lat": xr.DataArray(
name="lat",
data=np.array([60, 150, 271]),
dims=["lat"],
attrs={"units": "degrees_north", "axis": "Y", "bounds": "lat_bnds"},
),
},
data_vars={
"ts": xr.DataArray(
name="ts",
data=np.array([0, 1, 2]),
dims=["lon"],
attrs={"test_attr": "test"},
),
"lon_bnds": xr.DataArray(
name="lon_bnds",
data=np.array([[0, 120], [120, 181], [181, 360]]),
dims=["lon", "bnds"],
attrs={"xcdat_bounds": "True"},
)
),
"lat_bnds": xr.DataArray(
name="lat_bnds",
data=np.array([[0, 120], [120, 181], [181, 360]]),
dims=["lat", "bnds"],
attrs={"xcdat_bounds": "True"},
),
},
)

result = swap_lon_axis(ds_360, to=(-180, 180))
expected = xr.Dataset(
coords={
"lat": xr.DataArray(
name="lat",
data=np.array([60, 150, 271]),
dims=["lat"],
attrs={"units": "degrees_north", "axis": "Y", "bounds": "lat_bnds"},
),
"lon": xr.DataArray(
data=np.array([-89, 60, 150]),
dims=["lon"],
attrs={"units": "degrees_east", "axis": "X", "bounds": "lon_bnds"},
)
),
"lon2": xr.DataArray(
name="lon2",
data=np.array([-89, 60, 150]),
dims=["lon"],
attrs={"units": "degrees_east", "axis": "X", "bounds": "lon_bnds"},
),
},
data_vars={
"ts": xr.DataArray(
name="ts",
data=np.array([2, 0, 1]),
dims=["lon"],
attrs={"test_attr": "test"},
),
"lon_bnds": xr.DataArray(
name="lon_bnds",
data=np.array([[-179, 0], [0, 120], [120, -179]]),
dims=["lon", "bnds"],
attrs={"xcdat_bounds": "True"},
)
),
"lat_bnds": xr.DataArray(
name="lat_bnds",
data=np.array([[0, 120], [120, 181], [181, 360]]),
dims=["lat", "bnds"],
attrs={"xcdat_bounds": "True"},
),
},
)

Expand All @@ -418,14 +465,32 @@ def test_swap_from_360_to_180_and_sorts(self):
def test_swap_from_180_to_360_and_sorts_with_prime_meridian_cell_in_lon_bnds(self):
ds_180 = xr.Dataset(
coords={
"lat": xr.DataArray(
name="lat",
data=np.array([60, 150, 271]),
dims=["lat"],
attrs={"units": "degrees_north", "axis": "Y", "bounds": "lat_bnds"},
),
"lon": xr.DataArray(
name="lon",
data=np.array([-180, -1, 0, 1, 179]),
dims=["lon"],
attrs={"units": "degrees_east", "axis": "X", "bounds": "lon_bnds"},
)
),
"lon2": xr.DataArray(
name="lon2",
data=np.array([-180, -1, 0, 1, 179]),
dims=["lon"],
attrs={"units": "degrees_east", "axis": "X", "bounds": "lon_bnds"},
),
},
data_vars={
"ts": xr.DataArray(
name="ts",
data=np.array([0, 1, 2, 3, 4]),
dims=["lon"],
attrs={"test_attr": "test"},
),
"lon_bnds": xr.DataArray(
name="lon_bnds",
data=np.array(
Expand All @@ -440,26 +505,43 @@ def test_swap_from_180_to_360_and_sorts_with_prime_meridian_cell_in_lon_bnds(sel
dims=["lon", "bnds"],
attrs={"xcdat_bounds": "True"},
),
"ts": xr.DataArray(
name="ts",
data=np.array([0, 1, 2, 3, 4]),
dims=["lon"],
attrs={"test_attr": "test"},
"lat_bnds": xr.DataArray(
name="lat_bnds",
data=np.array([[0, 120], [120, 181], [181, 360]]),
dims=["lat", "bnds"],
attrs={"xcdat_bounds": "True"},
),
},
)

result = swap_lon_axis(ds_180, to=(0, 360))
expected = xr.Dataset(
coords={
"lat": xr.DataArray(
name="lat",
data=np.array([60, 150, 271]),
dims=["lat"],
attrs={"units": "degrees_north", "axis": "Y", "bounds": "lat_bnds"},
),
"lon": xr.DataArray(
name="lon",
data=np.array([0, 1, 179, 180, 359, 360]),
dims=["lon"],
attrs={"units": "degrees_east", "axis": "X", "bounds": "lon_bnds"},
)
),
"lon2": xr.DataArray(
name="lon2",
data=np.array([0, 1, 179, 180, 359, 360]),
dims=["lon"],
attrs={"units": "degrees_east", "axis": "X", "bounds": "lon_bnds"},
),
},
data_vars={
"ts": xr.DataArray(
name="ts",
data=np.array([2, 3, 4, 0, 1, 2]),
dims=["lon"],
attrs={"test_attr": "test"},
),
"lon_bnds": xr.DataArray(
name="lon_bnds",
data=np.array(
Expand All @@ -475,11 +557,11 @@ def test_swap_from_180_to_360_and_sorts_with_prime_meridian_cell_in_lon_bnds(sel
dims=["lon", "bnds"],
attrs={"xcdat_bounds": "True"},
),
"ts": xr.DataArray(
name="ts",
data=np.array([2, 3, 4, 0, 1, 2]),
dims=["lon"],
attrs={"test_attr": "test"},
"lat_bnds": xr.DataArray(
name="lat_bnds",
data=np.array([[0, 120], [120, 181], [181, 360]]),
dims=["lat", "bnds"],
attrs={"xcdat_bounds": "True"},
),
},
)
Expand Down
Loading

0 comments on commit 1371626

Please sign in to comment.