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

ECC-426: GRIB and BUFR centre: use common code tables C-1 and C-11

This commit is contained in:
Shahram Najm 2017-02-16 18:08:25 +00:00
parent e21dd8e9c8
commit e3eccf1fe7
21 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/bitmap.diff
View File

@ -5,7 +5,7 @@
====================== SECTION_1 ( length=52, padding=0 ) ======================
1-3 section1Length = 52
4 table2Version = 128
5 centre = 98 [European Centre for Medium-Range Weather Forecasts (grib1/0.table) ]
5 centre = 98 [European Centre for Medium-Range Weather Forecasts (common/c-1.table) ]
6 generatingProcessIdentifier = 130
7 gridDefinition = 255
8 section1Flags = 192 [11000000]

2
data/no_bitmap.diff
View File

@ -5,7 +5,7 @@
====================== SECTION_1 ( length=52, padding=0 ) ======================
1-3 section1Length = 52
4 table2Version = 128
5 centre = 98 [European Centre for Medium-Range Weather Forecasts (grib1/0.table) ]
5 centre = 98 [European Centre for Medium-Range Weather Forecasts (common/c-1.table) ]
6 generatingProcessIdentifier = 130
7 gridDefinition = 255
8 section1Flags = 128 [10000000]

4
definitions/Makefile.am
View File

@ -8796,6 +8796,8 @@ dist_definitionscdf_DATA = \
definitionscommondir = @ECCODES_DEFINITION_PATH@/common
dist_definitionscommon_DATA = \
common/c-1.table\
common/c-11.table\
common/statistics_grid.def\
common/statistics_spectral.def
@ -8805,7 +8807,6 @@ dist_definitionsgrib1_DATA = \
grib1/0.eidb.table\
grib1/0.eswi.table\
grib1/0.rjtd.table\
grib1/0.table\
grib1/1.table\
grib1/10.table\
grib1/11-2.table\
@ -9173,7 +9174,6 @@ definitionsgrib2dir = @ECCODES_DEFINITION_PATH@/grib2
dist_definitionsgrib2_DATA = \
grib2/boot.def\
grib2/boot_multifield.def\
grib2/centre.table\
grib2/cfName.def\
grib2/cfVarName.def\
grib2/dimension.0.table\

2
definitions/budg/section.1.def
View File

@ -10,7 +10,7 @@
section_length[3] section1Length ;
unsigned[1] gribTablesVersionNo ;
codetable[1] centre 'grib1/0.table' : string_type;
codetable[1] centre 'common/c-1.table' : string_type;
alias ls.centre=centre;
alias identificationOfOriginatingGeneratingCentre=centre;

2
definitions/bufr/old_section.1.def
View File

@ -7,7 +7,7 @@
# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
#
codetable[2] originatingCentrer 'grib1/0.table' : dump;
codetable[2] originatingCentre 'common/c-1.table' : dump;
unsigned[1] updateSequenceNumber;
flags[1] section1Flags 'bufr/section1_flags.table' = 128 : hidden ; # = section 2 present

2
definitions/bufr/section.1.1.def
View File

@ -7,7 +7,7 @@
# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
#
codetable[2] bufrHeaderCentre 'grib1/0.table' : dump;
codetable[2] bufrHeaderCentre 'common/c-1.table' : dump;
unsigned[1] updateSequenceNumber;
flags[1] section1Flags 'bufr/section1_flags.table' = 128 : hidden ; # = section 2 present

2
definitions/bufr/section.1.2.def
View File

@ -13,7 +13,7 @@ section_length[3] section1Length ;
unsigned[1] masterTableNumber;
codetable[2] bufrHeaderCentre 'grib1/0.table' : dump;
codetable[2] bufrHeaderCentre 'common/c-1.table' : dump;
unsigned[1] updateSequenceNumber;

4
definitions/bufr/section.1.3.def
View File

@ -13,8 +13,8 @@ section_length[3] section1Length ;
unsigned[1] masterTableNumber :dump;
codetable[1] bufrHeaderSubCentre 'grib1/0.table' : dump;
unsigned[1] bufrHeaderCentre : dump;
codetable[1] bufrHeaderSubCentre 'common/c-1.table' : dump;
codetable[1] bufrHeaderCentre 'common/c-1.table' : dump;
unsigned[1] updateSequenceNumber :dump;

4
definitions/bufr/section.1.4.def
View File

@ -13,8 +13,8 @@ section_length[3] section1Length ;
unsigned[1] masterTableNumber : dump ;
codetable[2] bufrHeaderCentre 'grib1/0.table' : dump;
unsigned[2] bufrHeaderSubCentre : dump;
codetable[2] bufrHeaderCentre 'common/c-11.table' : dump;
unsigned[2] bufrHeaderSubCentre : dump;
alias ls.centre=bufrHeaderCentre;
unsigned[1] updateSequenceNumber : dump;

0
definitions/grib1/0.table → definitions/common/c-1.table
View File

0
definitions/grib2/centre.table → definitions/common/c-11.table
View File

2
definitions/grib1/local.98.18.def
View File

@ -51,7 +51,7 @@ alias number=perturbationNumber;
unsigned[1] numberOfForecastsInEnsemble : dump ;
alias totalNumber=numberOfForecastsInEnsemble;
codetable[1] dataOrigin "grib1/0.table" : dump;
codetable[1] dataOrigin "common/c-1.table" : dump;
alias origin = dataOrigin;
ascii[4] modelIdentifier : dump ;

2
definitions/grib1/local.98.218.def
View File

@ -52,7 +52,7 @@ alias number=perturbationNumber;
unsigned[1] numberOfForecastsInEnsemble : dump ;
alias totalNumber=numberOfForecastsInEnsemble;
codetable[1] dataOrigin "grib1/0.table" : dump;
codetable[1] dataOrigin "common/c-1.table" : dump;
alias origin = dataOrigin;
ascii[4] modelIdentifier : dump ;

2
definitions/grib1/local.98.31.def
View File

@ -53,7 +53,7 @@ alias referenceDate = dateOfForecastRun;
unsigned[1] numberOfModels :dump;
pad padding_local1_31(42);
listOfModelIdentifiers list (numberOfModels) {
codetable[2] modelIdentifier 'grib1/0.table' :dump;
codetable[2] modelIdentifier 'common/c-1.table' :dump;
}
padto padding_sec1_loc(offsetSection1 + 240 );

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

@ -32,7 +32,7 @@ alias gribTablesVersionNo=table2Version;
#assert(section1Length > 5);
# Identification of originating/generating centre
codetable[1] centre 'grib1/0.table' : dump,string_type;
codetable[1] centre 'common/c-1.table' : dump,string_type;
alias identificationOfOriginatingGeneratingCentre=centre;
meta centreDescription codetable_title(centre);

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

@ -15,7 +15,7 @@ unsigned[1] dayOfAnalysis = day : dump;
unsigned[1] hourOfAnalysis = hour : dump;
unsigned[1] minuteOfAnalysis = minute : dump;
codetable[2] originatingCentreOfAnalysis 'grib1/0.table' = originatingCentre : dump,string_type;
codetable[2] originatingCentreOfAnalysis 'common/c-1.table' = originatingCentre : dump,string_type;
unsigned[2] subcentreOfAnalysis = subCentre : dump;

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

@ -7,7 +7,7 @@
# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
#
codetable[1] dataOrigin "grib1/0.table" : dump;
codetable[1] dataOrigin "common/c-1.table" : dump;
alias mars.origin=dataOrigin;
ascii[4] modelIdentifier : dump ;

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

@ -14,7 +14,7 @@ meta section1Pointer section_pointer(offsetSection1,section1Length,1);
unsigned[1] numberOfSection = 1 :read_only;
codetable[2] centre 'grib2/centre.table' : dump,string_type;
codetable[2] centre 'common/c-11.table' : dump,string_type;
alias identificationOfOriginatingGeneratingCentre=centre;
meta centreDescription codetable_title(centre);

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

@ -22,7 +22,7 @@ meta parameterName codetable_title(parameterNumber) : dump;
unsigned[2] inputProcessIdentifier : dump,edition_specific;
# The input originating centre shall have the value of the 'originating centre' of the original GRIB message
# used as input of the post-processing
codetable[2] inputOriginatingCentre 'grib2/centre.table' : dump,edition_specific,string_type;
codetable[2] inputOriginatingCentre 'common/c-11.table' : dump,edition_specific,string_type;
# This identifies which post-processing technique was used. This is defined by the originating centre
unsigned[1] typeOfPostProcessing : dump,edition_specific;

2
definitions/tide/section.1.def
View File

@ -9,7 +9,7 @@
section_length[3] section1Length ;
unsigned[1] gribTablesVersionNo ;
codetable[1] centre 'grib1/0.table';
codetable[1] centre 'common/c-1.table';
alias ls.centre=centre;
unsigned[1] generatingProcessIdentifier ;

2
examples/C/new_sample.c
View File

@ -47,7 +47,7 @@ int main(int argc,const char** argv)
CODES_CHECK(codes_set_long(h,"editionNumber",2),0);
/* 98 = European Center for Medium-Range Weather Forecasts (grib1/0.table) */
/* 98 = European Center for Medium-Range Weather Forecasts */
CODES_CHECK(codes_set_long(h,"centre",98),0);
CODES_CHECK(codes_set_long(h,"subCentre",0),0);