From 55a5c67efe86d44ee2335a1bead2e27693f9f9bb Mon Sep 17 00:00:00 2001
From: Nikolay Koldunov <koldunovn@gmail.com>
Date: Tue, 18 Aug 2020 17:14:37 +0200
Subject: [PATCH 1/4] fix thetao and so in BCC models

---
 esmvalcore/cmor/_fixes/cmip6/bcc_csm2_mr.py | 37 ++++++++++++++++++---
 esmvalcore/cmor/_fixes/cmip6/bcc_esm1.py    |  9 ++---
 2 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/esmvalcore/cmor/_fixes/cmip6/bcc_csm2_mr.py b/esmvalcore/cmor/_fixes/cmip6/bcc_csm2_mr.py
index 2787e282e4..9f5a27dbbb 100644
--- a/esmvalcore/cmor/_fixes/cmip6/bcc_csm2_mr.py
+++ b/esmvalcore/cmor/_fixes/cmip6/bcc_csm2_mr.py
@@ -2,19 +2,15 @@
 from ..cmip5.bcc_csm1_1 import Tos as BaseTos
 from ..common import ClFixHybridPressureCoord
 
-
 Cl = ClFixHybridPressureCoord
 
-
 Cli = ClFixHybridPressureCoord
 
-
 Clw = ClFixHybridPressureCoord
 
 
 class Tos(BaseTos):
     """Fixes for tos."""
-
     def fix_metadata(self, cubes):
         """Rename ``var_name`` of 1D-``latitude`` and 1D-``longitude``.
 
@@ -41,3 +37,36 @@ def fix_metadata(self, cubes):
         lon_coord.units = '1'
         lon_coord.circular = False
         return cubes
+
+
+class Thetao(BaseTos):
+    """Fixes for thetao and so."""
+    def fix_metadata(self, cubes):
+        """Rename ``var_name`` of 1D-``latitude`` and 1D-``longitude``.
+
+        Parameters
+        ----------
+        cubes : iris.cube.CubeList
+            Input cubes.
+
+        Returns
+        -------
+        iris.cube.CubeList
+
+        """
+        cube = self.get_cube_from_list(cubes)
+        lat_coord = cube.coord('latitude', dimensions=(2, ))
+        lon_coord = cube.coord('longitude', dimensions=(3, ))
+        lat_coord.standard_name = None
+        lat_coord.long_name = 'grid_latitude'
+        lat_coord.var_name = 'i'
+        lat_coord.units = '1'
+        lon_coord.standard_name = None
+        lon_coord.long_name = 'grid_longitude'
+        lon_coord.var_name = 'j'
+        lon_coord.units = '1'
+        lon_coord.circular = False
+        return cubes
+
+
+So = Thetao
diff --git a/esmvalcore/cmor/_fixes/cmip6/bcc_esm1.py b/esmvalcore/cmor/_fixes/cmip6/bcc_esm1.py
index cae45b3f2f..abb0063a35 100644
--- a/esmvalcore/cmor/_fixes/cmip6/bcc_esm1.py
+++ b/esmvalcore/cmor/_fixes/cmip6/bcc_esm1.py
@@ -1,15 +1,16 @@
 """Fixes for BCC-ESM1 model."""
 from ..common import ClFixHybridPressureCoord
 from .bcc_csm2_mr import Tos as BaseTos
-
+from .bcc_csm2_mr import Thetao as BaseThetao
 
 Cl = ClFixHybridPressureCoord
 
-
 Cli = ClFixHybridPressureCoord
 
-
 Clw = ClFixHybridPressureCoord
 
-
 Tos = BaseTos
+
+Thetao = BaseThetao
+
+So = BaseThetao

From 063b88e711f4bf03db625f57986ecd4531b285f4 Mon Sep 17 00:00:00 2001
From: Nikolay Koldunov <koldunovn@gmail.com>
Date: Tue, 18 Aug 2020 19:39:59 +0200
Subject: [PATCH 2/4] codacy

---
 esmvalcore/cmor/_fixes/cmip6/bcc_csm2_mr.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/esmvalcore/cmor/_fixes/cmip6/bcc_csm2_mr.py b/esmvalcore/cmor/_fixes/cmip6/bcc_csm2_mr.py
index 9f5a27dbbb..e3cc0d9eb2 100644
--- a/esmvalcore/cmor/_fixes/cmip6/bcc_csm2_mr.py
+++ b/esmvalcore/cmor/_fixes/cmip6/bcc_csm2_mr.py
@@ -11,6 +11,7 @@
 
 class Tos(BaseTos):
     """Fixes for tos."""
+    
     def fix_metadata(self, cubes):
         """Rename ``var_name`` of 1D-``latitude`` and 1D-``longitude``.
 

From 91a00ecd7c93e919391770c4a61904d7901b8285 Mon Sep 17 00:00:00 2001
From: Nikolay Koldunov <koldunovn@gmail.com>
Date: Tue, 18 Aug 2020 19:50:42 +0200
Subject: [PATCH 3/4] codacy

---
 esmvalcore/cmor/_fixes/cmip6/bcc_csm2_mr.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/esmvalcore/cmor/_fixes/cmip6/bcc_csm2_mr.py b/esmvalcore/cmor/_fixes/cmip6/bcc_csm2_mr.py
index e3cc0d9eb2..f2d125845b 100644
--- a/esmvalcore/cmor/_fixes/cmip6/bcc_csm2_mr.py
+++ b/esmvalcore/cmor/_fixes/cmip6/bcc_csm2_mr.py
@@ -11,7 +11,7 @@
 
 class Tos(BaseTos):
     """Fixes for tos."""
-    
+
     def fix_metadata(self, cubes):
         """Rename ``var_name`` of 1D-``latitude`` and 1D-``longitude``.
 

From 9c507e5432f78f80375d875ed214c507a2a6b358 Mon Sep 17 00:00:00 2001
From: Nikolay Koldunov <koldunovn@gmail.com>
Date: Tue, 18 Aug 2020 19:54:02 +0200
Subject: [PATCH 4/4] codacy

---
 esmvalcore/cmor/_fixes/cmip6/bcc_csm2_mr.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/esmvalcore/cmor/_fixes/cmip6/bcc_csm2_mr.py b/esmvalcore/cmor/_fixes/cmip6/bcc_csm2_mr.py
index f2d125845b..d6b0856375 100644
--- a/esmvalcore/cmor/_fixes/cmip6/bcc_csm2_mr.py
+++ b/esmvalcore/cmor/_fixes/cmip6/bcc_csm2_mr.py
@@ -42,6 +42,7 @@ def fix_metadata(self, cubes):
 
 class Thetao(BaseTos):
     """Fixes for thetao and so."""
+
     def fix_metadata(self, cubes):
         """Rename ``var_name`` of 1D-``latitude`` and 1D-``longitude``.