Merge pull request #1641 from marqh/intersectionBug

numerical tolerance

lib/iris/cube.py

@@ -2113,7 +2113,6 @@ def _intersect(self, name_or_coord, minimum, maximum,
         if modulus is None:
             raise ValueError('coordinate units with no modulus are not yet'
                              ' supported')
-
         subsets, points, bounds = self._intersect_modulus(coord,
                                                           minimum, maximum,
                                                           min_inclusive,
@@ -2234,8 +2233,11 @@ def _intersect_modulus(self, coord, minimum, maximum, min_inclusive,
             # and call the new bounds = the new points + the difference.
             pre_wrap_delta = np.diff(coord.bounds[inside_indices])
             post_wrap_delta = np.diff(bounds[inside_indices])
-            split_cell_indices, _ = np.where(pre_wrap_delta != post_wrap_delta)
-            if split_cell_indices.size:
+            close_enough = np.allclose(pre_wrap_delta, post_wrap_delta)
+            if not close_enough:
+                split_cell_indices, _ = np.where(pre_wrap_delta !=
+                                                 post_wrap_delta)
+
                 # Recalculate the extended minimum.
                 indices = inside_indices[split_cell_indices]
                 cells = bounds[indices]

lib/iris/tests/unit/cube/test_Cube.py

@@ -1051,6 +1051,14 @@ def test_decrementing_wrapped(self):
         self.assertEqual(result.data[0, 0, 0], 350)
         self.assertEqual(result.data[0, 0, -1], 10)
 
+    def test_numerical_tolerance(self):
+        # test the tolerance on the coordinate value is not causing a
+        # modulus wrapping
+        cube = create_cube(28.5, 68.5, bounds=True)
+        result = cube.intersection(longitude=(27.74, 68.61))
+        self.assertAlmostEqual(result.coord('longitude').points[0], 28.5)
+        self.assertAlmostEqual(result.coord('longitude').points[-1], 67.5)
+
 
 def unrolled_cube():
     data = np.arange(5, dtype='f4')