Fixes of ocean variables in multiple CMIP6 datasets (#1566)

* fixes for ocean variables of gfdl_cm4 and gfdl_esm4 datasets

* fixes for ocean variables of cesm2_waccm dataset

* extend ocean fixes to cesm2 family

* add missing import to tests of cesm2 models

* update test for gfdl_cm4 fixes

* add ocean fixes for cnrm models

* import changes from PR #1395

* extend fixes from ipsl_cm6a_lr to the other ipsl models (in line with #1395)

* fix codacy

* fix more codacy

* apply Omon fix for fgoals_f3_l

* clean up wrong fixes taken from PR #1395

Author: tomaslovato

esmvalcore/cmor/_fixes/cmip6/bcc_csm2_mr.py

@@ -17,3 +17,6 @@
 
 
 Sos = OceanFixGrid
+
+
+Uo = OceanFixGrid

esmvalcore/cmor/_fixes/cmip6/cesm2_fv2.py

@@ -1,6 +1,7 @@
 """Fixes for CESM2-FV2 model."""
 from .cesm2 import Cl as BaseCl
 from .cesm2 import Fgco2 as BaseFgco2
+from .cesm2 import Omon as BaseOmon
 from .cesm2 import Tas as BaseTas
 from ..common import SiconcFixScalarCoord
 
@@ -17,6 +18,9 @@
 Fgco2 = BaseFgco2
 
 
+Omon = BaseOmon
+
+
 Siconc = SiconcFixScalarCoord
 
 

esmvalcore/cmor/_fixes/cmip6/cesm2_waccm.py

@@ -3,6 +3,7 @@
 
 from .cesm2 import Cl as BaseCl
 from .cesm2 import Fgco2 as BaseFgco2
+from .cesm2 import Omon as BaseOmon
 from .cesm2 import Tas as BaseTas
 from ..common import SiconcFixScalarCoord
 
@@ -52,6 +53,9 @@ def fix_file(self, filepath, output_dir):
 Fgco2 = BaseFgco2
 
 
+Omon = BaseOmon
+
+
 Siconc = SiconcFixScalarCoord
 
 

esmvalcore/cmor/_fixes/cmip6/cesm2_waccm_fv2.py

@@ -1,6 +1,7 @@
 """Fixes for CESM2-WACCM-FV2 model."""
 from .cesm2 import Tas as BaseTas
 from .cesm2 import Fgco2 as BaseFgco2
+from .cesm2 import Omon as BaseOmon
 from .cesm2_waccm import Cl as BaseCl
 from .cesm2_waccm import Cli as BaseCli
 from .cesm2_waccm import Clw as BaseClw
@@ -19,6 +20,9 @@
 Fgco2 = BaseFgco2
 
 
+Omon = BaseOmon
+
+
 Siconc = SiconcFixScalarCoord
 
 

esmvalcore/cmor/_fixes/cmip6/cnrm_cm6_1.py

@@ -3,7 +3,11 @@
 
 from ..common import ClFixHybridPressureCoord
 from ..fix import Fix
-from ..shared import add_aux_coords_from_cubes, get_bounds_cube
+from ..shared import (
+    add_aux_coords_from_cubes,
+    get_bounds_cube,
+    fix_ocean_depth_coord
+)
 
 
 class Cl(ClFixHybridPressureCoord):
@@ -73,7 +77,30 @@ def fix_metadata(self, cubes):
         return iris.cube.CubeList([cube])
 
 
-Cli = Cl
+class Omon(Fix):
+    """Fixes for ocean variables."""
+
+    def fix_metadata(self, cubes):
+        """Fix ocean depth coordinate.
+
+        Parameters
+        ----------
+        cubes: iris CubeList
+            List of cubes to fix
 
+        Returns
+        -------
+        iris.cube.CubeList
+
+        """
+        for cube in cubes:
+            if cube.coords(axis='Z'):
+                z_coord = cube.coord(axis='Z')
+                if z_coord.standard_name is None:
+                    fix_ocean_depth_coord(cube)
+        return cubes
+
+
+Cli = Cl
 
 Clw = Cl

esmvalcore/cmor/_fixes/cmip6/cnrm_esm2_1.py

@@ -1,12 +1,9 @@
 """Fixes for CNRM-ESM2-1 model."""
-from ..fix import Fix
-from ..shared import (fix_ocean_depth_coord)
-
-
 from .cnrm_cm6_1 import Cl as BaseCl
 from .cnrm_cm6_1 import Clcalipso as BaseClcalipso
 from .cnrm_cm6_1 import Cli as BaseCli
 from .cnrm_cm6_1 import Clw as BaseClw
+from .cnrm_cm6_1 import Omon as BaseOmon
 
 
 Cl = BaseCl
@@ -21,25 +18,4 @@
 Clw = BaseClw
 
 
-class Omon(Fix):
-    """Fixes for ocean variables."""
-
-    def fix_metadata(self, cubes):
-        """Fix ocean depth coordinate.
-
-        Parameters
-        ----------
-        cubes: iris CubeList
-            List of cubes to fix
-
-        Returns
-        -------
-        iris.cube.CubeList
-
-        """
-        for cube in cubes:
-            if cube.coords(axis='Z'):
-                z_coord = cube.coord(axis='Z')
-                if z_coord.standard_name is None:
-                    fix_ocean_depth_coord(cube)
-        return cubes
+Omon = BaseOmon

esmvalcore/cmor/_fixes/cmip6/fgoals_f3_l.py

@@ -11,6 +11,9 @@
 Tos = OceanFixGrid
 
 
+Omon = OceanFixGrid
+
+
 class AllVars(Fix):
     """Fixes for all vars."""
     def fix_metadata(self, cubes):

esmvalcore/cmor/_fixes/cmip6/gfdl_cm4.py

@@ -4,6 +4,8 @@
 from ..common import ClFixHybridPressureCoord, SiconcFixScalarCoord
 from ..fix import Fix
 from ..shared import add_aux_coords_from_cubes, add_scalar_height_coord
+from .gfdl_esm4 import Omon as BaseOmon
+from .gfdl_esm4 import Fgco2 as BaseFgco2
 
 
 class Cl(ClFixHybridPressureCoord):
@@ -108,3 +110,12 @@ def fix_metadata(self, cubes):
         cube = self.get_cube_from_list(cubes)
         add_scalar_height_coord(cube, 10.0)
         return cubes
+
+
+Omon = BaseOmon
+
+
+Oyr = Omon
+
+
+Fgco2 = BaseFgco2

esmvalcore/cmor/_fixes/cmip6/gfdl_esm4.py

@@ -52,4 +52,7 @@ def fix_metadata(self, cubes):
         return cubes
 
 
+Oyr = Omon
+
+
 Siconc = SiconcFixScalarCoord

esmvalcore/cmor/_fixes/cmip6/ipsl_cm5a2_inca.py

@@ -0,0 +1,13 @@
+"""Fixes for IPSL-CM5A2-INCA model."""
+from .ipsl_cm6a_lr import AllVars as BaseAllVars
+from .ipsl_cm6a_lr import Clcalipso as BaseClcalipso
+from .ipsl_cm6a_lr import Omon as BaseOmon
+
+
+AllVars = BaseAllVars
+
+
+Clcalipso = BaseClcalipso
+
+
+Omon = BaseOmon