From 8bceabc60719d5d8d75788d34bd5fbcd0e92fc3d Mon Sep 17 00:00:00 2001 From: Sebastien Villaume Date: Sun, 12 May 2024 18:52:55 +0100 Subject: [PATCH] update all template paths to point correctly grib2/templates/ --- definitions/grib2/local.98.500.def | 2 +- .../grib2/local/ecmf/template.4.40033.def | 2 +- .../grib2/local/ecmf/template.4.40034.def | 2 +- .../grib2/local/ecmf/template.4.65533.def | 12 +++++------ .../grib2/local/ecmf/template.4.65534.def | 12 +++++------ .../grib2/local/kwbc/template.3.32769.def | 4 ++-- definitions/grib2/section.1.def | 2 +- definitions/grib2/section.3.def | 2 +- definitions/grib2/section.4.def | 2 +- definitions/grib2/section.5.def | 2 +- definitions/grib2/section.7.def | 2 +- definitions/grib2/templates/template.1.0.def | 2 +- definitions/grib2/templates/template.1.1.def | 2 +- definitions/grib2/templates/template.1.2.def | 4 ++-- definitions/grib2/templates/template.3.0.def | 4 ++-- definitions/grib2/templates/template.3.1.def | 6 +++--- definitions/grib2/templates/template.3.10.def | 6 +++--- .../grib2/templates/template.3.1000.def | 4 ++-- .../grib2/templates/template.3.110.def | 4 ++-- .../grib2/templates/template.3.1100.def | 4 ++-- definitions/grib2/templates/template.3.12.def | 6 +++--- .../grib2/templates/template.3.120.def | 2 +- definitions/grib2/templates/template.3.13.def | 4 ++-- .../grib2/templates/template.3.130.def | 2 +- .../grib2/templates/template.3.140.def | 4 ++-- .../grib2/templates/template.3.150.def | 6 +++--- definitions/grib2/templates/template.3.2.def | 6 +++--- definitions/grib2/templates/template.3.20.def | 4 ++-- definitions/grib2/templates/template.3.23.def | 4 ++-- definitions/grib2/templates/template.3.3.def | 8 ++++---- definitions/grib2/templates/template.3.30.def | 6 +++--- definitions/grib2/templates/template.3.31.def | 6 +++--- definitions/grib2/templates/template.3.33.def | 4 ++-- definitions/grib2/templates/template.3.4.def | 4 ++-- definitions/grib2/templates/template.3.40.def | 4 ++-- definitions/grib2/templates/template.3.41.def | 6 +++--- definitions/grib2/templates/template.3.42.def | 6 +++--- definitions/grib2/templates/template.3.43.def | 8 ++++---- definitions/grib2/templates/template.3.5.def | 6 +++--- definitions/grib2/templates/template.3.50.def | 2 +- definitions/grib2/templates/template.3.51.def | 4 ++-- definitions/grib2/templates/template.3.52.def | 4 ++-- definitions/grib2/templates/template.3.53.def | 6 +++--- definitions/grib2/templates/template.3.61.def | 4 ++-- definitions/grib2/templates/template.3.62.def | 4 ++-- definitions/grib2/templates/template.3.63.def | 4 ++-- definitions/grib2/templates/template.3.90.def | 6 +++--- .../grib2/templates/template.3.gaussian.def | 4 ++-- .../grib2/templates/template.3.grid.def | 2 +- .../grib2/templates/template.3.latlon.def | 4 ++-- .../templates/template.3.latlon_vares.def | 4 ++-- definitions/grib2/templates/template.4.0.def | 10 +++++----- definitions/grib2/templates/template.4.1.def | 12 +++++------ definitions/grib2/templates/template.4.10.def | 12 +++++------ .../grib2/templates/template.4.100.def | 16 +++++++-------- .../grib2/templates/template.4.1000.def | 8 ++++---- .../grib2/templates/template.4.1001.def | 8 ++++---- .../grib2/templates/template.4.1002.def | 6 +++--- .../grib2/templates/template.4.101.def | 14 ++++++------- .../grib2/templates/template.4.102.def | 16 +++++++-------- .../grib2/templates/template.4.103.def | 12 +++++------ .../grib2/templates/template.4.104.def | 14 ++++++------- .../grib2/templates/template.4.105.def | 12 +++++------ .../grib2/templates/template.4.106.def | 14 ++++++------- .../grib2/templates/template.4.107.def | 14 ++++++------- .../grib2/templates/template.4.108.def | 12 +++++------ .../grib2/templates/template.4.109.def | 14 ++++++------- definitions/grib2/templates/template.4.11.def | 12 +++++------ .../grib2/templates/template.4.110.def | 12 +++++------ .../grib2/templates/template.4.1100.def | 8 ++++---- .../grib2/templates/template.4.1101.def | 10 +++++----- .../grib2/templates/template.4.111.def | 14 ++++++------- .../grib2/templates/template.4.112.def | 14 ++++++------- .../grib2/templates/template.4.113.def | 12 +++++------ .../grib2/templates/template.4.114.def | 12 +++++------ .../grib2/templates/template.4.115.def | 14 ++++++------- .../grib2/templates/template.4.116.def | 14 ++++++------- .../grib2/templates/template.4.117.def | 12 +++++------ .../grib2/templates/template.4.118.def | 12 +++++------ .../grib2/templates/template.4.119.def | 12 +++++------ definitions/grib2/templates/template.4.12.def | 12 +++++------ .../grib2/templates/template.4.120.def | 12 +++++------ .../grib2/templates/template.4.121.def | 14 ++++++------- .../grib2/templates/template.4.122.def | 14 ++++++------- .../grib2/templates/template.4.123.def | 16 +++++++-------- definitions/grib2/templates/template.4.13.def | 16 +++++++-------- definitions/grib2/templates/template.4.14.def | 16 +++++++-------- definitions/grib2/templates/template.4.15.def | 10 +++++----- definitions/grib2/templates/template.4.2.def | 12 +++++------ definitions/grib2/templates/template.4.3.def | 16 +++++++-------- definitions/grib2/templates/template.4.30.def | 4 ++-- definitions/grib2/templates/template.4.31.def | 4 ++-- .../grib2/templates/template.4.311.def | 2 +- definitions/grib2/templates/template.4.32.def | 10 +++++----- definitions/grib2/templates/template.4.33.def | 12 +++++------ definitions/grib2/templates/template.4.34.def | 12 +++++------ definitions/grib2/templates/template.4.35.def | 4 ++-- definitions/grib2/templates/template.4.4.def | 16 +++++++-------- definitions/grib2/templates/template.4.40.def | 12 +++++------ definitions/grib2/templates/template.4.41.def | 14 ++++++------- definitions/grib2/templates/template.4.42.def | 12 +++++------ definitions/grib2/templates/template.4.43.def | 14 ++++++------- definitions/grib2/templates/template.4.44.def | 14 ++++++------- definitions/grib2/templates/template.4.45.def | 16 +++++++-------- definitions/grib2/templates/template.4.46.def | 14 ++++++------- definitions/grib2/templates/template.4.47.def | 16 +++++++-------- definitions/grib2/templates/template.4.48.def | 16 +++++++-------- definitions/grib2/templates/template.4.49.def | 18 ++++++++--------- definitions/grib2/templates/template.4.5.def | 12 +++++------ definitions/grib2/templates/template.4.51.def | 12 +++++------ definitions/grib2/templates/template.4.53.def | 12 +++++------ definitions/grib2/templates/template.4.54.def | 14 ++++++------- definitions/grib2/templates/template.4.55.def | 12 +++++------ definitions/grib2/templates/template.4.56.def | 12 +++++------ definitions/grib2/templates/template.4.57.def | 14 ++++++------- definitions/grib2/templates/template.4.58.def | 16 +++++++-------- definitions/grib2/templates/template.4.59.def | 14 ++++++------- definitions/grib2/templates/template.4.6.def | 12 +++++------ definitions/grib2/templates/template.4.60.def | 14 ++++++------- definitions/grib2/templates/template.4.61.def | 14 ++++++------- definitions/grib2/templates/template.4.62.def | 12 +++++------ definitions/grib2/templates/template.4.63.def | 14 ++++++------- definitions/grib2/templates/template.4.67.def | 14 ++++++------- definitions/grib2/templates/template.4.68.def | 16 +++++++-------- definitions/grib2/templates/template.4.7.def | 2 +- definitions/grib2/templates/template.4.70.def | 12 +++++------ definitions/grib2/templates/template.4.71.def | 14 ++++++------- definitions/grib2/templates/template.4.72.def | 12 +++++------ definitions/grib2/templates/template.4.73.def | 14 ++++++------- definitions/grib2/templates/template.4.76.def | 14 ++++++------- definitions/grib2/templates/template.4.77.def | 16 +++++++-------- definitions/grib2/templates/template.4.78.def | 14 ++++++------- definitions/grib2/templates/template.4.79.def | 16 +++++++-------- definitions/grib2/templates/template.4.8.def | 10 +++++----- definitions/grib2/templates/template.4.80.def | 18 ++++++++--------- definitions/grib2/templates/template.4.81.def | 20 +++++++++---------- definitions/grib2/templates/template.4.82.def | 16 +++++++-------- definitions/grib2/templates/template.4.83.def | 18 ++++++++--------- definitions/grib2/templates/template.4.84.def | 18 ++++++++--------- definitions/grib2/templates/template.4.85.def | 16 +++++++-------- definitions/grib2/templates/template.4.86.def | 12 +++++------ definitions/grib2/templates/template.4.87.def | 12 +++++------ definitions/grib2/templates/template.4.88.def | 8 ++++---- definitions/grib2/templates/template.4.89.def | 14 ++++++------- definitions/grib2/templates/template.4.9.def | 12 +++++------ definitions/grib2/templates/template.4.90.def | 14 ++++++------- definitions/grib2/templates/template.4.91.def | 12 +++++------ definitions/grib2/templates/template.4.92.def | 14 ++++++------- definitions/grib2/templates/template.4.93.def | 14 ++++++------- definitions/grib2/templates/template.4.94.def | 16 +++++++-------- definitions/grib2/templates/template.4.95.def | 10 +++++----- definitions/grib2/templates/template.4.96.def | 16 +++++++-------- definitions/grib2/templates/template.4.97.def | 16 +++++++-------- definitions/grib2/templates/template.4.98.def | 18 ++++++++--------- definitions/grib2/templates/template.4.99.def | 14 ++++++------- definitions/grib2/templates/template.5.0.def | 4 ++-- definitions/grib2/templates/template.5.1.def | 2 +- definitions/grib2/templates/template.5.2.def | 4 ++-- definitions/grib2/templates/template.5.3.def | 4 ++-- definitions/grib2/templates/template.5.40.def | 4 ++-- .../grib2/templates/template.5.40000.def | 2 +- definitions/grib2/templates/template.5.41.def | 4 ++-- definitions/grib2/templates/template.5.42.def | 4 ++-- definitions/grib2/templates/template.5.50.def | 2 +- .../grib2/templates/template.5.50000.def | 2 +- definitions/grib2/templates/template.5.51.def | 2 +- definitions/grib2/templates/template.5.53.def | 2 +- definitions/grib2/templates/template.5.61.def | 2 +- .../grib2/templates/template.7.40000.def | 2 +- 169 files changed, 805 insertions(+), 805 deletions(-) diff --git a/definitions/grib2/local.98.500.def b/definitions/grib2/local.98.500.def index 3fa593b58..d0d055743 100644 --- a/definitions/grib2/local.98.500.def +++ b/definitions/grib2/local.98.500.def @@ -41,7 +41,7 @@ codetable[2] instrument "grib2/tables/local/ecmf/obstat.5.0.table"; codetable[2] dataStream "grib2/tables/local/ecmf/obstat.6.0.table"; -# include "grib2/template.4.horizontal.def" +# include "grib2/templates/template.4.horizontal.def" codetable[2] observationDiagnostic "grib2/tables/local/ecmf/obstat.9.0.table"; diff --git a/definitions/grib2/local/ecmf/template.4.40033.def b/definitions/grib2/local/ecmf/template.4.40033.def index c5a1421ad..76eb92e2d 100644 --- a/definitions/grib2/local/ecmf/template.4.40033.def +++ b/definitions/grib2/local/ecmf/template.4.40033.def @@ -3,4 +3,4 @@ # # This is deprecated and only included for backward compatibility, use template 4.33 # -include "grib2/template.4.33.def" +include "grib2/templates/template.4.33.def" diff --git a/definitions/grib2/local/ecmf/template.4.40034.def b/definitions/grib2/local/ecmf/template.4.40034.def index 3c0fed44a..7897fd582 100644 --- a/definitions/grib2/local/ecmf/template.4.40034.def +++ b/definitions/grib2/local/ecmf/template.4.40034.def @@ -3,4 +3,4 @@ # # This is deprecated and only included for backward compatibility, use template 4.34 # -include "grib2/template.4.34.def" +include "grib2/templates/template.4.34.def" diff --git a/definitions/grib2/local/ecmf/template.4.65533.def b/definitions/grib2/local/ecmf/template.4.65533.def index 9ebacb060..949923b44 100644 --- a/definitions/grib2/local/ecmf/template.4.65533.def +++ b/definitions/grib2/local/ecmf/template.4.65533.def @@ -2,9 +2,9 @@ # TEMPLATE 4.65533, Individual member for large 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.horizontal.def" -include "grib2/template.4.leps.def" +include "grib2/templates/template.4.parameter.def" +include "grib2/templates/template.4.generating_process.def" +include "grib2/templates/template.4.forecast_time.def" +include "grib2/templates/template.4.point_in_time.def" +include "grib2/templates/template.4.horizontal.def" +include "grib2/templates/template.4.leps.def" diff --git a/definitions/grib2/local/ecmf/template.4.65534.def b/definitions/grib2/local/ecmf/template.4.65534.def index 208b0d185..0a05fff8e 100644 --- a/definitions/grib2/local/ecmf/template.4.65534.def +++ b/definitions/grib2/local/ecmf/template.4.65534.def @@ -2,9 +2,9 @@ # TEMPLATE 4.65534, Individual member for large 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.horizontal.def" -include "grib2/template.4.leps.def" -include "grib2/template.4.statistical.def" +include "grib2/templates/template.4.parameter.def" +include "grib2/templates/template.4.generating_process.def" +include "grib2/templates/template.4.forecast_time.def" +include "grib2/templates/template.4.horizontal.def" +include "grib2/templates/template.4.leps.def" +include "grib2/templates/template.4.statistical.def" diff --git a/definitions/grib2/local/kwbc/template.3.32769.def b/definitions/grib2/local/kwbc/template.3.32769.def index f6ed7da90..5aff8a025 100644 --- a/definitions/grib2/local/kwbc/template.3.32769.def +++ b/definitions/grib2/local/kwbc/template.3.32769.def @@ -3,8 +3,8 @@ # TEMPLATE 3.32769 - Rotate Latitude/Longitude (Arakawa Non-E Staggered grid) # See https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_temp3-32769.shtml -include "grib2/template.3.shape_of_the_earth.def"; -include "grib2/template.3.grid.def"; +include "grib2/templates/template.3.shape_of_the_earth.def"; +include "grib2/templates/template.3.grid.def"; meta latitudeOfFirstGridPointInDegrees scale(La1,one,grib2divider,truncateDegrees) : dump; meta longitudeOfFirstGridPointInDegrees scale(Lo1,one,grib2divider,truncateDegrees) : dump; diff --git a/definitions/grib2/section.1.def b/definitions/grib2/section.1.def index c4e3c21f1..b19eb67f8 100644 --- a/definitions/grib2/section.1.def +++ b/definitions/grib2/section.1.def @@ -115,7 +115,7 @@ alias calendarIdPresent = false; if ( ((section1Length > 21) or setCalendarId > 0) and deleteCalendarId == 0) { alias calendarIdPresent = present; codetable[2] calendarIdentificationTemplateNumber ('1.5.table',masterDir,localDir) : dump,string_type,no_fail; - template calendarIdentification "grib2/template.1.[calendarIdentificationTemplateNumber:l].def"; + template calendarIdentification "grib2/templates/template.1.[calendarIdentificationTemplateNumber:l].def"; } constant conceptsMasterDir="grib2" : hidden; diff --git a/definitions/grib2/section.3.def b/definitions/grib2/section.3.def index 40f21e591..b0d2c8476 100644 --- a/definitions/grib2/section.3.def +++ b/definitions/grib2/section.3.def @@ -38,7 +38,7 @@ alias isRotatedGrid = false; if (gridDefinitionTemplateNumber >= 32768) { template gridDefinitionSection "grib2/local/[centreForLocal]/template.3.[gridDefinitionTemplateNumber:l].def"; } else { - template gridDefinitionSection "grib2/template.3.[gridDefinitionTemplateNumber:l].def"; + template gridDefinitionSection "grib2/templates/template.3.[gridDefinitionTemplateNumber:l].def"; } if(PLPresent){ diff --git a/definitions/grib2/section.4.def b/definitions/grib2/section.4.def index 0c45720b1..816f31635 100644 --- a/definitions/grib2/section.4.def +++ b/definitions/grib2/section.4.def @@ -68,7 +68,7 @@ transient genVertHeightCoords = 0; if (productDefinitionTemplateNumber >= 32768) { template productDefinition "grib2/local/[centreForLocal]/template.4.[productDefinitionTemplateNumber:l].def"; } else { - template productDefinition "grib2/template.4.[productDefinitionTemplateNumber:l].def"; + template productDefinition "grib2/templates/template.4.[productDefinitionTemplateNumber:l].def"; } if (defined(marsStream) && defined(marsType)) { diff --git a/definitions/grib2/section.5.def b/definitions/grib2/section.5.def index 49980cdbe..5b2fc1e2b 100644 --- a/definitions/grib2/section.5.def +++ b/definitions/grib2/section.5.def @@ -51,7 +51,7 @@ concept packingType (unknown) { "grid_run_length" = { dataRepresentationTemplateNumber = 200; } } : dump; -template dataRepresentation "grib2/template.5.[dataRepresentationTemplateNumber:l].def"; +template dataRepresentation "grib2/templates/template.5.[dataRepresentationTemplateNumber:l].def"; alias ls.packingType=packingType; alias dataRepresentation=packingType; diff --git a/definitions/grib2/section.7.def b/definitions/grib2/section.7.def index f6d947674..0dc40afe4 100644 --- a/definitions/grib2/section.7.def +++ b/definitions/grib2/section.7.def @@ -13,7 +13,7 @@ unsigned[1] numberOfSection = 7:read_only; # Template number given in octets 10-11 of Section 5 position offsetBeforeData; #if (changed(dataRepresentationTemplateNumber)) { - template dataValues "grib2/template.7.[dataRepresentationTemplateNumber:l].def"; + template dataValues "grib2/templates/template.7.[dataRepresentationTemplateNumber:l].def"; #} meta changeDecimalPrecision decimal_precision(bitsPerValue,decimalScaleFactor,changingPrecision,values) : edition_specific; diff --git a/definitions/grib2/templates/template.1.0.def b/definitions/grib2/templates/template.1.0.def index 9c73ed2cc..a7428bdf7 100644 --- a/definitions/grib2/templates/template.1.0.def +++ b/definitions/grib2/templates/template.1.0.def @@ -2,4 +2,4 @@ # TEMPLATE 1.0, Calendar Definition -include "grib2/template.1.calendar.def" +include "grib2/templates/template.1.calendar.def" diff --git a/definitions/grib2/templates/template.1.1.def b/definitions/grib2/templates/template.1.1.def index 6d559c4d7..0354f634b 100644 --- a/definitions/grib2/templates/template.1.1.def +++ b/definitions/grib2/templates/template.1.1.def @@ -2,4 +2,4 @@ # TEMPLATE 1.1, Paleontological Offset -include "grib2/template.1.offset.def" +include "grib2/templates/template.1.offset.def" diff --git a/definitions/grib2/templates/template.1.2.def b/definitions/grib2/templates/template.1.2.def index 3544cd8ef..06c868aa6 100644 --- a/definitions/grib2/templates/template.1.2.def +++ b/definitions/grib2/templates/template.1.2.def @@ -2,5 +2,5 @@ # TEMPLATE 1.2, Calendar Definition and Paleontological Offset -include "grib2/template.1.calendar.def" -include "grib2/template.1.offset.def" +include "grib2/templates/template.1.calendar.def" +include "grib2/templates/template.1.offset.def" diff --git a/definitions/grib2/templates/template.3.0.def b/definitions/grib2/templates/template.3.0.def index 309391679..89a9af957 100644 --- a/definitions/grib2/templates/template.3.0.def +++ b/definitions/grib2/templates/template.3.0.def @@ -2,5 +2,5 @@ # TEMPLATE 3.0, Latitude/longitude (or equidistant cylindrical, or Plate Carree) -include "grib2/template.3.shape_of_the_earth.def" -include "grib2/template.3.latlon.def" +include "grib2/templates/template.3.shape_of_the_earth.def" +include "grib2/templates/template.3.latlon.def" diff --git a/definitions/grib2/templates/template.3.1.def b/definitions/grib2/templates/template.3.1.def index 45cd7200f..3766935bc 100644 --- a/definitions/grib2/templates/template.3.1.def +++ b/definitions/grib2/templates/template.3.1.def @@ -2,6 +2,6 @@ # TEMPLATE 3.1, Rotated Latitude/longitude (or equidistant cylindrical, or Plate Carree) -include "grib2/template.3.shape_of_the_earth.def" -include "grib2/template.3.latlon.def" -include "grib2/template.3.rotation.def" +include "grib2/templates/template.3.shape_of_the_earth.def" +include "grib2/templates/template.3.latlon.def" +include "grib2/templates/template.3.rotation.def" diff --git a/definitions/grib2/templates/template.3.10.def b/definitions/grib2/templates/template.3.10.def index 6fb8f1a46..303600551 100644 --- a/definitions/grib2/templates/template.3.10.def +++ b/definitions/grib2/templates/template.3.10.def @@ -1,7 +1,7 @@ # (C) Copyright 2005- ECMWF. # TEMPLATE 3.10, Mercator -include "grib2/template.3.shape_of_the_earth.def" +include "grib2/templates/template.3.shape_of_the_earth.def" constant isGridded = true; @@ -27,7 +27,7 @@ signed[4] longitudeOfFirstGridPoint : edition_specific,no_copy; alias Lo1 = longitudeOfFirstGridPoint; meta geography.longitudeOfFirstGridPointInDegrees scale(longitudeOfFirstGridPoint,oneConstant,grib2divider,truncateDegrees) : dump; -include "grib2/template.3.resolution_flags.def" +include "grib2/templates/template.3.resolution_flags.def" # LaD - Latitude(s) at which the Mercator projection intersects the Earth # (Latitude(s) where Di and Dj are specified) @@ -44,7 +44,7 @@ signed[4] longitudeOfLastGridPoint: edition_specific,no_copy ; alias Lo2 = longitudeOfLastGridPoint; meta geography.longitudeOfLastGridPointInDegrees scale(longitudeOfLastGridPoint,oneConstant,grib2divider,truncateDegrees) : dump; -include "grib2/template.3.scanning_mode.def" +include "grib2/templates/template.3.scanning_mode.def" # Orientation of the grid, angle between i direction on the map and the equator # NOTE 1: Limited to the range of 0 to 90 degrees; if the angle of orientation of the grid is neither 0 nor 90 degrees, diff --git a/definitions/grib2/templates/template.3.1000.def b/definitions/grib2/templates/template.3.1000.def index 8f825f393..4690bc620 100644 --- a/definitions/grib2/templates/template.3.1000.def +++ b/definitions/grib2/templates/template.3.1000.def @@ -6,7 +6,7 @@ # and should be used only for bilateral previously agreed tests transient template_is_experimental = 1 : hidden ; -include "grib2/template.3.shape_of_the_earth.def" +include "grib2/templates/template.3.shape_of_the_earth.def" constant isGridded = true; @@ -27,7 +27,7 @@ alias La1 = latitudeOfFirstGridPoint; unsigned[4] longitudeOfFirstGridPoint : edition_specific; alias Lo1 = longitudeOfFirstGridPoint; -include "grib2/template.3.scanning_mode.def" +include "grib2/templates/template.3.scanning_mode.def" # Latitude of last grid point signed[4] latitudeOfLastGridPoint : edition_specific; diff --git a/definitions/grib2/templates/template.3.110.def b/definitions/grib2/templates/template.3.110.def index fae3e5420..36aa5522b 100644 --- a/definitions/grib2/templates/template.3.110.def +++ b/definitions/grib2/templates/template.3.110.def @@ -1,7 +1,7 @@ # (C) Copyright 2005- ECMWF. # TEMPLATE 3.110, Equatorial azimuthal equidistant projection -include "grib2/template.3.shape_of_the_earth.def" +include "grib2/templates/template.3.shape_of_the_earth.def" constant isGridded = true; @@ -37,4 +37,4 @@ unsigned[4] Dy : dump; # Projection centre flag unsigned[1] projectionCentreFlag : dump; -include "grib2/template.3.scanning_mode.def" +include "grib2/templates/template.3.scanning_mode.def" diff --git a/definitions/grib2/templates/template.3.1100.def b/definitions/grib2/templates/template.3.1100.def index de65bca94..9970228f5 100644 --- a/definitions/grib2/templates/template.3.1100.def +++ b/definitions/grib2/templates/template.3.1100.def @@ -6,7 +6,7 @@ # and should be used only for bilateral previously agreed tests transient template_is_experimental = 1 : hidden; -include "grib2/template.3.shape_of_the_earth.def" +include "grib2/templates/template.3.shape_of_the_earth.def" constant isGridded = true; @@ -28,7 +28,7 @@ unsigned[4] longitudeOfFirstGridPoint : edition_specific,dump; alias Lo1 =longitudeOfFirstGridPoint; -include "grib2/template.3.scanning_mode.def" +include "grib2/templates/template.3.scanning_mode.def" # La2 - latitude of last grid point signed[4] latitudeOfLastGridPoint : edition_specific,dump; diff --git a/definitions/grib2/templates/template.3.12.def b/definitions/grib2/templates/template.3.12.def index fa3b2a8a0..634e6df69 100644 --- a/definitions/grib2/templates/template.3.12.def +++ b/definitions/grib2/templates/template.3.12.def @@ -1,7 +1,7 @@ # (C) Copyright 2005- ECMWF. # TEMPLATE 3.12, Transverse Mercator -include "grib2/template.3.shape_of_the_earth.def" +include "grib2/templates/template.3.shape_of_the_earth.def" constant isGridded = true; @@ -27,7 +27,7 @@ signed[4] longitudeOfReferencePoint : edition_specific,no_copy; alias LoR = longitudeOfReferencePoint; meta geography.longitudeOfReferencePointInDegrees scale(longitudeOfReferencePoint,oneConstant,grib2divider,truncateDegrees) : dump; -include "grib2/template.3.resolution_flags.def" +include "grib2/templates/template.3.resolution_flags.def" # m - scale factor at reference point ratio of distance on map to distance on spheroid # (IEEE 32-bit floating-point values) @@ -45,7 +45,7 @@ signed[4] YR : edition_specific,no_copy ; alias falseNorthing = YR; meta geography.YRInMetres scale(YR,one,hundred) : dump; -include "grib2/template.3.scanning_mode.def" +include "grib2/templates/template.3.scanning_mode.def" # Di - i-direction increment length in units of 10-2 m unsigned[4] Di : edition_specific,no_copy; diff --git a/definitions/grib2/templates/template.3.120.def b/definitions/grib2/templates/template.3.120.def index e208cab7c..b5a11043d 100644 --- a/definitions/grib2/templates/template.3.120.def +++ b/definitions/grib2/templates/template.3.120.def @@ -34,7 +34,7 @@ alias Dx = spacingOfBinsAlongRadials; unsigned[4] offsetFromOriginToInnerBound; alias Dstart = offsetFromOriginToInnerBound; -include "grib2/template.3.scanning_mode.def" +include "grib2/templates/template.3.scanning_mode.def" # Octets 40-(39+4Nr) : For each of Nr radials: radials list(numberOfRadials){ diff --git a/definitions/grib2/templates/template.3.13.def b/definitions/grib2/templates/template.3.13.def index 1fe8f8c47..ac4e363c9 100644 --- a/definitions/grib2/templates/template.3.13.def +++ b/definitions/grib2/templates/template.3.13.def @@ -1,5 +1,5 @@ # (C) Copyright 2005- ECMWF. # TEMPLATE 3.13 Mercator with modelling subdomains definition -include "grib2/template.3.10.def" -include "grib2/template.3.lam.def" +include "grib2/templates/template.3.10.def" +include "grib2/templates/template.3.lam.def" diff --git a/definitions/grib2/templates/template.3.130.def b/definitions/grib2/templates/template.3.130.def index eec6dbc5b..c2e7c96cf 100644 --- a/definitions/grib2/templates/template.3.130.def +++ b/definitions/grib2/templates/template.3.130.def @@ -6,7 +6,7 @@ constant isGridded = true; # Note: This template is deprecated. -include "grib2/template.3.shape_of_the_earth.def" +include "grib2/templates/template.3.shape_of_the_earth.def" points list(numberOfDataPoints) { signed[4] latitude; diff --git a/definitions/grib2/templates/template.3.140.def b/definitions/grib2/templates/template.3.140.def index d5c7b4666..a732332ab 100644 --- a/definitions/grib2/templates/template.3.140.def +++ b/definitions/grib2/templates/template.3.140.def @@ -1,7 +1,7 @@ # (C) Copyright 2005- ECMWF. # TEMPLATE 3.140, Lambert azimuthal equal area projection -include "grib2/template.3.shape_of_the_earth.def" +include "grib2/templates/template.3.shape_of_the_earth.def" constant isGridded = true; @@ -52,7 +52,7 @@ alias Dy = yDirectionGridLengthInMillimetres ; meta geography.yDirectionGridLengthInMetres scale(yDirectionGridLengthInMillimetres,one,thousand,truncateDegrees): dump; alias DyInMetres = yDirectionGridLengthInMetres; -include "grib2/template.3.scanning_mode.def" +include "grib2/templates/template.3.scanning_mode.def" iterator lambert_azimuthal_equal_area( numberOfPoints,missingValue,values, diff --git a/definitions/grib2/templates/template.3.150.def b/definitions/grib2/templates/template.3.150.def index 360e4d579..ff3456a62 100644 --- a/definitions/grib2/templates/template.3.150.def +++ b/definitions/grib2/templates/template.3.150.def @@ -1,7 +1,7 @@ # TEMPLATE 3.150 - The HEALPix grid # See https://healpix.jpl.nasa.gov/pdf/intro.pdf -include "grib2/template.3.shape_of_the_earth.def" -include "grib2/template.3.resolution_flags.def" -include "grib2/template.3.healpix.def" +include "grib2/templates/template.3.shape_of_the_earth.def" +include "grib2/templates/template.3.resolution_flags.def" +include "grib2/templates/template.3.healpix.def" diff --git a/definitions/grib2/templates/template.3.2.def b/definitions/grib2/templates/template.3.2.def index cc422db4d..507e88506 100644 --- a/definitions/grib2/templates/template.3.2.def +++ b/definitions/grib2/templates/template.3.2.def @@ -2,6 +2,6 @@ # TEMPLATE 3.2, Stretched Latitude/longitude (or equidistant cylindrical, or Plate Carree) -include "grib2/template.3.shape_of_the_earth.def" -include "grib2/template.3.latlon.def" -include "grib2/template.3.stretching.def" +include "grib2/templates/template.3.shape_of_the_earth.def" +include "grib2/templates/template.3.latlon.def" +include "grib2/templates/template.3.stretching.def" diff --git a/definitions/grib2/templates/template.3.20.def b/definitions/grib2/templates/template.3.20.def index 80b1dce80..7438b4766 100644 --- a/definitions/grib2/templates/template.3.20.def +++ b/definitions/grib2/templates/template.3.20.def @@ -1,7 +1,7 @@ # (C) Copyright 2005- ECMWF. # TEMPLATE 3.20, Polar stereographic projection -include "grib2/template.3.shape_of_the_earth.def" +include "grib2/templates/template.3.shape_of_the_earth.def" constant isGridded = true; @@ -63,7 +63,7 @@ flags[1] projectionCentreFlag 'grib2/tables/[tablesVersion]/3.5.table' : dump; # If bit 1 is 1, then the South Pole is on the projection plane flagbit southPoleOnProjectionPlane(projectionCentreFlag,7) : dump; # WMO bit 1 -include "grib2/template.3.scanning_mode.def" +include "grib2/templates/template.3.scanning_mode.def" iterator polar_stereographic(numberOfPoints,missingValue,values, radius,Nx,Ny, diff --git a/definitions/grib2/templates/template.3.23.def b/definitions/grib2/templates/template.3.23.def index 9a1087a71..30019547a 100644 --- a/definitions/grib2/templates/template.3.23.def +++ b/definitions/grib2/templates/template.3.23.def @@ -1,5 +1,5 @@ # (C) Copyright 2005- ECMWF. # TEMPLATE 3.23 Polar stereographic with modelling subdomains definition -include "grib2/template.3.20.def" -include "grib2/template.3.lam.def" +include "grib2/templates/template.3.20.def" +include "grib2/templates/template.3.lam.def" diff --git a/definitions/grib2/templates/template.3.3.def b/definitions/grib2/templates/template.3.3.def index 264a09c7a..5b612d7f7 100644 --- a/definitions/grib2/templates/template.3.3.def +++ b/definitions/grib2/templates/template.3.3.def @@ -2,8 +2,8 @@ # TEMPLATE 3.3, Stretched and Rotated Latitude/longitude (or equidistant cylindrical, or Plate Carree) -include "grib2/template.3.shape_of_the_earth.def" -include "grib2/template.3.latlon.def" -include "grib2/template.3.rotation.def" -include "grib2/template.3.stretching.def" +include "grib2/templates/template.3.shape_of_the_earth.def" +include "grib2/templates/template.3.latlon.def" +include "grib2/templates/template.3.rotation.def" +include "grib2/templates/template.3.stretching.def" diff --git a/definitions/grib2/templates/template.3.30.def b/definitions/grib2/templates/template.3.30.def index 7bd63fc00..395c52d09 100644 --- a/definitions/grib2/templates/template.3.30.def +++ b/definitions/grib2/templates/template.3.30.def @@ -1,7 +1,7 @@ # (C) Copyright 2005- ECMWF. # TEMPLATE 3.30, Lambert conformal -include "grib2/template.3.shape_of_the_earth.def" +include "grib2/templates/template.3.shape_of_the_earth.def" constant isGridded = true; @@ -32,7 +32,7 @@ meta geography.longitudeOfFirstGridPointInDegrees alias Lo1InDegrees = longitudeOfFirstGridPointInDegrees; #meta longitudeOfFirstGridPointInMicrodegrees times(longitudeOfFirstGridPoint,oneConstant) : no_copy; -include "grib2/template.3.resolution_flags.def" +include "grib2/templates/template.3.resolution_flags.def" # LaD - Latitude where Dx and Dy are specified signed[4] LaD : edition_specific; @@ -58,7 +58,7 @@ meta geography.DyInMetres scale(Dy,one,thousand) : dump; # Projection centre flag flags[1] projectionCentreFlag 'grib2/tables/[tablesVersion]/3.5.table' : dump; -include "grib2/template.3.scanning_mode.def" +include "grib2/templates/template.3.scanning_mode.def" # Latin 1 - first latitude from the pole at which the secant cone cuts the sphere signed[4] Latin1 : edition_specific; diff --git a/definitions/grib2/templates/template.3.31.def b/definitions/grib2/templates/template.3.31.def index d6e85c6c3..e85af94cb 100644 --- a/definitions/grib2/templates/template.3.31.def +++ b/definitions/grib2/templates/template.3.31.def @@ -1,7 +1,7 @@ # (C) Copyright 2005- ECMWF. # TEMPLATE 3.31, Albers equal area -include "grib2/template.3.shape_of_the_earth.def" +include "grib2/templates/template.3.shape_of_the_earth.def" constant isGridded = true; @@ -23,7 +23,7 @@ alias La1 = latitudeOfFirstGridPoint; unsigned[4] longitudeOfFirstGridPoint : edition_specific,dump; alias Lo1 = longitudeOfFirstGridPoint; -include "grib2/template.3.resolution_flags.def" +include "grib2/templates/template.3.resolution_flags.def" # LaD - Latitude where Dx and Dy are specified signed[4] LaD : dump; @@ -42,7 +42,7 @@ alias Dy = yDirectionGridLength; # Projection centre flag flags[1] projectionCentreFlag 'grib2/tables/[tablesVersion]/3.5.table' : dump; -include "grib2/template.3.scanning_mode.def" +include "grib2/templates/template.3.scanning_mode.def" # Latin 1 - first latitude from the pole at which the secant cone cuts the sphere signed[4] Latin1 :edition_specific; diff --git a/definitions/grib2/templates/template.3.33.def b/definitions/grib2/templates/template.3.33.def index 5c9dd93ef..e2cc830f1 100644 --- a/definitions/grib2/templates/template.3.33.def +++ b/definitions/grib2/templates/template.3.33.def @@ -1,5 +1,5 @@ # (C) Copyright 2005- ECMWF. # TEMPLATE 3.33, Lambert conformal with modelling subdomains definition -include "grib2/template.3.30.def" -include "grib2/template.3.lam.def" +include "grib2/templates/template.3.30.def" +include "grib2/templates/template.3.lam.def" diff --git a/definitions/grib2/templates/template.3.4.def b/definitions/grib2/templates/template.3.4.def index 224d12e7b..3c8d3b736 100644 --- a/definitions/grib2/templates/template.3.4.def +++ b/definitions/grib2/templates/template.3.4.def @@ -1,5 +1,5 @@ # (C) Copyright 2005- ECMWF. # TEMPLATE 3.4, Variable resolution latitude/longitude -include "grib2/template.3.shape_of_the_earth.def" -include "grib2/template.3.latlon_vares.def" +include "grib2/templates/template.3.shape_of_the_earth.def" +include "grib2/templates/template.3.latlon_vares.def" diff --git a/definitions/grib2/templates/template.3.40.def b/definitions/grib2/templates/template.3.40.def index 2f1c86a27..861ad15c3 100644 --- a/definitions/grib2/templates/template.3.40.def +++ b/definitions/grib2/templates/template.3.40.def @@ -2,5 +2,5 @@ # TEMPLATE 3.40, Gaussian latitude/longitude -include "grib2/template.3.shape_of_the_earth.def" -include "grib2/template.3.gaussian.def" +include "grib2/templates/template.3.shape_of_the_earth.def" +include "grib2/templates/template.3.gaussian.def" diff --git a/definitions/grib2/templates/template.3.41.def b/definitions/grib2/templates/template.3.41.def index 7c72c31e3..715d940da 100644 --- a/definitions/grib2/templates/template.3.41.def +++ b/definitions/grib2/templates/template.3.41.def @@ -2,6 +2,6 @@ # TEMPLATE 3.41, Rotated Gaussian latitude/longitude -include "grib2/template.3.shape_of_the_earth.def" -include "grib2/template.3.gaussian.def" -include "grib2/template.3.rotation.def" +include "grib2/templates/template.3.shape_of_the_earth.def" +include "grib2/templates/template.3.gaussian.def" +include "grib2/templates/template.3.rotation.def" diff --git a/definitions/grib2/templates/template.3.42.def b/definitions/grib2/templates/template.3.42.def index 8ec6895eb..126fd6d1f 100644 --- a/definitions/grib2/templates/template.3.42.def +++ b/definitions/grib2/templates/template.3.42.def @@ -2,6 +2,6 @@ # TEMPLATE 3.42, Stretched Gaussian latitude/longitude -include "grib2/template.3.shape_of_the_earth.def" -include "grib2/template.3.gaussian.def" -include "grib2/template.3.stretching.def" +include "grib2/templates/template.3.shape_of_the_earth.def" +include "grib2/templates/template.3.gaussian.def" +include "grib2/templates/template.3.stretching.def" diff --git a/definitions/grib2/templates/template.3.43.def b/definitions/grib2/templates/template.3.43.def index 7e35de9d8..597ca5200 100644 --- a/definitions/grib2/templates/template.3.43.def +++ b/definitions/grib2/templates/template.3.43.def @@ -2,7 +2,7 @@ # TEMPLATE 3.43, Stretched and rotated Gaussian latitude/longitude -include "grib2/template.3.shape_of_the_earth.def" -include "grib2/template.3.gaussian.def" -include "grib2/template.3.rotation.def" -include "grib2/template.3.stretching.def" +include "grib2/templates/template.3.shape_of_the_earth.def" +include "grib2/templates/template.3.gaussian.def" +include "grib2/templates/template.3.rotation.def" +include "grib2/templates/template.3.stretching.def" diff --git a/definitions/grib2/templates/template.3.5.def b/definitions/grib2/templates/template.3.5.def index b80f9264e..2e6d4ad0d 100644 --- a/definitions/grib2/templates/template.3.5.def +++ b/definitions/grib2/templates/template.3.5.def @@ -2,6 +2,6 @@ # TEMPLATE 3.5, Variable resolution rotated latitude/longitude -include "grib2/template.3.shape_of_the_earth.def" -include "grib2/template.3.latlon_vares.def" -include "grib2/template.3.rotation.def" +include "grib2/templates/template.3.shape_of_the_earth.def" +include "grib2/templates/template.3.latlon_vares.def" +include "grib2/templates/template.3.rotation.def" diff --git a/definitions/grib2/templates/template.3.50.def b/definitions/grib2/templates/template.3.50.def index 3db24135a..b88204d29 100644 --- a/definitions/grib2/templates/template.3.50.def +++ b/definitions/grib2/templates/template.3.50.def @@ -2,4 +2,4 @@ # TEMPLATE 3.50, Spherical harmonic coefficients -include "grib2/template.3.spherical_harmonics.def" +include "grib2/templates/template.3.spherical_harmonics.def" diff --git a/definitions/grib2/templates/template.3.51.def b/definitions/grib2/templates/template.3.51.def index 633355082..d5013b7f3 100644 --- a/definitions/grib2/templates/template.3.51.def +++ b/definitions/grib2/templates/template.3.51.def @@ -2,5 +2,5 @@ # TEMPLATE 3.51, Rotated spherical harmonic coefficients -include "grib2/template.3.spherical_harmonics.def" -include "grib2/template.3.rotation.def" +include "grib2/templates/template.3.spherical_harmonics.def" +include "grib2/templates/template.3.rotation.def" diff --git a/definitions/grib2/templates/template.3.52.def b/definitions/grib2/templates/template.3.52.def index 3d6975591..53d140c2f 100644 --- a/definitions/grib2/templates/template.3.52.def +++ b/definitions/grib2/templates/template.3.52.def @@ -2,5 +2,5 @@ # TEMPLATE 3.52, Stretched spherical harmonic coefficients -include "grib2/template.3.spherical_harmonics.def" -include "grib2/template.3.stretching.def" +include "grib2/templates/template.3.spherical_harmonics.def" +include "grib2/templates/template.3.stretching.def" diff --git a/definitions/grib2/templates/template.3.53.def b/definitions/grib2/templates/template.3.53.def index 69a93fca8..af3de465c 100644 --- a/definitions/grib2/templates/template.3.53.def +++ b/definitions/grib2/templates/template.3.53.def @@ -2,6 +2,6 @@ # TEMPLATE 3.53, Stretched and rotated spherical harmonic coefficients -include "grib2/template.3.spherical_harmonics.def" -include "grib2/template.3.rotation.def" -include "grib2/template.3.stretching.def" +include "grib2/templates/template.3.spherical_harmonics.def" +include "grib2/templates/template.3.rotation.def" +include "grib2/templates/template.3.stretching.def" diff --git a/definitions/grib2/templates/template.3.61.def b/definitions/grib2/templates/template.3.61.def index 2da3b7a99..429e3d5bd 100644 --- a/definitions/grib2/templates/template.3.61.def +++ b/definitions/grib2/templates/template.3.61.def @@ -5,9 +5,9 @@ transient biFourierMakeTemplate = 0; -include "grib2/template.3.bf.def" +include "grib2/templates/template.3.bf.def" -include "grib2/template.3.shape_of_the_earth.def" +include "grib2/templates/template.3.shape_of_the_earth.def" # La1 - latitude of first grid point signed[4] latitudeOfFirstGridPoint: edition_specific,no_copy ; diff --git a/definitions/grib2/templates/template.3.62.def b/definitions/grib2/templates/template.3.62.def index 03f2808c3..d2ce7d958 100644 --- a/definitions/grib2/templates/template.3.62.def +++ b/definitions/grib2/templates/template.3.62.def @@ -5,9 +5,9 @@ transient biFourierMakeTemplate = 0; -include "grib2/template.3.bf.def" +include "grib2/templates/template.3.bf.def" -include "grib2/template.3.shape_of_the_earth.def" +include "grib2/templates/template.3.shape_of_the_earth.def" # La1 - latitude of first grid point signed[4] latitudeOfFirstGridPoint : edition_specific ; diff --git a/definitions/grib2/templates/template.3.63.def b/definitions/grib2/templates/template.3.63.def index 71db1eccc..42181a22c 100644 --- a/definitions/grib2/templates/template.3.63.def +++ b/definitions/grib2/templates/template.3.63.def @@ -4,9 +4,9 @@ transient biFourierMakeTemplate = 0; -include "grib2/template.3.bf.def" +include "grib2/templates/template.3.bf.def" -include "grib2/template.3.shape_of_the_earth.def" +include "grib2/templates/template.3.shape_of_the_earth.def" # La1 - latitude of first grid point signed[4] latitudeOfFirstGridPoint : edition_specific; diff --git a/definitions/grib2/templates/template.3.90.def b/definitions/grib2/templates/template.3.90.def index 9f8ef1198..36bd303be 100644 --- a/definitions/grib2/templates/template.3.90.def +++ b/definitions/grib2/templates/template.3.90.def @@ -1,7 +1,7 @@ # (C) Copyright 2005- ECMWF. # TEMPLATE 3.90, Space view perspective or orthographic -include "grib2/template.3.shape_of_the_earth.def" +include "grib2/templates/template.3.shape_of_the_earth.def" constant isGridded = true; @@ -25,7 +25,7 @@ signed[4] longitudeOfSubSatellitePoint; meta geography.latitudeOfSubSatellitePointInDegrees scale(latitudeOfSubSatellitePoint,one,grib2divider,truncateDegrees) : dump; meta geography.longitudeOfSubSatellitePointInDegrees scale(longitudeOfSubSatellitePoint,one,grib2divider,truncateDegrees) : dump; -include "grib2/template.3.resolution_flags.def" +include "grib2/templates/template.3.resolution_flags.def" # dx - apparent diameter of Earth in grid lengths, in X-direction unsigned[4] dx : dump; @@ -47,7 +47,7 @@ unsigned[4] Yp : no_copy; meta geography.YpInGridLengths scale(Yp,one,thousand) : dump; alias yCoordinateOfSubSatellitePoint=YpInGridLengths; -include "grib2/template.3.scanning_mode.def" +include "grib2/templates/template.3.scanning_mode.def" # Orientation of the grid; i.e. the angle between the increasing Y-axis and the meridian # of the sub-satellite point in the direction of increasing latitude diff --git a/definitions/grib2/templates/template.3.gaussian.def b/definitions/grib2/templates/template.3.gaussian.def index e243b39eb..d8053354b 100644 --- a/definitions/grib2/templates/template.3.gaussian.def +++ b/definitions/grib2/templates/template.3.gaussian.def @@ -1,6 +1,6 @@ # (C) Copyright 2005- ECMWF. -include "grib2/template.3.grid.def" +include "grib2/templates/template.3.grid.def" # Di - i direction increment unsigned[4] iDirectionIncrement : can_be_missing; @@ -11,7 +11,7 @@ unsigned[4] N : dump; alias numberOfParallelsBetweenAPoleAndTheEquator=N ; alias geography.N=N; -include "grib2/template.3.scanning_mode.def" +include "grib2/templates/template.3.scanning_mode.def" modify Ni : can_be_missing,dump; diff --git a/definitions/grib2/templates/template.3.grid.def b/definitions/grib2/templates/template.3.grid.def index 2a317ea82..a857d5c24 100644 --- a/definitions/grib2/templates/template.3.grid.def +++ b/definitions/grib2/templates/template.3.grid.def @@ -47,7 +47,7 @@ alias La1 = latitudeOfFirstGridPoint; signed[4] longitudeOfFirstGridPoint ; alias Lo1 = longitudeOfFirstGridPoint; -include "grib2/template.3.resolution_flags.def" +include "grib2/templates/template.3.resolution_flags.def" # La2 - latitude of last grid point signed[4] latitudeOfLastGridPoint : edition_specific; diff --git a/definitions/grib2/templates/template.3.latlon.def b/definitions/grib2/templates/template.3.latlon.def index 407aa4eca..202488c00 100644 --- a/definitions/grib2/templates/template.3.latlon.def +++ b/definitions/grib2/templates/template.3.latlon.def @@ -1,6 +1,6 @@ # (C) Copyright 2005- ECMWF. -include "grib2/template.3.grid.def" +include "grib2/templates/template.3.grid.def" # Di - i direction increment unsigned[4] iDirectionIncrement : can_be_missing,edition_specific; @@ -12,7 +12,7 @@ unsigned[4] jDirectionIncrement : can_be_missing,edition_specific; alias Dj = jDirectionIncrement; alias Dy = jDirectionIncrement; -include "grib2/template.3.scanning_mode.def" +include "grib2/templates/template.3.scanning_mode.def" meta g2grid g2grid( latitudeOfFirstGridPoint, diff --git a/definitions/grib2/templates/template.3.latlon_vares.def b/definitions/grib2/templates/template.3.latlon_vares.def index 764690332..dd3f3f60f 100644 --- a/definitions/grib2/templates/template.3.latlon_vares.def +++ b/definitions/grib2/templates/template.3.latlon_vares.def @@ -34,9 +34,9 @@ when (missing(subdivisionsOfBasicAngle) || subdivisionsOfBasicAngle == 0) { set angleDivisor = subdivisionsOfBasicAngle; } -include "grib2/template.3.resolution_flags.def" +include "grib2/templates/template.3.resolution_flags.def" -include "grib2/template.3.scanning_mode.def" +include "grib2/templates/template.3.scanning_mode.def" longitudesList list(Ni) { unsigned[4] longitude; diff --git a/definitions/grib2/templates/template.4.0.def b/definitions/grib2/templates/template.4.0.def index d94c9e293..5eb44fc77 100644 --- a/definitions/grib2/templates/template.4.0.def +++ b/definitions/grib2/templates/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/templates/template.4.parameter.def" +include "grib2/templates/template.4.generating_process.def" +include "grib2/templates/template.4.forecast_time.def" +include "grib2/templates/template.4.point_in_time.def" +include "grib2/templates/template.4.horizontal.def" diff --git a/definitions/grib2/templates/template.4.1.def b/definitions/grib2/templates/template.4.1.def index d075620be..959752a71 100644 --- a/definitions/grib2/templates/template.4.1.def +++ b/definitions/grib2/templates/template.4.1.def @@ -2,9 +2,9 @@ # 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.horizontal.def" -include "grib2/template.4.eps.def" +include "grib2/templates/template.4.parameter.def" +include "grib2/templates/template.4.generating_process.def" +include "grib2/templates/template.4.forecast_time.def" +include "grib2/templates/template.4.point_in_time.def" +include "grib2/templates/template.4.horizontal.def" +include "grib2/templates/template.4.eps.def" diff --git a/definitions/grib2/templates/template.4.10.def b/definitions/grib2/templates/template.4.10.def index 84b437bdc..826900a39 100644 --- a/definitions/grib2/templates/template.4.10.def +++ b/definitions/grib2/templates/template.4.10.def @@ -5,9 +5,9 @@ # This template was not validated at the time of publication and should be used with caution. transient template_is_experimental = 1 : hidden; -include "grib2/template.4.parameter.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" +include "grib2/templates/template.4.parameter.def" +include "grib2/templates/template.4.generating_process.def" +include "grib2/templates/template.4.forecast_time.def" +include "grib2/templates/template.4.horizontal.def" +include "grib2/templates/template.4.percentile.def" +include "grib2/templates/template.4.statistical.def" diff --git a/definitions/grib2/templates/template.4.100.def b/definitions/grib2/templates/template.4.100.def index d78c32013..a52f903c2 100644 --- a/definitions/grib2/templates/template.4.100.def +++ b/definitions/grib2/templates/template.4.100.def @@ -2,11 +2,11 @@ # TEMPLATE 4.100, Individual ensemble forecast, control and perturbed, at a horizontal level or in a horizontal layer at a point in time for wave 2D spectra with explicit list of frequencies and directions -include "grib2/template.4.parameter.def" -include "grib2/template.4.wave.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.wave_spectra_list.def" +include "grib2/templates/template.4.parameter.def" +include "grib2/templates/template.4.wave.def" +include "grib2/templates/template.4.generating_process.def" +include "grib2/templates/template.4.forecast_time.def" +include "grib2/templates/template.4.point_in_time.def" +#include "grib2/templates/template.4.horizontal.def" +include "grib2/templates/template.4.eps.def" +include "grib2/templates/template.4.wave_spectra_list.def" diff --git a/definitions/grib2/templates/template.4.1000.def b/definitions/grib2/templates/template.4.1000.def index f179ae483..1d0aaf329 100644 --- a/definitions/grib2/templates/template.4.1000.def +++ b/definitions/grib2/templates/template.4.1000.def @@ -5,7 +5,7 @@ # and should be used only for bilateral previously agreed tests transient template_is_experimental = 1 : hidden; -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/templates/template.4.parameter.def" +include "grib2/templates/template.4.generating_process.def" +include "grib2/templates/template.4.forecast_time.def" +include "grib2/templates/template.4.point_in_time.def" diff --git a/definitions/grib2/templates/template.4.1001.def b/definitions/grib2/templates/template.4.1001.def index 5fafe70f3..13188b09b 100644 --- a/definitions/grib2/templates/template.4.1001.def +++ b/definitions/grib2/templates/template.4.1001.def @@ -5,7 +5,7 @@ # and should be used only for bilateral previously agreed tests transient template_is_experimental = 1 : hidden; -include "grib2/template.4.parameter.def" -include "grib2/template.4.generating_process.def" -include "grib2/template.4.forecast_time.def" -include "grib2/template.4.statistical.def" +include "grib2/templates/template.4.parameter.def" +include "grib2/templates/template.4.generating_process.def" +include "grib2/templates/template.4.forecast_time.def" +include "grib2/templates/template.4.statistical.def" diff --git a/definitions/grib2/templates/template.4.1002.def b/definitions/grib2/templates/template.4.1002.def index 08cac187c..4d31fac01 100644 --- a/definitions/grib2/templates/template.4.1002.def +++ b/definitions/grib2/templates/template.4.1002.def @@ -2,9 +2,9 @@ # 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/templates/template.4.parameter.def" +include "grib2/templates/template.4.generating_process.def" +include "grib2/templates/template.4.forecast_time.def" codetable[1] horizontalDimensionProcessed ('4.220.table',masterDir,localDir) : dump; diff --git a/definitions/grib2/templates/template.4.101.def b/definitions/grib2/templates/template.4.101.def index a19b0b164..e81209c9d 100644 --- a/definitions/grib2/templates/template.4.101.def +++ b/definitions/grib2/templates/template.4.101.def @@ -2,10 +2,10 @@ # TEMPLATE 4.101, Analysis or forecast at a horizontal level or in a horizontal layer at a point in time for wave 2D spectra with frequencies and directions defined by formulae -include "grib2/template.4.parameter.def" -include "grib2/template.4.wave.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.wave_spectra_formula.def" +include "grib2/templates/template.4.parameter.def" +include "grib2/templates/template.4.wave.def" +include "grib2/templates/template.4.generating_process.def" +include "grib2/templates/template.4.forecast_time.def" +include "grib2/templates/template.4.point_in_time.def" +#include "grib2/templates/template.4.horizontal.def" +include "grib2/templates/template.4.wave_spectra_formula.def" diff --git a/definitions/grib2/templates/template.4.102.def b/definitions/grib2/templates/template.4.102.def index 7bd5726a0..49c182bc9 100644 --- a/definitions/grib2/templates/template.4.102.def +++ b/definitions/grib2/templates/template.4.102.def @@ -2,11 +2,11 @@ # TEMPLATE 4.102, Individual ensemble forecast, control and perturbed, at a horizontal level or in a horizontal layer at a point in time for wave 2D spectra with frequencies and directions defined by formulae -include "grib2/template.4.parameter.def" -include "grib2/template.4.wave.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.wave_spectra_formula.def" +include "grib2/templates/template.4.parameter.def" +include "grib2/templates/template.4.wave.def" +include "grib2/templates/template.4.generating_process.def" +include "grib2/templates/template.4.forecast_time.def" +include "grib2/templates/template.4.point_in_time.def" +#include "grib2/templates/template.4.horizontal.def" +include "grib2/templates/template.4.eps.def" +include "grib2/templates/template.4.wave_spectra_formula.def" diff --git a/definitions/grib2/templates/template.4.103.def b/definitions/grib2/templates/template.4.103.def index 118403f33..78c261c3d 100644 --- a/definitions/grib2/templates/template.4.103.def +++ b/definitions/grib2/templates/template.4.103.def @@ -2,9 +2,9 @@ # TEMPLATE 4.103, Analysis or forecast at a horizontal level or in a horizontal layer at a point in time for waves selected by period range. -include "grib2/template.4.parameter.def" -include "grib2/template.4.wave_period_range.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/templates/template.4.parameter.def" +include "grib2/templates/template.4.wave_period_range.def" +include "grib2/templates/template.4.generating_process.def" +include "grib2/templates/template.4.forecast_time.def" +include "grib2/templates/template.4.point_in_time.def" +include "grib2/templates/template.4.horizontal.def" diff --git a/definitions/grib2/templates/template.4.104.def b/definitions/grib2/templates/template.4.104.def index f0db4712d..6ab7b26cd 100644 --- a/definitions/grib2/templates/template.4.104.def +++ b/definitions/grib2/templates/template.4.104.def @@ -2,10 +2,10 @@ # TEMPLATE 4.104, Individual ensemble forecast, control and perturbed, at a horizontal level or in a horizontal layer at a point in time for waves selected by period range. -include "grib2/template.4.parameter.def" -include "grib2/template.4.wave_period_range.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/templates/template.4.parameter.def" +include "grib2/templates/template.4.wave_period_range.def" +include "grib2/templates/template.4.generating_process.def" +include "grib2/templates/template.4.forecast_time.def" +include "grib2/templates/template.4.point_in_time.def" +include "grib2/templates/template.4.horizontal.def" +include "grib2/templates/template.4.eps.def" diff --git a/definitions/grib2/templates/template.4.105.def b/definitions/grib2/templates/template.4.105.def index 1ae52eaa0..58e286d72 100644 --- a/definitions/grib2/templates/template.4.105.def +++ b/definitions/grib2/templates/template.4.105.def @@ -2,9 +2,9 @@ # TEMPLATE 4.105, Analysis or forecast in relation to a reference period 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.horizontal.def" -include "grib2/template.4.statistical.def" -include "grib2/template.4.referenceperiod.def" +include "grib2/templates/template.4.parameter.def" +include "grib2/templates/template.4.generating_process.def" +include "grib2/templates/template.4.forecast_time.def" +include "grib2/templates/template.4.horizontal.def" +include "grib2/templates/template.4.statistical.def" +include "grib2/templates/template.4.referenceperiod.def" diff --git a/definitions/grib2/templates/template.4.106.def b/definitions/grib2/templates/template.4.106.def index 8c0920074..d542289db 100644 --- a/definitions/grib2/templates/template.4.106.def +++ b/definitions/grib2/templates/template.4.106.def @@ -2,10 +2,10 @@ # TEMPLATE 4.106, Individual ensemble forecast, control and perturbed in relation to a reference period 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.horizontal.def" -include "grib2/template.4.statistical.def" -include "grib2/template.4.eps.def" -include "grib2/template.4.referenceperiod.def" +include "grib2/templates/template.4.parameter.def" +include "grib2/templates/template.4.generating_process.def" +include "grib2/templates/template.4.forecast_time.def" +include "grib2/templates/template.4.horizontal.def" +include "grib2/templates/template.4.statistical.def" +include "grib2/templates/template.4.eps.def" +include "grib2/templates/template.4.referenceperiod.def" diff --git a/definitions/grib2/templates/template.4.107.def b/definitions/grib2/templates/template.4.107.def index f0f06a8d7..dc90a269e 100644 --- a/definitions/grib2/templates/template.4.107.def +++ b/definitions/grib2/templates/template.4.107.def @@ -2,10 +2,10 @@ # TEMPLATE 4.107, Derived forecasts based on all ensemble members in relation to a reference period 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.horizontal.def" -include "grib2/template.4.statistical.def" -include "grib2/template.4.derived.def" -include "grib2/template.4.referenceperiod.def" +include "grib2/templates/template.4.parameter.def" +include "grib2/templates/template.4.generating_process.def" +include "grib2/templates/template.4.forecast_time.def" +include "grib2/templates/template.4.horizontal.def" +include "grib2/templates/template.4.statistical.def" +include "grib2/templates/template.4.derived.def" +include "grib2/templates/template.4.referenceperiod.def" diff --git a/definitions/grib2/templates/template.4.108.def b/definitions/grib2/templates/template.4.108.def index df4ad830b..a6b282341 100644 --- a/definitions/grib2/templates/template.4.108.def +++ b/definitions/grib2/templates/template.4.108.def @@ -2,9 +2,9 @@ # TEMPLATE 4.108, Analysis or forecast at a horizontal level or in a horizontal layer at a point in time for generic optical properties -include "grib2/template.4.parameter.def" -include "grib2/template.4.optical.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/templates/template.4.parameter.def" +include "grib2/templates/template.4.optical.def" +include "grib2/templates/template.4.generating_process.def" +include "grib2/templates/template.4.forecast_time.def" +include "grib2/templates/template.4.point_in_time.def" +include "grib2/templates/template.4.horizontal.def" diff --git a/definitions/grib2/templates/template.4.109.def b/definitions/grib2/templates/template.4.109.def index bece80dee..0304cb028 100644 --- a/definitions/grib2/templates/template.4.109.def +++ b/definitions/grib2/templates/template.4.109.def @@ -2,10 +2,10 @@ # TEMPLATE 4.109, Individual ensemble forecast, control and perturbed, at a horizontal level or in a horizontal layer at a point in time for generic optical properties -include "grib2/template.4.parameter.def" -include "grib2/template.4.optical.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/templates/template.4.parameter.def" +include "grib2/templates/template.4.optical.def" +include "grib2/templates/template.4.generating_process.def" +include "grib2/templates/template.4.forecast_time.def" +include "grib2/templates/template.4.point_in_time.def" +include "grib2/templates/template.4.horizontal.def" +include "grib2/templates/template.4.eps.def" diff --git a/definitions/grib2/templates/template.4.11.def b/definitions/grib2/templates/template.4.11.def index e1c00f940..843721d54 100644 --- a/definitions/grib2/templates/template.4.11.def +++ b/definitions/grib2/templates/template.4.11.def @@ -2,9 +2,9 @@ # 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.horizontal.def" -include "grib2/template.4.eps.def" -include "grib2/template.4.statistical.def" +include "grib2/templates/template.4.parameter.def" +include "grib2/templates/template.4.generating_process.def" +include "grib2/templates/template.4.forecast_time.def" +include "grib2/templates/template.4.horizontal.def" +include "grib2/templates/template.4.eps.def" +include "grib2/templates/template.4.statistical.def" diff --git a/definitions/grib2/templates/template.4.110.def b/definitions/grib2/templates/template.4.110.def index 4a148ccb7..f511d12b6 100644 --- a/definitions/grib2/templates/template.4.110.def +++ b/definitions/grib2/templates/template.4.110.def @@ -2,9 +2,9 @@ # TEMPLATE 4.110 - 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 for generic optical properties -include "grib2/template.4.parameter.def" -include "grib2/template.4.optical.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" +include "grib2/templates/template.4.parameter.def" +include "grib2/templates/template.4.optical.def" +include "grib2/templates/template.4.generating_process.def" +include "grib2/templates/template.4.forecast_time.def" +include "grib2/templates/template.4.horizontal.def" +include "grib2/templates/template.4.statistical.def" diff --git a/definitions/grib2/templates/template.4.1100.def b/definitions/grib2/templates/template.4.1100.def index ac65bc69f..8774a9ba7 100644 --- a/definitions/grib2/templates/template.4.1100.def +++ b/definitions/grib2/templates/template.4.1100.def @@ -5,7 +5,7 @@ # and should be used only for bilateral previously agreed tests transient template_is_experimental = 1 : hidden; -include "grib2/template.4.parameter.def" -include "grib2/template.4.generating_process.def" -include "grib2/template.4.forecast_time.def" -include "grib2/template.4.horizontal.def" +include "grib2/templates/template.4.parameter.def" +include "grib2/templates/template.4.generating_process.def" +include "grib2/templates/template.4.forecast_time.def" +include "grib2/templates/template.4.horizontal.def" diff --git a/definitions/grib2/templates/template.4.1101.def b/definitions/grib2/templates/template.4.1101.def index 83e46a389..2e0137083 100644 --- a/definitions/grib2/templates/template.4.1101.def +++ b/definitions/grib2/templates/template.4.1101.def @@ -6,10 +6,10 @@ # (Octets 35-50 are very similar to octets 43-58 of product definition template 4.8, but the meaning of some fields differs slightly) transient template_is_experimental = 1 : hidden; -include "grib2/template.4.parameter.def" -include "grib2/template.4.generating_process.def" -include "grib2/template.4.forecast_time.def" -include "grib2/template.4.horizontal.def" +include "grib2/templates/template.4.parameter.def" +include "grib2/templates/template.4.generating_process.def" +include "grib2/templates/template.4.forecast_time.def" +include "grib2/templates/template.4.horizontal.def" unsigned[4] numberOfMissingInStatisticalProcess = 0 : edition_specific; alias totalNumberOfDataValuesMissingInStatisticalProcess=numberOfMissingInStatisticalProcess; @@ -25,4 +25,4 @@ codetable[1] indicatorOfUnitForTimeIncrement ('4.4.table',masterDir,localDir)=25 unsigned[4] timeIncrement=0 ; alias timeIncrementBetweenSuccessiveFields=timeIncrement; -# include "grib2/template.4.statistical.def" +# include "grib2/templates/template.4.statistical.def" diff --git a/definitions/grib2/templates/template.4.111.def b/definitions/grib2/templates/template.4.111.def index f2a63683b..a1ab23504 100644 --- a/definitions/grib2/templates/template.4.111.def +++ b/definitions/grib2/templates/template.4.111.def @@ -2,10 +2,10 @@ # TEMPLATE 4.111, Individual ensemble forecast, control and perturbed, at a horizontal level or in a horizontal layer in a continuous or non-continuous time interval for generic optical properties -include "grib2/template.4.parameter.def" -include "grib2/template.4.optical.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" +include "grib2/templates/template.4.parameter.def" +include "grib2/templates/template.4.optical.def" +include "grib2/templates/template.4.generating_process.def" +include "grib2/templates/template.4.forecast_time.def" +include "grib2/templates/template.4.horizontal.def" +include "grib2/templates/template.4.eps.def" +include "grib2/templates/template.4.statistical.def" diff --git a/definitions/grib2/templates/template.4.112.def b/definitions/grib2/templates/template.4.112.def index 6361f0762..3f1f28992 100644 --- a/definitions/grib2/templates/template.4.112.def +++ b/definitions/grib2/templates/template.4.112.def @@ -2,10 +2,10 @@ # TEMPLATE 4.112, Probability forecasts in relation to a reference period 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.horizontal.def" -include "grib2/template.4.statistical.def" -include "grib2/template.4.probability.def" -include "grib2/template.4.referenceperiod.def" +include "grib2/templates/template.4.parameter.def" +include "grib2/templates/template.4.generating_process.def" +include "grib2/templates/template.4.forecast_time.def" +include "grib2/templates/template.4.horizontal.def" +include "grib2/templates/template.4.statistical.def" +include "grib2/templates/template.4.probability.def" +include "grib2/templates/template.4.referenceperiod.def" diff --git a/definitions/grib2/templates/template.4.113.def b/definitions/grib2/templates/template.4.113.def index 52ecb5b61..b2d9c4bf9 100644 --- a/definitions/grib2/templates/template.4.113.def +++ b/definitions/grib2/templates/template.4.113.def @@ -2,9 +2,9 @@ # TEMPLATE 4.113, Generalised tiles at a horizontal level or horizontal layer at a point in time -include "grib2/template.4.parameter.def" -include "grib2/template.4.generalised_tile.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/templates/template.4.parameter.def" +include "grib2/templates/template.4.generalised_tile.def" +include "grib2/templates/template.4.generating_process.def" +include "grib2/templates/template.4.forecast_time.def" +include "grib2/templates/template.4.point_in_time.def" +include "grib2/templates/template.4.horizontal.def" diff --git a/definitions/grib2/templates/template.4.114.def b/definitions/grib2/templates/template.4.114.def index 3c342dff1..797016a80 100644 --- a/definitions/grib2/templates/template.4.114.def +++ b/definitions/grib2/templates/template.4.114.def @@ -2,9 +2,9 @@ # TEMPLATE 4.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 -include "grib2/template.4.parameter.def" -include "grib2/template.4.generalised_tile.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" \ No newline at end of file +include "grib2/templates/template.4.parameter.def" +include "grib2/templates/template.4.generalised_tile.def" +include "grib2/templates/template.4.generating_process.def" +include "grib2/templates/template.4.forecast_time.def" +include "grib2/templates/template.4.horizontal.def" +include "grib2/templates/template.4.statistical.def" \ No newline at end of file diff --git a/definitions/grib2/templates/template.4.115.def b/definitions/grib2/templates/template.4.115.def index 5064401c5..39b9bb781 100644 --- a/definitions/grib2/templates/template.4.115.def +++ b/definitions/grib2/templates/template.4.115.def @@ -2,10 +2,10 @@ # TEMPLATE 4.115, Individual ensemble forecast, control and perturbed on generalised tiles at a horizontal level or in a horizontal layer at a point in time -include "grib2/template.4.parameter.def" -include "grib2/template.4.generalised_tile.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.leps.def" +include "grib2/templates/template.4.parameter.def" +include "grib2/templates/template.4.generalised_tile.def" +include "grib2/templates/template.4.generating_process.def" +include "grib2/templates/template.4.forecast_time.def" +include "grib2/templates/template.4.point_in_time.def" +include "grib2/templates/template.4.horizontal.def" +include "grib2/templates/template.4.leps.def" diff --git a/definitions/grib2/templates/template.4.116.def b/definitions/grib2/templates/template.4.116.def index e035279ca..1d4e3f35e 100644 --- a/definitions/grib2/templates/template.4.116.def +++ b/definitions/grib2/templates/template.4.116.def @@ -2,10 +2,10 @@ # TEMPLATE 4.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 -include "grib2/template.4.parameter.def" -include "grib2/template.4.generalised_tile.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.leps.def" -include "grib2/template.4.statistical.def" \ No newline at end of file +include "grib2/templates/template.4.parameter.def" +include "grib2/templates/template.4.generalised_tile.def" +include "grib2/templates/template.4.generating_process.def" +include "grib2/templates/template.4.forecast_time.def" +include "grib2/templates/template.4.horizontal.def" +include "grib2/templates/template.4.leps.def" +include "grib2/templates/template.4.statistical.def" \ No newline at end of file diff --git a/definitions/grib2/templates/template.4.117.def b/definitions/grib2/templates/template.4.117.def index 2d35d198f..b62ee43c1 100644 --- a/definitions/grib2/templates/template.4.117.def +++ b/definitions/grib2/templates/template.4.117.def @@ -2,9 +2,9 @@ # TEMPLATE 4.117, Individual large 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.horizontal.def" -include "grib2/template.4.leps.def" +include "grib2/templates/template.4.parameter.def" +include "grib2/templates/template.4.generating_process.def" +include "grib2/templates/template.4.forecast_time.def" +include "grib2/templates/template.4.point_in_time.def" +include "grib2/templates/template.4.horizontal.def" +include "grib2/templates/template.4.leps.def" diff --git a/definitions/grib2/templates/template.4.118.def b/definitions/grib2/templates/template.4.118.def index e4f5979b9..7f4921c86 100644 --- a/definitions/grib2/templates/template.4.118.def +++ b/definitions/grib2/templates/template.4.118.def @@ -2,9 +2,9 @@ # TEMPLATE 4.118, Individual large 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.horizontal.def" -include "grib2/template.4.leps.def" -include "grib2/template.4.statistical.def" +include "grib2/templates/template.4.parameter.def" +include "grib2/templates/template.4.generating_process.def" +include "grib2/templates/template.4.forecast_time.def" +include "grib2/templates/template.4.horizontal.def" +include "grib2/templates/template.4.leps.def" +include "grib2/templates/template.4.statistical.def" diff --git a/definitions/grib2/templates/template.4.119.def b/definitions/grib2/templates/template.4.119.def index ef464a00f..beb4b1c50 100644 --- a/definitions/grib2/templates/template.4.119.def +++ b/definitions/grib2/templates/template.4.119.def @@ -2,9 +2,9 @@ # TEMPLATE 4.119, Probability forecasts from large ensembles 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.probabilityLargeEnsemble.def" +include "grib2/templates/template.4.parameter.def" +include "grib2/templates/template.4.generating_process.def" +include "grib2/templates/template.4.forecast_time.def" +include "grib2/templates/template.4.point_in_time.def" +include "grib2/templates/template.4.horizontal.def" +include "grib2/templates/template.4.probabilityLargeEnsemble.def" diff --git a/definitions/grib2/templates/template.4.12.def b/definitions/grib2/templates/template.4.12.def index 4b72f29ed..f3aa7d369 100644 --- a/definitions/grib2/templates/template.4.12.def +++ b/definitions/grib2/templates/template.4.12.def @@ -2,9 +2,9 @@ # 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.horizontal.def" -include "grib2/template.4.derived.def" -include "grib2/template.4.statistical.def" +include "grib2/templates/template.4.parameter.def" +include "grib2/templates/template.4.generating_process.def" +include "grib2/templates/template.4.forecast_time.def" +include "grib2/templates/template.4.horizontal.def" +include "grib2/templates/template.4.derived.def" +include "grib2/templates/template.4.statistical.def" diff --git a/definitions/grib2/templates/template.4.120.def b/definitions/grib2/templates/template.4.120.def index 9ad2f90bd..ac07749ca 100644 --- a/definitions/grib2/templates/template.4.120.def +++ b/definitions/grib2/templates/template.4.120.def @@ -2,9 +2,9 @@ # TEMPLATE 4.120, Probability forecasts from large ensembles 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.horizontal.def" -include "grib2/template.4.probabilityLargeEnsemble.def" -include "grib2/template.4.statistical.def" +include "grib2/templates/template.4.parameter.def" +include "grib2/templates/template.4.generating_process.def" +include "grib2/templates/template.4.forecast_time.def" +include "grib2/templates/template.4.horizontal.def" +include "grib2/templates/template.4.probabilityLargeEnsemble.def" +include "grib2/templates/template.4.statistical.def" diff --git a/definitions/grib2/templates/template.4.121.def b/definitions/grib2/templates/template.4.121.def index 73bba193b..a3d763540 100644 --- a/definitions/grib2/templates/template.4.121.def +++ b/definitions/grib2/templates/template.4.121.def @@ -2,10 +2,10 @@ # TEMPLATE 4.121, Probability forecasts with spatiotemporal processing based on focal (moving window) statistics 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.probabilityLargeEnsemble.def" -include "grib2/template.4.focalStatistics.def" +include "grib2/templates/template.4.parameter.def" +include "grib2/templates/template.4.generating_process.def" +include "grib2/templates/template.4.forecast_time.def" +include "grib2/templates/template.4.point_in_time.def" +include "grib2/templates/template.4.horizontal.def" +include "grib2/templates/template.4.probabilityLargeEnsemble.def" +include "grib2/templates/template.4.focalStatistics.def" diff --git a/definitions/grib2/templates/template.4.122.def b/definitions/grib2/templates/template.4.122.def index 40bf98240..12b626cf9 100644 --- a/definitions/grib2/templates/template.4.122.def +++ b/definitions/grib2/templates/template.4.122.def @@ -2,10 +2,10 @@ # TEMPLATE 4.122, Probability forecasts with spatiotemporal processing based on focal (moving window) statistics 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.horizontal.def" -include "grib2/template.4.probabilityLargeEnsemble.def" -include "grib2/template.4.statistical.def" -include "grib2/template.4.focalStatistics.def" +include "grib2/templates/template.4.parameter.def" +include "grib2/templates/template.4.generating_process.def" +include "grib2/templates/template.4.forecast_time.def" +include "grib2/templates/template.4.horizontal.def" +include "grib2/templates/template.4.probabilityLargeEnsemble.def" +include "grib2/templates/template.4.statistical.def" +include "grib2/templates/template.4.focalStatistics.def" diff --git a/definitions/grib2/templates/template.4.123.def b/definitions/grib2/templates/template.4.123.def index a70b9643c..440d24d06 100644 --- a/definitions/grib2/templates/template.4.123.def +++ b/definitions/grib2/templates/template.4.123.def @@ -2,11 +2,11 @@ # TEMPLATE 4.123, Probability forecasts from large ensembles with spatiotemporal processing based on focal (moving window) statistics in relation to a reference period 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.horizontal.def" -include "grib2/template.4.statistical.def" -include "grib2/template.4.probabilityLargeEnsemble.def" -include "grib2/template.4.referenceperiod.def" -include "grib2/template.4.focalStatistics.def" +include "grib2/templates/template.4.parameter.def" +include "grib2/templates/template.4.generating_process.def" +include "grib2/templates/template.4.forecast_time.def" +include "grib2/templates/template.4.horizontal.def" +include "grib2/templates/template.4.statistical.def" +include "grib2/templates/template.4.probabilityLargeEnsemble.def" +include "grib2/templates/template.4.referenceperiod.def" +include "grib2/templates/template.4.focalStatistics.def" diff --git a/definitions/grib2/templates/template.4.13.def b/definitions/grib2/templates/template.4.13.def index b892c0d52..1731a3723 100644 --- a/definitions/grib2/templates/template.4.13.def +++ b/definitions/grib2/templates/template.4.13.def @@ -2,11 +2,11 @@ # TEMPLATE 4.13, Derived forecasts based on a cluster of ensemble members over a rectangular area 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.horizontal.def" -include "grib2/template.4.derived.def" -include "grib2/template.4.rectangular_cluster.def" -include "grib2/template.4.statistical.def" -include "grib2/template.4.eps_cluster.def" +include "grib2/templates/template.4.parameter.def" +include "grib2/templates/template.4.generating_process.def" +include "grib2/templates/template.4.forecast_time.def" +include "grib2/templates/template.4.horizontal.def" +include "grib2/templates/template.4.derived.def" +include "grib2/templates/template.4.rectangular_cluster.def" +include "grib2/templates/template.4.statistical.def" +include "grib2/templates/template.4.eps_cluster.def" diff --git a/definitions/grib2/templates/template.4.14.def b/definitions/grib2/templates/template.4.14.def index 853a0d5a9..7a68b737c 100644 --- a/definitions/grib2/templates/template.4.14.def +++ b/definitions/grib2/templates/template.4.14.def @@ -2,11 +2,11 @@ # TEMPLATE 4.14, Derived forecasts based on a cluster of ensemble members over a circular area 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.horizontal.def" -include "grib2/template.4.derived.def" -include "grib2/template.4.circular_cluster.def" -include "grib2/template.4.statistical.def" -include "grib2/template.4.eps_cluster.def" +include "grib2/templates/template.4.parameter.def" +include "grib2/templates/template.4.generating_process.def" +include "grib2/templates/template.4.forecast_time.def" +include "grib2/templates/template.4.horizontal.def" +include "grib2/templates/template.4.derived.def" +include "grib2/templates/template.4.circular_cluster.def" +include "grib2/templates/template.4.statistical.def" +include "grib2/templates/template.4.eps_cluster.def" diff --git a/definitions/grib2/templates/template.4.15.def b/definitions/grib2/templates/template.4.15.def index 9192d1154..7e6a682d7 100644 --- a/definitions/grib2/templates/template.4.15.def +++ b/definitions/grib2/templates/template.4.15.def @@ -2,11 +2,11 @@ # 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/templates/template.4.parameter.def" +include "grib2/templates/template.4.generating_process.def" +include "grib2/templates/template.4.forecast_time.def" +include "grib2/templates/template.4.point_in_time.def" +include "grib2/templates/template.4.horizontal.def" codetable[1] statisticalProcess 'grib2/tables/[tablesVersion]/4.10.table'; codetable[1] spatialProcessing 'grib2/tables/[tablesVersion]/4.15.table'; diff --git a/definitions/grib2/templates/template.4.2.def b/definitions/grib2/templates/template.4.2.def index d8cb73222..59f08e449 100644 --- a/definitions/grib2/templates/template.4.2.def +++ b/definitions/grib2/templates/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/templates/template.4.parameter.def" +include "grib2/templates/template.4.generating_process.def" +include "grib2/templates/template.4.forecast_time.def" +include "grib2/templates/template.4.point_in_time.def" +include "grib2/templates/template.4.horizontal.def" +include "grib2/templates/template.4.derived.def" diff --git a/definitions/grib2/templates/template.4.3.def b/definitions/grib2/templates/template.4.3.def index 4c32231a2..ce369a1b2 100644 --- a/definitions/grib2/templates/template.4.3.def +++ b/definitions/grib2/templates/template.4.3.def @@ -2,11 +2,11 @@ # TEMPLATE 4.3, Derived forecasts based on a cluster of ensemble members over a rectangular 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.derived.def" -include "grib2/template.4.rectangular_cluster.def" -include "grib2/template.4.eps_cluster.def" +include "grib2/templates/template.4.parameter.def" +include "grib2/templates/template.4.generating_process.def" +include "grib2/templates/template.4.forecast_time.def" +include "grib2/templates/template.4.point_in_time.def" +include "grib2/templates/template.4.horizontal.def" +include "grib2/templates/template.4.derived.def" +include "grib2/templates/template.4.rectangular_cluster.def" +include "grib2/templates/template.4.eps_cluster.def" diff --git a/definitions/grib2/templates/template.4.30.def b/definitions/grib2/templates/template.4.30.def index 9416d4789..93db3e12b 100644 --- a/definitions/grib2/templates/template.4.30.def +++ b/definitions/grib2/templates/template.4.30.def @@ -4,7 +4,7 @@ # Note: This template is deprecated. Template 4.31 should be used instead. transient template_is_deprecated = 1 : hidden; -include "grib2/template.4.parameter.def" +include "grib2/templates/template.4.parameter.def" codetable[1] typeOfGeneratingProcess ('4.3.table',masterDir,localDir) : dump; @@ -12,4 +12,4 @@ codetable[1] typeOfGeneratingProcess ('4.3.table',masterDir,localDir) : dump; unsigned[1] observationGeneratingProcessIdentifier : dump; alias generatingProcessIdentifier=observationGeneratingProcessIdentifier; -include "grib2/template.4.satellite_30.def" +include "grib2/templates/template.4.satellite_30.def" diff --git a/definitions/grib2/templates/template.4.31.def b/definitions/grib2/templates/template.4.31.def index b9efb8761..1d1695e08 100644 --- a/definitions/grib2/templates/template.4.31.def +++ b/definitions/grib2/templates/template.4.31.def @@ -2,7 +2,7 @@ # TEMPLATE 4.31, Satellite Product -include "grib2/template.4.parameter.def" +include "grib2/templates/template.4.parameter.def" codetable[1] typeOfGeneratingProcess ('4.3.table',masterDir,localDir) : dump; @@ -10,4 +10,4 @@ codetable[1] typeOfGeneratingProcess ('4.3.table',masterDir,localDir) : dump; unsigned[1] observationGeneratingProcessIdentifier : dump; alias generatingProcessIdentifier=observationGeneratingProcessIdentifier; -include "grib2/template.4.satellite.def" +include "grib2/templates/template.4.satellite.def" diff --git a/definitions/grib2/templates/template.4.311.def b/definitions/grib2/templates/template.4.311.def index 5119e18a2..e90dd9f52 100644 --- a/definitions/grib2/templates/template.4.311.def +++ b/definitions/grib2/templates/template.4.311.def @@ -2,7 +2,7 @@ # TEMPLATE 4.311, Satellite Product Auxiliary Information -include "grib2/template.4.parameter.def" +include "grib2/templates/template.4.parameter.def" codetable[1] typeOfGeneratingProcess ('4.3.table',masterDir,localDir) : dump; diff --git a/definitions/grib2/templates/template.4.32.def b/definitions/grib2/templates/template.4.32.def index b09e799f0..5da061168 100644 --- a/definitions/grib2/templates/template.4.32.def +++ b/definitions/grib2/templates/template.4.32.def @@ -2,8 +2,8 @@ # TEMPLATE 4.32, Analysis or forecast at a horizontal level or in a horizontal layer at a point in time for simulated (synthetic) satellite data -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.satellite.def" +include "grib2/templates/template.4.parameter.def" +include "grib2/templates/template.4.generating_process.def" +include "grib2/templates/template.4.forecast_time.def" +include "grib2/templates/template.4.point_in_time.def" +include "grib2/templates/template.4.satellite.def" diff --git a/definitions/grib2/templates/template.4.33.def b/definitions/grib2/templates/template.4.33.def index 6a105c23f..b7c42bf90 100644 --- a/definitions/grib2/templates/template.4.33.def +++ b/definitions/grib2/templates/template.4.33.def @@ -2,9 +2,9 @@ # 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 "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.satellite.def" -include "grib2/template.4.eps.def" +include "grib2/templates/template.4.parameter.def" +include "grib2/templates/template.4.generating_process.def" +include "grib2/templates/template.4.forecast_time.def" +include "grib2/templates/template.4.point_in_time.def" +include "grib2/templates/template.4.satellite.def" +include "grib2/templates/template.4.eps.def" diff --git a/definitions/grib2/templates/template.4.34.def b/definitions/grib2/templates/template.4.34.def index c5856ebb2..b4e52250b 100644 --- a/definitions/grib2/templates/template.4.34.def +++ b/definitions/grib2/templates/template.4.34.def @@ -2,9 +2,9 @@ # 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 "grib2/template.4.parameter.def" -include "grib2/template.4.generating_process.def" -include "grib2/template.4.forecast_time.def" -include "grib2/template.4.satellite.def" -include "grib2/template.4.eps.def" -include "grib2/template.4.statistical.def" +include "grib2/templates/template.4.parameter.def" +include "grib2/templates/template.4.generating_process.def" +include "grib2/templates/template.4.forecast_time.def" +include "grib2/templates/template.4.satellite.def" +include "grib2/templates/template.4.eps.def" +include "grib2/templates/template.4.statistical.def" diff --git a/definitions/grib2/templates/template.4.35.def b/definitions/grib2/templates/template.4.35.def index 39d3fac8b..3d2bfa77d 100644 --- a/definitions/grib2/templates/template.4.35.def +++ b/definitions/grib2/templates/template.4.35.def @@ -2,7 +2,7 @@ # TEMPLATE 4.35, satellite product with or without associated quality values -include "grib2/template.4.parameter.def" +include "grib2/templates/template.4.parameter.def" codetable[1] typeOfGeneratingProcess ('4.3.table',masterDir,localDir) : dump; @@ -12,4 +12,4 @@ alias generatingProcessIdentifier=observationGeneratingProcessIdentifier; codetable[1] qualityValueAssociatedWithParameter('4.16.table',masterDir,localDir) : dump; -include "grib2/template.4.satellite.def" +include "grib2/templates/template.4.satellite.def" diff --git a/definitions/grib2/templates/template.4.4.def b/definitions/grib2/templates/template.4.4.def index b86e482c2..9f01d08fa 100644 --- a/definitions/grib2/templates/template.4.4.def +++ b/definitions/grib2/templates/template.4.4.def @@ -2,11 +2,11 @@ # TEMPLATE 4.4, Derived forecasts based on a cluster of ensemble members over a circular 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.derived.def" -include "grib2/template.4.circular_cluster.def" -include "grib2/template.4.eps_cluster.def" +include "grib2/templates/template.4.parameter.def" +include "grib2/templates/template.4.generating_process.def" +include "grib2/templates/template.4.forecast_time.def" +include "grib2/templates/template.4.point_in_time.def" +include "grib2/templates/template.4.horizontal.def" +include "grib2/templates/template.4.derived.def" +include "grib2/templates/template.4.circular_cluster.def" +include "grib2/templates/template.4.eps_cluster.def" diff --git a/definitions/grib2/templates/template.4.40.def b/definitions/grib2/templates/template.4.40.def index bc4fd84b3..eccdb60c1 100644 --- a/definitions/grib2/templates/template.4.40.def +++ b/definitions/grib2/templates/template.4.40.def @@ -2,9 +2,9 @@ # TEMPLATE 4.40, Analysis or forecast at a horizontal level or in a horizontal layer at a point in time for atmospheric chemical constituents -include "grib2/template.4.parameter.def" -include "grib2/template.4.chemical.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/templates/template.4.parameter.def" +include "grib2/templates/template.4.chemical.def" +include "grib2/templates/template.4.generating_process.def" +include "grib2/templates/template.4.forecast_time.def" +include "grib2/templates/template.4.point_in_time.def" +include "grib2/templates/template.4.horizontal.def" diff --git a/definitions/grib2/templates/template.4.41.def b/definitions/grib2/templates/template.4.41.def index 0b8787a0e..2a5ffd8a6 100644 --- a/definitions/grib2/templates/template.4.41.def +++ b/definitions/grib2/templates/template.4.41.def @@ -2,10 +2,10 @@ # TEMPLATE 4.41, Individual ensemble forecast, control and perturbed, at a horizontal level or in a horizontal layer at a point in time for atmospheric chemical constituents -include "grib2/template.4.parameter.def" -include "grib2/template.4.chemical.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/templates/template.4.parameter.def" +include "grib2/templates/template.4.chemical.def" +include "grib2/templates/template.4.generating_process.def" +include "grib2/templates/template.4.forecast_time.def" +include "grib2/templates/template.4.point_in_time.def" +include "grib2/templates/template.4.horizontal.def" +include "grib2/templates/template.4.eps.def" diff --git a/definitions/grib2/templates/template.4.42.def b/definitions/grib2/templates/template.4.42.def index 9bc4e2111..e9c5fd2f0 100644 --- a/definitions/grib2/templates/template.4.42.def +++ b/definitions/grib2/templates/template.4.42.def @@ -2,9 +2,9 @@ # TEMPLATE 4.42, 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 for atmospheric chemical constituents -include "grib2/template.4.parameter.def" -include "grib2/template.4.chemical.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" +include "grib2/templates/template.4.parameter.def" +include "grib2/templates/template.4.chemical.def" +include "grib2/templates/template.4.generating_process.def" +include "grib2/templates/template.4.forecast_time.def" +include "grib2/templates/template.4.horizontal.def" +include "grib2/templates/template.4.statistical.def" diff --git a/definitions/grib2/templates/template.4.43.def b/definitions/grib2/templates/template.4.43.def index 3bb670463..92aee5cfc 100644 --- a/definitions/grib2/templates/template.4.43.def +++ b/definitions/grib2/templates/template.4.43.def @@ -2,10 +2,10 @@ # TEMPLATE 4.43, Individual ensemble forecast, control and perturbed, at a horizontal level or in a horizontal layer in a continuous or non-continuous time interval for atmospheric chemical constituents -include "grib2/template.4.parameter.def" -include "grib2/template.4.chemical.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" +include "grib2/templates/template.4.parameter.def" +include "grib2/templates/template.4.chemical.def" +include "grib2/templates/template.4.generating_process.def" +include "grib2/templates/template.4.forecast_time.def" +include "grib2/templates/template.4.horizontal.def" +include "grib2/templates/template.4.eps.def" +include "grib2/templates/template.4.statistical.def" diff --git a/definitions/grib2/templates/template.4.44.def b/definitions/grib2/templates/template.4.44.def index 1fbadeec8..6f1dfbffe 100644 --- a/definitions/grib2/templates/template.4.44.def +++ b/definitions/grib2/templates/template.4.44.def @@ -6,14 +6,14 @@ transient template_is_deprecated = 1 : hidden; # GRIB-530: Special case for aerosol thanks to WMO error -include "grib2/template.4.parameter.def" -include "grib2/template.4.aerosol.def" -include "grib2/template.4.aerosol_size.def" -include "grib2/template.4.generating_process.def" +include "grib2/templates/template.4.parameter.def" +include "grib2/templates/template.4.aerosol.def" +include "grib2/templates/template.4.aerosol_size.def" +include "grib2/templates/template.4.generating_process.def" # GRIB-530: Special case for aerosol thanks to WMO error -include "grib2/template.4.forecast_time_44.def" +include "grib2/templates/template.4.forecast_time_44.def" -include "grib2/template.4.point_in_time.def" -include "grib2/template.4.horizontal.def" +include "grib2/templates/template.4.point_in_time.def" +include "grib2/templates/template.4.horizontal.def" diff --git a/definitions/grib2/templates/template.4.45.def b/definitions/grib2/templates/template.4.45.def index 6c48d108e..9e2b7df1c 100644 --- a/definitions/grib2/templates/template.4.45.def +++ b/definitions/grib2/templates/template.4.45.def @@ -2,11 +2,11 @@ # TEMPLATE 4.45, Individual ensemble forecast, control and perturbed, at a horizontal level or in a horizontal layer at a point in time for aerosol -include "grib2/template.4.parameter.def" -include "grib2/template.4.aerosol.def" -include "grib2/template.4.aerosol_size.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/templates/template.4.parameter.def" +include "grib2/templates/template.4.aerosol.def" +include "grib2/templates/template.4.aerosol_size.def" +include "grib2/templates/template.4.generating_process.def" +include "grib2/templates/template.4.forecast_time.def" +include "grib2/templates/template.4.point_in_time.def" +include "grib2/templates/template.4.horizontal.def" +include "grib2/templates/template.4.eps.def" diff --git a/definitions/grib2/templates/template.4.46.def b/definitions/grib2/templates/template.4.46.def index 445b16231..3fadc4a08 100644 --- a/definitions/grib2/templates/template.4.46.def +++ b/definitions/grib2/templates/template.4.46.def @@ -2,10 +2,10 @@ # TEMPLATE 4.46, 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 for aerosol -include "grib2/template.4.parameter.def" -include "grib2/template.4.aerosol.def" -include "grib2/template.4.aerosol_size.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" +include "grib2/templates/template.4.parameter.def" +include "grib2/templates/template.4.aerosol.def" +include "grib2/templates/template.4.aerosol_size.def" +include "grib2/templates/template.4.generating_process.def" +include "grib2/templates/template.4.forecast_time.def" +include "grib2/templates/template.4.horizontal.def" +include "grib2/templates/template.4.statistical.def" diff --git a/definitions/grib2/templates/template.4.47.def b/definitions/grib2/templates/template.4.47.def index 892820635..1d20488e2 100644 --- a/definitions/grib2/templates/template.4.47.def +++ b/definitions/grib2/templates/template.4.47.def @@ -4,11 +4,11 @@ # Note: This template is deprecated. Template 4.85 should be used instead. transient template_is_deprecated = 1 : hidden; -include "grib2/template.4.parameter.def" -include "grib2/template.4.aerosol.def" -include "grib2/template.4.aerosol_size.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" +include "grib2/templates/template.4.parameter.def" +include "grib2/templates/template.4.aerosol.def" +include "grib2/templates/template.4.aerosol_size.def" +include "grib2/templates/template.4.generating_process.def" +include "grib2/templates/template.4.forecast_time.def" +include "grib2/templates/template.4.horizontal.def" +include "grib2/templates/template.4.eps.def" +include "grib2/templates/template.4.statistical.def" diff --git a/definitions/grib2/templates/template.4.48.def b/definitions/grib2/templates/template.4.48.def index 65e4d3291..4c5516357 100644 --- a/definitions/grib2/templates/template.4.48.def +++ b/definitions/grib2/templates/template.4.48.def @@ -2,11 +2,11 @@ # TEMPLATE 4.48, Analysis or forecast at a horizontal level or in a horizontal layer at a point in time for optical properties of aerosol -include "grib2/template.4.parameter.def" -include "grib2/template.4.aerosol.def" -include "grib2/template.4.aerosol_size.def" -include "grib2/template.4.optical.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/templates/template.4.parameter.def" +include "grib2/templates/template.4.aerosol.def" +include "grib2/templates/template.4.aerosol_size.def" +include "grib2/templates/template.4.optical.def" +include "grib2/templates/template.4.generating_process.def" +include "grib2/templates/template.4.forecast_time.def" +include "grib2/templates/template.4.point_in_time.def" +include "grib2/templates/template.4.horizontal.def" diff --git a/definitions/grib2/templates/template.4.49.def b/definitions/grib2/templates/template.4.49.def index 40e48c7c6..1e23e335a 100644 --- a/definitions/grib2/templates/template.4.49.def +++ b/definitions/grib2/templates/template.4.49.def @@ -2,12 +2,12 @@ # TEMPLATE 4.49, Individual ensemble forecast, control and perturbed, at a horizontal level or in a horizontal layer at a point in time for optical properties of aerosol -include "grib2/template.4.parameter.def" -include "grib2/template.4.aerosol.def" -include "grib2/template.4.aerosol_size.def" -include "grib2/template.4.optical.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/templates/template.4.parameter.def" +include "grib2/templates/template.4.aerosol.def" +include "grib2/templates/template.4.aerosol_size.def" +include "grib2/templates/template.4.optical.def" +include "grib2/templates/template.4.generating_process.def" +include "grib2/templates/template.4.forecast_time.def" +include "grib2/templates/template.4.point_in_time.def" +include "grib2/templates/template.4.horizontal.def" +include "grib2/templates/template.4.eps.def" diff --git a/definitions/grib2/templates/template.4.5.def b/definitions/grib2/templates/template.4.5.def index ea951b9e5..c06eb638c 100644 --- a/definitions/grib2/templates/template.4.5.def +++ b/definitions/grib2/templates/template.4.5.def @@ -2,9 +2,9 @@ # 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.horizontal.def" -include "grib2/template.4.probability.def" +include "grib2/templates/template.4.parameter.def" +include "grib2/templates/template.4.generating_process.def" +include "grib2/templates/template.4.forecast_time.def" +include "grib2/templates/template.4.point_in_time.def" +include "grib2/templates/template.4.horizontal.def" +include "grib2/templates/template.4.probability.def" diff --git a/definitions/grib2/templates/template.4.51.def b/definitions/grib2/templates/template.4.51.def index 64ce2c3f8..091e183b2 100644 --- a/definitions/grib2/templates/template.4.51.def +++ b/definitions/grib2/templates/template.4.51.def @@ -2,9 +2,9 @@ # 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.horizontal.def" -include "grib2/template.4.categorical.def" +include "grib2/templates/template.4.parameter.def" +include "grib2/templates/template.4.generating_process.def" +include "grib2/templates/template.4.forecast_time.def" +include "grib2/templates/template.4.point_in_time.def" +include "grib2/templates/template.4.horizontal.def" +include "grib2/templates/template.4.categorical.def" diff --git a/definitions/grib2/templates/template.4.53.def b/definitions/grib2/templates/template.4.53.def index 719887a80..1f20fff3b 100644 --- a/definitions/grib2/templates/template.4.53.def +++ b/definitions/grib2/templates/template.4.53.def @@ -2,9 +2,9 @@ # TEMPLATE 4.53, Partitioned parameters at a horizontal level or in a horizontal layer at a point in time -include "grib2/template.4.parameter.def" -include "grib2/template.4.partition.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/templates/template.4.parameter.def" +include "grib2/templates/template.4.partition.def" +include "grib2/templates/template.4.generating_process.def" +include "grib2/templates/template.4.forecast_time.def" +include "grib2/templates/template.4.point_in_time.def" +include "grib2/templates/template.4.horizontal.def" diff --git a/definitions/grib2/templates/template.4.54.def b/definitions/grib2/templates/template.4.54.def index 892940830..3e86289a8 100644 --- a/definitions/grib2/templates/template.4.54.def +++ b/definitions/grib2/templates/template.4.54.def @@ -2,10 +2,10 @@ # 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 "grib2/template.4.parameter.def" -include "grib2/template.4.partition.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/templates/template.4.parameter.def" +include "grib2/templates/template.4.partition.def" +include "grib2/templates/template.4.generating_process.def" +include "grib2/templates/template.4.forecast_time.def" +include "grib2/templates/template.4.point_in_time.def" +include "grib2/templates/template.4.horizontal.def" +include "grib2/templates/template.4.eps.def" diff --git a/definitions/grib2/templates/template.4.55.def b/definitions/grib2/templates/template.4.55.def index ad14d7a84..cbe4b87ba 100644 --- a/definitions/grib2/templates/template.4.55.def +++ b/definitions/grib2/templates/template.4.55.def @@ -2,9 +2,9 @@ # TEMPLATE 4.55, Spatio-temporal changing tiles at a horizontal level or horizontal layer at a point in time -include "grib2/template.4.parameter.def" -include "grib2/template.4.tile.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/templates/template.4.parameter.def" +include "grib2/templates/template.4.tile.def" +include "grib2/templates/template.4.generating_process.def" +include "grib2/templates/template.4.forecast_time.def" +include "grib2/templates/template.4.point_in_time.def" +include "grib2/templates/template.4.horizontal.def" diff --git a/definitions/grib2/templates/template.4.56.def b/definitions/grib2/templates/template.4.56.def index 9f48c957b..979953b74 100644 --- a/definitions/grib2/templates/template.4.56.def +++ b/definitions/grib2/templates/template.4.56.def @@ -2,18 +2,18 @@ # Note: This template is deprecated. Template 4.59 should be used instead. transient template_is_deprecated = 1 : hidden; -include "grib2/template.4.parameter.def" -include "grib2/template.4.tile.def" -include "grib2/template.4.generating_process.def" -include "grib2/template.4.forecast_time.def" -include "grib2/template.4.horizontal.def" +include "grib2/templates/template.4.parameter.def" +include "grib2/templates/template.4.tile.def" +include "grib2/templates/template.4.generating_process.def" +include "grib2/templates/template.4.forecast_time.def" +include "grib2/templates/template.4.horizontal.def" # Note: This template is missing the entry: # Type of ensemble forecast # which is present in all other templates with EPS info! Mistake by WMO? # So we cannot include the eps template due to this missing entry! -# include "grib2/template.4.eps.def" +# include "grib2/templates/template.4.eps.def" # Have to manually define the keys unsigned[1] perturbationNumber : dump; alias number=perturbationNumber; diff --git a/definitions/grib2/templates/template.4.57.def b/definitions/grib2/templates/template.4.57.def index 3647b7f65..7b1f32c99 100644 --- a/definitions/grib2/templates/template.4.57.def +++ b/definitions/grib2/templates/template.4.57.def @@ -2,10 +2,10 @@ # TEMPLATE 4.57, Analysis or forecast at a horizontal level or in a horizontal layer at a point in time for atmospheric chemical constituents based on a distribution function -include "grib2/template.4.parameter.def" -include "grib2/template.4.chemical.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/templates/template.4.parameter.def" +include "grib2/templates/template.4.chemical.def" +include "grib2/templates/template.4.distribution.def" +include "grib2/templates/template.4.generating_process.def" +include "grib2/templates/template.4.forecast_time.def" +include "grib2/templates/template.4.point_in_time.def" +include "grib2/templates/template.4.horizontal.def" diff --git a/definitions/grib2/templates/template.4.58.def b/definitions/grib2/templates/template.4.58.def index aaa97cae5..4dacc03d0 100644 --- a/definitions/grib2/templates/template.4.58.def +++ b/definitions/grib2/templates/template.4.58.def @@ -2,11 +2,11 @@ # TEMPLATE 4.58, Individual ensemble forecast, control and perturbed, at a horizontal level or in a horizontal layer at a point in time for atmospheric chemical constituents based on a distribution function -include "grib2/template.4.parameter.def" -include "grib2/template.4.chemical.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.eps.def" +include "grib2/templates/template.4.parameter.def" +include "grib2/templates/template.4.chemical.def" +include "grib2/templates/template.4.distribution.def" +include "grib2/templates/template.4.generating_process.def" +include "grib2/templates/template.4.forecast_time.def" +include "grib2/templates/template.4.point_in_time.def" +include "grib2/templates/template.4.horizontal.def" +include "grib2/templates/template.4.eps.def" diff --git a/definitions/grib2/templates/template.4.59.def b/definitions/grib2/templates/template.4.59.def index 3795b9524..a6b450533 100644 --- a/definitions/grib2/templates/template.4.59.def +++ b/definitions/grib2/templates/template.4.59.def @@ -4,10 +4,10 @@ # Use this instead of template 4.56 -include "grib2/template.4.parameter.def" -include "grib2/template.4.tile.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/templates/template.4.parameter.def" +include "grib2/templates/template.4.tile.def" +include "grib2/templates/template.4.generating_process.def" +include "grib2/templates/template.4.forecast_time.def" +include "grib2/templates/template.4.point_in_time.def" +include "grib2/templates/template.4.horizontal.def" +include "grib2/templates/template.4.eps.def" diff --git a/definitions/grib2/templates/template.4.6.def b/definitions/grib2/templates/template.4.6.def index ea94aa32b..fb3d91385 100644 --- a/definitions/grib2/templates/template.4.6.def +++ b/definitions/grib2/templates/template.4.6.def @@ -2,9 +2,9 @@ # 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.horizontal.def" -include "grib2/template.4.percentile.def" +include "grib2/templates/template.4.parameter.def" +include "grib2/templates/template.4.generating_process.def" +include "grib2/templates/template.4.forecast_time.def" +include "grib2/templates/template.4.point_in_time.def" +include "grib2/templates/template.4.horizontal.def" +include "grib2/templates/template.4.percentile.def" diff --git a/definitions/grib2/templates/template.4.60.def b/definitions/grib2/templates/template.4.60.def index 20ae96179..198d5f62d 100644 --- a/definitions/grib2/templates/template.4.60.def +++ b/definitions/grib2/templates/template.4.60.def @@ -2,10 +2,10 @@ # 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.horizontal.def" -include "grib2/template.4.eps.def" -include "grib2/template.4.reforecast.def" +include "grib2/templates/template.4.parameter.def" +include "grib2/templates/template.4.generating_process.def" +include "grib2/templates/template.4.forecast_time.def" +include "grib2/templates/template.4.point_in_time.def" +include "grib2/templates/template.4.horizontal.def" +include "grib2/templates/template.4.eps.def" +include "grib2/templates/template.4.reforecast.def" diff --git a/definitions/grib2/templates/template.4.61.def b/definitions/grib2/templates/template.4.61.def index 4fc3886e8..4e8d3b0bc 100644 --- a/definitions/grib2/templates/template.4.61.def +++ b/definitions/grib2/templates/template.4.61.def @@ -2,10 +2,10 @@ # 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.horizontal.def" -include "grib2/template.4.eps.def" -include "grib2/template.4.reforecast.def" -include "grib2/template.4.statistical.def" +include "grib2/templates/template.4.parameter.def" +include "grib2/templates/template.4.generating_process.def" +include "grib2/templates/template.4.forecast_time.def" +include "grib2/templates/template.4.horizontal.def" +include "grib2/templates/template.4.eps.def" +include "grib2/templates/template.4.reforecast.def" +include "grib2/templates/template.4.statistical.def" diff --git a/definitions/grib2/templates/template.4.62.def b/definitions/grib2/templates/template.4.62.def index 53da724c4..c868a7ffa 100644 --- a/definitions/grib2/templates/template.4.62.def +++ b/definitions/grib2/templates/template.4.62.def @@ -2,9 +2,9 @@ # TEMPLATE 4.62, 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 for spatio-temporal changing tiles at a horizontal level or horizontal layer at a point in time -include "grib2/template.4.parameter.def" -include "grib2/template.4.tile.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" +include "grib2/templates/template.4.parameter.def" +include "grib2/templates/template.4.tile.def" +include "grib2/templates/template.4.generating_process.def" +include "grib2/templates/template.4.forecast_time.def" +include "grib2/templates/template.4.horizontal.def" +include "grib2/templates/template.4.statistical.def" diff --git a/definitions/grib2/templates/template.4.63.def b/definitions/grib2/templates/template.4.63.def index 2b0396795..4725a9708 100644 --- a/definitions/grib2/templates/template.4.63.def +++ b/definitions/grib2/templates/template.4.63.def @@ -2,10 +2,10 @@ # TEMPLATE 4.63, Individual ensemble forecast, control and perturbed, at a horizontal level or in a horizontal layer in a continuous or non-continuous time interval for spatio-temporal changing tiles -include "grib2/template.4.parameter.def" -include "grib2/template.4.tile.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" +include "grib2/templates/template.4.parameter.def" +include "grib2/templates/template.4.tile.def" +include "grib2/templates/template.4.generating_process.def" +include "grib2/templates/template.4.forecast_time.def" +include "grib2/templates/template.4.horizontal.def" +include "grib2/templates/template.4.eps.def" +include "grib2/templates/template.4.statistical.def" diff --git a/definitions/grib2/templates/template.4.67.def b/definitions/grib2/templates/template.4.67.def index 62f40d4fe..874439f73 100644 --- a/definitions/grib2/templates/template.4.67.def +++ b/definitions/grib2/templates/template.4.67.def @@ -2,10 +2,10 @@ # TEMPLATE 4.67, 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 for atmospheric chemical constituents based on a distribution function -include "grib2/template.4.parameter.def" -include "grib2/template.4.chemical.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" -include "grib2/template.4.statistical.def" +include "grib2/templates/template.4.parameter.def" +include "grib2/templates/template.4.chemical.def" +include "grib2/templates/template.4.distribution.def" +include "grib2/templates/template.4.generating_process.def" +include "grib2/templates/template.4.forecast_time.def" +include "grib2/templates/template.4.horizontal.def" +include "grib2/templates/template.4.statistical.def" diff --git a/definitions/grib2/templates/template.4.68.def b/definitions/grib2/templates/template.4.68.def index 60835b947..cfd2b7278 100644 --- a/definitions/grib2/templates/template.4.68.def +++ b/definitions/grib2/templates/template.4.68.def @@ -2,11 +2,11 @@ # TEMPLATE 4.68, Individual ensemble forecast, control and perturbed, at a horizontal level or in a horizontal layer in a continuous or non-continuous time interval for atmospheric chemical constituents based on a distribution function -include "grib2/template.4.parameter.def" -include "grib2/template.4.chemical.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" -include "grib2/template.4.eps.def" -include "grib2/template.4.statistical.def" +include "grib2/templates/template.4.parameter.def" +include "grib2/templates/template.4.chemical.def" +include "grib2/templates/template.4.distribution.def" +include "grib2/templates/template.4.generating_process.def" +include "grib2/templates/template.4.forecast_time.def" +include "grib2/templates/template.4.horizontal.def" +include "grib2/templates/template.4.eps.def" +include "grib2/templates/template.4.statistical.def" diff --git a/definitions/grib2/templates/template.4.7.def b/definitions/grib2/templates/template.4.7.def index 7c79ced72..458763521 100644 --- a/definitions/grib2/templates/template.4.7.def +++ b/definitions/grib2/templates/template.4.7.def @@ -1,4 +1,4 @@ # Note: This template is deprecated. Template 4.0 should be used instead. transient template_is_deprecated = 1 : hidden; -include "grib2/template.4.0.def" +include "grib2/templates/template.4.0.def" diff --git a/definitions/grib2/templates/template.4.70.def b/definitions/grib2/templates/template.4.70.def index 399e81197..5415e39e3 100644 --- a/definitions/grib2/templates/template.4.70.def +++ b/definitions/grib2/templates/template.4.70.def @@ -2,9 +2,9 @@ # TEMPLATE 4.70, 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/templates/template.4.parameter.def" +include "grib2/templates/template.4.postproc.def" +include "grib2/templates/template.4.generating_process.def" +include "grib2/templates/template.4.forecast_time.def" +include "grib2/templates/template.4.point_in_time.def" +include "grib2/templates/template.4.horizontal.def" diff --git a/definitions/grib2/templates/template.4.71.def b/definitions/grib2/templates/template.4.71.def index ba40285b1..03c4ff05f 100644 --- a/definitions/grib2/templates/template.4.71.def +++ b/definitions/grib2/templates/template.4.71.def @@ -2,10 +2,10 @@ # TEMPLATE 4.71, 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.horizontal.def" -include "grib2/template.4.eps.def" +include "grib2/templates/template.4.parameter.def" +include "grib2/templates/template.4.postproc.def" +include "grib2/templates/template.4.generating_process.def" +include "grib2/templates/template.4.forecast_time.def" +include "grib2/templates/template.4.point_in_time.def" +include "grib2/templates/template.4.horizontal.def" +include "grib2/templates/template.4.eps.def" diff --git a/definitions/grib2/templates/template.4.72.def b/definitions/grib2/templates/template.4.72.def index 33d58a725..89b972b2d 100644 --- a/definitions/grib2/templates/template.4.72.def +++ b/definitions/grib2/templates/template.4.72.def @@ -2,9 +2,9 @@ # TEMPLATE 4.72, 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.horizontal.def" -include "grib2/template.4.statistical.def" +include "grib2/templates/template.4.parameter.def" +include "grib2/templates/template.4.postproc.def" +include "grib2/templates/template.4.generating_process.def" +include "grib2/templates/template.4.forecast_time.def" +include "grib2/templates/template.4.horizontal.def" +include "grib2/templates/template.4.statistical.def" diff --git a/definitions/grib2/templates/template.4.73.def b/definitions/grib2/templates/template.4.73.def index 306ea6ed0..027355fb7 100644 --- a/definitions/grib2/templates/template.4.73.def +++ b/definitions/grib2/templates/template.4.73.def @@ -2,10 +2,10 @@ # TEMPLATE 4.73, 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.horizontal.def" -include "grib2/template.4.eps.def" -include "grib2/template.4.statistical.def" +include "grib2/templates/template.4.parameter.def" +include "grib2/templates/template.4.postproc.def" +include "grib2/templates/template.4.generating_process.def" +include "grib2/templates/template.4.forecast_time.def" +include "grib2/templates/template.4.horizontal.def" +include "grib2/templates/template.4.eps.def" +include "grib2/templates/template.4.statistical.def" diff --git a/definitions/grib2/templates/template.4.76.def b/definitions/grib2/templates/template.4.76.def index 11ff6b277..d4292a79a 100644 --- a/definitions/grib2/templates/template.4.76.def +++ b/definitions/grib2/templates/template.4.76.def @@ -2,10 +2,10 @@ # TEMPLATE 4.76, Analysis or forecast at a horizontal level or in a horizontal layer at a point in time for atmospheric chemical constituents with source/sink -include "grib2/template.4.parameter.def" -include "grib2/template.4.chemical.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/templates/template.4.parameter.def" +include "grib2/templates/template.4.chemical.def" +include "grib2/templates/template.4.source.def" +include "grib2/templates/template.4.generating_process.def" +include "grib2/templates/template.4.forecast_time.def" +include "grib2/templates/template.4.point_in_time.def" +include "grib2/templates/template.4.horizontal.def" diff --git a/definitions/grib2/templates/template.4.77.def b/definitions/grib2/templates/template.4.77.def index 5690c99eb..91d315705 100644 --- a/definitions/grib2/templates/template.4.77.def +++ b/definitions/grib2/templates/template.4.77.def @@ -2,11 +2,11 @@ # TEMPLATE 4.77, Individual ensemble forecast, control and perturbed, at a horizontal level or in a horizontal layer at a point in time for atmospheric chemical constituents with a source/sink -include "grib2/template.4.parameter.def" -include "grib2/template.4.chemical.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.eps.def" +include "grib2/templates/template.4.parameter.def" +include "grib2/templates/template.4.chemical.def" +include "grib2/templates/template.4.source.def" +include "grib2/templates/template.4.generating_process.def" +include "grib2/templates/template.4.forecast_time.def" +include "grib2/templates/template.4.point_in_time.def" +include "grib2/templates/template.4.horizontal.def" +include "grib2/templates/template.4.eps.def" diff --git a/definitions/grib2/templates/template.4.78.def b/definitions/grib2/templates/template.4.78.def index 88a383062..a653ec7d1 100644 --- a/definitions/grib2/templates/template.4.78.def +++ b/definitions/grib2/templates/template.4.78.def @@ -2,10 +2,10 @@ # TEMPLATE 4.78, 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 for atmospheric chemical constituents with source/sink -include "grib2/template.4.parameter.def" -include "grib2/template.4.chemical.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" -include "grib2/template.4.statistical.def" +include "grib2/templates/template.4.parameter.def" +include "grib2/templates/template.4.chemical.def" +include "grib2/templates/template.4.source.def" +include "grib2/templates/template.4.generating_process.def" +include "grib2/templates/template.4.forecast_time.def" +include "grib2/templates/template.4.horizontal.def" +include "grib2/templates/template.4.statistical.def" diff --git a/definitions/grib2/templates/template.4.79.def b/definitions/grib2/templates/template.4.79.def index 0a7ba48c7..83f67c6d4 100644 --- a/definitions/grib2/templates/template.4.79.def +++ b/definitions/grib2/templates/template.4.79.def @@ -2,11 +2,11 @@ # TEMPLATE 4.79, Individual ensemble forecast, control and perturbed, at a horizontal level or in a horizontal layer in a continuous or non-continuous time interval for atmospheric chemical constituents with source/sink -include "grib2/template.4.parameter.def" -include "grib2/template.4.chemical.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" -include "grib2/template.4.eps.def" -include "grib2/template.4.statistical.def" +include "grib2/templates/template.4.parameter.def" +include "grib2/templates/template.4.chemical.def" +include "grib2/templates/template.4.source.def" +include "grib2/templates/template.4.generating_process.def" +include "grib2/templates/template.4.forecast_time.def" +include "grib2/templates/template.4.horizontal.def" +include "grib2/templates/template.4.eps.def" +include "grib2/templates/template.4.statistical.def" diff --git a/definitions/grib2/templates/template.4.8.def b/definitions/grib2/templates/template.4.8.def index 8b14b6536..eadc85d6a 100644 --- a/definitions/grib2/templates/template.4.8.def +++ b/definitions/grib2/templates/template.4.8.def @@ -2,8 +2,8 @@ # 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.horizontal.def" -include "grib2/template.4.statistical.def" +include "grib2/templates/template.4.parameter.def" +include "grib2/templates/template.4.generating_process.def" +include "grib2/templates/template.4.forecast_time.def" +include "grib2/templates/template.4.horizontal.def" +include "grib2/templates/template.4.statistical.def" diff --git a/definitions/grib2/templates/template.4.80.def b/definitions/grib2/templates/template.4.80.def index 3ebee5d44..096a2b960 100644 --- a/definitions/grib2/templates/template.4.80.def +++ b/definitions/grib2/templates/template.4.80.def @@ -2,12 +2,12 @@ # TEMPLATE 4.80, Analysis or forecast at a horizontal level or in a horizontal layer at a point in time for optical properties of aerosol with source/sink -include "grib2/template.4.parameter.def" -include "grib2/template.4.aerosol.def" -include "grib2/template.4.source.def" -include "grib2/template.4.aerosol_size.def" -include "grib2/template.4.optical.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/templates/template.4.parameter.def" +include "grib2/templates/template.4.aerosol.def" +include "grib2/templates/template.4.source.def" +include "grib2/templates/template.4.aerosol_size.def" +include "grib2/templates/template.4.optical.def" +include "grib2/templates/template.4.generating_process.def" +include "grib2/templates/template.4.forecast_time.def" +include "grib2/templates/template.4.point_in_time.def" +include "grib2/templates/template.4.horizontal.def" diff --git a/definitions/grib2/templates/template.4.81.def b/definitions/grib2/templates/template.4.81.def index 8b4810cb7..d518f612b 100644 --- a/definitions/grib2/templates/template.4.81.def +++ b/definitions/grib2/templates/template.4.81.def @@ -2,13 +2,13 @@ # TEMPLATE 4.81, Individual ensemble forecast, control and perturbed, at a horizontal level or in a horizontal layer at a point in time for optical properties of aerosol with source/sink -include "grib2/template.4.parameter.def" -include "grib2/template.4.aerosol.def" -include "grib2/template.4.source.def" -include "grib2/template.4.aerosol_size.def" -include "grib2/template.4.optical.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/templates/template.4.parameter.def" +include "grib2/templates/template.4.aerosol.def" +include "grib2/templates/template.4.source.def" +include "grib2/templates/template.4.aerosol_size.def" +include "grib2/templates/template.4.optical.def" +include "grib2/templates/template.4.generating_process.def" +include "grib2/templates/template.4.forecast_time.def" +include "grib2/templates/template.4.point_in_time.def" +include "grib2/templates/template.4.horizontal.def" +include "grib2/templates/template.4.eps.def" diff --git a/definitions/grib2/templates/template.4.82.def b/definitions/grib2/templates/template.4.82.def index 5d92154dd..003eda451 100644 --- a/definitions/grib2/templates/template.4.82.def +++ b/definitions/grib2/templates/template.4.82.def @@ -2,11 +2,11 @@ # TEMPLATE 4.82, 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 for aerosol with source/sink -include "grib2/template.4.parameter.def" -include "grib2/template.4.aerosol.def" -include "grib2/template.4.source.def" -include "grib2/template.4.aerosol_size.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" +include "grib2/templates/template.4.parameter.def" +include "grib2/templates/template.4.aerosol.def" +include "grib2/templates/template.4.source.def" +include "grib2/templates/template.4.aerosol_size.def" +include "grib2/templates/template.4.generating_process.def" +include "grib2/templates/template.4.forecast_time.def" +include "grib2/templates/template.4.horizontal.def" +include "grib2/templates/template.4.statistical.def" diff --git a/definitions/grib2/templates/template.4.83.def b/definitions/grib2/templates/template.4.83.def index 395931e68..ca2afdfb5 100644 --- a/definitions/grib2/templates/template.4.83.def +++ b/definitions/grib2/templates/template.4.83.def @@ -5,12 +5,12 @@ # It is recommended not to use this template. Product definition template 4.84 should be used instead because it contains an additional octet to specify the type of generating process transient template_is_deprecated = 1 : hidden; -include "grib2/template.4.parameter.def" -include "grib2/template.4.aerosol.def" -include "grib2/template.4.source.def" -include "grib2/template.4.aerosol_size.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" +include "grib2/templates/template.4.parameter.def" +include "grib2/templates/template.4.aerosol.def" +include "grib2/templates/template.4.source.def" +include "grib2/templates/template.4.aerosol_size.def" +include "grib2/templates/template.4.generating_process.def" +include "grib2/templates/template.4.forecast_time.def" +include "grib2/templates/template.4.horizontal.def" +include "grib2/templates/template.4.eps.def" +include "grib2/templates/template.4.statistical.def" diff --git a/definitions/grib2/templates/template.4.84.def b/definitions/grib2/templates/template.4.84.def index a85bded9f..8984cd538 100644 --- a/definitions/grib2/templates/template.4.84.def +++ b/definitions/grib2/templates/template.4.84.def @@ -2,12 +2,12 @@ # TEMPLATE 4.84, Individual ensemble forecast, control and perturbed, at a horizontal level or in a horizontal layer in a continuous or non-continuous time interval for aerosol with source or sink -include "grib2/template.4.parameter.def" -include "grib2/template.4.aerosol.def" -include "grib2/template.4.source.def" -include "grib2/template.4.aerosol_size.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" +include "grib2/templates/template.4.parameter.def" +include "grib2/templates/template.4.aerosol.def" +include "grib2/templates/template.4.source.def" +include "grib2/templates/template.4.aerosol_size.def" +include "grib2/templates/template.4.generating_process.def" +include "grib2/templates/template.4.forecast_time.def" +include "grib2/templates/template.4.horizontal.def" +include "grib2/templates/template.4.eps.def" +include "grib2/templates/template.4.statistical.def" diff --git a/definitions/grib2/templates/template.4.85.def b/definitions/grib2/templates/template.4.85.def index b6afd6e69..da65b0085 100644 --- a/definitions/grib2/templates/template.4.85.def +++ b/definitions/grib2/templates/template.4.85.def @@ -2,11 +2,11 @@ # TEMPLATE 4.85, individual ensemble forecast, control and perturbed, at a horizontal level or in a horizontal layer in a continuous or non-continuous time interval for aerosol -include "grib2/template.4.parameter.def" -include "grib2/template.4.aerosol.def" -include "grib2/template.4.aerosol_size.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" +include "grib2/templates/template.4.parameter.def" +include "grib2/templates/template.4.aerosol.def" +include "grib2/templates/template.4.aerosol_size.def" +include "grib2/templates/template.4.generating_process.def" +include "grib2/templates/template.4.forecast_time.def" +include "grib2/templates/template.4.horizontal.def" +include "grib2/templates/template.4.eps.def" +include "grib2/templates/template.4.statistical.def" diff --git a/definitions/grib2/templates/template.4.86.def b/definitions/grib2/templates/template.4.86.def index 957fa492a..9e435f37b 100644 --- a/definitions/grib2/templates/template.4.86.def +++ b/definitions/grib2/templates/template.4.86.def @@ -2,9 +2,9 @@ # 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.horizontal.def" -include "grib2/template.4.quantile.def" +include "grib2/templates/template.4.parameter.def" +include "grib2/templates/template.4.generating_process.def" +include "grib2/templates/template.4.forecast_time.def" +include "grib2/templates/template.4.point_in_time.def" +include "grib2/templates/template.4.horizontal.def" +include "grib2/templates/template.4.quantile.def" diff --git a/definitions/grib2/templates/template.4.87.def b/definitions/grib2/templates/template.4.87.def index b8e264e0f..b711d3f58 100644 --- a/definitions/grib2/templates/template.4.87.def +++ b/definitions/grib2/templates/template.4.87.def @@ -2,9 +2,9 @@ # 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.horizontal.def" -include "grib2/template.4.quantile.def" -include "grib2/template.4.statistical.def" +include "grib2/templates/template.4.parameter.def" +include "grib2/templates/template.4.generating_process.def" +include "grib2/templates/template.4.forecast_time.def" +include "grib2/templates/template.4.horizontal.def" +include "grib2/templates/template.4.quantile.def" +include "grib2/templates/template.4.statistical.def" diff --git a/definitions/grib2/templates/template.4.88.def b/definitions/grib2/templates/template.4.88.def index 8fd7405c1..5dcf28849 100644 --- a/definitions/grib2/templates/template.4.88.def +++ b/definitions/grib2/templates/template.4.88.def @@ -2,8 +2,8 @@ # 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" +include "grib2/templates/template.4.parameter.def" +include "grib2/templates/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" +include "grib2/templates/template.4.horizontal.def" +include "grib2/templates/template.4.localtime.def" diff --git a/definitions/grib2/templates/template.4.89.def b/definitions/grib2/templates/template.4.89.def index eee84fade..353dad1b0 100644 --- a/definitions/grib2/templates/template.4.89.def +++ b/definitions/grib2/templates/template.4.89.def @@ -2,10 +2,10 @@ # TEMPLATE 4.89, Post-processed 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.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.quantile.def" +include "grib2/templates/template.4.parameter.def" +include "grib2/templates/template.4.postproc.def" +include "grib2/templates/template.4.generating_process.def" +include "grib2/templates/template.4.forecast_time.def" +include "grib2/templates/template.4.point_in_time.def" +include "grib2/templates/template.4.horizontal.def" +include "grib2/templates/template.4.quantile.def" diff --git a/definitions/grib2/templates/template.4.9.def b/definitions/grib2/templates/template.4.9.def index 62774df29..b84de1e61 100644 --- a/definitions/grib2/templates/template.4.9.def +++ b/definitions/grib2/templates/template.4.9.def @@ -2,9 +2,9 @@ # 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.horizontal.def" -include "grib2/template.4.probability.def" -include "grib2/template.4.statistical.def" +include "grib2/templates/template.4.parameter.def" +include "grib2/templates/template.4.generating_process.def" +include "grib2/templates/template.4.forecast_time.def" +include "grib2/templates/template.4.horizontal.def" +include "grib2/templates/template.4.probability.def" +include "grib2/templates/template.4.statistical.def" diff --git a/definitions/grib2/templates/template.4.90.def b/definitions/grib2/templates/template.4.90.def index 94e5cc8e4..2cc381910 100644 --- a/definitions/grib2/templates/template.4.90.def +++ b/definitions/grib2/templates/template.4.90.def @@ -2,10 +2,10 @@ # TEMPLATE 4.90, Post-processed 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.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.quantile.def" -include "grib2/template.4.statistical.def" +include "grib2/templates/template.4.parameter.def" +include "grib2/templates/template.4.postproc.def" +include "grib2/templates/template.4.generating_process.def" +include "grib2/templates/template.4.forecast_time.def" +include "grib2/templates/template.4.horizontal.def" +include "grib2/templates/template.4.quantile.def" +include "grib2/templates/template.4.statistical.def" diff --git a/definitions/grib2/templates/template.4.91.def b/definitions/grib2/templates/template.4.91.def index 207ecd911..50c1f31a4 100644 --- a/definitions/grib2/templates/template.4.91.def +++ b/definitions/grib2/templates/template.4.91.def @@ -2,9 +2,9 @@ # 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.horizontal.def" -include "grib2/template.4.categorical.def" -include "grib2/template.4.statistical.def" +include "grib2/templates/template.4.parameter.def" +include "grib2/templates/template.4.generating_process.def" +include "grib2/templates/template.4.forecast_time.def" +include "grib2/templates/template.4.horizontal.def" +include "grib2/templates/template.4.categorical.def" +include "grib2/templates/template.4.statistical.def" diff --git a/definitions/grib2/templates/template.4.92.def b/definitions/grib2/templates/template.4.92.def index d94c89015..2ad564c24 100644 --- a/definitions/grib2/templates/template.4.92.def +++ b/definitions/grib2/templates/template.4.92.def @@ -2,10 +2,10 @@ # TEMPLATE 4.92, Individual ensemble forecast, control and perturbed, 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" -#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.localtime.def" +include "grib2/templates/template.4.parameter.def" +include "grib2/templates/template.4.generating_process.def" +#include "grib2/templates/template.4.forecast_time.def" +#include "grib2/templates/template.4.point_in_time.def" +include "grib2/templates/template.4.horizontal.def" +include "grib2/templates/template.4.eps.def" +include "grib2/templates/template.4.localtime.def" diff --git a/definitions/grib2/templates/template.4.93.def b/definitions/grib2/templates/template.4.93.def index 9ff2e882d..0e6370e81 100644 --- a/definitions/grib2/templates/template.4.93.def +++ b/definitions/grib2/templates/template.4.93.def @@ -2,12 +2,12 @@ # TEMPLATE 4.93, 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.postproc.def" -include "grib2/template.4.generating_process.def" +include "grib2/templates/template.4.parameter.def" +include "grib2/templates/template.4.postproc.def" +include "grib2/templates/template.4.generating_process.def" -#include "grib2/template.4.forecast_time.def" -#include "grib2/template.4.point_in_time.def" +#include "grib2/templates/template.4.forecast_time.def" +#include "grib2/templates/template.4.point_in_time.def" -include "grib2/template.4.horizontal.def" -include "grib2/template.4.localtime.def" +include "grib2/templates/template.4.horizontal.def" +include "grib2/templates/template.4.localtime.def" diff --git a/definitions/grib2/templates/template.4.94.def b/definitions/grib2/templates/template.4.94.def index 26850a8c8..1b7d2258e 100644 --- a/definitions/grib2/templates/template.4.94.def +++ b/definitions/grib2/templates/template.4.94.def @@ -2,13 +2,13 @@ # TEMPLATE 4.94, Individual ensemble forecast, control and perturbed, at a horizontal level or in a horizontal layer at a local time -include "grib2/template.4.parameter.def" -include "grib2/template.4.postproc.def" -include "grib2/template.4.generating_process.def" +include "grib2/templates/template.4.parameter.def" +include "grib2/templates/template.4.postproc.def" +include "grib2/templates/template.4.generating_process.def" -#include "grib2/template.4.forecast_time.def" -#include "grib2/template.4.point_in_time.def" +#include "grib2/templates/template.4.forecast_time.def" +#include "grib2/templates/template.4.point_in_time.def" -include "grib2/template.4.horizontal.def" -include "grib2/template.4.eps.def" -include "grib2/template.4.localtime.def" +include "grib2/templates/template.4.horizontal.def" +include "grib2/templates/template.4.eps.def" +include "grib2/templates/template.4.localtime.def" diff --git a/definitions/grib2/templates/template.4.95.def b/definitions/grib2/templates/template.4.95.def index 5ffd5e1f2..356a41264 100644 --- a/definitions/grib2/templates/template.4.95.def +++ b/definitions/grib2/templates/template.4.95.def @@ -2,11 +2,11 @@ # TEMPLATE 4.95, Average, accumulation extreme values or other statistically processed value 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" +include "grib2/templates/template.4.parameter.def" +include "grib2/templates/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_statistical.def" -include "grib2/template.4.localtime.def" +include "grib2/templates/template.4.horizontal.def" +include "grib2/templates/template.4.localtime_statistical.def" +include "grib2/templates/template.4.localtime.def" diff --git a/definitions/grib2/templates/template.4.96.def b/definitions/grib2/templates/template.4.96.def index 043794cf4..eebacd87c 100644 --- a/definitions/grib2/templates/template.4.96.def +++ b/definitions/grib2/templates/template.4.96.def @@ -2,13 +2,13 @@ # TEMPLATE 4.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 local time -include "grib2/template.4.parameter.def" -include "grib2/template.4.generating_process.def" +include "grib2/templates/template.4.parameter.def" +include "grib2/templates/template.4.generating_process.def" -#include "grib2/template.4.forecast_time.def" -#include "grib2/template.4.point_in_time.def" +#include "grib2/templates/template.4.forecast_time.def" +#include "grib2/templates/template.4.point_in_time.def" -include "grib2/template.4.horizontal.def" -include "grib2/template.4.eps.def" -include "grib2/template.4.localtime_statistical.def" -include "grib2/template.4.localtime.def" +include "grib2/templates/template.4.horizontal.def" +include "grib2/templates/template.4.eps.def" +include "grib2/templates/template.4.localtime_statistical.def" +include "grib2/templates/template.4.localtime.def" diff --git a/definitions/grib2/templates/template.4.97.def b/definitions/grib2/templates/template.4.97.def index 1ea736ac7..2177b586a 100644 --- a/definitions/grib2/templates/template.4.97.def +++ b/definitions/grib2/templates/template.4.97.def @@ -2,13 +2,13 @@ # TEMPLATE 4.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 local time -include "grib2/template.4.parameter.def" -include "grib2/template.4.postproc.def" -include "grib2/template.4.generating_process.def" +include "grib2/templates/template.4.parameter.def" +include "grib2/templates/template.4.postproc.def" +include "grib2/templates/template.4.generating_process.def" -#include "grib2/template.4.forecast_time.def" -#include "grib2/template.4.point_in_time.def" +#include "grib2/templates/template.4.forecast_time.def" +#include "grib2/templates/template.4.point_in_time.def" -include "grib2/template.4.horizontal.def" -include "grib2/template.4.localtime_statistical.def" -include "grib2/template.4.localtime.def" +include "grib2/templates/template.4.horizontal.def" +include "grib2/templates/template.4.localtime_statistical.def" +include "grib2/templates/template.4.localtime.def" diff --git a/definitions/grib2/templates/template.4.98.def b/definitions/grib2/templates/template.4.98.def index 453f6689d..c9495e3dc 100644 --- a/definitions/grib2/templates/template.4.98.def +++ b/definitions/grib2/templates/template.4.98.def @@ -2,14 +2,14 @@ # TEMPLATE 4.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 local time -include "grib2/template.4.parameter.def" -include "grib2/template.4.postproc.def" -include "grib2/template.4.generating_process.def" +include "grib2/templates/template.4.parameter.def" +include "grib2/templates/template.4.postproc.def" +include "grib2/templates/template.4.generating_process.def" -#include "grib2/template.4.forecast_time.def" -#include "grib2/template.4.point_in_time.def" +#include "grib2/templates/template.4.forecast_time.def" +#include "grib2/templates/template.4.point_in_time.def" -include "grib2/template.4.horizontal.def" -include "grib2/template.4.eps.def" -include "grib2/template.4.localtime_statistical.def" -include "grib2/template.4.localtime.def" +include "grib2/templates/template.4.horizontal.def" +include "grib2/templates/template.4.eps.def" +include "grib2/templates/template.4.localtime_statistical.def" +include "grib2/templates/template.4.localtime.def" diff --git a/definitions/grib2/templates/template.4.99.def b/definitions/grib2/templates/template.4.99.def index fc2d9a616..7e823894f 100644 --- a/definitions/grib2/templates/template.4.99.def +++ b/definitions/grib2/templates/template.4.99.def @@ -2,10 +2,10 @@ # TEMPLATE 4.99, Analysis or forecast at a horizontal level or in a horizontal layer at a point in time for wave 2D spectra with explicit list of frequencies and directions -include "grib2/template.4.parameter.def" -include "grib2/template.4.wave.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.wave_spectra_list.def" +include "grib2/templates/template.4.parameter.def" +include "grib2/templates/template.4.wave.def" +include "grib2/templates/template.4.generating_process.def" +include "grib2/templates/template.4.forecast_time.def" +include "grib2/templates/template.4.point_in_time.def" +#include "grib2/templates/template.4.horizontal.def" +include "grib2/templates/template.4.wave_spectra_list.def" diff --git a/definitions/grib2/templates/template.5.0.def b/definitions/grib2/templates/template.5.0.def index 709f8be74..56eb4f724 100644 --- a/definitions/grib2/templates/template.5.0.def +++ b/definitions/grib2/templates/template.5.0.def @@ -2,6 +2,6 @@ # TEMPLATE 5.0, Grid point data - simple packing -include "grib2/template.5.packing.def" -include "grib2/template.5.original_values.def" +include "grib2/templates/template.5.packing.def" +include "grib2/templates/template.5.original_values.def" diff --git a/definitions/grib2/templates/template.5.1.def b/definitions/grib2/templates/template.5.1.def index 14864c9f5..923a0a28e 100644 --- a/definitions/grib2/templates/template.5.1.def +++ b/definitions/grib2/templates/template.5.1.def @@ -5,7 +5,7 @@ # This template was not validated at the time of publication and should be used with caution transient template_is_experimental = 1 : hidden; -include "grib2/template.5.packing.def" +include "grib2/templates/template.5.packing.def" unsigned[1] matrixBitmapsPresent; # same as in edition 1 diff --git a/definitions/grib2/templates/template.5.2.def b/definitions/grib2/templates/template.5.2.def index 59f7f5342..c4f200505 100644 --- a/definitions/grib2/templates/template.5.2.def +++ b/definitions/grib2/templates/template.5.2.def @@ -2,8 +2,8 @@ # TEMPLATE 5.2, Grid point data - complex packing -include "grib2/template.5.packing.def" -include "grib2/template.5.original_values.def" +include "grib2/templates/template.5.packing.def" +include "grib2/templates/template.5.original_values.def" # Group splitting method used codetable[1] groupSplittingMethodUsed ('5.4.table',masterDir,localDir); diff --git a/definitions/grib2/templates/template.5.3.def b/definitions/grib2/templates/template.5.3.def index 2640883f4..16866c0fb 100644 --- a/definitions/grib2/templates/template.5.3.def +++ b/definitions/grib2/templates/template.5.3.def @@ -2,8 +2,8 @@ # TEMPLATE 5.3, Grid point data - complex packing and spatial differencing -include "grib2/template.5.packing.def" -include "grib2/template.5.original_values.def" +include "grib2/templates/template.5.packing.def" +include "grib2/templates/template.5.original_values.def" # Group splitting method used codetable[1] groupSplittingMethodUsed ('5.4.table',masterDir,localDir); diff --git a/definitions/grib2/templates/template.5.40.def b/definitions/grib2/templates/template.5.40.def index 51a56b1b7..11eccf88d 100644 --- a/definitions/grib2/templates/template.5.40.def +++ b/definitions/grib2/templates/template.5.40.def @@ -2,8 +2,8 @@ # TEMPLATE 5.40, Grid point data - JPEG 2000 Code Stream Format -include "grib2/template.5.packing.def" -include "grib2/template.5.original_values.def" +include "grib2/templates/template.5.packing.def" +include "grib2/templates/template.5.original_values.def" codetable[1] typeOfCompressionUsed ('5.40.table',masterDir,localDir) ; diff --git a/definitions/grib2/templates/template.5.40000.def b/definitions/grib2/templates/template.5.40000.def index 7fd4303ad..3875ed1a3 100644 --- a/definitions/grib2/templates/template.5.40000.def +++ b/definitions/grib2/templates/template.5.40000.def @@ -1,3 +1,3 @@ # (C) Copyright 2005- ECMWF. -include "grib2/template.5.40.def" +include "grib2/templates/template.5.40.def" diff --git a/definitions/grib2/templates/template.5.41.def b/definitions/grib2/templates/template.5.41.def index 58ebd8e34..473df3dec 100644 --- a/definitions/grib2/templates/template.5.41.def +++ b/definitions/grib2/templates/template.5.41.def @@ -2,5 +2,5 @@ # TEMPLATE 5.41, Grid point data - PNG Code Stream Format -include "grib2/template.5.packing.def" -include "grib2/template.5.original_values.def" +include "grib2/templates/template.5.packing.def" +include "grib2/templates/template.5.original_values.def" diff --git a/definitions/grib2/templates/template.5.42.def b/definitions/grib2/templates/template.5.42.def index 401966908..ef06bec59 100644 --- a/definitions/grib2/templates/template.5.42.def +++ b/definitions/grib2/templates/template.5.42.def @@ -2,8 +2,8 @@ # TEMPLATE 5.42, Grid point data - CCSDS recommended lossless compression -include "grib2/template.5.packing.def" -include "grib2/template.5.original_values.def" +include "grib2/templates/template.5.packing.def" +include "grib2/templates/template.5.original_values.def" unsigned[1] ccsdsFlags : dump; alias ccsdsCompressionOptionsMask=ccsdsFlags; diff --git a/definitions/grib2/templates/template.5.50.def b/definitions/grib2/templates/template.5.50.def index ab444b3ec..43cf7bcce 100644 --- a/definitions/grib2/templates/template.5.50.def +++ b/definitions/grib2/templates/template.5.50.def @@ -1,7 +1,7 @@ # (C) Copyright 2005- ECMWF. # TEMPLATE 5.50, Spectral data - simple packing -include "grib2/template.5.packing.def" +include "grib2/templates/template.5.packing.def" # Real part of (0,0) ieeefloat realPartOf00; diff --git a/definitions/grib2/templates/template.5.50000.def b/definitions/grib2/templates/template.5.50000.def index 19c5b14da..47931f2b3 100644 --- a/definitions/grib2/templates/template.5.50000.def +++ b/definitions/grib2/templates/template.5.50000.def @@ -2,7 +2,7 @@ # TEMPLATE 5.50000, Spherical harmonics data - complex packing (IEEE) -include "grib2/template.5.packing.def" +include "grib2/templates/template.5.packing.def" if (gribex_mode_on()) { transient computeLaplacianOperator=0 : hidden; diff --git a/definitions/grib2/templates/template.5.51.def b/definitions/grib2/templates/template.5.51.def index f7dc292ca..1d710451c 100644 --- a/definitions/grib2/templates/template.5.51.def +++ b/definitions/grib2/templates/template.5.51.def @@ -2,7 +2,7 @@ # TEMPLATE 5.51, Spherical harmonics data - complex packing -include "grib2/template.5.packing.def" +include "grib2/templates/template.5.packing.def" if (gribex_mode_on()) { transient computeLaplacianOperator=0 : hidden; diff --git a/definitions/grib2/templates/template.5.53.def b/definitions/grib2/templates/template.5.53.def index c7b21de5f..a2c88e477 100644 --- a/definitions/grib2/templates/template.5.53.def +++ b/definitions/grib2/templates/template.5.53.def @@ -3,7 +3,7 @@ # TEMPLATE 5.53, BiFourier coefficients data - complex packing # Spectral data for limited area models - complex packing -include "grib2/template.5.packing.def" +include "grib2/templates/template.5.packing.def" transient computeLaplacianOperator=1 : hidden; diff --git a/definitions/grib2/templates/template.5.61.def b/definitions/grib2/templates/template.5.61.def index f19db39ee..8a15e4500 100644 --- a/definitions/grib2/templates/template.5.61.def +++ b/definitions/grib2/templates/template.5.61.def @@ -7,6 +7,6 @@ transient template_is_experimental = 1 : hidden; constant typeOfPreProcessing = 1; -include "grib2/template.5.packing.def" +include "grib2/templates/template.5.packing.def" ieeefloat preProcessingParameter : read_only; diff --git a/definitions/grib2/templates/template.7.40000.def b/definitions/grib2/templates/template.7.40000.def index 33d9b4b8c..ca196b4d9 100644 --- a/definitions/grib2/templates/template.7.40000.def +++ b/definitions/grib2/templates/template.7.40000.def @@ -1,3 +1,3 @@ # (C) Copyright 2005- ECMWF. -include "grib2/template.7.40.def" +include "grib2/templates/template.7.40.def"