Skip to content

PI-2472: Fix issue related to comparison / equality in regridding code #3624

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Dec 24, 2019
Merged

PI-2472: Fix issue related to comparison / equality in regridding code #3624

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4f2a7d1
Update test to compare cubes rather than data
ehogan Dec 23, 2019
6f2dcda
Ensure test fails on correct issue
ehogan Dec 23, 2019
9e33c80
Use == rather than is when checking for equality
ehogan Dec 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/iris/analysis/_regrid.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -881,9 +881,9 @@ def _create_cube(
def copy_coords(src_coords, add_method):
for coord in src_coords:
dims = src.coord_dims(coord)
if coord is src_x_coord:
if coord == src_x_coord:
coord = grid_x_coord
elif coord is src_y_coord:
elif coord == src_y_coord:
coord = grid_y_coord
elif x_dim in dims or y_dim in dims:
continue
Expand Down
41 changes: 31 additions & 10 deletions lib/iris/tests/unit/analysis/area_weighted/test_AreaWeightedRegridder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,18 +137,26 @@ def test_multiple_src_on_same_grid(self):
src2.coord(name).guess_bounds()

target = self.cube(np.linspace(20, 32, 2), np.linspace(10, 22, 2))
# Ensure the bounds of the target cover the same range as the
# source.
target_lat_bounds = np.column_stack(
(
src1.coord("latitude").bounds[[0, 1], [0, 1]],
src1.coord("latitude").bounds[[2, 3], [0, 1]],
)
)
target.coord("latitude").bounds = target_lat_bounds
target_lon_bounds = np.column_stack(
(
src1.coord("longitude").bounds[[0, 1], [0, 1]],
src1.coord("longitude").bounds[[2, 3], [0, 1]],
)
)
target.coord("longitude").bounds = target_lon_bounds
for name in coord_names:
# Remove coords system and units so it is no longer spherical.
target.coord(name).coord_system = None
target.coord(name).units = None
# Ensure the bounds of the target cover the same range as the
# source.
target.coord(name).bounds = np.column_stack(
(
src1.coord(name).bounds[[0, 1], [0, 1]],
src1.coord(name).bounds[[2, 3], [0, 1]],
)
)

regridder = AreaWeightedRegridder(src1, target)
result1 = regridder(src1)
Expand All @@ -161,16 +169,29 @@ def test_multiple_src_on_same_grid(self):
[np.mean(src1.data[2:4, 0:2]), np.mean(src1.data[2:4, 2:4])],
]
)
reference1.coord("latitude").bounds = target_lat_bounds
reference1.coord("longitude").bounds = target_lon_bounds

reference2 = self.cube(np.linspace(20, 32, 2), np.linspace(10, 22, 2))
reference2.data = np.array(
[
[np.mean(src2.data[0:2, 0:2]), np.mean(src2.data[0:2, 2:4])],
[np.mean(src2.data[2:4, 0:2]), np.mean(src2.data[2:4, 2:4])],
]
)
reference2.coord("latitude").bounds = target_lat_bounds
reference2.coord("longitude").bounds = target_lon_bounds

self.assertArrayEqual(result1.data, reference1.data)
self.assertArrayEqual(result2.data, reference2.data)
for name in coord_names:
# Remove coords system and units so it is no longer spherical.
reference1.coord(name).coord_system = None
reference1.coord(name).units = None
reference2.coord(name).coord_system = None
reference2.coord(name).units = None

# Compare the cubes rather than just the data.
self.assertEqual(result1, reference1)
self.assertEqual(result2, reference2)

def test_mismatched_data_dims(self):
coord_names = ["latitude", "longitude"]
Expand Down