add siconc fixes for EC-Earth3-Veg and EC-Earth3-Veg-LR models

esmvalcore/cmor/_fixes/cmip6/ec_earth3_veg.py

@@ -1,6 +1,6 @@
 """Fixes for EC-Earth3-Veg model."""
 import numpy as np
-
+import cf_units
 from ..fix import Fix
 
 
@@ -24,6 +24,19 @@ def fix_data(self, cube):
         return cube
 
 
+class Siconc(Fix):
+    """Fixes for siconc variable."""
+
+    def fix_metadata(self, cubes):
+        """Fix metadata."""
+        for cube in cubes:
+            if cube.coords('time'):
+                time_coord = cube.coord('time')
+                time_coord.units = cf_units.Unit(time_coord.units.origin,
+                                                 'proleptic_gregorian')
+        return cubes
+
+
 class Tas(Fix):
     """Fixes for tas."""
 

esmvalcore/cmor/_fixes/cmip6/ec_earth3_veg_lr.py

@@ -0,0 +1,5 @@
+"""Fixes for EC-Earth3-Veg-LR model."""
+from ..common import OceanFixGrid
+
+
+Siconc = OceanFixGrid

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

@@ -1,13 +1,14 @@
 """Tests for EC-Earth3-Veg."""
 import unittest
 
+import cf_units
 import iris
 import numpy as np
 import pytest
 from cf_units import Unit
 from iris.cube import Cube
 
-from esmvalcore.cmor._fixes.cmip6.ec_earth3_veg import Siconca, Tas
+from esmvalcore.cmor._fixes.cmip6.ec_earth3_veg import Siconc, Siconca, Tas
 from esmvalcore.cmor.fix import Fix
 from esmvalcore.cmor.table import get_var_info
 
@@ -32,6 +33,31 @@ def test_fix_data(self):
         self.assertEqual(cube.units, Unit('%'))
 
 
+def test_get_siconc_fix():
+    """Test getting of fix."""
+    fix = Fix.get_fixes('CMIP6', 'EC-Earth3-Veg', 'SImon', 'siconc')
+    assert fix == [Siconc(None)]
+
+
+def test_siconc_fix_calendar():
+    vardef = get_var_info('CMIP6', 'SImon', 'siconc')
+    fix = Siconc(vardef)
+    cube = iris.cube.Cube([1, 2])
+    bad_unit = cf_units.Unit('days since 1850-01-01 00:00:00', 'gregorian')
+    time_coord = iris.coords.DimCoord(
+        [0.0, 1.0],
+        var_name='time',
+        standard_name='time',
+        units=bad_unit,
+    )
+    cube.add_dim_coord(time_coord, 0)
+
+    fixed_cubes = fix.fix_metadata([cube])
+    good_unit = cf_units.Unit('days since 1850-01-01 00:00:00',
+                              'proleptic_gregorian')
+    assert fixed_cubes[0].coord('time').units == good_unit
+
+
 @pytest.fixture
 def tas_cubes():
     """Cubes to test fixes for ``tas``."""

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

@@ -0,0 +1,15 @@
+"""Test fixes for EC-Earth3-Veg-LR."""
+from esmvalcore.cmor._fixes.cmip6.ec_earth3_veg_lr import Siconc
+from esmvalcore.cmor._fixes.common import OceanFixGrid
+from esmvalcore.cmor._fixes.fix import Fix
+
+
+def test_get_siconc_fix():
+    """Test getting of fix."""
+    fix = Fix.get_fixes('CMIP6', 'EC-Earth3-Veg-LR', 'SImon', 'siconc')
+    assert fix == [Siconc(None)]
+
+
+def test_siconc_fix():
+    """Test fix for ``siconc``."""
+    assert Siconc is OceanFixGrid