diff --git a/lib/iris/tests/results/analysis/regrid/linear_circular_grid.cml b/lib/iris/tests/results/analysis/regrid/linear_circular_grid.cml index 23da537d1a..cd55f30885 100644 --- a/lib/iris/tests/results/analysis/regrid/linear_circular_grid.cml +++ b/lib/iris/tests/results/analysis/regrid/linear_circular_grid.cml @@ -7,10 +7,10 @@ - + diff --git a/lib/iris/tests/results/analysis/regrid/linear_masked_altitude.cml b/lib/iris/tests/results/analysis/regrid/linear_masked_altitude.cml index e9b0aab378..f4e9914aa6 100644 --- a/lib/iris/tests/results/analysis/regrid/linear_masked_altitude.cml +++ b/lib/iris/tests/results/analysis/regrid/linear_masked_altitude.cml @@ -8,60 +8,60 @@ + [[424.423, 398.043, nan, nan, nan], + [368.688, 343.878, nan, nan, nan], + [375.091, 347.861, nan, nan, nan], + [446.161, 414.22, nan, nan, nan]]]" shape="(2, 4, 5)" standard_name="altitude" units="Unit('m')" value_type="float32"> diff --git a/lib/iris/tests/results/analysis/regrid/linear_non_circular.cml b/lib/iris/tests/results/analysis/regrid/linear_non_circular.cml index 7faef54684..ad0c691c4f 100644 --- a/lib/iris/tests/results/analysis/regrid/linear_non_circular.cml +++ b/lib/iris/tests/results/analysis/regrid/linear_non_circular.cml @@ -7,10 +7,10 @@ - + diff --git a/lib/iris/tests/results/analysis/regrid/linear_partial_overlap.cml b/lib/iris/tests/results/analysis/regrid/linear_partial_overlap.cml index 147f5c69a1..e55e259bc8 100644 --- a/lib/iris/tests/results/analysis/regrid/linear_partial_overlap.cml +++ b/lib/iris/tests/results/analysis/regrid/linear_partial_overlap.cml @@ -6,54 +6,54 @@ - + [[nan, nan, 367.726, 355.63], + [nan, nan, 340.443, 407.574], + [nan, nan, 336.602, 419.093], + [nan, nan, 376.39, 341.021]]]" shape="(2, 4, 4)" standard_name="altitude" units="Unit('m')" value_type="float32"> diff --git a/lib/iris/tests/results/analysis/regrid/nearest_circular_grid.cml b/lib/iris/tests/results/analysis/regrid/nearest_circular_grid.cml index e1f6df038b..7bc60cbbe2 100644 --- a/lib/iris/tests/results/analysis/regrid/nearest_circular_grid.cml +++ b/lib/iris/tests/results/analysis/regrid/nearest_circular_grid.cml @@ -7,10 +7,10 @@ - + diff --git a/lib/iris/tests/results/analysis/regrid/nearest_masked_altitude.cml b/lib/iris/tests/results/analysis/regrid/nearest_masked_altitude.cml index cfe47b3f8b..83ceaea0a9 100644 --- a/lib/iris/tests/results/analysis/regrid/nearest_masked_altitude.cml +++ b/lib/iris/tests/results/analysis/regrid/nearest_masked_altitude.cml @@ -14,14 +14,14 @@ [[325.116, 337.95], [289.584, 302.472], - [--, --], - [--, --], + [nan, nan], + [nan, nan], [424.168, 436.85]], [[325.116, 337.95], [289.584, 302.472], - [--, --], - [--, --], + [nan, nan], + [nan, nan], [424.168, 436.85]], [[440.66, 453.316], @@ -39,14 +39,14 @@ [[337.95, 357.202], [302.472, 321.806], - [--, --], - [--, --], + [nan, nan], + [nan, nan], [436.85, 455.873]], [[337.95, 357.202], [302.472, 321.806], - [--, --], - [--, --], + [nan, nan], + [nan, nan], [436.85, 455.873]], [[453.316, 472.302], @@ -54,13 +54,13 @@ [315.637, 334.94], [315.637, 334.94], [272.726, 292.128]]]]" id="9041e969" points="[[[418.698, 379.592, 202.986, 202.986, 333.61], - [329.929, 294.417, --, --, 428.923], - [329.929, 294.417, --, --, 428.923], + [329.929, 294.417, nan, nan, 428.923], + [329.929, 294.417, nan, nan, 428.923], [445.406, 398.973, 307.595, 307.595, 264.642]], [[434.57, 395.539, 219.272, 219.272, 349.646], - [345.971, 310.528, --, --, 444.776], - [345.971, 310.528, --, --, 444.776], + [345.971, 310.528, nan, nan, 444.776], + [345.971, 310.528, nan, nan, 444.776], [461.227, 414.883, 323.68, 323.68, 280.81]]]" shape="(2, 4, 5)" standard_name="altitude" units="Unit('m')" value_type="float32"> diff --git a/lib/iris/tests/results/analysis/regrid/nearest_non_circular.cml b/lib/iris/tests/results/analysis/regrid/nearest_non_circular.cml index 23a19b5185..3355a81174 100644 --- a/lib/iris/tests/results/analysis/regrid/nearest_non_circular.cml +++ b/lib/iris/tests/results/analysis/regrid/nearest_non_circular.cml @@ -7,10 +7,10 @@ - + diff --git a/lib/iris/tests/results/analysis/regrid/nearest_partial_overlap.cml b/lib/iris/tests/results/analysis/regrid/nearest_partial_overlap.cml index 3763379f50..351e86a2ac 100644 --- a/lib/iris/tests/results/analysis/regrid/nearest_partial_overlap.cml +++ b/lib/iris/tests/results/analysis/regrid/nearest_partial_overlap.cml @@ -6,54 +6,54 @@ - + [[nan, nan, 395.539, 349.646], + [nan, nan, 310.528, 444.776], + [nan, nan, 310.528, 444.776], + [nan, nan, 414.883, 280.81]]]" shape="(2, 4, 4)" standard_name="altitude" units="Unit('m')" value_type="float32"> diff --git a/lib/iris/tests/results/analysis/regrid/no_overlap.cml b/lib/iris/tests/results/analysis/regrid/no_overlap.cml index a4503e2532..5168c88ca5 100644 --- a/lib/iris/tests/results/analysis/regrid/no_overlap.cml +++ b/lib/iris/tests/results/analysis/regrid/no_overlap.cml @@ -6,54 +6,54 @@ - + [[nan, nan, nan, nan], + [nan, nan, nan, nan], + [nan, nan, nan, nan], + [nan, nan, nan, nan]]]" shape="(2, 4, 4)" standard_name="altitude" units="Unit('m')" value_type="float32"> diff --git a/lib/iris/tests/unit/analysis/regrid/test_RectilinearRegridder.py b/lib/iris/tests/unit/analysis/regrid/test_RectilinearRegridder.py index 5e50095d36..ca86e5cdd7 100644 --- a/lib/iris/tests/unit/analysis/regrid/test_RectilinearRegridder.py +++ b/lib/iris/tests/unit/analysis/regrid/test_RectilinearRegridder.py @@ -1153,7 +1153,6 @@ def test_grid_subset_missing_data_2(self): cml = RESULT_DIR + ('{}_subset_masked_2.cml'.format(method),) self.assertCMLApproxData(result, cml) - @tests.skip_dask_mask def test_grid_partial_overlap(self): # The destination grid points are partially contained within the # src grid points. @@ -1166,7 +1165,6 @@ def test_grid_partial_overlap(self): cml = RESULT_DIR + ('{}_partial_overlap.cml'.format(method),) self.assertCMLApproxData(result, cml) - @tests.skip_dask_mask def test_grid_no_overlap(self): # The destination grid points are NOT contained within the # src grid points. @@ -1178,7 +1176,6 @@ def test_grid_no_overlap(self): result = regridder(self.src) self.assertCMLApproxData(result, RESULT_DIR + ('no_overlap.cml',)) - @tests.skip_dask_mask def test_grid_subset_missing_data_aux(self): # The destination grid points are entirely contained within the # src grid points AND we have missing data on the aux coordinate. @@ -1234,7 +1231,6 @@ def setUp(self): self.mode = 'mask' self.methods = ('linear', 'nearest') - @tests.skip_dask_mask def test_non_circular(self): # Non-circular src -> non-circular grid for method in self.methods: @@ -1353,7 +1349,6 @@ def make_2d_cube(x_points, y_points, data): self.assertMaskedArrayEqual(result_masked.data, expected_result_data) - @tests.skip_dask_mask def test_circular_grid(self): # Non-circular src -> circular grid grid = self.grid