From 369494108ef30020120575e05ae333850a3d9504 Mon Sep 17 00:00:00 2001 From: Shahram Najm Date: Mon, 4 Jul 2022 12:58:43 +0100 Subject: [PATCH] Cleanup --- definitions/grib2/section.5.def | 56 ++++++++++++------------ definitions/grib2/template.5.50000.def | 2 +- definitions/grib2/template.5.50001.def | 1 + definitions/grib2/template.5.50002.def | 0 definitions/grib2/template.5.packing.def | 0 definitions/grib2/template.7.50000.def | 1 + definitions/grib2/template.7.50001.def | 1 + 7 files changed, 32 insertions(+), 29 deletions(-) mode change 100755 => 100644 definitions/grib2/template.5.50001.def mode change 100755 => 100644 definitions/grib2/template.5.50002.def mode change 100755 => 100644 definitions/grib2/template.5.packing.def diff --git a/definitions/grib2/section.5.def b/definitions/grib2/section.5.def index c8986abc9..3c6c80642 100644 --- a/definitions/grib2/section.5.def +++ b/definitions/grib2/section.5.def @@ -5,11 +5,11 @@ position offsetBSection5; # SECTION 5, DATA REPRESENTATION SECTION position offsetSection5; -section_length[4] section5Length ; +section_length[4] section5Length; meta section5 section_pointer(offsetSection5,section5Length,5); -unsigned[1] numberOfSection =5 : read_only; +unsigned[1] numberOfSection = 5 : read_only; # Number of data points where one or more values are specified in Section 7 when a bit map is present, # total number of data pints when a bit map is absent. @@ -22,32 +22,32 @@ codetable[2] dataRepresentationTemplateNumber ('5.0.table',masterDir,localDir) : concept packingType (unknown) { #set uses the last one #get returns the first match - "grid_simple" = { dataRepresentationTemplateNumber = 0; } - "spectral_complex" = { dataRepresentationTemplateNumber = 51; spectralType=1; spectralMode=1; } - "spectral_simple" = { dataRepresentationTemplateNumber = 50; spectralType=1; spectralMode=1; } - "grid_simple_matrix" = { dataRepresentationTemplateNumber = 1; } - "grid_complex" = { dataRepresentationTemplateNumber = 2; } - "grid_complex_spatial_differencing" = { dataRepresentationTemplateNumber = 3; } - "grid_jpeg" = { dataRepresentationTemplateNumber = 40000; } - "grid_jpeg" = { dataRepresentationTemplateNumber = 40; } - "grid_png" = { dataRepresentationTemplateNumber = 40010; } - "grid_png" = { dataRepresentationTemplateNumber = 41; } - "grid_ccsds" = { dataRepresentationTemplateNumber = 42; } - "grid_ieee" = { dataRepresentationTemplateNumber = 4; } - "grid_second_order" = { dataRepresentationTemplateNumber = 50001; } - "grid_second_order" = { dataRepresentationTemplateNumber = 50002; } - "grid_second_order_boustrophedonic" = { dataRepresentationTemplateNumber = 50002; } - "grid_second_order_no_boustrophedonic" = { dataRepresentationTemplateNumber = 50001; } - "grid_second_order_row_by_row" = { dataRepresentationTemplateNumber = 50001; } - "grid_second_order_constant_width" = { dataRepresentationTemplateNumber = 50001; } - "grid_second_order_general_grib1" = { dataRepresentationTemplateNumber = 50001; } - "grid_second_order_no_SPD" = { dataRepresentationTemplateNumber = 50001;orderOfSPD=0; } - "grid_second_order_SPD1" = { dataRepresentationTemplateNumber = 50001;orderOfSPD=1; } - "grid_second_order_SPD2" = { dataRepresentationTemplateNumber = 50001;orderOfSPD=2; } - "grid_second_order_SPD3" = { dataRepresentationTemplateNumber = 50001;orderOfSPD=3; } - "spectral_ieee" = { dataRepresentationTemplateNumber=50000; } - "grid_simple_log_preprocessing" = { dataRepresentationTemplateNumber = 61; } - "bifourier_complex" = { dataRepresentationTemplateNumber = 53; spectralType=2; } + "grid_simple" = { dataRepresentationTemplateNumber = 0; } + "spectral_complex" = { dataRepresentationTemplateNumber = 51; spectralType=1; spectralMode=1; } + "spectral_simple" = { dataRepresentationTemplateNumber = 50; spectralType=1; spectralMode=1; } + "grid_simple_matrix" = { dataRepresentationTemplateNumber = 1; } + "grid_complex" = { dataRepresentationTemplateNumber = 2; } + "grid_complex_spatial_differencing" = { dataRepresentationTemplateNumber = 3; } + "grid_jpeg" = { dataRepresentationTemplateNumber = 40000; } + "grid_jpeg" = { dataRepresentationTemplateNumber = 40; } + "grid_png" = { dataRepresentationTemplateNumber = 40010; } + "grid_png" = { dataRepresentationTemplateNumber = 41; } + "grid_ccsds" = { dataRepresentationTemplateNumber = 42; } + "grid_ieee" = { dataRepresentationTemplateNumber = 4; } + "grid_second_order" = { dataRepresentationTemplateNumber = 50001; } + "grid_second_order" = { dataRepresentationTemplateNumber = 50002; } + "grid_second_order_boustrophedonic" = { dataRepresentationTemplateNumber = 50002; } + "grid_second_order_no_boustrophedonic" = { dataRepresentationTemplateNumber = 50001; } + "grid_second_order_row_by_row" = { dataRepresentationTemplateNumber = 50001; } + "grid_second_order_constant_width" = { dataRepresentationTemplateNumber = 50001; } + "grid_second_order_general_grib1" = { dataRepresentationTemplateNumber = 50001; } + "grid_second_order_no_SPD" = { dataRepresentationTemplateNumber = 50001;orderOfSPD=0; } + "grid_second_order_SPD1" = { dataRepresentationTemplateNumber = 50001;orderOfSPD=1; } + "grid_second_order_SPD2" = { dataRepresentationTemplateNumber = 50001;orderOfSPD=2; } + "grid_second_order_SPD3" = { dataRepresentationTemplateNumber = 50001;orderOfSPD=3; } + "spectral_ieee" = { dataRepresentationTemplateNumber = 50000; } + "grid_simple_log_preprocessing" = { dataRepresentationTemplateNumber = 61; } + "bifourier_complex" = { dataRepresentationTemplateNumber = 53; spectralType=2; } } : dump; template dataRepresentation "grib2/template.5.[dataRepresentationTemplateNumber:l].def"; diff --git a/definitions/grib2/template.5.50000.def b/definitions/grib2/template.5.50000.def index 46427b613..84e5cd545 100644 --- a/definitions/grib2/template.5.50000.def +++ b/definitions/grib2/template.5.50000.def @@ -1,6 +1,6 @@ # (C) Copyright 2005- ECMWF. -# TEMPLATE 5.51, Spherical harmonics data - complex packing +# TEMPLATE 5.50000, Spherical harmonics data - complex packing ( IEEE ) include "grib2/template.5.packing.def"; diff --git a/definitions/grib2/template.5.50001.def b/definitions/grib2/template.5.50001.def old mode 100755 new mode 100644 index 01d0aedbe..567a73e05 --- a/definitions/grib2/template.5.50001.def +++ b/definitions/grib2/template.5.50001.def @@ -1,4 +1,5 @@ # (C) Copyright 2005- ECMWF. +# Second order ieeefloat referenceValue: no_copy; meta referenceValueError reference_value_error(referenceValue,ieee); diff --git a/definitions/grib2/template.5.50002.def b/definitions/grib2/template.5.50002.def old mode 100755 new mode 100644 diff --git a/definitions/grib2/template.5.packing.def b/definitions/grib2/template.5.packing.def old mode 100755 new mode 100644 diff --git a/definitions/grib2/template.7.50000.def b/definitions/grib2/template.7.50000.def index d1584d690..0a45b8cd7 100644 --- a/definitions/grib2/template.7.50000.def +++ b/definitions/grib2/template.7.50000.def @@ -1,4 +1,5 @@ # (C) Copyright 2005- ECMWF. +# spectral_ieee constant GRIBEXShBugPresent = 0; constant sphericalHarmonics = 1; diff --git a/definitions/grib2/template.7.50001.def b/definitions/grib2/template.7.50001.def index 178f36336..6a7a0f5a0 100644 --- a/definitions/grib2/template.7.50001.def +++ b/definitions/grib2/template.7.50001.def @@ -1,4 +1,5 @@ # (C) Copyright 2005- ECMWF. +# Second order if (bitsPerValue) { meta groupWidths unsigned_bits(widthOfWidths,numberOfGroups) : read_only;