diff --git a/definitions/grib1/data.grid_second_order_constant_width.def b/definitions/grib1/data.grid_second_order_constant_width.def index 9feeade6b..1c30e0e24 100644 --- a/definitions/grib1/data.grid_second_order_constant_width.def +++ b/definitions/grib1/data.grid_second_order_constant_width.def @@ -49,7 +49,7 @@ if(bitmapPresent) { ): read_only; alias data.packedValues = codedValues; - + if (boustrophedonicOrdering) { if (GRIBEX_boustrophedonic) diff --git a/definitions/grib1/data.grid_second_order_general_grib1.def b/definitions/grib1/data.grid_second_order_general_grib1.def index 7548225a2..3e02ac8df 100644 --- a/definitions/grib1/data.grid_second_order_general_grib1.def +++ b/definitions/grib1/data.grid_second_order_general_grib1.def @@ -49,7 +49,7 @@ if(bitmapPresent) { ): read_only; alias data.packedValues = codedValues; - + if (boustrophedonicOrdering) { if (GRIBEX_boustrophedonic) diff --git a/definitions/grib1/data.grid_simple_matrix.def b/definitions/grib1/data.grid_simple_matrix.def index 432ee33d6..73eaf0dd6 100644 --- a/definitions/grib1/data.grid_simple_matrix.def +++ b/definitions/grib1/data.grid_simple_matrix.def @@ -61,7 +61,7 @@ if(matrixOfValues == 0) # For grib1 -> grib2 constant bitMapIndicator = 0; - meta codedValues data_g1simple_packing ( + meta codedValues data_g1simple_packing( section4Length, offsetBeforeData, offsetSection4, diff --git a/definitions/grib1/data.spectral_complex.def b/definitions/grib1/data.spectral_complex.def index d8bd43a0f..9a3e53419 100644 --- a/definitions/grib1/data.spectral_complex.def +++ b/definitions/grib1/data.spectral_complex.def @@ -93,7 +93,7 @@ constant PUnset = -32767; subSetJ, subSetK, subSetM, - + pentagonalResolutionParameterJ, pentagonalResolutionParameterK, pentagonalResolutionParameterM @@ -122,7 +122,7 @@ constant PUnset = -32767; subSetJ, subSetK, subSetM, - + pentagonalResolutionParameterJ, pentagonalResolutionParameterK, pentagonalResolutionParameterM diff --git a/definitions/grib1/data.spectral_ieee.def b/definitions/grib1/data.spectral_ieee.def index 85b0d2097..7c05c33b8 100644 --- a/definitions/grib1/data.spectral_ieee.def +++ b/definitions/grib1/data.spectral_ieee.def @@ -89,7 +89,7 @@ constant PUnset = -32767; subSetJ, subSetK, subSetM, - + pentagonalResolutionParameterJ, pentagonalResolutionParameterK, pentagonalResolutionParameterM @@ -118,7 +118,7 @@ constant PUnset = -32767; subSetJ, subSetK, subSetM, - + pentagonalResolutionParameterJ, pentagonalResolutionParameterK, pentagonalResolutionParameterM diff --git a/definitions/grib1/local.98.13.def b/definitions/grib1/local.98.13.def index 876e2c5a5..c205278b0 100644 --- a/definitions/grib1/local.98.13.def +++ b/definitions/grib1/local.98.13.def @@ -112,7 +112,7 @@ if(localFlag == 3) alias system = systemNumber; alias method = methodNumber; alias refdate = referenceDate; - + alias mars._leg_number = legNumber; } @@ -143,7 +143,7 @@ if(localFlag == 4) alias baseTimeOfThisLeg = legBaseTime; unsigned[1] legNumber : dump; unsigned[1] oceanAtmosphereCoupling : dump; - + # Hours unsigned[2] offsetToEndOf4DvarWindow : dump; alias anoffset=offsetToEndOf4DvarWindow; diff --git a/definitions/grib1/section.1.def b/definitions/grib1/section.1.def index cd4151031..ff89dcd09 100644 --- a/definitions/grib1/section.1.def +++ b/definitions/grib1/section.1.def @@ -61,7 +61,7 @@ alias levelType=indicatorOfTypeOfLevel; transient pressureUnits="hPa"; -concept_nofail typeOfLevelECMF (unknown, "typeOfLevel.def",conceptsMasterDir,conceptsLocalDirECMF); +concept_nofail typeOfLevelECMF (unknown, "typeOfLevel.def",conceptsMasterDir,conceptsLocalDirECMF); concept_nofail vertical.typeOfLevel (typeOfLevelECMF, "typeOfLevel.def",conceptsDir2,conceptsDir1); when ( typeOfLevel is "isobaricInPa" ) { set pressureUnits="Pa"; } @@ -129,7 +129,7 @@ unsigned[1] P1 : edition_specific; unsigned[1] P2 : edition_specific; # Local comes before Master to give precedence to the local, centre-specific table -codetable[1] timeRangeIndicator ('5.table',tablesLocalDir,tablesMasterDir) = 1 : dump,edition_specific; +codetable[1] timeRangeIndicator ('5.table',tablesLocalDir,tablesMasterDir) = 1 : dump,edition_specific; unsigned[2] numberIncludedInAverage; @@ -255,7 +255,7 @@ if(((section1Length > 40) or new() or setLocalDefinition> 0) and deleteLocalDefi { constant localUsePresent = 1 : edition_specific; alias grib2LocalSectionPresent=present; - + if( (centre == ECMWF) or (centre != ECMWF and subCentre == ECMWF)) @@ -279,7 +279,7 @@ if(((section1Length > 40) or new() or setLocalDefinition> 0) and deleteLocalDefi # Other centres pad reservedNeedNotBePresent(12); template_nofail localDefinition "grib1/local.[centre:l].def"; - + section_padding localExtensionPadding : read_only; } } diff --git a/definitions/grib2/local.98.9.def b/definitions/grib2/local.98.9.def index 7f9f0c989..cfeb27dcf 100644 --- a/definitions/grib2/local.98.9.def +++ b/definitions/grib2/local.98.9.def @@ -20,7 +20,7 @@ if(type != perturbedType) # Ritz numbers: signed[4] NINT_LOG10_RITZ : dump ; signed[4] NINT_RITZ_EXP : dump ; - + alias local.numberOfIterations= numberOfIterations; alias local.numberOfSingularVectorsComputed= numberOfSingularVectorsComputed ; alias local.normAtInitialTime= normAtInitialTime ; diff --git a/definitions/grib2/tables/4/4.151.table b/definitions/grib2/tables/4/4.151.table index bcfa0aea7..95598aab8 100644 --- a/definitions/grib2/tables/4/4.151.table +++ b/definitions/grib2/tables/4/4.151.table @@ -1,4 +1,4 @@ -# CODE TABLE 4.15, Confidence level units +# CODE TABLE 4.15, Confidence level units 0 0 bad 1 1 suspect diff --git a/definitions/grib2/tables/4/4.2.0.1.table b/definitions/grib2/tables/4/4.2.0.1.table index 6012e4beb..dbce129d4 100644 --- a/definitions/grib2/tables/4/4.2.0.1.table +++ b/definitions/grib2/tables/4/4.2.0.1.table @@ -31,7 +31,7 @@ 29 29 Total snowfall (m) 30 30 Precipitable water category (Code table 4.202) 31 31 Hail (m) -32 32 Graupel (snow pellets) (kg kg-1) +32 32 Graupel (snow pellets) (kg kg-1) 33 33 Categorical rain (Code table 4.222) 34 34 Categorical freezing rain (Code table 4.222) 35 35 Categorical ice pellets (Code table 4.222) diff --git a/definitions/grib2/tables/5/4.151.table b/definitions/grib2/tables/5/4.151.table index bcfa0aea7..95598aab8 100644 --- a/definitions/grib2/tables/5/4.151.table +++ b/definitions/grib2/tables/5/4.151.table @@ -1,4 +1,4 @@ -# CODE TABLE 4.15, Confidence level units +# CODE TABLE 4.15, Confidence level units 0 0 bad 1 1 suspect diff --git a/definitions/grib2/template.3.1.def b/definitions/grib2/template.3.1.def index 733573062..1cfca8e5d 100644 --- a/definitions/grib2/template.3.1.def +++ b/definitions/grib2/template.3.1.def @@ -1,7 +1,7 @@ # (C) Copyright 2005- ECMWF. # 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"; diff --git a/definitions/grib2/template.3.10.def b/definitions/grib2/template.3.10.def index 818c43c09..975d8dc87 100644 --- a/definitions/grib2/template.3.10.def +++ b/definitions/grib2/template.3.10.def @@ -50,7 +50,7 @@ include "grib2/template.3.scanning_mode.def"; unsigned[4] orientationOfTheGrid : dump ; meta geography.orientationOfTheGridInDegrees scale(orientationOfTheGrid,oneConstant,grib2divider,truncateDegrees) : dump; - + # Di - longitudinal direction grid length # NOTE 2: Grid lengths are in units of 10**-3 m, at the latitude specified by LaD unsigned[4] Di : edition_specific,no_copy; diff --git a/definitions/grib2/template.3.12.def b/definitions/grib2/template.3.12.def index e2b5bcb18..d75098148 100644 --- a/definitions/grib2/template.3.12.def +++ b/definitions/grib2/template.3.12.def @@ -48,7 +48,7 @@ include "grib2/template.3.scanning_mode.def"; unsigned[4] Di : edition_specific,no_copy; alias iDirectionIncrementGridLength = Di; meta geography.DiInMetres scale(Di,oneConstant,hundred,truncateDegrees) : dump; - + # Dj - j-direction increment length in units of 10-2 m unsigned[4] Dj : edition_specific,no_copy; alias jDirectionIncrementGridLength = Dj; diff --git a/definitions/grib2/template.3.2.def b/definitions/grib2/template.3.2.def index 5ef4ef744..f587f9886 100644 --- a/definitions/grib2/template.3.2.def +++ b/definitions/grib2/template.3.2.def @@ -1,7 +1,7 @@ # (C) Copyright 2005- ECMWF. # 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"; diff --git a/definitions/grib2/template.3.4.def b/definitions/grib2/template.3.4.def index 1a3cca40e..4e533b4b2 100644 --- a/definitions/grib2/template.3.4.def +++ b/definitions/grib2/template.3.4.def @@ -1,6 +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"; diff --git a/definitions/grib2/template.3.41.def b/definitions/grib2/template.3.41.def index 03534c221..e3443dd34 100644 --- a/definitions/grib2/template.3.41.def +++ b/definitions/grib2/template.3.41.def @@ -1,7 +1,7 @@ # (C) Copyright 2005- ECMWF. # 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"; diff --git a/definitions/grib2/template.3.5.def b/definitions/grib2/template.3.5.def index d364d792c..ecfb3e07c 100644 --- a/definitions/grib2/template.3.5.def +++ b/definitions/grib2/template.3.5.def @@ -1,7 +1,7 @@ # (C) Copyright 2005- ECMWF. # 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"; diff --git a/definitions/grib2/template.4.horizontal.def b/definitions/grib2/template.4.horizontal.def index 537377b9e..bb753e4e3 100755 --- a/definitions/grib2/template.4.horizontal.def +++ b/definitions/grib2/template.4.horizontal.def @@ -47,7 +47,7 @@ if (typeOfSecondFixedSurface == 255) { scaledValueOfSecondFixedSurface, pressureUnits) :dump; alias level=topLevel; # (see GRIB-725) - + } alias ls.level=level; alias vertical.level=level; diff --git a/definitions/grib2/template.4.statistical.def b/definitions/grib2/template.4.statistical.def index e4be03e10..35390d536 100644 --- a/definitions/grib2/template.4.statistical.def +++ b/definitions/grib2/template.4.statistical.def @@ -74,7 +74,7 @@ if (numberOfTimeRange == 1 || numberOfTimeRange == 2) { meta endStep g2end_step( startStep, stepUnits, - + year, month, day, @@ -94,7 +94,7 @@ if (numberOfTimeRange == 1 || numberOfTimeRange == 2) { typeOfTimeIncrement, numberOfTimeRange ) : dump,no_copy; - + meta stepRange g2step_range(startStep,endStep): dump; } else { constant stepType = "multiple steps"; diff --git a/definitions/grib2/template.5.50.def b/definitions/grib2/template.5.50.def index 065d65c51..9c63c39dd 100644 --- a/definitions/grib2/template.5.50.def +++ b/definitions/grib2/template.5.50.def @@ -3,5 +3,5 @@ # TEMPLATE 5.50, Spectral data - simple packing include "grib2/template.5.packing.def"; -# Real part of (0,0) +# Real part of (0,0) ieeefloat realPartOf00 ; diff --git a/definitions/grib2/template.7.50.def b/definitions/grib2/template.7.50.def index ce7f790aa..a905f224b 100644 --- a/definitions/grib2/template.7.50.def +++ b/definitions/grib2/template.7.50.def @@ -31,7 +31,6 @@ transient numberOfPackedValues = numberOfValues - 1 : no_copy; numberOfValues ) ; - meta packingError simple_packing_error(bitsPerValue,binaryScaleFactor,decimalScaleFactor,referenceValue,ieee) : no_copy; meta unpackedError simple_packing_error(zero,binaryScaleFactor,decimalScaleFactor,referenceValue,ieee) : no_copy;