Skip to content

Fix naming of cubes from abf/abl files #3384

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
merged 1 commit into from
Sep 2, 2019
Merged

Fix naming of cubes from abf/abl files #3384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions docs/iris/src/whatsnew/contributions_2.3.0/bugfix_2019-Aug-29_abf_abl_cube_names.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* The name of cubes loaded from abf/abl files has been corrected.
6 changes: 3 additions & 3 deletions lib/iris/fileformats/abf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# (C) British Crown Copyright 2012 - 2015, Met Office
# (C) British Crown Copyright 2012 - 2019, Met Office
#
# This file is part of Iris.
#
Expand Down Expand Up @@ -118,9 +118,9 @@ def to_cube(self):

# Name.
if self.format.lower() == "abf":
cube.rename("leaf_area_index")
elif self.format.lower() == "abl":
cube.rename("FAPAR")
elif self.format.lower() == "abl":
cube.rename("leaf_area_index")
else:
msg = "Unknown ABF/ABL format: {}".format(self.format)
raise iris.exceptions.TranslationError(msg)
Expand Down
2 changes: 1 addition & 1 deletion lib/iris/tests/results/abf/load.cml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<cubes xmlns="urn:x-iris:cubeml-0.2">
<cube dtype="uint8" standard_name="leaf_area_index" units="%">
<cube dtype="uint8" long_name="FAPAR" units="%">
<attributes>
<attribute name="source" value="Boston University"/>
</attributes>
Expand Down