From 042942496bc51d9bd3d0126edd75cf260d825b82 Mon Sep 17 00:00:00 2001 From: Shahram Najm Date: Fri, 4 Jan 2019 14:27:20 +0000 Subject: [PATCH] ECC-744: Added local ECMWF tables --- definitions/grib2/localConcepts/ecmf/cfVarName.def | 1 - definitions/grib2/localConcepts/ecmf/name.def | 1 - definitions/grib2/localConcepts/ecmf/paramId.def | 1 - definitions/grib2/localConcepts/ecmf/shortName.def | 1 - definitions/grib2/localConcepts/ecmf/units.def | 1 - definitions/grib2/section.1.def | 4 ++-- definitions/grib2/tables/local/ecmf/1.1.table | 6 ++++++ definitions/grib2/tables/local/ecmf/1/4.230.table | 5 +++++ 8 files changed, 13 insertions(+), 7 deletions(-) create mode 100644 definitions/grib2/tables/local/ecmf/1.1.table create mode 100644 definitions/grib2/tables/local/ecmf/1/4.230.table diff --git a/definitions/grib2/localConcepts/ecmf/cfVarName.def b/definitions/grib2/localConcepts/ecmf/cfVarName.def index ce2cc895d..2ac419bdb 100644 --- a/definitions/grib2/localConcepts/ecmf/cfVarName.def +++ b/definitions/grib2/localConcepts/ecmf/cfVarName.def @@ -8369,7 +8369,6 @@ parameterCategory = 20 ; parameterNumber = 2 ; localTablesVersion = 1 ; - tablesVersion = 255 ; constituentType = 63000 ; is_chemical = 1; } diff --git a/definitions/grib2/localConcepts/ecmf/name.def b/definitions/grib2/localConcepts/ecmf/name.def index fd1fd0b43..7bd832bba 100644 --- a/definitions/grib2/localConcepts/ecmf/name.def +++ b/definitions/grib2/localConcepts/ecmf/name.def @@ -8369,7 +8369,6 @@ parameterCategory = 20 ; parameterNumber = 2 ; localTablesVersion = 1 ; - tablesVersion = 255 ; constituentType = 63000 ; is_chemical = 1; } diff --git a/definitions/grib2/localConcepts/ecmf/paramId.def b/definitions/grib2/localConcepts/ecmf/paramId.def index a2e51ef84..c28ad5e8b 100644 --- a/definitions/grib2/localConcepts/ecmf/paramId.def +++ b/definitions/grib2/localConcepts/ecmf/paramId.def @@ -8369,7 +8369,6 @@ parameterCategory = 20 ; parameterNumber = 2 ; localTablesVersion = 1 ; - tablesVersion = 255 ; constituentType = 63000 ; is_chemical = 1; } diff --git a/definitions/grib2/localConcepts/ecmf/shortName.def b/definitions/grib2/localConcepts/ecmf/shortName.def index b9a49dd31..e43756845 100644 --- a/definitions/grib2/localConcepts/ecmf/shortName.def +++ b/definitions/grib2/localConcepts/ecmf/shortName.def @@ -8369,7 +8369,6 @@ parameterCategory = 20 ; parameterNumber = 2 ; localTablesVersion = 1 ; - tablesVersion = 255 ; constituentType = 63000 ; is_chemical = 1; } diff --git a/definitions/grib2/localConcepts/ecmf/units.def b/definitions/grib2/localConcepts/ecmf/units.def index 35def1d55..1888d4e75 100644 --- a/definitions/grib2/localConcepts/ecmf/units.def +++ b/definitions/grib2/localConcepts/ecmf/units.def @@ -8369,7 +8369,6 @@ parameterCategory = 20 ; parameterNumber = 2 ; localTablesVersion = 1 ; - tablesVersion = 255 ; constituentType = 63000 ; is_chemical = 1; } diff --git a/definitions/grib2/section.1.def b/definitions/grib2/section.1.def index 5f166f4f3..4889e51f4 100644 --- a/definitions/grib2/section.1.def +++ b/definitions/grib2/section.1.def @@ -39,11 +39,11 @@ when (tablesVersion!=255) { set masterDir="grib2/tables/4"; } -codetable[1] localTablesVersion 'grib2/tables/[tablesVersion]/1.1.table' ; +codetable[1] localTablesVersion 'grib2/tables/local/[centreForLocal]/1.1.table' ; alias versionNumberOfGribLocalTables=localTablesVersion; transient localDir=""; -if (localTablesVersion != 0) { +if (localTablesVersion != 0 and localTablesVersion != 255) { transient localDir="grib2/tables/local/[centre]/[localTablesVersion]"; } diff --git a/definitions/grib2/tables/local/ecmf/1.1.table b/definitions/grib2/tables/local/ecmf/1.1.table new file mode 100644 index 000000000..648fc7f97 --- /dev/null +++ b/definitions/grib2/tables/local/ecmf/1.1.table @@ -0,0 +1,6 @@ +# Code Table 1.1 GRIB Local Tables Version Number +0 0 Local tables not used +# . Only table entries and templates from the current Master table are valid. +# 1-254 Number of local tables version used +1 1 ECMWF local tables version 1 +255 255 Missing diff --git a/definitions/grib2/tables/local/ecmf/1/4.230.table b/definitions/grib2/tables/local/ecmf/1/4.230.table new file mode 100644 index 000000000..a11421457 --- /dev/null +++ b/definitions/grib2/tables/local/ecmf/1/4.230.table @@ -0,0 +1,5 @@ +# Code table 4.230 - Atmospheric chemical constituent type +# For ECMWF + +63000 63000 Some SHITE +