Skip to content

metadata translations may 2019 #3315

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 5 commits into from
Sep 2, 2019
Merged

metadata translations may 2019 #3315

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9d998e3
metadata translations may 2019
marqh May 22, 2019
282832e
header for iris-grib
marqh May 22, 2019
f3793a8
revert header change (review) excepting name update
marqh May 23, 2019
c6a36ce
protect online registries from emergent metarelate bug
marqh May 23, 2019
e18b3a6
review follow up
marqh Jun 3, 2019
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
10 changes: 5 additions & 5 deletions lib/iris/fileformats/um_cf_map.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# (C) British Crown Copyright 2013 - 2018, Met Office
# (C) British Crown Copyright 2013 - 2019, Met Office
#
# This file is part of Iris.
#
Expand All @@ -16,11 +16,11 @@
# along with Iris. If not, see <http://www.gnu.org/licenses/>.
#
# DO NOT EDIT: AUTO-GENERATED
# Created on 01 June 2018 13:06 from
# Created on 22 May 2019 12:05 from
# http://www.metarelate.net/metOcean
# at commit c07efb7ba0442332cbd5514c9d661c4f84a635c6
# at commit a3649e942198f014f0258d926678dbbff616feae

# https://github.com/metarelate/metOcean/commit/c07efb7ba0442332cbd5514c9d661c4f84a635c6
# https://github.com/metarelate/metOcean/commit/a3649e942198f014f0258d926678dbbff616feae

"""
Provides UM/CF phenomenon translations.
Expand Down Expand Up @@ -720,7 +720,7 @@
'm01s16i202': CFName('geopotential_height', None, 'm'),
'm01s16i203': CFName('air_temperature', None, 'K'),
'm01s16i204': CFName('relative_humidity', None, '%'),
'm01s16i205': CFName(None, 'wet_bulb_potential_temperature', 'K'),
'm01s16i205': CFName('wet_bulb_potential_temperature', None, 'K'),
'm01s16i222': CFName('air_pressure_at_sea_level', None, 'Pa'),
'm01s16i224': CFName(None, 'square_of_height', 'm2'),
'm01s16i255': CFName('geopotential_height', None, 'm'),
Expand Down
8 changes: 6 additions & 2 deletions tools/gen_translations.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# (C) British Crown Copyright 2014 - 2017, Met Office
# (C) British Crown Copyright 2014 - 2019, Met Office
#
# This file is part of Iris.
#
Expand Down Expand Up @@ -28,6 +28,7 @@
import requests
import sys

import metarelate
from metarelate.fuseki import FusekiServer

from translator import (FORMAT_URIS, FieldcodeCFMappings, StashCFNameMappings,
Expand Down Expand Up @@ -191,7 +192,7 @@ def build_grib_cf_map(fuseki, now, git_sha, base_dir):
with open(filename, 'w') as fh:
fh.write(HEADER.format(year=YEAR, doc_string=DOC_STRING_GRIB,
datestamp=now, git_sha=git_sha,
name='Iris'))
name='iris-grib'))
fh.write(HEADER_GRIB)
fh.write('\n')

Expand Down Expand Up @@ -221,6 +222,9 @@ def build_grib_cf_map(fuseki, now, git_sha, base_dir):


def main():
# Protect metarelate resource from 1.0 emergent bug
if not float(metarelate.__version__) >= 1.1:
raise ValueError("Please ensure that Metarelate Version is >= 1.1")
now = datetime.utcnow().strftime('%d %B %Y %H:%m')
git_sha = requests.get('http://www.metarelate.net/metOcean/latest_sha').text
gen_path = os.path.abspath(sys.modules['__main__'].__file__)
Expand Down