Skip to content

Added various fixes for hybrid pressure coordinates #529

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mattiarighi merged 4 commits into from
Mar 12, 2020
Merged

Added various fixes for hybrid pressure coordinates #529

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b9e9fda
Added fixes for sigma pressure coordinate of cl
schlunma Mar 9, 2020
716fdcc
Added fixes for sigma pressure coordinate of cli, clw and clcalipso
schlunma Mar 9, 2020
8b10380
Added suggestions from @zklaus
schlunma Mar 12, 2020
2980eea
Avoid broken pytest-html plugin
bouweandela Mar 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions esmvalcore/cmor/_fixes/cmip5/bcc_csm1_1.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,13 @@
from scipy.interpolate import InterpolatedUnivariateSpline
from scipy.ndimage import map_coordinates

from ..common import ClFixHybridPressureCoord
from ..fix import Fix


Cl = ClFixHybridPressureCoord


class Tos(Fix):
"""Fixes for tos."""

Expand Down
4 changes: 4 additions & 0 deletions esmvalcore/cmor/_fixes/cmip5/bcc_csm1_1_m.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
"""Fixes for bcc-csm1-1-m."""
from .bcc_csm1_1 import Tos as BaseTos
from ..common import ClFixHybridPressureCoord


Cl = ClFixHybridPressureCoord


class Tos(BaseTos):
Expand Down
6 changes: 5 additions & 1 deletion esmvalcore/cmor/_fixes/cmip5/canesm2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@

"""Fixes for CanESM2 model."""
from ..common import ClFixHybridPressureCoord
from ..fix import Fix


Cl = ClFixHybridPressureCoord


class FgCo2(Fix):
"""Fixes for fgco2."""

Expand All @@ -15,6 +18,7 @@ def fix_data(self, cube):
Parameters
----------
cube: iris.cube.Cube
Input cube to fix.

Returns
-------
Expand Down
14 changes: 10 additions & 4 deletions esmvalcore/cmor/_fixes/cmip5/ccsm4.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
"""Fixes for CCSM4 model."""
from ..common import ClFixHybridPressureCoord
from ..fix import Fix
from ..shared import round_coordinates


Cl = ClFixHybridPressureCoord


class Rlut(Fix):
"""Fixes for rlut."""

Expand All @@ -15,11 +19,12 @@ def fix_metadata(self, cubes):

Parameters
----------
cube: iris.cube.CubeList
cubes : iris.cube.CubeList
Input cubes.

Returns
-------
iris.cube.Cube
iris.cube.CubeList

"""
return round_coordinates(cubes, 3)
Expand Down Expand Up @@ -80,11 +85,12 @@ def fix_metadata(self, cubes):

Parameters
----------
cube: iris.cube.CubeList
cubes : iris.cube.CubeList
Input cubes.

Returns
-------
iris.cube.Cube
iris.cube.CubeList

"""
self.get_cube_from_list(cubes).units = '1e3'
Expand Down
5 changes: 5 additions & 0 deletions esmvalcore/cmor/_fixes/cmip5/csiro_mk3_6_0.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
"""Fixes for CSIRO-Mk3-6-0 model."""
from ..common import ClFixHybridPressureCoord


Cl = ClFixHybridPressureCoord
5 changes: 5 additions & 0 deletions esmvalcore/cmor/_fixes/cmip5/giss_e2_h.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
"""Fixes for GISS-E2-H."""
from ..common import ClFixHybridPressureCoord


Cl = ClFixHybridPressureCoord
5 changes: 5 additions & 0 deletions esmvalcore/cmor/_fixes/cmip5/giss_e2_r.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
"""Fixes for GISS-E2-R."""
from ..common import ClFixHybridPressureCoord


Cl = ClFixHybridPressureCoord
11 changes: 8 additions & 3 deletions esmvalcore/cmor/_fixes/cmip5/inmcm4.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@

"""Fixes for inmcm4 model."""
import iris

from ..common import ClFixHybridPressureCoord
from ..fix import Fix


Cl = ClFixHybridPressureCoord


class Gpp(Fix):
"""Fixes for gpp."""

Expand All @@ -16,7 +19,8 @@ def fix_data(self, cube):

Parameters
----------
cube: iris.cube.Cube
cube : iris.cube.Cube
Input cube.

Returns
-------
Expand All @@ -40,7 +44,8 @@ def fix_data(self, cube):

Parameters
----------
cube: iris.cube.Cube
cube : iris.cube.Cube
Input cube.

Returns
-------
Expand Down
5 changes: 5 additions & 0 deletions esmvalcore/cmor/_fixes/cmip5/ipsl_cm5a_lr.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
"""Fixes for IPSL-CM5A-LR model."""
from ..common import ClFixHybridPressureCoord


Cl = ClFixHybridPressureCoord
5 changes: 5 additions & 0 deletions esmvalcore/cmor/_fixes/cmip5/ipsl_cm5a_mr.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
"""Fixes for IPSL-CM5A-MR model."""
from ..common import ClFixHybridPressureCoord


Cl = ClFixHybridPressureCoord
5 changes: 5 additions & 0 deletions esmvalcore/cmor/_fixes/cmip5/ipsl_cm5b_lr.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
"""Fixes for IPSL-CM5B-LR model."""
from ..common import ClFixHybridPressureCoord


Cl = ClFixHybridPressureCoord
9 changes: 9 additions & 0 deletions esmvalcore/cmor/_fixes/cmip5/miroc5.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
"""Fixes for MIROC5 model."""
from dask import array as da

from ..common import ClFixHybridPressureCoord
from ..fix import Fix
from ..shared import round_coordinates


Cl = ClFixHybridPressureCoord


class Sftof(Fix):
"""Fixes for sftof."""

Expand All @@ -17,6 +21,7 @@ def fix_data(self, cube):
Parameters
----------
cube: iris.cube.Cube
Input cube.

Returns
-------
Expand All @@ -41,6 +46,7 @@ def fix_data(self, cube):
Parameters
----------
cube: iris.cube.Cube
Input cube.

Returns
-------
Expand Down Expand Up @@ -98,6 +104,7 @@ def fix_data(self, cube):
Parameters
----------
cube: iris.cube.Cube
Input cube.

Returns
-------
Expand All @@ -121,6 +128,7 @@ def fix_metadata(self, cubes):
Parameters
----------
cubes: iris.cube.CubeList
Input cubes.

Returns
-------
Expand All @@ -146,6 +154,7 @@ def fix_data(self, cube):
Parameters
----------
cube: iris.cube.Cube
Input cube.

Returns
-------
Expand Down
15 changes: 11 additions & 4 deletions esmvalcore/cmor/_fixes/cmip5/miroc_esm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
"""Fixes for MIROC ESM model."""
"""Fixes for MIROC-ESM model."""

from iris.coords import DimCoord
from iris.exceptions import CoordinateNotFoundError

from ..common import ClFixHybridPressureCoord
from ..fix import Fix


Cl = ClFixHybridPressureCoord


class Tro3(Fix):
"""Fixes for tro3."""

Expand All @@ -18,6 +22,7 @@ def fix_data(self, cube):
Parameters
----------
cube: iris.cube.Cube
Input cube.

Returns
-------
Expand All @@ -41,11 +46,12 @@ def fix_metadata(self, cubes):

Parameters
----------
cube: iris.cube.CubeList
cubes : iris.cube.CubeList
Input cubes.

Returns
-------
iris.cube.Cube
iris.cube.CubeList

"""
self.get_cube_from_list(cubes).units = '1.0e-6'
Expand All @@ -63,7 +69,8 @@ def fix_metadata(self, cubes):

Parameters
----------
cube: iris.cube.CubeList
cubes : iris.cube.CubeList
Input cubes.

Returns
-------
Expand Down
8 changes: 6 additions & 2 deletions esmvalcore/cmor/_fixes/cmip5/mpi_esm_lr.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@

"""Fixes for MPI ESM LR model."""
"""Fixes for MPI-ESM-LR model."""
from ..common import ClFixHybridPressureCoord
from ..fix import Fix


Cl = ClFixHybridPressureCoord


class Pctisccp(Fix):
"""Fixes for pctisccp."""

Expand All @@ -15,6 +18,7 @@ def fix_data(self, cube):
Parameters
----------
cube: iris.cube.Cube
Input cube.

Returns
-------
Expand Down
5 changes: 5 additions & 0 deletions esmvalcore/cmor/_fixes/cmip5/mpi_esm_mr.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
"""Fixes for MPI-ESM-MR model."""
from ..common import ClFixHybridPressureCoord


Cl = ClFixHybridPressureCoord
5 changes: 5 additions & 0 deletions esmvalcore/cmor/_fixes/cmip5/mpi_esm_p.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
"""Fixes for MPI-ESM-P model."""
from ..common import ClFixHybridPressureCoord


Cl = ClFixHybridPressureCoord
7 changes: 6 additions & 1 deletion esmvalcore/cmor/_fixes/cmip5/mri_cgcm3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@

"""Fixes for MRI-CGCM3 model."""
from dask import array as da

from ..common import ClFixHybridPressureCoord
from ..fix import Fix


Cl = ClFixHybridPressureCoord


class Msftmyz(Fix):
"""Fixes for msftmyz."""

Expand All @@ -17,6 +20,7 @@ def fix_data(self, cube):
Parameters
----------
cube: iris.cube.Cube
Input cube.

Returns
-------
Expand All @@ -39,6 +43,7 @@ def fix_data(self, cube):
Parameters
----------
cube: iris.cube.Cube
Input cube.

Returns
-------
Expand Down
5 changes: 5 additions & 0 deletions esmvalcore/cmor/_fixes/cmip5/noresm1_m.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
"""Fixes for NorESM1-M."""
from ..common import ClFixHybridPressureCoord


Cl = ClFixHybridPressureCoord
10 changes: 10 additions & 0 deletions esmvalcore/cmor/_fixes/cmip6/bcc_csm2_mr.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
"""Fixes for BCC-CSM2-MR model."""
from ..cmip5.bcc_csm1_1 import Tos as BaseTos
from ..common import ClFixHybridPressureCoord


Cl = ClFixHybridPressureCoord


Cli = ClFixHybridPressureCoord


Clw = ClFixHybridPressureCoord


class Tos(BaseTos):
Expand Down
10 changes: 10 additions & 0 deletions esmvalcore/cmor/_fixes/cmip6/bcc_esm1.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
"""Fixes for BCC-ESM1 model."""
from .bcc_csm2_mr import Tos as BaseTos
from ..common import ClFixHybridPressureCoord


Cl = ClFixHybridPressureCoord


Cli = ClFixHybridPressureCoord


Clw = ClFixHybridPressureCoord


class Tos(BaseTos):
Expand Down
11 changes: 11 additions & 0 deletions esmvalcore/cmor/_fixes/cmip6/cams_csm1_0.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
"""Fixes for CAMS-CSM1-0 model."""
from ..common import ClFixHybridPressureCoord


Cl = ClFixHybridPressureCoord


Cli = ClFixHybridPressureCoord


Clw = ClFixHybridPressureCoord
Loading