GRIB3: Updates to sections, templates and components

definitions/grib3/section.09.def

@@ -10,6 +10,8 @@
 # Section 9 - Overlay Section
 
 position offsetSection9;
+position offsetBSection9;
+
 section_length[4] section9Length;
 meta section9Pointer section_pointer(offsetSection9,section9Length,9);
 unsigned[1] numberOfSection = 9: read_only;

definitions/grib3/template.8.1.def

@@ -10,4 +10,4 @@
 # TEMPLATE 8.1, IEEE floating point
 
 # IEEE floating point
-include "grib3/template.component.8.4.def";
+include "grib3/template.component.8.1.def";

definitions/grib3/template.8.missing_value.def

@@ -1,5 +1,11 @@
-#  Missing value management used
-# default = 0 means 'No explicit missing values included within data values'
+# Missing value management
+
+# Management of explicitly missing values is an alternative to bit-map use
+# within the Overlay Section.
+# It is intended to reduce the whole GRIB message size and to provide better
+# performance when decoding data with missing values
+
+# default = 0 means No explicit missing values included within data values
 codetable[1] missingValueManagementUsed ('8.2.table',masterDir,localDir)=0;
 
 #  Primary missing value substitute

definitions/grib3/template.component.3.0.def

@@ -1,4 +1,4 @@
-# Time Domain Section Template Component 3.0 - Forecast point in time
+# Time Domain Template Component 3.0 - Forecast point in time
 
 # Hours of observational data cut-off after reference time
 # Note: Hours greater than 65534 will be coded as 65534

definitions/grib3/template.component.4.0.def

@@ -1,4 +1,4 @@
-# Horizontal Domain Section Template Component 4.0 - Ellipsoid of revolution defined with axis lengths
+# Horizontal Domain Template Component 4.0 - Ellipsoid of revolution defined with axis lengths
 
 # Scale factor of length of semi-major axis
 unsigned[1] scaleFactorOfLengthOfSemiMajorAxis = missing() : can_be_missing, edition_specific;

definitions/grib3/template.component.4.1.def

@@ -1,4 +1,4 @@
-# Horizontal Domain Section Template Component 4.1 - Latitude/longitude regular grid
+# Horizontal Domain Template Component 4.1 - Latitude/longitude regular grid
 
 # Ni - number of points along a parallel
 unsigned[4] Ni : dump; # Note: This is for a REGULAR GRID so Ni cannot be missing

definitions/grib3/template.component.4.2.def

@@ -1,4 +1,4 @@
-# Horizontal Domain Section Template Component 4.2 - Rotation of latitude/longitude coordinates system
+# Horizontal Domain Template Component 4.2 - Rotation of latitude/longitude coordinates system
 
 # Latitude of the southern pole of projection
 signed[4] latitudeOfSouthernPole : no_copy;

definitions/grib3/template.component.4.3.def

@@ -1,4 +1,4 @@
-# Horizontal Domain Section Template Component 4.3 - Stretching of latitude/longitude coordinates system
+# Horizontal Domain Template Component 4.3 - Stretching of latitude/longitude coordinates system
 
 label "Stretching information";
 

definitions/grib3/template.component.7.0.def

@@ -1,13 +1,13 @@
-# Observable Property Section Template Component 7.0 - Observable property by discipline, category and number
+# Observable Property Template Component 7.0 - Observable property by discipline, category and number
 
-# Parameter Discipline
+# Parameter discipline
 codetable[1] parameterDiscipline('7.1.table',masterDir,localDir) : dump;
 alias discipline = parameterDiscipline;
 
 # Parameter category
-codetable[1] parameterCategory ('7.2.[discipline:l].table',masterDir,localDir) : dump;
+codetable[1] parameterCategory ('7.2.[discipline:i].table',masterDir,localDir) : dump;
 
 # Parameter number
-codetable[2] parameterNumber ('7.3.[discipline:l].[parameterCategory:l].table',masterDir,localDir) : dump;
+codetable[2] parameterNumber ('7.3.[discipline:i].[parameterCategory:i].table',masterDir,localDir) : dump;
 meta parameterUnits codetable_units(parameterNumber) : dump;
 meta parameterName  codetable_title(parameterNumber) : dump;

definitions/grib3/template.component.7.1.def

@@ -1,4 +1,4 @@
-# Observable Property Section Template Component 7.1 - Units conversion
+# Observable Property Template Component 7.1 - Units conversion
 
 ieeefloat unitsConversionScaleFactor : dump, edition_specific,no_copy;
 ieeefloat unitsConversionOffset : dump, edition_specific,no_copy;

definitions/grib3/template.component.7.2.def

@@ -1,4 +1,4 @@
-# Observable Property Section Template Component 7.2 - Chemical or physical constituents
+# Observable Property Template Component 7.2 - Chemical or physical constituents
 
 # Common code table C-14
 codetable[2] atmosphericChemicalOrPhysicalConstituentType ('7.230.table',masterDir,localDir) : dump;

definitions/grib3/template.component.7.3.def

@@ -1,4 +1,4 @@
-# Observable Property Section Template Component 7.3 - Aerosol size
+# Observable Property Template Component 7.3 - Aerosol size
 
 codetable[1] typeOfSizeInterval ('7.4.table',masterDir,localDir) : dump;
 alias typeOfIntervalForFirstAndSecondSize=typeOfSizeInterval;

definitions/grib3/template.component.7.4.def

@@ -1,4 +1,4 @@
-# Observable Property Section Template Component 7.4 - Radiation wavelength interval
+# Observable Property Template Component 7.4 - Radiation wavelength interval
 
 codetable[1] typeOfWavelengthInterval ('7.4.table',masterDir,localDir) : dump;
 alias typeOfIntervalForFirstAndSecondWavelength=typeOfWavelengthInterval;

definitions/grib3/template.component.8.0.def

@@ -1,5 +1,6 @@
-# Data Representation Section Template Component 8.0 - Grid point data - Simple packing
+# Data Representation Template Component 8.0 - Grid point data - Simple packing
 
 include "grib3/template.8.packing.def";
 include "grib3/template.8.original_values.def";
 include "grib3/template.8.missing_value.def";
+label 'Template Component 8.0';

definitions/grib3/template.component.8.1.def

@@ -1,4 +1,4 @@
-# Data Representation Section Template Component 8.4 - Grid point data - IEEE floating point data
+# Data Representation Template Component 8.1 - Grid point data - IEEE floating point data
 
 transient bitsPerValue=0 : hidden;
 transient referenceValue=0  : hidden;

definitions/grib3/template.component.9.0.def

@@ -1,4 +1,6 @@
-# Overlay Section Template Component 9.0 - Bitmap
+# Overlay Template Component 9.0 - Bitmap
+
+# TODO: Is there a Bit-map indicator???
 
 
 #  Bit-map indicator
@@ -15,16 +17,16 @@ if(bitMapIndicator == 0)
     {
       meta primaryBitmap g2bitmap( tableReference,
           missingValue,
-          offsetBSection6,
-          section6Length,
+          offsetBSection9,
+          section9Length,
           numberOfDataMatrices) : read_only;
     }
     else
     {
       meta geography.bitmap g2bitmap( tableReference,
           missingValue,
-          offsetBSection6,
-          section6Length,
+          offsetBSection9,
+          section9Length,
           numberOfDataPoints) : read_only;
     }
   }
@@ -32,8 +34,8 @@ if(bitMapIndicator == 0)
   {
     meta geography.bitmap g2bitmap( tableReference,
         missingValue,
-        offsetBSection6,
-        section6Length,
+        offsetBSection9,
+        section9Length,
         numberOfDataPoints) : read_only;
   }
 }