From 1135a0f97f384c439ad6affba3c32301329c4324 Mon Sep 17 00:00:00 2001 From: Shahram Najm Date: Thu, 30 May 2013 15:42:28 +0100 Subject: [PATCH] GRIB-369: Addition of WMO GRIB Edition2 Version 11. New prod defn templates --- definitions/Makefile.am | 5 ++++- definitions/grib2/tables/10/4.0.table | 1 - definitions/grib2/tables/11/4.0.table | 1 - definitions/grib2/tables/7/4.0.table | 1 - definitions/grib2/tables/8/4.0.table | 1 - definitions/grib2/tables/9/4.0.table | 1 - definitions/grib2/template.4.33.def | 17 +++++++++++++++++ definitions/grib2/template.4.34.def | 18 ++++++++++++++++++ definitions/grib2/template.4.40033.def | 12 ++++-------- definitions/grib2/template.4.40034.def | 13 ++++--------- ...{template.4.40052.def => template.4.53.def} | 2 +- definitions/grib2/template.4.54.def | 16 ++++++++++++++++ 12 files changed, 64 insertions(+), 24 deletions(-) create mode 100644 definitions/grib2/template.4.33.def create mode 100644 definitions/grib2/template.4.34.def rename definitions/grib2/{template.4.40052.def => template.4.53.def} (84%) create mode 100644 definitions/grib2/template.4.54.def diff --git a/definitions/Makefile.am b/definitions/Makefile.am index 10e2ea05c..41586f191 100644 --- a/definitions/Makefile.am +++ b/definitions/Makefile.am @@ -399,11 +399,12 @@ dist_definitionsgrib2_DATA = \ grib2/template.4.31.def\ grib2/template.4.311.def\ grib2/template.4.32.def\ + grib2/template.4.33.def\ + grib2/template.4.34.def\ grib2/template.4.4.def\ grib2/template.4.40.def\ grib2/template.4.40033.def\ grib2/template.4.40034.def\ - grib2/template.4.40052.def\ grib2/template.4.41.def\ grib2/template.4.42.def\ grib2/template.4.43.def\ @@ -414,6 +415,8 @@ dist_definitionsgrib2_DATA = \ grib2/template.4.48.def\ grib2/template.4.5.def\ grib2/template.4.51.def\ + grib2/template.4.53.def\ + grib2/template.4.54.def\ grib2/template.4.6.def\ grib2/template.4.7.def\ grib2/template.4.8.def\ diff --git a/definitions/grib2/tables/10/4.0.table b/definitions/grib2/tables/10/4.0.table index e81170f12..5f405bed8 100644 --- a/definitions/grib2/tables/10/4.0.table +++ b/definitions/grib2/tables/10/4.0.table @@ -50,5 +50,4 @@ # 32768-65534 Reserved for local use 40033 40033 Individual ensemble forecast, control and perturbed, at a horizontal level or in a horizontal layer at a point in time for simulated (synthetic) satellite data 40034 40034 Individual ensemble forecast, control and perturbed, at a horizontal level or in a horizontal layer, in a continuous or non-continuous interval for simulated (synthetic) satellite data -40052 40052 Partitioned parameters at a horizontal level or horizontal layer at a point in time 65535 65535 Missing diff --git a/definitions/grib2/tables/11/4.0.table b/definitions/grib2/tables/11/4.0.table index 2ba20dae5..0f864030d 100644 --- a/definitions/grib2/tables/11/4.0.table +++ b/definitions/grib2/tables/11/4.0.table @@ -54,5 +54,4 @@ # 32768-65534 Reserved for local use 40033 40033 Individual ensemble forecast, control and perturbed, at a horizontal level or in a horizontal layer at a point in time for simulated (synthetic) satellite data 40034 40034 Individual ensemble forecast, control and perturbed, at a horizontal level or in a horizontal layer, in a continuous or non-continuous interval for simulated (synthetic) satellite data -40052 40052 Partitioned parameters at a horizontal level or horizontal layer at a point in time 65535 65535 Missing diff --git a/definitions/grib2/tables/7/4.0.table b/definitions/grib2/tables/7/4.0.table index e5ca51336..97223a788 100644 --- a/definitions/grib2/tables/7/4.0.table +++ b/definitions/grib2/tables/7/4.0.table @@ -50,5 +50,4 @@ #32768-65534 Reserved for local use 40033 40033 Individual ensemble forecast, control and perturbed, at a horizontal level or in a horizontal layer at a point in time for simulated (synthetic) satellite data 40034 40034 Individual ensemble forecast, control and perturbed, at a horizontal level or in a horizontal layer, in a continuous or non-continuous interval for simulated (synthetic) satellite data -40052 40052 Partitioned parameters at a horizontal level or horizontal layer at a point in time 65535 65535 Missing diff --git a/definitions/grib2/tables/8/4.0.table b/definitions/grib2/tables/8/4.0.table index 762eae2e0..e6d663640 100644 --- a/definitions/grib2/tables/8/4.0.table +++ b/definitions/grib2/tables/8/4.0.table @@ -50,5 +50,4 @@ # 32768-65534 Reserved for local use 40033 40033 Individual ensemble forecast, control and perturbed, at a horizontal level or in a horizontal layer at a point in time for simulated (synthetic) satellite data 40034 40034 Individual ensemble forecast, control and perturbed, at a horizontal level or in a horizontal layer, in a continuous or non-continuous interval for simulated (synthetic) satellite data -40052 40052 Partitioned parameters at a horizontal level or horizontal layer at a point in time 65535 65535 Missing diff --git a/definitions/grib2/tables/9/4.0.table b/definitions/grib2/tables/9/4.0.table index 762eae2e0..e6d663640 100644 --- a/definitions/grib2/tables/9/4.0.table +++ b/definitions/grib2/tables/9/4.0.table @@ -50,5 +50,4 @@ # 32768-65534 Reserved for local use 40033 40033 Individual ensemble forecast, control and perturbed, at a horizontal level or in a horizontal layer at a point in time for simulated (synthetic) satellite data 40034 40034 Individual ensemble forecast, control and perturbed, at a horizontal level or in a horizontal layer, in a continuous or non-continuous interval for simulated (synthetic) satellite data -40052 40052 Partitioned parameters at a horizontal level or horizontal layer at a point in time 65535 65535 Missing diff --git a/definitions/grib2/template.4.33.def b/definitions/grib2/template.4.33.def new file mode 100644 index 000000000..97eccbff8 --- /dev/null +++ b/definitions/grib2/template.4.33.def @@ -0,0 +1,17 @@ +# Copyright 2005-2013 ECMWF. +# +# This software is licensed under the terms of the Apache Licence Version 2.0 +# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0. +# +# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by +# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction. +# + +# TEMPLATE 4.33, Individual ensemble forecast, control and perturbed, at a horizontal level or in a horizontal layer at a point in time for simulated (synthetic) satellite data + +include "template.4.32.def" +include "template.4.eps.def" + +alias instrument = instrumentType; +alias ident = satelliteNumber; + diff --git a/definitions/grib2/template.4.34.def b/definitions/grib2/template.4.34.def new file mode 100644 index 000000000..7fc3d75e1 --- /dev/null +++ b/definitions/grib2/template.4.34.def @@ -0,0 +1,18 @@ +# Copyright 2005-2013 ECMWF. +# +# This software is licensed under the terms of the Apache Licence Version 2.0 +# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0. +# +# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by +# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction. +# + +# TEMPLATE 4.34, Individual ensemble forecast, control and perturbed, at a horizontal level or in a horizontal layer, in a continuous or non-continuous interval for simulated (synthetic) satellite data + +include "template.4.32.def" +include "template.4.eps.def" +include "template.4.statistical.def" + +alias instrument = instrumentType; +alias ident = satelliteNumber; + diff --git a/definitions/grib2/template.4.40033.def b/definitions/grib2/template.4.40033.def index 567632540..ad59ce613 100644 --- a/definitions/grib2/template.4.40033.def +++ b/definitions/grib2/template.4.40033.def @@ -7,11 +7,7 @@ # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction. # -# TEMPLATE 4.40033, Individual ensemble forecast, control and perturbed, at a horizontal level or in a horizontal layer at a point in time for simulated (synthetic) satellite data - -include "template.4.32.def" -include "template.4.eps.def" - -alias instrument = instrumentType; -alias ident = satelliteNumber; - +# +# This is deprecated and only included for backward compatibility, use template 4.33 +# +include "template.4.33.def" diff --git a/definitions/grib2/template.4.40034.def b/definitions/grib2/template.4.40034.def index 7fc4d9034..7a807a83e 100644 --- a/definitions/grib2/template.4.40034.def +++ b/definitions/grib2/template.4.40034.def @@ -7,12 +7,7 @@ # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction. # -# TEMPLATE 4.40034, Individual ensemble forecast, control and perturbed, at a horizontal level or in a horizontal layer, in a continuous or non-continuous interval for simulated (synthetic) satellite data - -include "template.4.32.def" -include "template.4.eps.def" -include "template.4.statistical.def" - -alias instrument = instrumentType; -alias ident = satelliteNumber; - +# +# This is deprecated and only included for backward compatibility, use template 4.34 +# +include "template.4.34.def" diff --git a/definitions/grib2/template.4.40052.def b/definitions/grib2/template.4.53.def similarity index 84% rename from definitions/grib2/template.4.40052.def rename to definitions/grib2/template.4.53.def index c519d6b61..d50c99d66 100644 --- a/definitions/grib2/template.4.40052.def +++ b/definitions/grib2/template.4.53.def @@ -6,7 +6,7 @@ # In applying this licence, ECMWF does not waive the privileges and immunities granted to it by # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction. # -# TEMPLATE 4.40052, Partitioned parameters at a horizontal level or horizontal layer at a point in time +# TEMPLATE 4.53, Partitioned parameters at a horizontal level or in a horizontal layer at a point in time include "template.4.parameter_partition.def" include "template.4.point_in_time.def"; diff --git a/definitions/grib2/template.4.54.def b/definitions/grib2/template.4.54.def new file mode 100644 index 000000000..a20d88c04 --- /dev/null +++ b/definitions/grib2/template.4.54.def @@ -0,0 +1,16 @@ +# Copyright 2005-2013 ECMWF. +# +# This software is licensed under the terms of the Apache Licence Version 2.0 +# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0. +# +# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by +# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction. +# +# TEMPLATE 4.54, Individual ensemble forecast, control and perturbed, at a horizontal level or in a horizontal layer at a point in time for partitioned parameters + +include "template.4.53.def" +include "template.4.eps.def" + +constant cat="cat"; +alias mars.levtype=cat; +alias mars.levelist=partitionNumber;