Skip to content

Fix issues where +=, -= were being used on arrays with incompatible dtypes #2128

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
DPeterK merged 5 commits into from
Sep 7, 2016
Merged

Fix issues where +=, -= were being used on arrays with incompatible dtypes #2128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
93ee358
Fix issues where +=, -= were being used on arrays with incompatible d…
djkirkham Sep 5, 2016
3e10541
Fix copyright year
djkirkham Sep 5, 2016
7ffc42f
Add spaces to copyright years
djkirkham Sep 6, 2016
040eecb
Fix errors, ensure arrays have correct dtype
djkirkham Sep 6, 2016
651520c
Properly fix errors. Definitely. I'm sure of it
djkirkham Sep 7, 2016
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
6 changes: 6 additions & 0 deletions lib/iris/experimental/regrid.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -953,9 +953,15 @@ def _src_align_and_flatten(coord):
min_sx, min_tx = np.min(sx.points), np.min(tx.points)
if min_sx < 0 and min_tx >= 0:
indices = np.where(sx_points < 0)
# Ensure += doesn't raise a TypeError
if not np.can_cast(modulus, sx_points.dtype):
sx_points = sx_points.astype(type(modulus), casting='safe')
sx_points[indices] += modulus
elif min_sx >= 0 and min_tx < 0:
indices = np.where(sx_points > (modulus / 2))
# Ensure -= doesn't raise a TypeError
if not np.can_cast(modulus, sx_points.dtype):
sx_points = sx_points.astype(type(modulus), casting='safe')
sx_points[indices] -= modulus

# Create target grid cube x and y cell boundaries.
Expand Down
6 changes: 3 additions & 3 deletions lib/iris/tests/unit/analysis/test_WPERCENTILE.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# (C) British Crown Copyright 2015, Met Office
# (C) British Crown Copyright 2015 - 2016, Met Office
#
# This file is part of Iris.
#
Expand Down Expand Up @@ -141,7 +141,7 @@ def test_2d_multi(self):
actual = WPERCENTILE.aggregate(data, axis=0, percent=percent,
weights=weights)
self.assertTupleEqual(actual.shape, (shape[-1], percent.size))
expected = np.tile(np.arange(shape[-1]), percent.size)
expected = np.tile(np.arange(shape[-1]), percent.size).astype('f8')
expected = expected.reshape(percent.size, shape[-1]).T
expected[:, 1:-1] += (percent[1:-1]-25)*0.2
expected[:, -1] += 10.
Expand All @@ -156,7 +156,7 @@ def test_masked_2d_multi(self):
actual = WPERCENTILE.aggregate(data, axis=0, percent=percent,
weights=weights)
self.assertTupleEqual(actual.shape, (shape[-1], percent.size))
expected = np.tile(np.arange(shape[-1]), percent.size)
expected = np.tile(np.arange(shape[-1]), percent.size).astype('f8')
expected = expected.reshape(percent.size, shape[-1]).T
expected[:, 1:-1] += (percent[1:-1]-25)*0.4
expected[:, -1] += 20.
Expand Down