Fixes for sos and siconc of BCC models (#1090)

* sos and siconc fixed

* tests added

* test fixed

* fix flake8

* fix flake8

* fix codacy issue

esmvalcore/cmor/_fixes/cmip6/bcc_csm2_mr.py

@@ -14,3 +14,6 @@
 
 
 Siconc = OceanFixGrid
+
+
+Sos = OceanFixGrid

esmvalcore/cmor/_fixes/cmip6/bcc_esm1.py

@@ -11,3 +11,9 @@
 
 
 Tos = OceanFixGrid
+
+
+Sos = OceanFixGrid
+
+
+Siconc = OceanFixGrid

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

@@ -1,5 +1,12 @@
 """Test fixes for BCC-CSM2-MR."""
-from esmvalcore.cmor._fixes.cmip6.bcc_csm2_mr import Cl, Cli, Clw, Siconc, Tos
+from esmvalcore.cmor._fixes.cmip6.bcc_csm2_mr import (
+    Cl,
+    Cli,
+    Clw,
+    Siconc,
+    Sos,
+    Tos,
+)
 from esmvalcore.cmor._fixes.common import (
     ClFixHybridPressureCoord,
     OceanFixGrid,
@@ -60,3 +67,14 @@ def test_get_siconc_fix():
 def test_siconc_fix():
     """Test fix for ``siconc``."""
     assert Siconc is OceanFixGrid
+
+
+def test_get_sos_fix():
+    """Test getting of fix."""
+    fix = Fix.get_fixes('CMIP6', 'BCC-CSM2-MR', 'Omon', 'sos')
+    assert fix == [Sos(None)]
+
+
+def test_sos_fix():
+    """Test fix for ``sos``."""
+    assert Sos is OceanFixGrid

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

@@ -1,5 +1,12 @@
 """Test fixes for BCC-ESM1."""
-from esmvalcore.cmor._fixes.cmip6.bcc_esm1 import Cl, Cli, Clw, Tos
+from esmvalcore.cmor._fixes.cmip6.bcc_esm1 import (
+    Cl,
+    Cli,
+    Clw,
+    Siconc,
+    Sos,
+    Tos,
+)
 from esmvalcore.cmor._fixes.common import (
     ClFixHybridPressureCoord,
     OceanFixGrid,
@@ -40,6 +47,28 @@ def test_clw_fix():
     assert Clw is ClFixHybridPressureCoord
 
 
+def test_get_siconc_fix():
+    """Test getting of fix."""
+    fix = Fix.get_fixes('CMIP6', 'BCC-ESM1', 'SImon', 'siconc')
+    assert fix == [Siconc(None)]
+
+
+def test_siconc_fix():
+    """Test fix for ``siconc``."""
+    assert Siconc is OceanFixGrid
+
+
+def test_get_sos_fix():
+    """Test getting of fix."""
+    fix = Fix.get_fixes('CMIP6', 'BCC-ESM1', 'Omon', 'sos')
+    assert fix == [Sos(None)]
+
+
+def test_sos_fix():
+    """Test fix for ``sos``."""
+    assert Sos is OceanFixGrid
+
+
 def test_get_tos_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'BCC-ESM1', 'Omon', 'tos')