diff --git a/lib/iris/tests/__init__.py b/lib/iris/tests/__init__.py index 0ff5f68867..8dcc0e136c 100644 --- a/lib/iris/tests/__init__.py +++ b/lib/iris/tests/__init__.py @@ -755,6 +755,18 @@ def patch(self, *args, **kwargs): # Return patch replacement object. return start_result + def assertArrayShapeStats(self, result, shape, mean, std_dev): + """ + Assert that the result, a cube, has the provided shape and that the + mean and standard deviation of the data array are also as provided. + Thus build confidence that a cube processing operation, such as a + cube.regrid, has maintained its behaviour. + + """ + self.assertEqual(result.shape, shape) + self.assertAlmostEqual(result.data.mean(), mean, places=5) + self.assertAlmostEqual(result.data.std(), std_dev, places=5) + get_result_path = IrisTest.get_result_path diff --git a/lib/iris/tests/experimental/regrid/test_regrid_area_weighted_rectilinear_src_and_grid.py b/lib/iris/tests/experimental/regrid/test_regrid_area_weighted_rectilinear_src_and_grid.py index e5318a6b80..2bcf89da35 100644 --- a/lib/iris/tests/experimental/regrid/test_regrid_area_weighted_rectilinear_src_and_grid.py +++ b/lib/iris/tests/experimental/regrid/test_regrid_area_weighted_rectilinear_src_and_grid.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2013 - 2015, Met Office +# (C) British Crown Copyright 2013 - 2016, Met Office # # This file is part of Iris. # @@ -37,12 +37,6 @@ import iris.analysis._interpolation import iris.tests.stock -# Run tests in no graphics mode if matplotlib is not available. -if tests.MPL_AVAILABLE: - import matplotlib.pyplot as plt - import iris.quickplot as qplt - - RESULT_DIR = ('experimental', 'regrid', 'regrid_area_weighted_rectilinear_src_and_grid') @@ -161,7 +155,7 @@ def _resampled_grid(cube, x_samplefactor, y_samplefactor): return new_cube -class TestAreaWeightedRegrid(tests.GraphicsTest): +class TestAreaWeightedRegrid(tests.IrisTest): def setUp(self): # A cube with a hybrid height derived coordinate. self.realistic_cube = iris.tests.stock.realistic_4d()[:2, :5, :20, :30] @@ -367,25 +361,11 @@ def test_regrid_to_higher_res(self): res = regrid_area_weighted(src, dest) self.assertCMLApproxData(res, RESULT_DIR + ('higher.cml',)) - @tests.skip_plot def test_hybrid_height(self): src = self.realistic_cube dest = _resampled_grid(src, 0.7, 0.8) res = regrid_area_weighted(src, dest) self.assertCMLApproxData(res, RESULT_DIR + ('hybridheight.cml',)) - # Consider a single slice to allow visual tests of altitudes. - src = src[1, 2] - res = res[1, 2] - qplt.pcolormesh(res) - self.check_graphic() - plt.contourf(res.coord('grid_longitude').points, - res.coord('grid_latitude').points, - res.coord('altitude').points) - self.check_graphic() - plt.contourf(res.coord('grid_longitude').points, - res.coord('grid_latitude').points, - res.coord('surface_altitude').points) - self.check_graphic() def test_missing_data(self): src = self.simple_cube.copy() @@ -443,7 +423,6 @@ def test_ten_by_ten_subset(self): res = regrid_area_weighted(src, dest) self.assertTrue(res, src[indices]) - @tests.skip_plot def test_cross_section(self): # Slice to get a cross section. # Constant latitude @@ -458,10 +437,6 @@ def test_cross_section(self): res = regrid_area_weighted(src, dest) self.assertCMLApproxData(res, RESULT_DIR + ('const_lat_cross_section.cml',)) - # Plot a single slice. - qplt.plot(res[0]) - qplt.plot(src[0], 'r') - self.check_graphic() # Constant longitude src = self.realistic_cube[0, :, :, 10] @@ -475,10 +450,6 @@ def test_cross_section(self): res = regrid_area_weighted(src, dest) self.assertCMLApproxData(res, RESULT_DIR + ('const_lon_cross_section.cml',)) - # Plot a single slice. - qplt.plot(res[0]) - qplt.plot(src[0], 'r') - self.check_graphic() def test_scalar_source_cube(self): src = self.simple_cube[1, 2] @@ -495,39 +466,32 @@ def test_scalar_source_cube(self): self.assertEqual(res.data, src.data) @tests.skip_data - @tests.skip_plot def test_global_data_reduce_res(self): src = iris.tests.stock.global_pp() src.coord('latitude').guess_bounds() src.coord('longitude').guess_bounds() dest = _resampled_grid(src, 0.4, 0.3) res = regrid_area_weighted(src, dest) - qplt.pcolormesh(res) - self.check_graphic() + self.assertArrayShapeStats(res, (21, 38), 280.137698, 15.998966) @tests.skip_data - @tests.skip_plot def test_global_data_increase_res(self): src = iris.tests.stock.global_pp() src.coord('latitude').guess_bounds() src.coord('longitude').guess_bounds() dest = _resampled_grid(src, 1.5, 1.5) res = regrid_area_weighted(src, dest) - qplt.pcolormesh(res) - self.check_graphic() + self.assertArrayShapeStats(res, (109, 144), 279.955722, 16.313940) @tests.skip_data - @tests.skip_plot def test_global_data_same_res(self): src = iris.tests.stock.global_pp() src.coord('latitude').guess_bounds() src.coord('longitude').guess_bounds() res = regrid_area_weighted(src, src) - qplt.pcolormesh(res) - self.check_graphic() + self.assertArrayShapeStats(res, (73, 96), 279.945167, 16.345842) @tests.skip_data - @tests.skip_plot def test_global_data_subset(self): src = iris.tests.stock.global_pp() src.coord('latitude').guess_bounds() @@ -545,12 +509,9 @@ def test_global_data_subset(self): dest.add_dim_coord(dest_lon, 1) res = regrid_area_weighted(src, dest) - qplt.pcolormesh(res) - plt.gca().coastlines() - self.check_graphic() + self.assertArrayShapeStats(res, (40, 30), 280.979336, 16.640421) @tests.skip_data - @tests.skip_plot def test_circular_subset(self): src = iris.tests.stock.global_pp() src.coord('latitude').guess_bounds() @@ -568,12 +529,9 @@ def test_circular_subset(self): dest.add_dim_coord(dest_lon, 1) res = regrid_area_weighted(src, dest) - qplt.pcolormesh(res) - plt.gca().coastlines() - self.check_graphic() + self.assertArrayShapeStats(res, (40, 7), 285.653967, 15.212710) @tests.skip_data - @tests.skip_plot def test_non_circular_subset(self): src = iris.tests.stock.global_pp() src.coord('latitude').guess_bounds() @@ -592,9 +550,7 @@ def test_non_circular_subset(self): dest.add_dim_coord(dest_lon, 1) res = regrid_area_weighted(src, dest) - qplt.pcolormesh(res) - plt.gca().coastlines() - self.check_graphic() + self.assertArrayShapeStats(res, (40, 7), 285.550800, 15.190245) if __name__ == "__main__": diff --git a/lib/iris/tests/integration/test_grib_load.py b/lib/iris/tests/integration/test_grib_load.py index fc594a490c..8a42e58c1c 100644 --- a/lib/iris/tests/integration/test_grib_load.py +++ b/lib/iris/tests/integration/test_grib_load.py @@ -42,13 +42,6 @@ from unittest import skipIf -# Run tests in no graphics mode if matplotlib is not available. -if tests.MPL_AVAILABLE: - import matplotlib.pyplot as plt - from matplotlib.colors import LogNorm - import iris.plot as iplt - import iris.quickplot as qplt - if tests.GRIB_AVAILABLE: try: import iris_grib @@ -97,64 +90,32 @@ def test_load_masked(self): self.assertCML(cubes, ('grib_load', 'missing_values_grib2.cml')) @skip_irisgrib_fails - @tests.skip_plot def test_y_fastest(self): cubes = iris.load(tests.get_data_path(("GRIB", "y_fastest", "y_fast.grib2"))) self.assertCML(cubes, ("grib_load", "y_fastest.cml")) - iplt.contourf(cubes[0]) - plt.gca().coastlines() - plt.title("y changes fastest") - self.check_graphic() - @tests.skip_plot def test_polar_stereo_grib1(self): cube = iris.load_cube(tests.get_data_path( ("GRIB", "polar_stereo", "ST4.2013052210.01h"))) self.assertCML(cube, ("grib_load", "polar_stereo_grib1.cml")) - qplt.contourf(cube, norm=LogNorm()) - plt.gca().coastlines() - plt.gca().gridlines() - plt.title("polar stereo grib1") - self.check_graphic() - @tests.skip_plot def test_polar_stereo_grib2(self): cube = iris.load_cube(tests.get_data_path( ("GRIB", "polar_stereo", "CMC_glb_TMP_ISBL_1015_ps30km_2013052000_P006.grib2"))) self.assertCML(cube, ("grib_load", "polar_stereo_grib2.cml")) - qplt.contourf(cube) - plt.gca().coastlines() - plt.gca().gridlines() - plt.title("polar stereo grib2") - self.check_graphic() - - @tests.skip_plot def test_lambert_grib1(self): cube = iris.load_cube(tests.get_data_path( ("GRIB", "lambert", "lambert.grib1"))) self.assertCML(cube, ("grib_load", "lambert_grib1.cml")) - qplt.contourf(cube) - plt.gca().coastlines() - plt.gca().gridlines() - plt.title("lambert grib1") - self.check_graphic() - - @tests.skip_plot def test_lambert_grib2(self): cube = iris.load_cube(tests.get_data_path( ("GRIB", "lambert", "lambert.grib2"))) self.assertCML(cube, ("grib_load", "lambert_grib2.cml")) - qplt.contourf(cube) - plt.gca().coastlines() - plt.gca().gridlines() - plt.title("lambert grib2") - self.check_graphic() - def test_regular_gg_grib1(self): cube = iris.load_cube(tests.get_data_path( ('GRIB', 'gaussian', 'regular_gg.grib1'))) @@ -191,38 +152,21 @@ def _old_compat_load(name): name)))[0] return [cube] - @tests.skip_plot def test_ij_directions_ipos_jpos(self): cubes = self._old_compat_load("ipos_jpos.grib2") self.assertCML(cubes, ("grib_load", "ipos_jpos.cml")) - iplt.contourf(cubes[0]) - plt.gca().coastlines() - plt.title("ipos_jpos cube") - self.check_graphic() def test_ij_directions_ipos_jneg(self): cubes = self._old_compat_load("ipos_jneg.grib2") self.assertCML(cubes, ("grib_load", "ipos_jneg.cml")) - iplt.contourf(cubes[0]) - plt.gca().coastlines() - plt.title("ipos_jneg cube") - self.check_graphic() def test_ij_directions_ineg_jneg(self): cubes = self._old_compat_load("ineg_jneg.grib2") self.assertCML(cubes, ("grib_load", "ineg_jneg.cml")) - iplt.contourf(cubes[0]) - plt.gca().coastlines() - plt.title("ineg_jneg cube") - self.check_graphic() def test_ij_directions_ineg_jpos(self): cubes = self._old_compat_load("ineg_jpos.grib2") self.assertCML(cubes, ("grib_load", "ineg_jpos.cml")) - iplt.contourf(cubes[0]) - plt.gca().coastlines() - plt.title("ineg_jpos cube") - self.check_graphic() @tests.skip_data diff --git a/lib/iris/tests/integration/test_regridding.py b/lib/iris/tests/integration/test_regridding.py index 7d3d052ef6..c26c96a847 100644 --- a/lib/iris/tests/integration/test_regridding.py +++ b/lib/iris/tests/integration/test_regridding.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2013 - 2015, Met Office +# (C) British Crown Copyright 2013 - 2016, Met Office # # This file is part of Iris. # @@ -32,20 +32,17 @@ from iris.cube import Cube from iris.tests.stock import global_pp -# Run tests in no graphics mode if matplotlib is not available. -if tests.MPL_AVAILABLE: - import iris.quickplot as qplt - @tests.skip_data -@tests.skip_plot -class TestOSGBToLatLon(tests.GraphicsTest): +class TestOSGBToLatLon(tests.IrisTest): def setUp(self): path = tests.get_data_path( ('NIMROD', 'uk2km', 'WO0000000003452', '201007020900_u1096_ng_ey00_visibility0180_screen_2km')) self.src = iris.load_cube(path)[0] - self.src.data = self.src.data.astype(np.float32) + # Cast up to float64, to work around numpy<=1.8 bug with means of + # arrays of 32bit floats. + self.src.data = self.src.data.astype(np.float64) self.grid = Cube(np.empty((73, 96))) cs = GeogCS(6370000) lat = DimCoord(np.linspace(46, 65, 73), 'latitude', units='degrees', @@ -58,23 +55,25 @@ def setUp(self): def _regrid(self, method): regridder = Regridder(self.src, self.grid, method, 'mask') result = regridder(self.src) - qplt.pcolor(result, antialiased=False) - qplt.plt.gca().coastlines() + return result def test_linear(self): - self._regrid('linear') - self.check_graphic() + res = self._regrid('linear') + self.assertArrayShapeStats(res, (73, 96), -16100.351951, 5603.850769) def test_nearest(self): - self._regrid('nearest') - self.check_graphic() + res = self._regrid('nearest') + self.assertArrayShapeStats(res, (73, 96), -16095.965585, 5612.657155) @tests.skip_data -@tests.skip_plot -class TestGlobalSubsample(tests.GraphicsTest): +class TestGlobalSubsample(tests.IrisTest): def setUp(self): self.src = global_pp() + _ = self.src.data + # Cast up to float64, to work around numpy<=1.8 bug with means of + # arrays of 32bit floats. + self.src.data = self.src.data.astype(np.float64) # Subsample and shift the target grid so that we can see a visual # difference between regridding scheme methods. grid = self.src[1::2, 1::3] @@ -85,16 +84,15 @@ def setUp(self): def _regrid(self, method): regridder = Regridder(self.src, self.grid, method, 'mask') result = regridder(self.src) - qplt.pcolormesh(result) - qplt.plt.gca().coastlines() + return result def test_linear(self): - self._regrid('linear') - self.check_graphic() + res = self._regrid('linear') + self.assertArrayShapeStats(res, (36, 32), 280.35907, 15.997223) def test_nearest(self): - self._regrid('nearest') - self.check_graphic() + res = self._regrid('nearest') + self.assertArrayShapeStats(res, (36, 32), 280.33726, 16.064001) if __name__ == "__main__": diff --git a/lib/iris/tests/results/visual_tests/test_grib_load.TestBasicLoad.test_lambert_grib1.0.png b/lib/iris/tests/results/visual_tests/test_grib_load.TestBasicLoad.test_lambert_grib1.0.png deleted file mode 100644 index a42e5adf3d..0000000000 Binary files a/lib/iris/tests/results/visual_tests/test_grib_load.TestBasicLoad.test_lambert_grib1.0.png and /dev/null differ diff --git a/lib/iris/tests/results/visual_tests/test_grib_load.TestBasicLoad.test_lambert_grib2.0.png b/lib/iris/tests/results/visual_tests/test_grib_load.TestBasicLoad.test_lambert_grib2.0.png deleted file mode 100644 index 15e9ead0a6..0000000000 Binary files a/lib/iris/tests/results/visual_tests/test_grib_load.TestBasicLoad.test_lambert_grib2.0.png and /dev/null differ diff --git a/lib/iris/tests/results/visual_tests/test_grib_load.TestBasicLoad.test_polar_stereo_grib1.0.png b/lib/iris/tests/results/visual_tests/test_grib_load.TestBasicLoad.test_polar_stereo_grib1.0.png deleted file mode 100644 index c40a859e98..0000000000 Binary files a/lib/iris/tests/results/visual_tests/test_grib_load.TestBasicLoad.test_polar_stereo_grib1.0.png and /dev/null differ diff --git a/lib/iris/tests/results/visual_tests/test_grib_load.TestBasicLoad.test_polar_stereo_grib2.0.png b/lib/iris/tests/results/visual_tests/test_grib_load.TestBasicLoad.test_polar_stereo_grib2.0.png deleted file mode 100644 index d8613212b1..0000000000 Binary files a/lib/iris/tests/results/visual_tests/test_grib_load.TestBasicLoad.test_polar_stereo_grib2.0.png and /dev/null differ diff --git a/lib/iris/tests/results/visual_tests/test_grib_load.TestBasicLoad.test_y_fastest.0.png b/lib/iris/tests/results/visual_tests/test_grib_load.TestBasicLoad.test_y_fastest.0.png deleted file mode 100644 index 13c2bfd836..0000000000 Binary files a/lib/iris/tests/results/visual_tests/test_grib_load.TestBasicLoad.test_y_fastest.0.png and /dev/null differ diff --git a/lib/iris/tests/results/visual_tests/test_grib_load.TestIjDirections.test_ij_directions_ineg_jneg.0.png b/lib/iris/tests/results/visual_tests/test_grib_load.TestIjDirections.test_ij_directions_ineg_jneg.0.png deleted file mode 100644 index 0d54a204c8..0000000000 Binary files a/lib/iris/tests/results/visual_tests/test_grib_load.TestIjDirections.test_ij_directions_ineg_jneg.0.png and /dev/null differ diff --git a/lib/iris/tests/results/visual_tests/test_grib_load.TestIjDirections.test_ij_directions_ineg_jpos.0.png b/lib/iris/tests/results/visual_tests/test_grib_load.TestIjDirections.test_ij_directions_ineg_jpos.0.png deleted file mode 100644 index b3592c5c12..0000000000 Binary files a/lib/iris/tests/results/visual_tests/test_grib_load.TestIjDirections.test_ij_directions_ineg_jpos.0.png and /dev/null differ diff --git a/lib/iris/tests/results/visual_tests/test_grib_load.TestIjDirections.test_ij_directions_ipos_jneg.0.png b/lib/iris/tests/results/visual_tests/test_grib_load.TestIjDirections.test_ij_directions_ipos_jneg.0.png deleted file mode 100644 index 10256c1d4b..0000000000 Binary files a/lib/iris/tests/results/visual_tests/test_grib_load.TestIjDirections.test_ij_directions_ipos_jneg.0.png and /dev/null differ diff --git a/lib/iris/tests/results/visual_tests/test_grib_load.TestIjDirections.test_ij_directions_ipos_jpos.0.png b/lib/iris/tests/results/visual_tests/test_grib_load.TestIjDirections.test_ij_directions_ipos_jpos.0.png deleted file mode 100644 index ffbd94e75e..0000000000 Binary files a/lib/iris/tests/results/visual_tests/test_grib_load.TestIjDirections.test_ij_directions_ipos_jpos.0.png and /dev/null differ diff --git a/lib/iris/tests/results/visual_tests/test_regrid_area_weighted_rectilinear_src_and_grid.TestAreaWeightedRegrid.test_circular_subset.0.png b/lib/iris/tests/results/visual_tests/test_regrid_area_weighted_rectilinear_src_and_grid.TestAreaWeightedRegrid.test_circular_subset.0.png deleted file mode 100644 index 75d4f8d4ea..0000000000 Binary files a/lib/iris/tests/results/visual_tests/test_regrid_area_weighted_rectilinear_src_and_grid.TestAreaWeightedRegrid.test_circular_subset.0.png and /dev/null differ diff --git a/lib/iris/tests/results/visual_tests/test_regrid_area_weighted_rectilinear_src_and_grid.TestAreaWeightedRegrid.test_cross_section.0.png b/lib/iris/tests/results/visual_tests/test_regrid_area_weighted_rectilinear_src_and_grid.TestAreaWeightedRegrid.test_cross_section.0.png deleted file mode 100644 index 71f9e19cc6..0000000000 Binary files a/lib/iris/tests/results/visual_tests/test_regrid_area_weighted_rectilinear_src_and_grid.TestAreaWeightedRegrid.test_cross_section.0.png and /dev/null differ diff --git a/lib/iris/tests/results/visual_tests/test_regrid_area_weighted_rectilinear_src_and_grid.TestAreaWeightedRegrid.test_cross_section.1.png b/lib/iris/tests/results/visual_tests/test_regrid_area_weighted_rectilinear_src_and_grid.TestAreaWeightedRegrid.test_cross_section.1.png deleted file mode 100644 index 24eb398b67..0000000000 Binary files a/lib/iris/tests/results/visual_tests/test_regrid_area_weighted_rectilinear_src_and_grid.TestAreaWeightedRegrid.test_cross_section.1.png and /dev/null differ diff --git a/lib/iris/tests/results/visual_tests/test_regrid_area_weighted_rectilinear_src_and_grid.TestAreaWeightedRegrid.test_global_data_increase_res.0.png b/lib/iris/tests/results/visual_tests/test_regrid_area_weighted_rectilinear_src_and_grid.TestAreaWeightedRegrid.test_global_data_increase_res.0.png deleted file mode 100644 index 7ad26b20be..0000000000 Binary files a/lib/iris/tests/results/visual_tests/test_regrid_area_weighted_rectilinear_src_and_grid.TestAreaWeightedRegrid.test_global_data_increase_res.0.png and /dev/null differ diff --git a/lib/iris/tests/results/visual_tests/test_regrid_area_weighted_rectilinear_src_and_grid.TestAreaWeightedRegrid.test_global_data_reduce_res.0.png b/lib/iris/tests/results/visual_tests/test_regrid_area_weighted_rectilinear_src_and_grid.TestAreaWeightedRegrid.test_global_data_reduce_res.0.png deleted file mode 100644 index 880c70a91b..0000000000 Binary files a/lib/iris/tests/results/visual_tests/test_regrid_area_weighted_rectilinear_src_and_grid.TestAreaWeightedRegrid.test_global_data_reduce_res.0.png and /dev/null differ diff --git a/lib/iris/tests/results/visual_tests/test_regrid_area_weighted_rectilinear_src_and_grid.TestAreaWeightedRegrid.test_global_data_same_res.0.png b/lib/iris/tests/results/visual_tests/test_regrid_area_weighted_rectilinear_src_and_grid.TestAreaWeightedRegrid.test_global_data_same_res.0.png deleted file mode 100644 index d14728dbc0..0000000000 Binary files a/lib/iris/tests/results/visual_tests/test_regrid_area_weighted_rectilinear_src_and_grid.TestAreaWeightedRegrid.test_global_data_same_res.0.png and /dev/null differ diff --git a/lib/iris/tests/results/visual_tests/test_regrid_area_weighted_rectilinear_src_and_grid.TestAreaWeightedRegrid.test_global_data_subset.0.png b/lib/iris/tests/results/visual_tests/test_regrid_area_weighted_rectilinear_src_and_grid.TestAreaWeightedRegrid.test_global_data_subset.0.png deleted file mode 100644 index 3d5d4c5437..0000000000 Binary files a/lib/iris/tests/results/visual_tests/test_regrid_area_weighted_rectilinear_src_and_grid.TestAreaWeightedRegrid.test_global_data_subset.0.png and /dev/null differ diff --git a/lib/iris/tests/results/visual_tests/test_regrid_area_weighted_rectilinear_src_and_grid.TestAreaWeightedRegrid.test_hybrid_height.0.png b/lib/iris/tests/results/visual_tests/test_regrid_area_weighted_rectilinear_src_and_grid.TestAreaWeightedRegrid.test_hybrid_height.0.png deleted file mode 100644 index 9b5b152a4b..0000000000 Binary files a/lib/iris/tests/results/visual_tests/test_regrid_area_weighted_rectilinear_src_and_grid.TestAreaWeightedRegrid.test_hybrid_height.0.png and /dev/null differ diff --git a/lib/iris/tests/results/visual_tests/test_regrid_area_weighted_rectilinear_src_and_grid.TestAreaWeightedRegrid.test_hybrid_height.1.png b/lib/iris/tests/results/visual_tests/test_regrid_area_weighted_rectilinear_src_and_grid.TestAreaWeightedRegrid.test_hybrid_height.1.png deleted file mode 100644 index 7254ca2532..0000000000 Binary files a/lib/iris/tests/results/visual_tests/test_regrid_area_weighted_rectilinear_src_and_grid.TestAreaWeightedRegrid.test_hybrid_height.1.png and /dev/null differ diff --git a/lib/iris/tests/results/visual_tests/test_regrid_area_weighted_rectilinear_src_and_grid.TestAreaWeightedRegrid.test_hybrid_height.2.png b/lib/iris/tests/results/visual_tests/test_regrid_area_weighted_rectilinear_src_and_grid.TestAreaWeightedRegrid.test_hybrid_height.2.png deleted file mode 100644 index f32baca44b..0000000000 Binary files a/lib/iris/tests/results/visual_tests/test_regrid_area_weighted_rectilinear_src_and_grid.TestAreaWeightedRegrid.test_hybrid_height.2.png and /dev/null differ diff --git a/lib/iris/tests/results/visual_tests/test_regrid_area_weighted_rectilinear_src_and_grid.TestAreaWeightedRegrid.test_non_circular_subset.0.png b/lib/iris/tests/results/visual_tests/test_regrid_area_weighted_rectilinear_src_and_grid.TestAreaWeightedRegrid.test_non_circular_subset.0.png deleted file mode 100644 index 0953f930a5..0000000000 Binary files a/lib/iris/tests/results/visual_tests/test_regrid_area_weighted_rectilinear_src_and_grid.TestAreaWeightedRegrid.test_non_circular_subset.0.png and /dev/null differ diff --git a/lib/iris/tests/results/visual_tests/test_regridding.TestGlobalSubsample.test_linear.0.png b/lib/iris/tests/results/visual_tests/test_regridding.TestGlobalSubsample.test_linear.0.png deleted file mode 100644 index 2f74feb217..0000000000 Binary files a/lib/iris/tests/results/visual_tests/test_regridding.TestGlobalSubsample.test_linear.0.png and /dev/null differ diff --git a/lib/iris/tests/results/visual_tests/test_regridding.TestGlobalSubsample.test_nearest.0.png b/lib/iris/tests/results/visual_tests/test_regridding.TestGlobalSubsample.test_nearest.0.png deleted file mode 100644 index 429e6d214b..0000000000 Binary files a/lib/iris/tests/results/visual_tests/test_regridding.TestGlobalSubsample.test_nearest.0.png and /dev/null differ diff --git a/lib/iris/tests/results/visual_tests/test_regridding.TestOSGBToLatLon.test_linear.0.png b/lib/iris/tests/results/visual_tests/test_regridding.TestOSGBToLatLon.test_linear.0.png deleted file mode 100644 index efbcd1ab2c..0000000000 Binary files a/lib/iris/tests/results/visual_tests/test_regridding.TestOSGBToLatLon.test_linear.0.png and /dev/null differ diff --git a/lib/iris/tests/results/visual_tests/test_regridding.TestOSGBToLatLon.test_nearest.0.png b/lib/iris/tests/results/visual_tests/test_regridding.TestOSGBToLatLon.test_nearest.0.png deleted file mode 100644 index e90d2a3f79..0000000000 Binary files a/lib/iris/tests/results/visual_tests/test_regridding.TestOSGBToLatLon.test_nearest.0.png and /dev/null differ diff --git a/lib/iris/tests/results/visual_tests/test_trajectory.TestTrajectory.test_trajectory_extraction.0.png b/lib/iris/tests/results/visual_tests/test_trajectory.TestTrajectory.test_trajectory_extraction.0.png deleted file mode 100644 index 885e0d6588..0000000000 Binary files a/lib/iris/tests/results/visual_tests/test_trajectory.TestTrajectory.test_trajectory_extraction.0.png and /dev/null differ diff --git a/lib/iris/tests/results/visual_tests/test_trajectory.TestTrajectory.test_trajectory_extraction.1.png b/lib/iris/tests/results/visual_tests/test_trajectory.TestTrajectory.test_trajectory_extraction.1.png deleted file mode 100644 index e0145970a7..0000000000 Binary files a/lib/iris/tests/results/visual_tests/test_trajectory.TestTrajectory.test_trajectory_extraction.1.png and /dev/null differ diff --git a/lib/iris/tests/results/visual_tests/test_trajectory.TestTrajectory.test_tri_polar.0.png b/lib/iris/tests/results/visual_tests/test_trajectory.TestTrajectory.test_tri_polar.0.png deleted file mode 100644 index 379d4aaa49..0000000000 Binary files a/lib/iris/tests/results/visual_tests/test_trajectory.TestTrajectory.test_tri_polar.0.png and /dev/null differ diff --git a/lib/iris/tests/test_trajectory.py b/lib/iris/tests/test_trajectory.py index 4d75e3b2e9..f64de6baed 100644 --- a/lib/iris/tests/test_trajectory.py +++ b/lib/iris/tests/test_trajectory.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2015, Met Office +# (C) British Crown Copyright 2010 - 2016, Met Office # # This file is part of Iris. # @@ -28,10 +28,6 @@ import iris.analysis.trajectory import iris.tests.stock -# Run tests in no graphics mode if matplotlib is not available. -if tests.MPL_AVAILABLE: - import matplotlib.pyplot as plt - class TestSimple(tests.IrisTest): def test_invalid_coord(self): @@ -58,7 +54,6 @@ def test_trajectory_definition(self): self.assertEqual(trajectory.sampled_points[31], {'lat': 0.12499999999999989, 'lon': 3.875}) @tests.skip_data - @tests.skip_plot def test_trajectory_extraction(self): # Load the COLPEX data => TZYX @@ -113,11 +108,6 @@ def traj_to_sample_points(trajectory): self.assertCML(trajectory_cube, ('trajectory', 'constant_latitude.cml')) - # Sanity check the results against a simple slice - plt.plot(cube[0, 0, 10, :].data) - plt.plot(trajectory_cube[0, 0, :].data) - self.check_graphic() - # Extract a zig-zag trajectory waypoints = [ {'grid_latitude': -0.1188, 'grid_longitude': 359.5886}, @@ -139,17 +129,7 @@ def traj_to_sample_points(trajectory): self.assertCML(trajectory_cube, ('trajectory', 'zigzag.cml'), checksum=False) self.assertArrayAllClose(trajectory_cube.data, expected, rtol=2.0e-7) - # Sanity check the results against a simple slice - x = cube.coord('grid_longitude').points - y = cube.coord('grid_latitude').points - plt.pcolormesh(x, y, cube[0, 0, :, :].data) - x = trajectory_cube.coord('grid_longitude').points - y = trajectory_cube.coord('grid_latitude').points - plt.scatter(x, y, c=trajectory_cube.data) - self.check_graphic() - @tests.skip_data - @tests.skip_plot def test_tri_polar(self): # load data cubes = iris.load(tests.get_data_path(['NetCDF', 'ORCA2', 'votemper.nc'])) @@ -168,15 +148,6 @@ def test_tri_polar(self): sampled_cube = iris.analysis.trajectory.interpolate(cube, sample_points) self.assertCML(sampled_cube, ('trajectory', 'tri_polar_latitude_slice.cml')) - # turn it upside down for the visualisation - plot_cube = sampled_cube[0] - plot_cube = plot_cube[::-1, :] - - plt.clf() - plt.pcolormesh(plot_cube.data, vmin=cube.data.min(), vmax=cube.data.max()) - plt.colorbar() - self.check_graphic() - # Try to request linear interpolation. # Not allowed, as we have multi-dimensional coords. self.assertRaises(iris.exceptions.CoordinateMultiDimError, iris.analysis.trajectory.interpolate, cube, sample_points, method="linear")