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

Performance: remove the label statements or use underscore so grib_push_accessor does not add them to cache

This commit is contained in:
Shahram Najm 2017-06-14 15:33:37 +01:00
parent 9c7fd259df
commit 17885b337f
50 changed files with 21 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
definitions/empty_template.def
View File

@ -1,2 +1,2 @@
label "x"; label "_x";

1
definitions/grib1/local.34.def
View File

@ -1,4 +1,3 @@
label "JMA - extension";
# Japanese Meteorological Agency # Japanese Meteorological Agency
codetable[1] localDefinitionNumber 'grib1/localDefinitionNumber.34.table' = 1 : dump; codetable[1] localDefinitionNumber 'grib1/localDefinitionNumber.34.table' = 1 : dump;
template localDefinition "grib1/local.34.[localDefinitionNumber:l].def"; template localDefinition "grib1/local.34.[localDefinitionNumber:l].def";

2
definitions/grib1/section.0.def
View File

@ -7,4 +7,4 @@
# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction. # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
# #
label empty; label "_empty";

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

@ -1 +1 @@
label "empty section"; label "_empty section";

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

@ -1,3 +1,3 @@
label "empty section"; label "_empty section";

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

@ -1,3 +1,3 @@
label "local 98.1"; label "_local 98.1";

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

@ -7,6 +7,6 @@
# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction. # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
# #
label "empty section"; label "_empty section";
# END 1/local.98.5 ---------------------------------------------------------------------- # END 1/local.98.5 ----------------------------------------------------------------------

1
definitions/grib2/localConcepts/edzw/default_step_units.def
View File

@ -1,4 +1,3 @@
# Override for sub-hourly steps # Override for sub-hourly steps
# See ECC-438 # See ECC-438
label "subhourly";
alias defaultStepUnits=indicatorOfUnitOfTimeRange; alias defaultStepUnits=indicatorOfUnitOfTimeRange;

2
definitions/grib2/meta.def
View File

@ -7,6 +7,6 @@
# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction. # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
# #
label "Empty file"; label "_Empty file";
#meta area g1area(latitudeOfFirstGridPoint,longitudeOfFirstGridPoint,latitudeOfLastGridPoint,longitudeOfLastGridPoint,angleMultiplier,angleDivisor); #meta area g1area(latitudeOfFirstGridPoint,longitudeOfFirstGridPoint,latitudeOfLastGridPoint,longitudeOfLastGridPoint,angleMultiplier,angleDivisor);

1
definitions/grib2/section.5.def
View File

@ -7,7 +7,6 @@
# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction. # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
# #
label "grib 2 Section 5 DATA REPRESENTATION SECTION";
position offsetBSection5; position offsetBSection5;
# START grib2::section # START grib2::section

2
definitions/grib2/section.6.def
View File

@ -7,7 +7,7 @@
# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction. # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
# #
label "grib 2 Section 6 BIT-MAP SECTION";
# START grib2::section # START grib2::section
# SECTION 6, BIT-MAP SECTION # SECTION 6, BIT-MAP SECTION
# Length of section in octets # Length of section in octets

2
definitions/grib2/section.7.def
View File

@ -7,7 +7,7 @@
# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction. # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
# #
label "grib 2 Section 7 data";
# START grib2::section # START grib2::section
# SECTION 7, DATA SECTION # SECTION 7, DATA SECTION
# Length of section in octets # Length of section in octets

1
definitions/grib2/template.3.spherical_harmonics.def
View File

@ -7,7 +7,6 @@
# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction. # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
# #
label "Spherical harmonics";
constant sphericalHarmonics=1; constant sphericalHarmonics=1;
# constant dataRepresentationType = 50; # constant dataRepresentationType = 50;

2
definitions/grib2/template.3.stretching.def
View File

@ -7,8 +7,6 @@
# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction. # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
# #
label "Stretching information";
# Latitude of the pole of stretching # Latitude of the pole of stretching
signed[4] latitudeOfThePoleOfStretching : edition_specific,no_copy; signed[4] latitudeOfThePoleOfStretching : edition_specific,no_copy;

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

@ -8,7 +8,7 @@
# #
# test template # test template
label "test template"; label "_test template";

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

@ -7,8 +7,6 @@
# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction. # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
# #
label "Categorical Forecast";
# Total number of forecast probabilities # Total number of forecast probabilities
unsigned[1] numberOfCategories : dump; unsigned[1] numberOfCategories : dump;

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

@ -7,8 +7,6 @@
# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction. # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
# #
label "Circular cluster";
# Cluster identifier # Cluster identifier
unsigned[1] clusterIdentifier : dump; unsigned[1] clusterIdentifier : dump;
alias number=clusterIdentifier; alias number=clusterIdentifier;

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

@ -7,8 +7,6 @@
# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction. # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
# #
label "Derived forecast";
# Derived forecast # Derived forecast
codetable[1] derivedForecast ('4.7.table',masterDir,localDir) : dump; codetable[1] derivedForecast ('4.7.table',masterDir,localDir) : dump;

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

@ -7,8 +7,6 @@
# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction. # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
# #
label "EPS information";
# Type of ensemble forecast # Type of ensemble forecast
codetable[1] typeOfEnsembleForecast ('4.6.table',masterDir,localDir) = 255 : dump; codetable[1] typeOfEnsembleForecast ('4.6.table',masterDir,localDir) = 255 : dump;

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

@ -7,8 +7,6 @@
# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction. # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
# #
label "Parameter information";
# Parameter category # Parameter category
codetable[1] parameterCategory ('4.1.[discipline:l].table',masterDir,localDir) : dump; codetable[1] parameterCategory ('4.1.[discipline:l].table',masterDir,localDir) : dump;

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

@ -7,8 +7,6 @@
# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction. # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
# #
label "Parameter information";
# Parameter category # Parameter category
codetable[1] parameterCategory ('4.1.[discipline:l].table',masterDir,localDir) : dump; codetable[1] parameterCategory ('4.1.[discipline:l].table',masterDir,localDir) : dump;

3
definitions/grib2/template.4.parameter_aerosol_44.def
View File

@ -9,9 +9,6 @@
# GRIB-530: This template is to be used by template.4.44.def ONLY # GRIB-530: This template is to be used by template.4.44.def ONLY
label "Parameter information";
# Parameter category # Parameter category
codetable[1] parameterCategory ('4.1.[discipline:l].table',masterDir,localDir) : dump; codetable[1] parameterCategory ('4.1.[discipline:l].table',masterDir,localDir) : dump;

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

@ -7,8 +7,6 @@
# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction. # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
# #
label "Parameter information";
# Parameter category # Parameter category
codetable[1] parameterCategory ('4.1.[discipline:l].table',masterDir,localDir) : dump; codetable[1] parameterCategory ('4.1.[discipline:l].table',masterDir,localDir) : dump;

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

@ -7,8 +7,6 @@
# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction. # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
# #
label "Parameter information";
# Parameter category # Parameter category
codetable[1] parameterCategory ('4.1.[discipline:l].table',masterDir,localDir): dump; codetable[1] parameterCategory ('4.1.[discipline:l].table',masterDir,localDir): dump;

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

@ -7,8 +7,6 @@
# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction. # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
# #
label "Parameter information";
# Parameter category # Parameter category
codetable[1] parameterCategory ('4.1.[discipline:l].table',masterDir,localDir): dump; codetable[1] parameterCategory ('4.1.[discipline:l].table',masterDir,localDir): dump;

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

@ -7,8 +7,6 @@
# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction. # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
# #
label "Parameter information";
# Parameter category # Parameter category
codetable[1] parameterCategory ('4.1.[discipline:l].table',masterDir,localDir) : dump; codetable[1] parameterCategory ('4.1.[discipline:l].table',masterDir,localDir) : dump;

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

@ -7,8 +7,6 @@
# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction. # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
# #
label "Parameter information";
# Parameter category # Parameter category
codetable[1] parameterCategory ('4.1.[discipline:l].table',masterDir,localDir): dump; codetable[1] parameterCategory ('4.1.[discipline:l].table',masterDir,localDir): dump;

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

@ -7,8 +7,6 @@
# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction. # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
# #
label "Tile information";
# Parameter category # Parameter category
codetable[1] parameterCategory ('4.1.[discipline:l].table',masterDir,localDir) : dump; codetable[1] parameterCategory ('4.1.[discipline:l].table',masterDir,localDir) : dump;

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

@ -7,8 +7,6 @@
# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction. # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
# #
label "Percentile forecast";
# Percentile value # Percentile value
# (from 100% to 0%) # (from 100% to 0%)
unsigned[1] percentileValue : dump; unsigned[1] percentileValue : dump;

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

@ -7,8 +7,6 @@
# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction. # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
# #
label "Forecast probability";
# Forecast probability number # Forecast probability number
unsigned[1] forecastProbabilityNumber : dump; unsigned[1] forecastProbabilityNumber : dump;

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

@ -7,8 +7,6 @@
# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction. # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
# #
label "Rectangular cluster";
# Cluster identifier # Cluster identifier
unsigned[1] clusterIdentifier : dump ; unsigned[1] clusterIdentifier : dump ;
alias number=clusterIdentifier; alias number=clusterIdentifier;

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

@ -1,5 +1,3 @@
label "S2S reforecasts";
# The Model Version Date # The Model Version Date
# This is the date when the reforecast is produced with a particular version of the model # This is the date when the reforecast is produced with a particular version of the model

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

@ -7,7 +7,6 @@
# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction. # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
# #
label "statistical processing";
# Year of end of overall time interval # Year of end of overall time interval
unsigned[2] yearOfEndOfOverallTimeInterval =0 : edition_specific; unsigned[2] yearOfEndOfOverallTimeInterval =0 : edition_specific;

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

@ -7,7 +7,6 @@
# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction. # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
# #
label "grib 2 Section 5 template 5.4";
# START 2/template.5.4 ---------------------------------------------------------------------- # START 2/template.5.4 ----------------------------------------------------------------------
# TEMPLATE 5.4, Grid point data - IEEE packing # TEMPLATE 5.4, Grid point data - IEEE packing
# added for conversion from other packing # added for conversion from other packing

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

@ -7,7 +7,6 @@
# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction. # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
# #
label "grib 2 Section 5 template 5.6";
# START 2/template.5.6 ---------------------------------------------------------------------- # START 2/template.5.6 ----------------------------------------------------------------------
# Grid point data - Simple packing with preprocessing # Grid point data - Simple packing with preprocessing

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

@ -7,7 +7,6 @@
# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction. # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
# #
label "grib 2 Section 5 template 5.61";
# START 2/template.5.61 ---------------------------------------------------------------------- # START 2/template.5.61 ----------------------------------------------------------------------
# Grid point data - Simple packing with logarithmic preprocessing # Grid point data - Simple packing with logarithmic preprocessing
constant typeOfPreProcessing=1; constant typeOfPreProcessing=1;

2
definitions/mars/base.def
View File

@ -1,2 +1,2 @@
label "x"; label "_x";

2
definitions/mars/eswi/grib.oper.3v.def
View File

@ -1,2 +1,2 @@
label "x"; label "_x";

2
definitions/mars/eswi/grib.oper.4v.def
View File

@ -1,2 +1,2 @@
label "x"; label "_x";

2
definitions/mars/eswi/grib.oper.an.def
View File

@ -1,2 +1,2 @@
label "x"; label "_x";

2
definitions/mars/eswi/grib.oper.si.def
View File

@ -1,2 +1,2 @@
label "x"; label "_x";

1
definitions/mars/grib.edmm.fg.def
View File

@ -7,6 +7,5 @@
#alias mars.step = startStep; #alias mars.step = startStep;
#} #}
label "x";
alias mars.number=perturbationNumber; alias mars.number=perturbationNumber;

1
definitions/mars/grib.lwda.4v.def
View File

@ -1,3 +1,2 @@
label "x";
alias mars.anoffset=offsetToEndOf4DvarWindow; alias mars.anoffset=offsetToEndOf4DvarWindow;

1
definitions/mars/grib.lwda.an.def
View File

@ -1,3 +1,2 @@
label "x";
alias mars.anoffset=offsetToEndOf4DvarWindow; alias mars.anoffset=offsetToEndOf4DvarWindow;

1
definitions/mars/grib.lwda.ea.def
View File

@ -1,3 +1,2 @@
label "x";
alias mars.anoffset=offsetToEndOf4DvarWindow; alias mars.anoffset=offsetToEndOf4DvarWindow;

1
definitions/mars/grib.lwda.ef.def
View File

@ -1,3 +1,2 @@
label "x";
alias mars.anoffset=offsetToEndOf4DvarWindow; alias mars.anoffset=offsetToEndOf4DvarWindow;

1
definitions/mars/grib.lwda.me.def
View File

@ -1,4 +1,3 @@
label "model errors";
#alias mars.number=perturbationNumber; #alias mars.number=perturbationNumber;
alias mars.anoffset=offsetToEndOf4DvarWindow; alias mars.anoffset=offsetToEndOf4DvarWindow;

2
definitions/mars/grib.me.def
View File

@ -1,3 +1,3 @@
label "model errors"; label "_model errors";
#alias mars.number=perturbationNumber; #alias mars.number=perturbationNumber;

2
definitions/mars/grib.mnth.fg.def
View File

@ -7,4 +7,4 @@
#alias mars.step = startStep; #alias mars.step = startStep;
#} #}
label "x"; label "_x";

10
examples/python/high_level_api.py
View File

@ -28,9 +28,9 @@ for i1 in range(len(TEST_KEYS)):
TEST_INDEX_OUTPUT = TESTGRIB TEST_INDEX_OUTPUT = TESTGRIB
TEST_STEPRANGE = ('0', '12', '18', '24', '6') TEST_STEPRANGE = ('0', '12', '18', '24', '6')
# These keys should be available even if new keys are defined # These keys should be available even if new keys are defined
KNOWN_GRIB_KEYS = ['7777', 'EPS information', 'GRIBEditionNumber', 'N', 'NV', KNOWN_GRIB_KEYS = ['7777', 'GRIBEditionNumber', 'N', 'NV',
'Ni', 'Nj', 'PLPresent', 'PVPresent', 'Ni', 'Nj', 'PLPresent', 'PVPresent',
'Parameter information', 'addEmptySection2', 'addEmptySection2',
'addExtraLocalSection', 'alternativeRowScanning', 'addExtraLocalSection', 'alternativeRowScanning',
'angleDivisor', 'angleMultiplier', 'angularPrecision', 'angleDivisor', 'angleMultiplier', 'angularPrecision',
'average', 'backgroundProcess', 'average', 'backgroundProcess',
@ -49,8 +49,6 @@ KNOWN_GRIB_KEYS = ['7777', 'EPS information', 'GRIBEditionNumber', 'N', 'NV',
'forecastTime', 'g2grid', 'gaussianGridName', 'forecastTime', 'g2grid', 'gaussianGridName',
'genVertHeightCoords', 'generatingProcessIdentifier', 'genVertHeightCoords', 'generatingProcessIdentifier',
'getNumberOfValues', 'global', 'globalDomain', 'getNumberOfValues', 'global', 'globalDomain',
'grib 2 Section 5 DATA REPRESENTATION SECTION',
'grib 2 Section 6 BIT-MAP SECTION', 'grib 2 Section 7 data',
'grib2LocalSectionNumber', 'grib2LocalSectionPresent', 'grib2LocalSectionNumber', 'grib2LocalSectionPresent',
'grib2divider', 'gridDefinitionDescription', 'grib2divider', 'gridDefinitionDescription',
'gridDefinitionTemplateNumber', 'gridDefinitionTemplateNumber',
@ -131,7 +129,7 @@ KNOWN_GRIB_KEYS = ['7777', 'EPS information', 'GRIBEditionNumber', 'N', 'NV',
'unitsECMF', 'unitsOfFirstFixedSurface', 'unitsECMF', 'unitsOfFirstFixedSurface',
'unitsOfSecondFixedSurface', 'unpackedError', 'unitsOfSecondFixedSurface', 'unpackedError',
'uvRelativeToGrid', 'validityDate', 'validityTime', 'uvRelativeToGrid', 'validityDate', 'validityTime',
'values', 'x', 'year'] 'values', 'year']
KNOWN_BUFR_KEYS = ['edition', 'masterTableNumber', 'bufrHeaderSubCentre', 'bufrHeaderCentre', KNOWN_BUFR_KEYS = ['edition', 'masterTableNumber', 'bufrHeaderSubCentre', 'bufrHeaderCentre',
'updateSequenceNumber', 'dataCategory', 'dataSubCategory', 'masterTablesVersionNumber', 'updateSequenceNumber', 'dataCategory', 'dataSubCategory', 'masterTablesVersionNumber',
'localTablesVersionNumber', 'typicalYearOfCentury', 'typicalMonth', 'typicalDay', 'localTablesVersionNumber', 'typicalYearOfCentury', 'typicalMonth', 'typicalDay',
@ -229,7 +227,7 @@ class TestGribMessage(unittest.TestCase):
msg = GribMessage(grib_file) msg = GribMessage(grib_file)
msg_keys = msg.keys() msg_keys = msg.keys()
for key in KNOWN_GRIB_KEYS: for key in KNOWN_GRIB_KEYS:
assert key in msg_keys assert key in msg_keys, "key '%s' not found" % key
# Size of message in bytes # Size of message in bytes
self.assertEqual(msg.size(), 160219) self.assertEqual(msg.size(), 160219)
self.assertEqual(len(msg.keys()), len(msg)) self.assertEqual(len(msg.keys()), len(msg))