diff --git a/esmvalcore/_config/extra_facets/emac-mappings.yml b/esmvalcore/_config/extra_facets/emac-mappings.yml index a80b852861..acc303a2e4 100644 --- a/esmvalcore/_config/extra_facets/emac-mappings.yml +++ b/esmvalcore/_config/extra_facets/emac-mappings.yml @@ -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] diff --git a/esmvalcore/cmor/_fixes/emac/emac.py b/esmvalcore/cmor/_fixes/emac/emac.py index 001ad79200..6a3dd3528c 100644 --- a/esmvalcore/cmor/_fixes/emac/emac.py +++ b/esmvalcore/cmor/_fixes/emac/emac.py @@ -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]) diff --git a/tests/integration/cmor/_fixes/emac/test_emac.py b/tests/integration/cmor/_fixes/emac/test_emac.py index a3c2f8c83b..2a72f9c38b 100644 --- a/tests/integration/cmor/_fixes/emac/test_emac.py +++ b/tests/integration/cmor/_fixes/emac/test_emac.py @@ -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) @@ -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():