diff --git a/definitions/grib2/cfVarName.def b/definitions/grib2/cfVarName.def index cafebf06b..5f81ee153 100644 --- a/definitions/grib2/cfVarName.def +++ b/definitions/grib2/cfVarName.def @@ -10665,25 +10665,4 @@ parameterNumber = 52 ; typeOfFirstFixedSurface = 1 ; typeOfStatisticalProcessing = 1 ; -} -#Tile class -'ticl' = { - discipline = 2 ; - parameterCategory = 0 ; - parameterNumber = 35 ; - typeOfFirstFixedSurface = 1 ; -} -#Tile fraction -'tifr' = { - discipline = 2 ; - parameterCategory = 0 ; - parameterNumber = 36 ; - typeOfFirstFixedSurface = 1 ; -} -#Tile percentage -'tipe' = { - discipline = 2 ; - parameterCategory = 0 ; - parameterNumber = 37 ; - typeOfFirstFixedSurface = 1 ; -} +} \ No newline at end of file diff --git a/definitions/grib2/name.def b/definitions/grib2/name.def index 052da0f13..d35ebf903 100644 --- a/definitions/grib2/name.def +++ b/definitions/grib2/name.def @@ -10665,25 +10665,4 @@ parameterNumber = 52 ; typeOfFirstFixedSurface = 1 ; typeOfStatisticalProcessing = 1 ; -} -#Tile class -'Tile class' = { - discipline = 2 ; - parameterCategory = 0 ; - parameterNumber = 35 ; - typeOfFirstFixedSurface = 1 ; -} -#Tile fraction -'Tile fraction' = { - discipline = 2 ; - parameterCategory = 0 ; - parameterNumber = 36 ; - typeOfFirstFixedSurface = 1 ; -} -#Tile percentage -'Tile percentage' = { - discipline = 2 ; - parameterCategory = 0 ; - parameterNumber = 37 ; - typeOfFirstFixedSurface = 1 ; -} +} \ No newline at end of file diff --git a/definitions/grib2/paramId.def b/definitions/grib2/paramId.def index bd892dfee..68404062b 100644 --- a/definitions/grib2/paramId.def +++ b/definitions/grib2/paramId.def @@ -10665,25 +10665,4 @@ parameterNumber = 52 ; typeOfFirstFixedSurface = 1 ; typeOfStatisticalProcessing = 1 ; -} -#Tile class -'231005' = { - discipline = 2 ; - parameterCategory = 0 ; - parameterNumber = 35 ; - typeOfFirstFixedSurface = 1 ; -} -#Tile fraction -'231006' = { - discipline = 2 ; - parameterCategory = 0 ; - parameterNumber = 36 ; - typeOfFirstFixedSurface = 1 ; -} -#Tile percentage -'231007' = { - discipline = 2 ; - parameterCategory = 0 ; - parameterNumber = 37 ; - typeOfFirstFixedSurface = 1 ; } \ No newline at end of file diff --git a/definitions/grib2/shortName.def b/definitions/grib2/shortName.def index 8bfaf4ded..23d1af6bd 100644 --- a/definitions/grib2/shortName.def +++ b/definitions/grib2/shortName.def @@ -10665,25 +10665,4 @@ parameterNumber = 52 ; typeOfFirstFixedSurface = 1 ; typeOfStatisticalProcessing = 1 ; -} -#Tile class -'ticl' = { - discipline = 2 ; - parameterCategory = 0 ; - parameterNumber = 35 ; - typeOfFirstFixedSurface = 1 ; -} -#Tile fraction -'tifr' = { - discipline = 2 ; - parameterCategory = 0 ; - parameterNumber = 36 ; - typeOfFirstFixedSurface = 1 ; -} -#Tile percentage -'tipe' = { - discipline = 2 ; - parameterCategory = 0 ; - parameterNumber = 37 ; - typeOfFirstFixedSurface = 1 ; -} +} \ No newline at end of file diff --git a/definitions/grib2/tables/30/4.0.table b/definitions/grib2/tables/30/4.0.table index f96b82082..47aa74902 100644 --- a/definitions/grib2/tables/30/4.0.table +++ b/definitions/grib2/tables/30/4.0.table @@ -80,19 +80,15 @@ 96 96 Average, accumulation, extreme values or other statistically processed values of an individual ensemble forecast, control and perturbed, at a horizontal level or in a horizontal layer at a specified local time 97 97 Average, accumulation, extreme values or other statistically processed values of post-processing analysis or forecast at a horizontal level or in a horizontal layer at a specified local time 98 98 Average, accumulation, extreme values or other statistically processed values of a post-processing individual ensemble forecast, control and perturbed, at a horizontal level or in a horizontal layer at a specified local time -113 113 Generalised tiles at a horizontal level or horizontal layer at a point in time -114 114 Average, accumulation, and/or extreme values or other statistically processed values on generalised tiles at a horizontal level or in a horizontal layer in a continuous or non-continuous time interval -115 115 Individual ensemble forecast, control and perturbed on generalised tiles at a horizontal level or in a horizontal layer at a point in time -116 116 Individual ensemble forecast, control and perturbed on generalised tiles at a horizontal level or in a horizontal layer in a continuous or non-continuous time interval -# 117-253 Reserved -254 254 CCITT IA5 character string -# 255-999 Reserved -1000 1000 Cross-section of analysis and forecast at a point in time -1001 1001 Cross-section of averaged or otherwise statistically processed analysis or forecast over a range of time -1002 1002 Cross-section of analysis and forecast, averaged or otherwise statistically processed over latitude or longitude -# 1003-1099 Reserved -1100 1100 Hovmoller-type grid with no averaging or other statistical processing -1101 1101 Hovmoller-type grid with averaging or other statistical processing -# 1102-32767 Reserved -# 32768-65534 Reserved for local use -65535 65535 Missing +# 99-253 Reserved +254 254 CCITT IA5 character string +# 255-999 Reserved +1000 1000 Cross-section of analysis and forecast at a point in time +1001 1001 Cross-section of averaged or otherwise statistically processed analysis or forecast over a range of time +1002 1002 Cross-section of analysis and forecast, averaged or otherwise statistically processed over latitude or longitude +# 1003-1099 Reserved +1100 1100 Hovmoller-type grid with no averaging or other statistical processing +1101 1101 Hovmoller-type grid with averaging or other statistical processing +# 1102-32767 Reserved +# 32768-65534 Reserved for local use +65535 65535 Missing diff --git a/definitions/grib2/tables/30/4.241.table b/definitions/grib2/tables/30/4.241.table index e01e34497..5ea7f775a 100644 --- a/definitions/grib2/tables/30/4.241.table +++ b/definitions/grib2/tables/30/4.241.table @@ -1,13 +1,9 @@ # Code table 4.241 - Coverage attributes -0 UNDEF Undefined -1 UNMOD Unmodified -2 SNOW Snow covered -3 FLOOD Flooded -4 ICE Ice covered -5 ITCW With intercepted water -6 ITCS With intercepted snow -7 AGG Aggregated -8 UNRES Unresolved -# 9-191 Reserved +0 0 Undefined +1 1 Unmodified +2 2 Snow covered +3 3 Flooded +4 4 Ice covered +# 5-191 Reserved # 192-254 Reserved for local use -255 255 Missing value +255 255 Missing value diff --git a/definitions/grib2/tables/30/4.242.table b/definitions/grib2/tables/30/4.242.table index 25744b4a1..f6865957c 100644 --- a/definitions/grib2/tables/30/4.242.table +++ b/definitions/grib2/tables/30/4.242.table @@ -1,10 +1,7 @@ # Code table 4.242 - Tile classification -0 0 Reserved -1 1 Land use classes according to ESA-GlobCover GCV2009 -2 2 Land use classes according to European Commission-Global Land Cover Project GLC2000 -3 3 Land use classes according to ECOCLIMAP -4 4 Land use classes according to ECOCLIMAP-SG -5 5 Land use classes according to USGS EROS Global Land Cover Characterization (GLCC) v2.0 BATS Classification -# 6-191 Reserved -# 192-254 Reserved for local use -255 255 Missing value +0 0 Reserved +1 1 Land use classes according to ESA-GlobCover GCV2009 +2 2 Land use classes according to European Commission-Global Land Cover Project GLC2000 +# 3-191 Reserved +# 192-254 Reserved for local use +255 255 Missing value diff --git a/definitions/grib2/tables/30/4.5.table b/definitions/grib2/tables/30/4.5.table index 30e1d91c0..98103671d 100644 --- a/definitions/grib2/tables/30/4.5.table +++ b/definitions/grib2/tables/30/4.5.table @@ -84,9 +84,6 @@ 182 182 Grid tile water fraction as a model surface 183 183 Grid tile ice fraction on sea, lake or river as a model surface 184 184 Grid tile glacier ice and inland ice fraction as a model surface -185 sol Roof level (numeric) -186 sol Wall level (numeric) -187 sol Road level (numeric) -# 188-191 Reserved -# 195-254 Reserved for local use +# 185-191 Reserved +# 192-254 Reserved for local use 255 255 Missing diff --git a/definitions/grib2/tables/32/4.241.table b/definitions/grib2/tables/32/4.241.table index e57536560..1ac4d0aa7 100644 --- a/definitions/grib2/tables/32/4.241.table +++ b/definitions/grib2/tables/32/4.241.table @@ -1,12 +1,12 @@ # Code table 4.241 - Coverage attributes -0 0 Undefined -1 1 Unmodified -2 2 Snow covered -3 3 Flooded -4 4 Ice covered -5 5 With intercepted water -6 6 With intercepted snow -7 7 Aggregated +0 UNDEF Undefined +1 UNMMOD Unmodified +2 SNOW Snow covered +3 FLOOD Flooded +4 ICE Ice covered +5 ITCW With intercepted water +6 ITCS With intercepted snow +7 AGG Aggregated # 8-191 Reserved # 192-254 Reserved for local use 255 255 Missing value diff --git a/definitions/grib2/template.4.leps.def b/definitions/grib2/template.4.leps.def index e2177d405..0d72e67a9 100644 --- a/definitions/grib2/template.4.leps.def +++ b/definitions/grib2/template.4.leps.def @@ -9,4 +9,4 @@ alias number=perturbationNumber; # Number of forecasts in ensemble unsigned[4] numberOfForecastsInEnsemble : dump; -alias totalNumber=numberOfForecastsInEnsemble; +alias totalNumber=numberOfForecastsInEnsemble; \ No newline at end of file diff --git a/definitions/grib2/units.def b/definitions/grib2/units.def index 12c2fe58c..b6882cb39 100644 --- a/definitions/grib2/units.def +++ b/definitions/grib2/units.def @@ -10665,25 +10665,4 @@ parameterNumber = 52 ; typeOfFirstFixedSurface = 1 ; typeOfStatisticalProcessing = 1 ; -} -#Tile class -'(Code table 4.243)' = { - discipline = 2 ; - parameterCategory = 0 ; - parameterNumber = 35 ; - typeOfFirstFixedSurface = 1 ; -} -#Tile fraction -'Proportion' = { - discipline = 2 ; - parameterCategory = 0 ; - parameterNumber = 36 ; - typeOfFirstFixedSurface = 1 ; -} -#Tile percentage -'%' = { - discipline = 2 ; - parameterCategory = 0 ; - parameterNumber = 37 ; - typeOfFirstFixedSurface = 1 ; -} +} \ No newline at end of file diff --git a/tests/grib_generalised_tiles.sh b/tests/grib_generalised_tiles.sh index bc4ee072c..2ac9c59e2 100755 --- a/tests/grib_generalised_tiles.sh +++ b/tests/grib_generalised_tiles.sh @@ -45,6 +45,18 @@ ${tools_dir}/grib_set -s productDefinitionTemplateNumber=114,tablesVersion=30 ${ grib_check_key_exists ${temp_grib_a} typeOfTile,typeOfStatisticalProcessing +# Check Ensemble template also works + +${tools_dir}/grib_set -s productDefinitionTemplateNumber=115,tablesVersion=30 ${sample_grib2} ${temp_grib_a} + +grib_check_key_exists ${temp_grib_a} typeOfTile,perturbationNumber + +# Check Ensemble StatisticalProcessing template also works + +${tools_dir}/grib_set -s productDefinitionTemplateNumber=116,tablesVersion=30 ${sample_grib2} ${temp_grib_a} + +grib_check_key_exists ${temp_grib_a} typeOfTile,perturbationNumber,typeOfStatisticalProcessing + # Clean up rm -f $temp_grib_a $temp_grib_b $temp_dump