diff --git a/data/bitmap.diff b/data/bitmap.diff index 237da36d8..950e1bda1 100644 --- a/data/bitmap.diff +++ b/data/bitmap.diff @@ -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] diff --git a/data/no_bitmap.diff b/data/no_bitmap.diff index 72c38b9e1..fb1ddc413 100644 --- a/data/no_bitmap.diff +++ b/data/no_bitmap.diff @@ -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] diff --git a/definitions/Makefile.am b/definitions/Makefile.am index f3ac03d61..886789fe7 100644 --- a/definitions/Makefile.am +++ b/definitions/Makefile.am @@ -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\ diff --git a/definitions/budg/section.1.def b/definitions/budg/section.1.def index d7d7c85a1..8d6a3f38e 100644 --- a/definitions/budg/section.1.def +++ b/definitions/budg/section.1.def @@ -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; diff --git a/definitions/bufr/old_section.1.def b/definitions/bufr/old_section.1.def index bb4299c1c..999469dfa 100644 --- a/definitions/bufr/old_section.1.def +++ b/definitions/bufr/old_section.1.def @@ -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 diff --git a/definitions/bufr/section.1.1.def b/definitions/bufr/section.1.1.def index 82e48429c..d40fdf323 100644 --- a/definitions/bufr/section.1.1.def +++ b/definitions/bufr/section.1.1.def @@ -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 diff --git a/definitions/bufr/section.1.2.def b/definitions/bufr/section.1.2.def index b7a23da0e..bcd64b98b 100644 --- a/definitions/bufr/section.1.2.def +++ b/definitions/bufr/section.1.2.def @@ -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; diff --git a/definitions/bufr/section.1.3.def b/definitions/bufr/section.1.3.def index 527b02800..c24f9d34a 100644 --- a/definitions/bufr/section.1.3.def +++ b/definitions/bufr/section.1.3.def @@ -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; diff --git a/definitions/bufr/section.1.4.def b/definitions/bufr/section.1.4.def index 78db20b7f..a85aaddd0 100644 --- a/definitions/bufr/section.1.4.def +++ b/definitions/bufr/section.1.4.def @@ -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; diff --git a/definitions/grib1/0.table b/definitions/common/c-1.table similarity index 100% rename from definitions/grib1/0.table rename to definitions/common/c-1.table diff --git a/definitions/grib2/centre.table b/definitions/common/c-11.table similarity index 100% rename from definitions/grib2/centre.table rename to definitions/common/c-11.table diff --git a/definitions/grib1/local.98.18.def b/definitions/grib1/local.98.18.def index c4434fc30..80be8dcda 100644 --- a/definitions/grib1/local.98.18.def +++ b/definitions/grib1/local.98.18.def @@ -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 ; diff --git a/definitions/grib1/local.98.218.def b/definitions/grib1/local.98.218.def index fd773f6a9..da14c33f0 100644 --- a/definitions/grib1/local.98.218.def +++ b/definitions/grib1/local.98.218.def @@ -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 ; diff --git a/definitions/grib1/local.98.31.def b/definitions/grib1/local.98.31.def index cc77c4843..e2a5cdb41 100644 --- a/definitions/grib1/local.98.31.def +++ b/definitions/grib1/local.98.31.def @@ -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 ); diff --git a/definitions/grib1/section.1.def b/definitions/grib1/section.1.def index a62f802f7..062dc81c3 100644 --- a/definitions/grib1/section.1.def +++ b/definitions/grib1/section.1.def @@ -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); diff --git a/definitions/grib2/local.98.11.def b/definitions/grib2/local.98.11.def index 2707954b0..baf1c38b2 100644 --- a/definitions/grib2/local.98.11.def +++ b/definitions/grib2/local.98.11.def @@ -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; diff --git a/definitions/grib2/local.98.18.def b/definitions/grib2/local.98.18.def index d2c1bb83c..1a19a7902 100644 --- a/definitions/grib2/local.98.18.def +++ b/definitions/grib2/local.98.18.def @@ -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 ; diff --git a/definitions/grib2/section.1.def b/definitions/grib2/section.1.def index 6992690dd..280c9843c 100644 --- a/definitions/grib2/section.1.def +++ b/definitions/grib2/section.1.def @@ -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); diff --git a/definitions/grib2/template.4.parameter_postproc.def b/definitions/grib2/template.4.parameter_postproc.def index d5a24738f..394f26c82 100644 --- a/definitions/grib2/template.4.parameter_postproc.def +++ b/definitions/grib2/template.4.parameter_postproc.def @@ -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; diff --git a/definitions/tide/section.1.def b/definitions/tide/section.1.def index 870d19d6d..44a30e50f 100644 --- a/definitions/tide/section.1.def +++ b/definitions/tide/section.1.def @@ -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 ; diff --git a/examples/C/new_sample.c b/examples/C/new_sample.c index 0bd742c6b..239e08fd7 100644 --- a/examples/C/new_sample.c +++ b/examples/C/new_sample.c @@ -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);