core
/
eccodes
mirror of https://github.com/ecmwf/eccodes.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Definitions: clean up

This commit is contained in:
Shahram Najm 2022-02-22 17:27:41 +00:00
parent 3747d8bc2d
commit 873c655322
22 changed files with 27 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
definitions/grib1/data.grid_second_order_constant_width.def
View File

@ -49,7 +49,7 @@ if(bitmapPresent) {
): read_only;
alias data.packedValues = codedValues;
if (boustrophedonicOrdering)
{
if (GRIBEX_boustrophedonic)

2
definitions/grib1/data.grid_second_order_general_grib1.def
View File

@ -49,7 +49,7 @@ if(bitmapPresent) {
): read_only;
alias data.packedValues = codedValues;
if (boustrophedonicOrdering)
{
if (GRIBEX_boustrophedonic)

2
definitions/grib1/data.grid_simple_matrix.def
View File

@ -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,

4
definitions/grib1/data.spectral_complex.def
View File

@ -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

4
definitions/grib1/data.spectral_ieee.def
View File

@ -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

4
definitions/grib1/local.98.13.def
View File

@ -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;

8
definitions/grib1/section.1.def
View File

@ -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;
}
}

2
definitions/grib2/local.98.9.def
View File

@ -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 ;

2
definitions/grib2/tables/4/4.151.table
View File

@ -1,4 +1,4 @@
# CODE TABLE 4.15, Confidence level units
# CODE TABLE 4.15, Confidence level units
0 0 bad
1 1 suspect

2
definitions/grib2/tables/4/4.2.0.1.table
View File

@ -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)

2
definitions/grib2/tables/5/4.151.table
View File

@ -1,4 +1,4 @@
# CODE TABLE 4.15, Confidence level units
# CODE TABLE 4.15, Confidence level units
0 0 bad
1 1 suspect

2
definitions/grib2/template.3.1.def
View File

@ -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";

2
definitions/grib2/template.3.10.def
View File

@ -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;

2
definitions/grib2/template.3.12.def
View File

@ -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;

2
definitions/grib2/template.3.2.def
View File

@ -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";

1
definitions/grib2/template.3.4.def
View File

@ -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";

2
definitions/grib2/template.3.41.def
View File

@ -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";

2
definitions/grib2/template.3.5.def
View File

@ -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";

2
definitions/grib2/template.4.horizontal.def
View File

@ -47,7 +47,7 @@ if (typeOfSecondFixedSurface == 255) {
scaledValueOfSecondFixedSurface,
pressureUnits) :dump;
alias level=topLevel; # (see GRIB-725)
}
alias ls.level=level;
alias vertical.level=level;

4
definitions/grib2/template.4.statistical.def
View File

@ -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";

2
definitions/grib2/template.5.50.def
View File

@ -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 ;

1
definitions/grib2/template.7.50.def
View File

@ -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;