Skip to content

Fix calculation of precipitation flux in EMAC on-the-fly CMORizer #1755

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
schlunma merged 3 commits into from
Oct 13, 2022
Merged

Fix calculation of precipitation flux in EMAC on-the-fly CMORizer #1755

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
715a05a
Removed aprs from calculation of pr in EMAC CMORizer
schlunma Oct 13, 2022
9f8d1a9
Fixed EMAC pr test
schlunma Oct 13, 2022
02d0774
Update emac-mappings.yml
schlunma Oct 13, 2022
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
2 changes: 1 addition & 1 deletion esmvalcore/_config/extra_facets/emac-mappings.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ EMAC:
od550aer:
raw_name: [aot_opt_TOT_550_total_cav, aot_opt_TOT_550_total_ave]
channel: AERmon
pr: # derived from aprl_*, aprc_*, aprs_*
pr: # derived from aprl_*, aprc_*
channel: Amon
prc:
raw_name: [aprc_cav, aprc_ave]
Expand Down
3 changes: 1 addition & 2 deletions esmvalcore/cmor/_fixes/emac/emac.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,8 +246,7 @@ def fix_metadata(self, cubes):
"""Fix metadata."""
cube = (
self.get_cube(cubes, var_name=['aprl_cav', 'aprl_ave']) +
self.get_cube(cubes, var_name=['aprc_cav', 'aprc_ave']) +
self.get_cube(cubes, var_name=['aprs_cav', 'aprs_ave'])
self.get_cube(cubes, var_name=['aprc_cav', 'aprc_ave'])
)
cube.var_name = self.vardef.short_name
return CubeList([cube])
Expand Down
4 changes: 1 addition & 3 deletions tests/integration/cmor/_fixes/emac/test_emac.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1105,10 +1105,8 @@ def test_pr_fix(cubes_2d):
"""Test fix."""
cubes_2d[0].var_name = 'aprl_cav'
cubes_2d[1].var_name = 'aprc_cav'
cubes_2d[2].var_name = 'aprs_cav'
cubes_2d[0].units = 'kg m-2 s-1'
cubes_2d[1].units = 'kg m-2 s-1'
cubes_2d[2].units = 'kg m-2 s-1'
vardef = get_var_info('EMAC', 'Amon', 'pr')
extra_facets = get_extra_facets('EMAC', 'EMAC', 'Amon', 'pr', ())
fix = Pr(vardef, extra_facets=extra_facets)
Expand All @@ -1125,7 +1123,7 @@ def test_pr_fix(cubes_2d):
assert cube.units == 'kg m-2 s-1'
assert 'positive' not in cube.attributes

np.testing.assert_allclose(cube.data, [[[3.0]]])
np.testing.assert_allclose(cube.data, [[[2.0]]])


def test_get_prc_fix():
Expand Down