Skip to content

fix for MaskedConstant errors #2143

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
ajdawson merged 1 commit into from
Oct 7, 2016
Merged

fix for MaskedConstant errors #2143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 9 additions & 0 deletions lib/iris/tests/unit/util/test_new_axis.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,15 @@ def test_lazy_data(self):
self.assertTrue(res.has_lazy_data())
self.assertEqual(res.shape, (1,) + cube.shape)

def test_masked_unit_array(self):
cube = tests.stock.simple_3d_mask()
test_cube = cube[0, 0, 0]
test_cube = new_axis(test_cube, 'longitude')
test_cube = new_axis(test_cube, 'latitude')
data_shape = test_cube.data.shape
mask_shape = test_cube.data.mask.shape
self.assertEqual(data_shape, mask_shape)


if __name__ == '__main__':
unittest.main()
11 changes: 10 additions & 1 deletion lib/iris/util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1082,7 +1082,16 @@ def new_axis(src_cube, scalar_coord=None):

# Indexing numpy arrays requires loading deferred data here returning a
# copy of the data with a new leading dimension.
new_cube = iris.cube.Cube(src_cube.lazy_data()[None])
# If the source cube is a Masked Constant, it is changed here to a Masked
# Array to allow the mask to gain an extra dimension with the data.
if src_cube.has_lazy_data():
new_cube = iris.cube.Cube(src_cube.lazy_data()[None])
else:
if isinstance(src_cube.data, ma.core.MaskedConstant):
new_data = ma.array([np.nan], mask=[True])
else:
new_data = src_cube.data[None]
new_cube = iris.cube.Cube(new_data)
new_cube.metadata = src_cube.metadata

for coord in src_cube.aux_coords:
Expand Down