Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions lib/iris/coord_systems.py
Original file line number Diff line number Diff line change
Expand Up @@ -914,11 +914,11 @@ def __repr__(self):
return ("LambertAzimuthalEqualArea(latitude_of_projection_origin={!r},"
" longitude_of_projection_origin={!r}, false_easting={!r},"
" false_northing={!r}, ellipsoid={!r})").format(
self.latitude_of_projection_origin,
self.longitude_of_projection_origin,
self.false_easting,
self.false_northing,
self.ellipsoid)
self.latitude_of_projection_origin,
self.longitude_of_projection_origin,
self.false_easting,
self.false_northing,
self.ellipsoid)

def as_cartopy_crs(self):
if self.ellipsoid is not None:
Expand Down
4 changes: 2 additions & 2 deletions lib/iris/experimental/regrid.py
Original file line number Diff line number Diff line change
Expand Up @@ -137,8 +137,8 @@ def _within_bounds(src_bounds, tgt_bounds, orderswap=False):
extremes of the source bounds.

"""
min_bound = np.min(src_bounds)
max_bound = np.max(src_bounds)
min_bound = np.min(src_bounds) - 1e-14
max_bound = np.max(src_bounds) + 1e-14

# Swap upper-lower is necessary.
if orderswap is True:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# (C) British Crown Copyright 2014 - 2015, Met Office
# (C) British Crown Copyright 2014 - 2016, Met Office
#
# This file is part of Iris.
#
Expand Down Expand Up @@ -150,5 +150,37 @@ def test_scalar_with_overlap_above_mdtol(self):
self.assertEqual(ma.count_masked(res.data), 1)


class TestWrapAround(tests.IrisTest):
def test_float_tolerant_equality(self):
# Ensure that floating point numbers are treated appropriately when
# introducing precision difference from wrap_around.
source = Cube([[1]])
cs = GeogCS(6371229)

bounds = np.array([[-91, 0]], dtype='float')
points = bounds.mean(axis=1)
lon_coord = DimCoord(points, bounds=bounds, standard_name='longitude',
units='degrees', coord_system=cs)
source.add_aux_coord(lon_coord, 1)

bounds = np.array([[-90, 90]], dtype='float')
points = bounds.mean(axis=1)
lat_coord = DimCoord(points, bounds=bounds, standard_name='latitude',
units='degrees', coord_system=cs)
source.add_aux_coord(lat_coord, 0)

grid = Cube([[0]])
bounds = np.array([[270, 360]], dtype='float')
points = bounds.mean(axis=1)
lon_coord = DimCoord(points, bounds=bounds, standard_name='longitude',
units='degrees', coord_system=cs)
grid.add_aux_coord(lon_coord, 1)
grid.add_aux_coord(lat_coord, 0)

res = regrid(source, grid)
# The result should be equal to the source data and NOT be masked.
self.assertArrayEqual(res.data, np.array([1.0]))


if __name__ == '__main__':
tests.main()