Skip to content

Fix overwriting in generic level check #886

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
bouweandela merged 5 commits into from
Dec 2, 2020
Merged

Fix overwriting in generic level check #886

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
86c8bce
Avoid overwritting original cmor info
sloosvel Nov 26, 2020
18ef01e
Initialise names
sloosvel Nov 26, 2020
f86d82f
Generalise error messages
sloosvel Nov 26, 2020
6e05019
Generalise error message
sloosvel Nov 26, 2020
7b9ba1a
Update esmvalcore/cmor/check.py
sloosvel Dec 1, 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
29 changes: 16 additions & 13 deletions esmvalcore/cmor/check.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,51 +385,54 @@ def _check_dim_names(self):
self._does_msg, coordinate.name, 'exist')

def _check_generic_level_dim_names(self, key, coordinate):
standard_name = None
out_name = None
name = None
if coordinate.generic_lev_coords:
for coord in coordinate.generic_lev_coords.values():
try:
cube_coord = self._cube.coord(
var_name=coord.out_name
)
coordinate.out_name = coord.out_name
out_name = coord.out_name
if cube_coord.standard_name == coord.standard_name:
coordinate.standard_name = coord.standard_name
coordinate.name = coord.name
standard_name = coord.standard_name
name = coord.name
except iris.exceptions.CoordinateNotFoundError:
try:
cube_coord = self._cube.coord(
var_name=coord.standard_name
)
coordinate.standard_name = coord.standard_name
coordinate.name = coord.name
standard_name = coord.standard_name
name = coord.name
except iris.exceptions.CoordinateNotFoundError:
pass
if coordinate.standard_name:
if not coordinate.out_name:
if standard_name:
if not out_name:
self.report_error(
f'Coordinate {coordinate.name} '
f'Generic level coordinate {key} '
'has wrong var_name.',
)
level = coordinate.generic_lev_coords[coordinate.name]
level = coordinate.generic_lev_coords[name]
level.generic_level = True
level.generic_lev_coords = self._cmor_var.coordinates[
key].generic_lev_coords
self._cmor_var.coordinates[key] = level
self.report_debug_message(
f'Generic level coordinate {key} '
'will be checked against '
f'{coordinate.name} coordinate information'
f'{name} coordinate information'
)
else:
if coordinate.out_name:
if out_name:
self.report_critical(
f'Coordinate {coordinate.name} '
f'Generic level coordinate {key} '
'has wrong standard_name '
'or is not set.',
)
else:
self.report_critical(
self._does_msg, coordinate.name, 'exist'
self._does_msg, key, 'exist'
)

def _check_coords(self):
Expand Down