From d0c3e7d458a0ed82811c51517dd623da1bcd1762 Mon Sep 17 00:00:00 2001 From: Shahram Najm Date: Thu, 18 Feb 2021 14:44:54 +0000 Subject: [PATCH] ECC-1203: GRIB2 Definitions: Refactor section 4 templates for better modularisation --- definitions/grib2/template.4.0.def | 10 ++++----- definitions/grib2/template.4.1.def | 6 ++--- definitions/grib2/template.4.10.def | 4 ++-- definitions/grib2/template.4.1000.def | 6 ++--- definitions/grib2/template.4.1001.def | 4 ++-- definitions/grib2/template.4.1002.def | 12 ++++------ definitions/grib2/template.4.11.def | 4 ++-- definitions/grib2/template.4.1100.def | 6 ++--- definitions/grib2/template.4.1101.def | 6 ++--- definitions/grib2/template.4.12.def | 4 ++-- definitions/grib2/template.4.15.def | 12 +++++----- definitions/grib2/template.4.2.def | 12 +++++----- definitions/grib2/template.4.5.def | 6 ++--- definitions/grib2/template.4.51.def | 6 ++--- definitions/grib2/template.4.53.def | 5 +++++ definitions/grib2/template.4.54.def | 5 +++++ definitions/grib2/template.4.57.def | 6 ++--- definitions/grib2/template.4.58.def | 2 +- definitions/grib2/template.4.6.def | 6 ++--- definitions/grib2/template.4.60.def | 6 ++--- definitions/grib2/template.4.61.def | 4 ++-- definitions/grib2/template.4.67.def | 2 +- definitions/grib2/template.4.68.def | 2 +- definitions/grib2/template.4.70.def | 12 +++++----- definitions/grib2/template.4.71.def | 10 ++++----- definitions/grib2/template.4.72.def | 8 +++---- definitions/grib2/template.4.73.def | 8 +++---- definitions/grib2/template.4.76.def | 6 ++--- definitions/grib2/template.4.77.def | 4 ++-- definitions/grib2/template.4.78.def | 2 +- definitions/grib2/template.4.79.def | 2 +- definitions/grib2/template.4.8.def | 4 ++-- definitions/grib2/template.4.86.def | 6 ++--- definitions/grib2/template.4.87.def | 4 ++-- definitions/grib2/template.4.88.def | 4 ++-- definitions/grib2/template.4.9.def | 4 ++-- definitions/grib2/template.4.91.def | 4 ++-- definitions/grib2/template.4.aerosol.def | 2 +- definitions/grib2/template.4.chemical.def | 2 +- definitions/grib2/template.4.partition.def | 6 ++--- definitions/grib2/template.5.3.def | 26 +++++++++++----------- definitions/grib2/template.5.42.def | 2 +- 42 files changed, 129 insertions(+), 123 deletions(-) diff --git a/definitions/grib2/template.4.0.def b/definitions/grib2/template.4.0.def index 511d301d5..d94c9e293 100644 --- a/definitions/grib2/template.4.0.def +++ b/definitions/grib2/template.4.0.def @@ -2,8 +2,8 @@ # TEMPLATE 4.0, Analysis or forecast at a horizontal level or in a horizontal layer at a point in time -include "grib2/template.4.parameter.def"; -include "grib2/template.4.generating_process.def"; -include "grib2/template.4.forecast_time.def"; -include "grib2/template.4.point_in_time.def"; -include "grib2/template.4.horizontal.def"; +include "grib2/template.4.parameter.def" +include "grib2/template.4.generating_process.def" +include "grib2/template.4.forecast_time.def" +include "grib2/template.4.point_in_time.def" +include "grib2/template.4.horizontal.def" diff --git a/definitions/grib2/template.4.1.def b/definitions/grib2/template.4.1.def index 7d012fb12..d075620be 100644 --- a/definitions/grib2/template.4.1.def +++ b/definitions/grib2/template.4.1.def @@ -3,8 +3,8 @@ # TEMPLATE 4.1, Individual ensemble forecast, control and perturbed, at a horizontal level or in a horizontal layer at a point in time include "grib2/template.4.parameter.def" -include "grib2/template.4.generating_process.def"; -include "grib2/template.4.forecast_time.def"; -include "grib2/template.4.point_in_time.def"; +include "grib2/template.4.generating_process.def" +include "grib2/template.4.forecast_time.def" +include "grib2/template.4.point_in_time.def" include "grib2/template.4.horizontal.def" include "grib2/template.4.eps.def" diff --git a/definitions/grib2/template.4.10.def b/definitions/grib2/template.4.10.def index d89e12526..1bcd610b0 100644 --- a/definitions/grib2/template.4.10.def +++ b/definitions/grib2/template.4.10.def @@ -3,8 +3,8 @@ # TEMPLATE 4.10, Percentile forecasts at a horizontal level or in a horizontal layer in a continuous or non-continuous time interval include "grib2/template.4.parameter.def" -include "grib2/template.4.generating_process.def"; -include "grib2/template.4.forecast_time.def"; +include "grib2/template.4.generating_process.def" +include "grib2/template.4.forecast_time.def" include "grib2/template.4.horizontal.def" include "grib2/template.4.percentile.def" include "grib2/template.4.statistical.def" diff --git a/definitions/grib2/template.4.1000.def b/definitions/grib2/template.4.1000.def index c88c42db8..a31654ff5 100644 --- a/definitions/grib2/template.4.1000.def +++ b/definitions/grib2/template.4.1000.def @@ -3,6 +3,6 @@ # TEMPLATE 4.1000, Cross section of analysis and forecast at a point in time include "grib2/template.4.parameter.def" -include "grib2/template.4.generating_process.def"; -include "grib2/template.4.forecast_time.def"; -include "grib2/template.4.point_in_time.def"; +include "grib2/template.4.generating_process.def" +include "grib2/template.4.forecast_time.def" +include "grib2/template.4.point_in_time.def" diff --git a/definitions/grib2/template.4.1001.def b/definitions/grib2/template.4.1001.def index 9b3e8c27e..b0e1ca17e 100644 --- a/definitions/grib2/template.4.1001.def +++ b/definitions/grib2/template.4.1001.def @@ -3,6 +3,6 @@ # TEMPLATE 4.1001, Cross section of averaged or otherwise statistically processed analysis or forecast over a range of time include "grib2/template.4.parameter.def" -include "grib2/template.4.generating_process.def"; -include "grib2/template.4.forecast_time.def"; +include "grib2/template.4.generating_process.def" +include "grib2/template.4.forecast_time.def" include "grib2/template.4.statistical.def" diff --git a/definitions/grib2/template.4.1002.def b/definitions/grib2/template.4.1002.def index 64e77ab53..08cac187c 100644 --- a/definitions/grib2/template.4.1002.def +++ b/definitions/grib2/template.4.1002.def @@ -3,23 +3,19 @@ # TEMPLATE 4.1002, Cross-section of analysis and forecast, averaged or otherwise statistically processed over latitude or longitude include "grib2/template.4.parameter.def" -include "grib2/template.4.generating_process.def"; -include "grib2/template.4.forecast_time.def"; +include "grib2/template.4.generating_process.def" +include "grib2/template.4.forecast_time.def" -# Horizontal dimension processed codetable[1] horizontalDimensionProcessed ('4.220.table',masterDir,localDir) : dump; -# Treatment of missing data (e.g. below ground) +# Treatment of missing data (e.g. below ground) codetable[1] treatmentOfMissingData ('4.221.table',masterDir,localDir) : dump; -# Type of statistical processing +# Type of statistical processing codetable[1] typeOfStatisticalProcessing ('4.10.table',masterDir,localDir) : dump; #alias typeOfStatisticalProcessing=stepType; -# Start of range unsigned[4] startOfRange : dump; - -# End of range unsigned[4] endOfRange : dump; # Number of values diff --git a/definitions/grib2/template.4.11.def b/definitions/grib2/template.4.11.def index e9f571b57..e1c00f940 100644 --- a/definitions/grib2/template.4.11.def +++ b/definitions/grib2/template.4.11.def @@ -3,8 +3,8 @@ # TEMPLATE 4.11, Individual ensemble forecast, control and perturbed, at a horizontal level or in a horizontal layer in a continuous or non-continuous time interval include "grib2/template.4.parameter.def" -include "grib2/template.4.generating_process.def"; -include "grib2/template.4.forecast_time.def"; +include "grib2/template.4.generating_process.def" +include "grib2/template.4.forecast_time.def" include "grib2/template.4.horizontal.def" include "grib2/template.4.eps.def" include "grib2/template.4.statistical.def" diff --git a/definitions/grib2/template.4.1100.def b/definitions/grib2/template.4.1100.def index 8b157c45d..76ebfc467 100644 --- a/definitions/grib2/template.4.1100.def +++ b/definitions/grib2/template.4.1100.def @@ -1,8 +1,8 @@ # (C) Copyright 2005- ECMWF. -# TEMPLATE 4.1100, Hovmöller-type grid with no averaging or other statistical processing +# TEMPLATE 4.1100, Hovmoller-type grid with no averaging or other statistical processing include "grib2/template.4.parameter.def" -include "grib2/template.4.generating_process.def"; -include "grib2/template.4.forecast_time.def"; +include "grib2/template.4.generating_process.def" +include "grib2/template.4.forecast_time.def" include "grib2/template.4.horizontal.def" diff --git a/definitions/grib2/template.4.1101.def b/definitions/grib2/template.4.1101.def index 8eb6278e8..ef9e951ed 100644 --- a/definitions/grib2/template.4.1101.def +++ b/definitions/grib2/template.4.1101.def @@ -1,9 +1,9 @@ # (C) Copyright 2005- ECMWF. -# TEMPLATE 4.1101, Hovmöller-type grid with averaging or other statistical processing +# TEMPLATE 4.1101, Hovmoller-type grid with averaging or other statistical processing include "grib2/template.4.parameter.def" -include "grib2/template.4.generating_process.def"; -include "grib2/template.4.forecast_time.def"; +include "grib2/template.4.generating_process.def" +include "grib2/template.4.forecast_time.def" include "grib2/template.4.horizontal.def" include "grib2/template.4.statistical.def" diff --git a/definitions/grib2/template.4.12.def b/definitions/grib2/template.4.12.def index 8ce009f65..4b72f29ed 100644 --- a/definitions/grib2/template.4.12.def +++ b/definitions/grib2/template.4.12.def @@ -3,8 +3,8 @@ # TEMPLATE 4.12, Derived forecasts based on all ensemble members at a horizontal level or in a horizontal layer in a continuous or non-continuous time interval include "grib2/template.4.parameter.def" -include "grib2/template.4.generating_process.def"; -include "grib2/template.4.forecast_time.def"; +include "grib2/template.4.generating_process.def" +include "grib2/template.4.forecast_time.def" include "grib2/template.4.horizontal.def" include "grib2/template.4.derived.def" include "grib2/template.4.statistical.def" diff --git a/definitions/grib2/template.4.15.def b/definitions/grib2/template.4.15.def index 1310b5cba..9192d1154 100644 --- a/definitions/grib2/template.4.15.def +++ b/definitions/grib2/template.4.15.def @@ -2,12 +2,12 @@ # TEMPLATE 4.15, Average, accumulation, extreme values, or other statistically-processed values over a spatial area at a horizontal level or in a horizontal layer at a point in time -include "grib2/template.4.parameter.def"; -include "grib2/template.4.generating_process.def"; -include "grib2/template.4.forecast_time.def"; -include "grib2/template.4.point_in_time.def"; -include "grib2/template.4.horizontal.def"; +include "grib2/template.4.parameter.def" +include "grib2/template.4.generating_process.def" +include "grib2/template.4.forecast_time.def" +include "grib2/template.4.point_in_time.def" +include "grib2/template.4.horizontal.def" + codetable[1] statisticalProcess 'grib2/tables/[tablesVersion]/4.10.table'; codetable[1] spatialProcessing 'grib2/tables/[tablesVersion]/4.15.table'; unsigned[1] numberOfPointsUsed; - diff --git a/definitions/grib2/template.4.2.def b/definitions/grib2/template.4.2.def index 13a9caa7a..d8cb73222 100644 --- a/definitions/grib2/template.4.2.def +++ b/definitions/grib2/template.4.2.def @@ -2,9 +2,9 @@ # TEMPLATE 4.2, Derived forecast based on all ensemble members at a horizontal level or in a horizontal layer at a point in time -include "grib2/template.4.parameter.def"; -include "grib2/template.4.generating_process.def"; -include "grib2/template.4.forecast_time.def"; -include "grib2/template.4.point_in_time.def"; -include "grib2/template.4.horizontal.def"; -include "grib2/template.4.derived.def"; +include "grib2/template.4.parameter.def" +include "grib2/template.4.generating_process.def" +include "grib2/template.4.forecast_time.def" +include "grib2/template.4.point_in_time.def" +include "grib2/template.4.horizontal.def" +include "grib2/template.4.derived.def" diff --git a/definitions/grib2/template.4.5.def b/definitions/grib2/template.4.5.def index 8da5ab9a3..ea951b9e5 100644 --- a/definitions/grib2/template.4.5.def +++ b/definitions/grib2/template.4.5.def @@ -3,8 +3,8 @@ # TEMPLATE 4.5, Probability forecasts at a horizontal level or in a horizontal layer at a point in time include "grib2/template.4.parameter.def" -include "grib2/template.4.generating_process.def"; -include "grib2/template.4.forecast_time.def"; -include "grib2/template.4.point_in_time.def"; +include "grib2/template.4.generating_process.def" +include "grib2/template.4.forecast_time.def" +include "grib2/template.4.point_in_time.def" include "grib2/template.4.horizontal.def" include "grib2/template.4.probability.def" diff --git a/definitions/grib2/template.4.51.def b/definitions/grib2/template.4.51.def index f33fd2e51..64ce2c3f8 100644 --- a/definitions/grib2/template.4.51.def +++ b/definitions/grib2/template.4.51.def @@ -3,8 +3,8 @@ # TEMPLATE 4.51, Categorical forecasts at a horizontal level or in a horizontal layer at a point in time include "grib2/template.4.parameter.def" -include "grib2/template.4.generating_process.def"; -include "grib2/template.4.forecast_time.def"; -include "grib2/template.4.point_in_time.def"; +include "grib2/template.4.generating_process.def" +include "grib2/template.4.forecast_time.def" +include "grib2/template.4.point_in_time.def" include "grib2/template.4.horizontal.def" include "grib2/template.4.categorical.def" diff --git a/definitions/grib2/template.4.53.def b/definitions/grib2/template.4.53.def index 719887a80..fe5c05bc6 100644 --- a/definitions/grib2/template.4.53.def +++ b/definitions/grib2/template.4.53.def @@ -8,3 +8,8 @@ include "grib2/template.4.generating_process.def" include "grib2/template.4.forecast_time.def" include "grib2/template.4.point_in_time.def" include "grib2/template.4.horizontal.def" + + +constant cat="cat"; +alias mars.levtype=cat; +alias mars.levelist=partitionNumber; diff --git a/definitions/grib2/template.4.54.def b/definitions/grib2/template.4.54.def index 892940830..585e43d52 100644 --- a/definitions/grib2/template.4.54.def +++ b/definitions/grib2/template.4.54.def @@ -9,3 +9,8 @@ include "grib2/template.4.forecast_time.def" include "grib2/template.4.point_in_time.def" include "grib2/template.4.horizontal.def" include "grib2/template.4.eps.def" + + +constant cat="cat"; +alias mars.levtype=cat; +alias mars.levelist=partitionNumber; diff --git a/definitions/grib2/template.4.57.def b/definitions/grib2/template.4.57.def index aa419d139..3647b7f65 100644 --- a/definitions/grib2/template.4.57.def +++ b/definitions/grib2/template.4.57.def @@ -4,8 +4,8 @@ include "grib2/template.4.parameter.def" include "grib2/template.4.chemical.def" -include "grib2/template.4.distribution.def"; +include "grib2/template.4.distribution.def" include "grib2/template.4.generating_process.def" include "grib2/template.4.forecast_time.def" -include "grib2/template.4.point_in_time.def"; -include "grib2/template.4.horizontal.def"; +include "grib2/template.4.point_in_time.def" +include "grib2/template.4.horizontal.def" diff --git a/definitions/grib2/template.4.58.def b/definitions/grib2/template.4.58.def index ed6a008d8..aaa97cae5 100644 --- a/definitions/grib2/template.4.58.def +++ b/definitions/grib2/template.4.58.def @@ -4,7 +4,7 @@ include "grib2/template.4.parameter.def" include "grib2/template.4.chemical.def" -include "grib2/template.4.distribution.def"; +include "grib2/template.4.distribution.def" include "grib2/template.4.generating_process.def" include "grib2/template.4.forecast_time.def" include "grib2/template.4.point_in_time.def" diff --git a/definitions/grib2/template.4.6.def b/definitions/grib2/template.4.6.def index 3dbfc567d..ea94aa32b 100644 --- a/definitions/grib2/template.4.6.def +++ b/definitions/grib2/template.4.6.def @@ -3,8 +3,8 @@ # TEMPLATE 4.6, Percentile forecasts at a horizontal level or in a horizontal layer at a point in time include "grib2/template.4.parameter.def" -include "grib2/template.4.generating_process.def"; -include "grib2/template.4.forecast_time.def"; -include "grib2/template.4.point_in_time.def"; +include "grib2/template.4.generating_process.def" +include "grib2/template.4.forecast_time.def" +include "grib2/template.4.point_in_time.def" include "grib2/template.4.horizontal.def" include "grib2/template.4.percentile.def" diff --git a/definitions/grib2/template.4.60.def b/definitions/grib2/template.4.60.def index 999fff741..20ae96179 100644 --- a/definitions/grib2/template.4.60.def +++ b/definitions/grib2/template.4.60.def @@ -3,9 +3,9 @@ # TEMPLATE 4.60, Individual ensemble re-forecast, control and perturbed, at a horizontal level or in a horizontal layer at a point in time include "grib2/template.4.parameter.def" -include "grib2/template.4.generating_process.def"; -include "grib2/template.4.forecast_time.def"; -include "grib2/template.4.point_in_time.def"; +include "grib2/template.4.generating_process.def" +include "grib2/template.4.forecast_time.def" +include "grib2/template.4.point_in_time.def" include "grib2/template.4.horizontal.def" include "grib2/template.4.eps.def" include "grib2/template.4.reforecast.def" diff --git a/definitions/grib2/template.4.61.def b/definitions/grib2/template.4.61.def index 213487c7a..4fc3886e8 100644 --- a/definitions/grib2/template.4.61.def +++ b/definitions/grib2/template.4.61.def @@ -3,8 +3,8 @@ # TEMPLATE 4.61, Individual ensemble re-forecast, control and perturbed, at a horizontal level or in a horizontal layer in a continuous or non-continuous time interval include "grib2/template.4.parameter.def" -include "grib2/template.4.generating_process.def"; -include "grib2/template.4.forecast_time.def"; +include "grib2/template.4.generating_process.def" +include "grib2/template.4.forecast_time.def" include "grib2/template.4.horizontal.def" include "grib2/template.4.eps.def" include "grib2/template.4.reforecast.def" diff --git a/definitions/grib2/template.4.67.def b/definitions/grib2/template.4.67.def index 3c2571960..62f40d4fe 100644 --- a/definitions/grib2/template.4.67.def +++ b/definitions/grib2/template.4.67.def @@ -4,7 +4,7 @@ include "grib2/template.4.parameter.def" include "grib2/template.4.chemical.def" -include "grib2/template.4.distribution.def"; +include "grib2/template.4.distribution.def" include "grib2/template.4.generating_process.def" include "grib2/template.4.forecast_time.def" include "grib2/template.4.horizontal.def" diff --git a/definitions/grib2/template.4.68.def b/definitions/grib2/template.4.68.def index 8f7c6c82a..60835b947 100644 --- a/definitions/grib2/template.4.68.def +++ b/definitions/grib2/template.4.68.def @@ -4,7 +4,7 @@ include "grib2/template.4.parameter.def" include "grib2/template.4.chemical.def" -include "grib2/template.4.distribution.def"; +include "grib2/template.4.distribution.def" include "grib2/template.4.generating_process.def" include "grib2/template.4.forecast_time.def" include "grib2/template.4.horizontal.def" diff --git a/definitions/grib2/template.4.70.def b/definitions/grib2/template.4.70.def index 59cad3c21..520106a26 100644 --- a/definitions/grib2/template.4.70.def +++ b/definitions/grib2/template.4.70.def @@ -2,9 +2,9 @@ # EFAS: Analysis or forecast at a horizontal level or in a horizontal layer at a point in time -include "grib2/template.4.parameter.def"; -include "grib2/template.4.postproc.def"; -include "grib2/template.4.generating_process.def"; -include "grib2/template.4.forecast_time.def"; -include "grib2/template.4.point_in_time.def"; -include "grib2/template.4.horizontal.def"; +include "grib2/template.4.parameter.def" +include "grib2/template.4.postproc.def" +include "grib2/template.4.generating_process.def" +include "grib2/template.4.forecast_time.def" +include "grib2/template.4.point_in_time.def" +include "grib2/template.4.horizontal.def" diff --git a/definitions/grib2/template.4.71.def b/definitions/grib2/template.4.71.def index 5a401d796..f91f2e366 100644 --- a/definitions/grib2/template.4.71.def +++ b/definitions/grib2/template.4.71.def @@ -2,10 +2,10 @@ # EFAS: Individual ensemble forecast, control and perturbed, at a horizontal level or in a horizontal layer at a point in time -include "grib2/template.4.parameter.def"; -include "grib2/template.4.postproc.def"; -include "grib2/template.4.generating_process.def"; -include "grib2/template.4.forecast_time.def"; -include "grib2/template.4.point_in_time.def"; +include "grib2/template.4.parameter.def" +include "grib2/template.4.postproc.def" +include "grib2/template.4.generating_process.def" +include "grib2/template.4.forecast_time.def" +include "grib2/template.4.point_in_time.def" include "grib2/template.4.horizontal.def" include "grib2/template.4.eps.def" diff --git a/definitions/grib2/template.4.72.def b/definitions/grib2/template.4.72.def index 5947d08e8..ba6ad7da9 100644 --- a/definitions/grib2/template.4.72.def +++ b/definitions/grib2/template.4.72.def @@ -2,9 +2,9 @@ # EFAS: Average, accumulation, and/or extreme values or other statistically processed values at a horizontal level or in a horizontal layer in a continuous or non-continuous time interval -include "grib2/template.4.parameter.def"; -include "grib2/template.4.postproc.def"; -include "grib2/template.4.generating_process.def"; -include "grib2/template.4.forecast_time.def"; +include "grib2/template.4.parameter.def" +include "grib2/template.4.postproc.def" +include "grib2/template.4.generating_process.def" +include "grib2/template.4.forecast_time.def" include "grib2/template.4.horizontal.def" include "grib2/template.4.statistical.def" diff --git a/definitions/grib2/template.4.73.def b/definitions/grib2/template.4.73.def index 08683a0d9..535d7ba4e 100644 --- a/definitions/grib2/template.4.73.def +++ b/definitions/grib2/template.4.73.def @@ -2,10 +2,10 @@ # EFAS: Individual ensemble forecast, control and perturbed, at a horizontal level or in a horizontal layer in a continuous or non-continuous time interval -include "grib2/template.4.parameter.def"; -include "grib2/template.4.postproc.def"; -include "grib2/template.4.generating_process.def"; -include "grib2/template.4.forecast_time.def"; +include "grib2/template.4.parameter.def" +include "grib2/template.4.postproc.def" +include "grib2/template.4.generating_process.def" +include "grib2/template.4.forecast_time.def" include "grib2/template.4.horizontal.def" include "grib2/template.4.eps.def" include "grib2/template.4.statistical.def" diff --git a/definitions/grib2/template.4.76.def b/definitions/grib2/template.4.76.def index fe2cd344a..11ff6b277 100644 --- a/definitions/grib2/template.4.76.def +++ b/definitions/grib2/template.4.76.def @@ -4,8 +4,8 @@ include "grib2/template.4.parameter.def" include "grib2/template.4.chemical.def" -include "grib2/template.4.source.def"; +include "grib2/template.4.source.def" include "grib2/template.4.generating_process.def" include "grib2/template.4.forecast_time.def" -include "grib2/template.4.point_in_time.def"; -include "grib2/template.4.horizontal.def"; +include "grib2/template.4.point_in_time.def" +include "grib2/template.4.horizontal.def" diff --git a/definitions/grib2/template.4.77.def b/definitions/grib2/template.4.77.def index 388c823eb..5690c99eb 100644 --- a/definitions/grib2/template.4.77.def +++ b/definitions/grib2/template.4.77.def @@ -4,9 +4,9 @@ include "grib2/template.4.parameter.def" include "grib2/template.4.chemical.def" -include "grib2/template.4.source.def"; +include "grib2/template.4.source.def" include "grib2/template.4.generating_process.def" include "grib2/template.4.forecast_time.def" -include "grib2/template.4.point_in_time.def"; +include "grib2/template.4.point_in_time.def" include "grib2/template.4.horizontal.def" include "grib2/template.4.eps.def" diff --git a/definitions/grib2/template.4.78.def b/definitions/grib2/template.4.78.def index f42319718..88a383062 100644 --- a/definitions/grib2/template.4.78.def +++ b/definitions/grib2/template.4.78.def @@ -4,7 +4,7 @@ include "grib2/template.4.parameter.def" include "grib2/template.4.chemical.def" -include "grib2/template.4.source.def"; +include "grib2/template.4.source.def" include "grib2/template.4.generating_process.def" include "grib2/template.4.forecast_time.def" include "grib2/template.4.horizontal.def" diff --git a/definitions/grib2/template.4.79.def b/definitions/grib2/template.4.79.def index 95dd0ee30..0a7ba48c7 100644 --- a/definitions/grib2/template.4.79.def +++ b/definitions/grib2/template.4.79.def @@ -4,7 +4,7 @@ include "grib2/template.4.parameter.def" include "grib2/template.4.chemical.def" -include "grib2/template.4.source.def"; +include "grib2/template.4.source.def" include "grib2/template.4.generating_process.def" include "grib2/template.4.forecast_time.def" include "grib2/template.4.horizontal.def" diff --git a/definitions/grib2/template.4.8.def b/definitions/grib2/template.4.8.def index 9ca5b7383..8b14b6536 100644 --- a/definitions/grib2/template.4.8.def +++ b/definitions/grib2/template.4.8.def @@ -3,7 +3,7 @@ # TEMPLATE 4.8, Average, accumulation, and/or extreme values or other statistically processed values at a horizontal level or in a horizontal layer in a continuous or non-continuous time interval include "grib2/template.4.parameter.def" -include "grib2/template.4.generating_process.def"; -include "grib2/template.4.forecast_time.def"; +include "grib2/template.4.generating_process.def" +include "grib2/template.4.forecast_time.def" include "grib2/template.4.horizontal.def" include "grib2/template.4.statistical.def" diff --git a/definitions/grib2/template.4.86.def b/definitions/grib2/template.4.86.def index 4c38cffc5..957fa492a 100644 --- a/definitions/grib2/template.4.86.def +++ b/definitions/grib2/template.4.86.def @@ -3,8 +3,8 @@ # TEMPLATE 4.86, Quantile forecasts at a horizontal level or in a horizontal layer at a point in time include "grib2/template.4.parameter.def" -include "grib2/template.4.generating_process.def"; -include "grib2/template.4.forecast_time.def"; -include "grib2/template.4.point_in_time.def"; +include "grib2/template.4.generating_process.def" +include "grib2/template.4.forecast_time.def" +include "grib2/template.4.point_in_time.def" include "grib2/template.4.horizontal.def" include "grib2/template.4.quantile.def" diff --git a/definitions/grib2/template.4.87.def b/definitions/grib2/template.4.87.def index 511f31c6e..b8e264e0f 100644 --- a/definitions/grib2/template.4.87.def +++ b/definitions/grib2/template.4.87.def @@ -3,8 +3,8 @@ # TEMPLATE 4.87, Quantile forecasts at a horizontal level or in a horizontal layer in a continuous or non-continuous time interval include "grib2/template.4.parameter.def" -include "grib2/template.4.generating_process.def"; -include "grib2/template.4.forecast_time.def"; +include "grib2/template.4.generating_process.def" +include "grib2/template.4.forecast_time.def" include "grib2/template.4.horizontal.def" include "grib2/template.4.quantile.def" include "grib2/template.4.statistical.def" diff --git a/definitions/grib2/template.4.88.def b/definitions/grib2/template.4.88.def index 745b2e631..8fd7405c1 100644 --- a/definitions/grib2/template.4.88.def +++ b/definitions/grib2/template.4.88.def @@ -3,7 +3,7 @@ # TEMPLATE 4.88, Analysis or Forecast at a horizontal level or in a horizontal layer at a local time include "grib2/template.4.parameter.def" -include "grib2/template.4.generating_process.def"; -# no template.4.forecast_time.def component in this tempalte. +include "grib2/template.4.generating_process.def" +# no template.4.forecast_time.def component in this template. include "grib2/template.4.horizontal.def" include "grib2/template.4.localtime.def" diff --git a/definitions/grib2/template.4.9.def b/definitions/grib2/template.4.9.def index 79ba81a86..62774df29 100644 --- a/definitions/grib2/template.4.9.def +++ b/definitions/grib2/template.4.9.def @@ -3,8 +3,8 @@ # TEMPLATE 4.9, Probability forecasts at a horizontal level or in a horizontal layer in a continuous or non-continuous time interval include "grib2/template.4.parameter.def" -include "grib2/template.4.generating_process.def"; -include "grib2/template.4.forecast_time.def"; +include "grib2/template.4.generating_process.def" +include "grib2/template.4.forecast_time.def" include "grib2/template.4.horizontal.def" include "grib2/template.4.probability.def" include "grib2/template.4.statistical.def" diff --git a/definitions/grib2/template.4.91.def b/definitions/grib2/template.4.91.def index 271d8b73a..207ecd911 100644 --- a/definitions/grib2/template.4.91.def +++ b/definitions/grib2/template.4.91.def @@ -3,8 +3,8 @@ # TEMPLATE 4.91, Categorical forecasts at a horizontal level or in a horizontal layer in a continuous or non-continuous time interval include "grib2/template.4.parameter.def" -include "grib2/template.4.generating_process.def"; -include "grib2/template.4.forecast_time.def"; +include "grib2/template.4.generating_process.def" +include "grib2/template.4.forecast_time.def" include "grib2/template.4.horizontal.def" include "grib2/template.4.categorical.def" include "grib2/template.4.statistical.def" diff --git a/definitions/grib2/template.4.aerosol.def b/definitions/grib2/template.4.aerosol.def index dca13f766..31b8a01f5 100644 --- a/definitions/grib2/template.4.aerosol.def +++ b/definitions/grib2/template.4.aerosol.def @@ -1,4 +1,4 @@ # (C) Copyright 2005- ECMWF. -# Atmospheric chemical or physical constitutent type +# Atmospheric chemical or physical constituent type codetable[2] aerosolType ('4.233.table',masterDir,localDir) : dump; diff --git a/definitions/grib2/template.4.chemical.def b/definitions/grib2/template.4.chemical.def index 4c49d7dc0..1a5ebf694 100644 --- a/definitions/grib2/template.4.chemical.def +++ b/definitions/grib2/template.4.chemical.def @@ -1,5 +1,5 @@ # (C) Copyright 2005- ECMWF. -# Atmospheric chemical or physical constitutent type +# Atmospheric chemical or physical constituent type codetable[2] constituentType ('4.230.table',masterDir,localDir) : dump; meta constituentTypeName codetable_title(constituentType); diff --git a/definitions/grib2/template.4.partition.def b/definitions/grib2/template.4.partition.def index bdb9bc2f3..4a08f835a 100644 --- a/definitions/grib2/template.4.partition.def +++ b/definitions/grib2/template.4.partition.def @@ -8,6 +8,6 @@ partitions list(numberOfPartitions) { codetable[2] partitionNumber ('4.[partitionTable].table',masterDir,localDir) : dump; -constant cat="cat"; -alias mars.levtype=cat; -alias mars.levelist=partitionNumber; +#constant cat="cat"; +#alias mars.levtype=cat; +#alias mars.levelist=partitionNumber; diff --git a/definitions/grib2/template.5.3.def b/definitions/grib2/template.5.3.def index c2d00ef45..f825ca270 100644 --- a/definitions/grib2/template.5.3.def +++ b/definitions/grib2/template.5.3.def @@ -5,47 +5,47 @@ include "grib2/template.5.packing.def"; include "grib2/template.5.original_values.def"; -# Group splitting method used +# Group splitting method used codetable[1] groupSplittingMethodUsed ('5.4.table',masterDir,localDir); -# Missing value management used +# Missing value management used codetable[1] missingValueManagementUsed ('5.5.table',masterDir,localDir); -# Primary missing value substitute +# Primary missing value substitute unsigned[4] primaryMissingValueSubstitute ; -# Secondary missing value substitute +# Secondary missing value substitute unsigned[4] secondaryMissingValueSubstitute ; -# NG - Number of groups of data values into which field is split +# NG - Number of groups of data values into which field is split unsigned[4] numberOfGroupsOfDataValues ; alias NG = numberOfGroupsOfDataValues; -# Reference for group widths +# Reference for group widths unsigned[1] referenceForGroupWidths ; -# Number of bits used for the group widths +# Number of bits used for the group widths # (after the reference value in octet 36 has been removed) unsigned[1] numberOfBitsUsedForTheGroupWidths ; -# Reference for group lengths +# Reference for group lengths unsigned[4] referenceForGroupLengths ; -# Length increment for the group lengths +# Length increment for the group lengths unsigned[1] lengthIncrementForTheGroupLengths ; -# True length of last group +# True length of last group unsigned[4] trueLengthOfLastGroup ; -# Number of bits used for the scaled group lengths +# Number of bits used for the scaled group lengths # (after subtraction of the reference value given in octets 38-41 and division # by the length increment given in octet 42) unsigned[1] numberOfBitsForScaledGroupLengths ; alias numberOfBitsUsedForTheScaledGroupLengths=numberOfBitsForScaledGroupLengths; -# Order of spatial differencing +# Order of spatial differencing codetable[1] orderOfSpatialDifferencing ('5.6.table',masterDir,localDir); -# Number of octets required in the Data Section to specify extra descriptors needed for spatial differencing +# Number of octets required in the Data Section to specify extra descriptors needed for spatial differencing # (octets 6-ww in Data Template 7.3) unsigned[1] numberOfOctetsExtraDescriptors ; diff --git a/definitions/grib2/template.5.42.def b/definitions/grib2/template.5.42.def index 2caa260fb..a2ad605af 100644 --- a/definitions/grib2/template.5.42.def +++ b/definitions/grib2/template.5.42.def @@ -12,7 +12,7 @@ flagbit AEC_DATA_SIGNED_OPTION_MASK(ccsdsFlags,0) = 0; # AEC_DATA_3BYTE_OPTION_MASK was switched on in order to allow data stored # with 17 <=bitsPerValue<= 24 to be stored in 3 rather than 4 bytes. -# This eliminates discretization errors that were occuring when it was off. +# This eliminates discretization errors that were occurring when it was off. flagbit AEC_DATA_3BYTE_OPTION_MASK(ccsdsFlags,1) = 1; flagbit AEC_DATA_MSB_OPTION_MASK(ccsdsFlags,2) = 1;