Ensure lat/lon bounds in FGOALS-l3 atmos variables are contiguous (#1571)

* Add tas ecearth fix

* Remove uneeded fix

* Add fix for non contiguous bounds

* Add test

* Expand test

* Define wrong bounds as noncontiguous but monotic

* Revert "Add tas ecearth fix"

This reverts commit e8ae0ba.

* Fix flake

* Add check before guessing bounds

Author: sloosvel

esmvalcore/cmor/_fixes/cmip6/fgoals_f3_l.py

@@ -32,6 +32,12 @@ def fix_metadata(self, cubes):
         """
         for cube in cubes:
             if cube.attributes['table_id'] == 'Amon':
+                for coord in ['latitude', 'longitude']:
+                    cube_coord = cube.coord(coord)
+                    bounds = cube_coord.bounds
+                    if np.any(bounds[:-1, 1] != bounds[1:, 0]):
+                        cube_coord.bounds = None
+                        cube_coord.guess_bounds()
                 time = cube.coord('time')
                 if np.any(time.bounds[:-1, 1] != time.bounds[1:, 0]):
                     times = time.units.num2date(time.points)

tests/integration/cmor/_fixes/cmip6/test_fgoals_f3_l.py

@@ -1,5 +1,6 @@
 """Tests for the fixes of FGOALS-f3-L."""
 
+import numpy as np
 import iris
 import pytest
 from cf_units import Unit
@@ -24,15 +25,48 @@ def cubes():
         standard_name='time',
         units=Unit('days since 0001-01-01 00:00:00', calendar='365_day'))
 
-    correct_cube = iris.cube.Cube([10., 10., 10.],
+    correct_lat_coord = iris.coords.DimCoord(
+        [0.0, 1.0],
+        bounds=[[-0.5, 0.5], [0.5, 1.5]],
+        var_name='lat',
+        standard_name='latitude',
+        units='degrees')
+
+    wrong_lat_coord = iris.coords.DimCoord(
+        [0.0, 1.0],
+        bounds=[[-0.5, 0.5], [1.5, 2.]],
+        var_name='lat',
+        standard_name='latitude',
+        units='degrees')
+
+    correct_lon_coord = iris.coords.DimCoord(
+        [0.0, 1.0],
+        bounds=[[-0.5, 0.5], [0.5, 1.5]],
+        var_name='lon',
+        standard_name='longitude',
+        units='degrees')
+
+    wrong_lon_coord = iris.coords.DimCoord(
+        [0.0, 1.0],
+        bounds=[[-0.5, 0.5], [1.5, 2.]],
+        var_name='lon',
+        standard_name='longitude',
+        units='degrees')
+
+    correct_cube = iris.cube.Cube(10 * np.ones((3, 2, 2)),
                                   var_name='tas',
-                                  dim_coords_and_dims=[(correct_time_coord, 0)
+                                  dim_coords_and_dims=[(correct_time_coord, 0),
+                                                       (correct_lat_coord, 1),
+                                                       (correct_lon_coord, 2)
                                                        ],
                                   attributes={'table_id': 'Amon'},
                                   units=Unit('degC'))
-    wrong_cube = iris.cube.Cube([10., 10., 10.],
+
+    wrong_cube = iris.cube.Cube(10 * np.ones((3, 2, 2)),
                                 var_name='tas',
-                                dim_coords_and_dims=[(wrong_time_coord, 0)],
+                                dim_coords_and_dims=[(wrong_time_coord, 0),
+                                                     (wrong_lat_coord, 1),
+                                                     (wrong_lon_coord, 2)],
                                 attributes={'table_id': 'Amon'},
                                 units=Unit('degC'))
 
@@ -50,7 +84,11 @@ def test_allvars_fix_metadata(cubes):
     assert cubes is out_cubes
     for cube in out_cubes:
         time = cube.coord('time')
+        lat = cube.coord('latitude')
+        lon = cube.coord('longitude')
         assert all(time.bounds[1:, 0] == time.bounds[:-1, 1])
+        assert all(lat.bounds[1:, 0] == lat.bounds[:-1, 1])
+        assert all(lon.bounds[1:, 0] == lon.bounds[:-1, 1])
 
 
 def test_tos_fix():