diff --git a/definitions/bufr/boot_edition_0.def b/definitions/bufr/boot_edition_0.def index c6e327579..086b379a5 100644 --- a/definitions/bufr/boot_edition_0.def +++ b/definitions/bufr/boot_edition_0.def @@ -1,11 +1,4 @@ # Copyright 2005-2019 ECMWF. -# -# This software is licensed under the terms of the Apache Licence Version 2.0 -# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0. -# -# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by -# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction. -# ascii[4] identifier = "BUFR" : read_only,hidden; alias identifier=identifier; @@ -15,22 +8,20 @@ unsigned[3] section1Length; unsigned[1] edition = 0 : dump; alias editionNumber=edition; -template section_1 "bufr/section.1.1.def" ; +template section_1 "bufr/section.1.1.def"; flagbit localSectionPresent(section1Flags,7) = 1; alias section2Present=localSectionPresent; - if(localSectionPresent){ - template section_2 "bufr/section.2.def" ; + template section_2 "bufr/section.2.def"; } else { transient section2Length = 0; } -template section_3 "bufr/section.3.def" ; -template section_4 "bufr/section.4.def" ; -template section_5 "bufr/section.5.def" ; +template section_3 "bufr/section.3.def"; +template section_4 "bufr/section.4.def"; +template section_5 "bufr/section.5.def"; transient totalLength = section1Length + section2Length + section3Length + section4Length + 8; - diff --git a/definitions/bufr/boot_edition_1.def b/definitions/bufr/boot_edition_1.def index a9d68ab1a..26d2af230 100644 --- a/definitions/bufr/boot_edition_1.def +++ b/definitions/bufr/boot_edition_1.def @@ -1,11 +1,4 @@ # Copyright 2005-2019 ECMWF. -# -# This software is licensed under the terms of the Apache Licence Version 2.0 -# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0. -# -# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by -# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction. -# ascii[4] identifier = "BUFR" : read_only,hidden; alias identifier=identifier; @@ -15,22 +8,21 @@ unsigned[3] section1Length; unsigned[1] edition = 1 : dump; alias editionNumber=edition; -template section_1 "bufr/section.1.1.def" ; +template section_1 "bufr/section.1.1.def"; flagbit localSectionPresent(section1Flags,7) = 1; alias section2Present=localSectionPresent; if(localSectionPresent){ - template section_2 "bufr/section.2.def" ; + template section_2 "bufr/section.2.def"; } else { transient section2Length = 0; } -template section_3 "bufr/section.3.def" ; -template section_4 "bufr/section.4.def" ; -template section_5 "bufr/section.5.def" ; +template section_3 "bufr/section.3.def"; +template section_4 "bufr/section.4.def"; +template section_5 "bufr/section.5.def"; transient totalLength = section1Length + section2Length + section3Length + section4Length + 8; - diff --git a/definitions/bufr/boot_edition_2.def b/definitions/bufr/boot_edition_2.def index 95c831838..580532c17 100644 --- a/definitions/bufr/boot_edition_2.def +++ b/definitions/bufr/boot_edition_2.def @@ -1,34 +1,25 @@ # Copyright 2005-2019 ECMWF. -# -# This software is licensed under the terms of the Apache Licence Version 2.0 -# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0. -# -# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by -# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction. -# - ascii[4] identifier = "BUFR" : read_only,hidden; alias identifier=identifier; -unsigned[3] totalLength ; +unsigned[3] totalLength; unsigned[1] edition = 2 : dump; alias editionNumber=edition; -template section_1 "bufr/section.1.2.def" ; +template section_1 "bufr/section.1.2.def"; flagbit localSectionPresent(section1Flags,7) = 1; alias section2Present=localSectionPresent; if(localSectionPresent){ - template section_2 "bufr/section.2.def" ; + template section_2 "bufr/section.2.def"; } else { transient section2Length = 0; } -template section_3 "bufr/section.3.def" ; -template section_4 "bufr/section.4.def" ; -template section_5 "bufr/section.5.def" ; - +template section_3 "bufr/section.3.def"; +template section_4 "bufr/section.4.def"; +template section_5 "bufr/section.5.def"; diff --git a/definitions/bufr/boot_edition_3.def b/definitions/bufr/boot_edition_3.def index e6ad7a21e..4bb740592 100644 --- a/definitions/bufr/boot_edition_3.def +++ b/definitions/bufr/boot_edition_3.def @@ -1,11 +1,4 @@ # Copyright 2005-2019 ECMWF. -# -# This software is licensed under the terms of the Apache Licence Version 2.0 -# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0. -# -# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by -# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction. -# ascii[4] identifier = "BUFR" : read_only,hidden; alias identifier=identifier; @@ -15,20 +8,18 @@ section_length[3] totalLength ; unsigned[1] edition = 3 : dump; alias editionNumber=edition; -template section_1 "bufr/section.1.3.def" ; +template section_1 "bufr/section.1.3.def"; flagbit localSectionPresent(section1Flags,7) = 1; alias section2Present=localSectionPresent; - if(localSectionPresent){ - template section_2 "bufr/section.2.def" ; + template section_2 "bufr/section.2.def"; } else { transient section2Length = 0; } -template section_3 "bufr/section.3.def" ; -template section_4 "bufr/section.4.def" ; -template section_5 "bufr/section.5.def" ; - +template section_3 "bufr/section.3.def"; +template section_4 "bufr/section.4.def"; +template section_5 "bufr/section.5.def"; diff --git a/definitions/bufr/boot_edition_4.def b/definitions/bufr/boot_edition_4.def index 466aa07b2..f25469381 100644 --- a/definitions/bufr/boot_edition_4.def +++ b/definitions/bufr/boot_edition_4.def @@ -1,11 +1,4 @@ # Copyright 2005-2019 ECMWF. -# -# This software is licensed under the terms of the Apache Licence Version 2.0 -# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0. -# -# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by -# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction. -# ascii[4] identifier = "BUFR" : read_only,hidden; alias identifier=identifier; @@ -15,19 +8,18 @@ section_length[3] totalLength ; unsigned[1] edition = 4 : dump; alias editionNumber=edition; -template section_1 "bufr/section.1.4.def" ; +template section_1 "bufr/section.1.4.def"; flagbit localSectionPresent(section1Flags,7) = 1; alias section2Present=localSectionPresent; if(localSectionPresent){ - template section_2 "bufr/section.2.def" ; + template section_2 "bufr/section.2.def"; } else { transient section2Length = 0; } -template section_3 "bufr/section.3.def" ; -template section_4 "bufr/section.4.def" ; -template section_5 "bufr/section.5.def" ; - +template section_3 "bufr/section.3.def"; +template section_4 "bufr/section.4.def"; +template section_5 "bufr/section.5.def"; diff --git a/definitions/bufr/old_section.1.def b/definitions/bufr/old_section.1.def index 976607bfa..d638808e5 100644 --- a/definitions/bufr/old_section.1.def +++ b/definitions/bufr/old_section.1.def @@ -1,17 +1,9 @@ # Copyright 2005-2019 ECMWF. -# -# This software is licensed under the terms of the Apache Licence Version 2.0 -# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0. -# -# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by -# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction. -# codetable[2] originatingCentre 'common/c-1.table' : dump; unsigned[1] updateSequenceNumber; -flags[1] section1Flags 'bufr/section1_flags.table' = 128 : hidden ; # = section 2 present - +flags[1] section1Flags 'bufr/section1_flags.table' = 128 : hidden; # = section 2 present unsigned[1] dataCategory; unsigned[1] dataSubCategory; diff --git a/definitions/bufr/section.0.def b/definitions/bufr/section.0.def index 7fd9d6bd7..625d8e596 100644 --- a/definitions/bufr/section.0.def +++ b/definitions/bufr/section.0.def @@ -1,10 +1,3 @@ # Copyright 2005-2019 ECMWF. -# -# This software is licensed under the terms of the Apache Licence Version 2.0 -# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0. -# -# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by -# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction. -# label empty; diff --git a/definitions/bufr/section.1.1.def b/definitions/bufr/section.1.1.def index 91c3db205..5aade0f44 100644 --- a/definitions/bufr/section.1.1.def +++ b/definitions/bufr/section.1.1.def @@ -1,18 +1,10 @@ # Copyright 2005-2019 ECMWF. -# -# This software is licensed under the terms of the Apache Licence Version 2.0 -# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0. -# -# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by -# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction. -# codetable[2] bufrHeaderCentre 'common/c-1.table' : dump; unsigned[1] updateSequenceNumber; flags[1] section1Flags 'bufr/section1_flags.table' = 128 : hidden ; # = section 2 present - unsigned[1] dataCategory : dump; unsigned[1] dataSubCategory : dump; unsigned[2] localTablesVersionNumber : dump; @@ -28,4 +20,3 @@ alias masterTableNumber = editionNumber; # ? alias ls.masterTablesVersionNumber=masterTablesVersionNumber; alias ls.localTablesVersionNumber=localTablesVersionNumber; - diff --git a/definitions/bufr/section.1.2.def b/definitions/bufr/section.1.2.def index 18c860c6e..44b978305 100644 --- a/definitions/bufr/section.1.2.def +++ b/definitions/bufr/section.1.2.def @@ -1,13 +1,4 @@ # Copyright 2005-2019 ECMWF. -# -# This software is licensed under the terms of the Apache Licence Version 2.0 -# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0. -# -# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by -# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction. -# - - position offsetSection1; section_length[3] section1Length ; @@ -36,6 +27,4 @@ alias ls.centre=bufrHeaderCentre; alias ls.masterTablesVersionNumber=masterTablesVersionNumber; alias ls.localTablesVersionNumber=localTablesVersionNumber; - section_padding section1Padding; - diff --git a/definitions/bufr/section.1.3.def b/definitions/bufr/section.1.3.def index ca174510a..fae33dfc9 100644 --- a/definitions/bufr/section.1.3.def +++ b/definitions/bufr/section.1.3.def @@ -1,12 +1,4 @@ # Copyright 2005-2019 ECMWF. -# -# This software is licensed under the terms of the Apache Licence Version 2.0 -# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0. -# -# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by -# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction. -# - position offsetSection1; section_length[3] section1Length ; @@ -18,7 +10,7 @@ codetable[1] bufrHeaderCentre 'common/c-1.table' : dump; unsigned[1] updateSequenceNumber :dump; -flags[1] section1Flags 'bufr/section1_flags.table' = 128 : hidden ; # = section 2 present +flags[1] section1Flags 'bufr/section1_flags.table' = 128 : hidden ; # = section 2 present unsigned[1] dataCategory : dump; unsigned[1] dataSubCategory : dump; @@ -42,11 +34,8 @@ meta ls.typicalTime sprintf("%.2d%.2d%.2d",typicalHour,typicalMinute,typicalSeco meta typicalDateTime julian_date(typicalYear,typicalMonth,typicalDay,typicalHour,typicalMinute,typicalSecond) ; - alias ls.centre=bufrHeaderCentre; alias ls.masterTablesVersionNumber=masterTablesVersionNumber; alias ls.localTablesVersionNumber=localTablesVersionNumber; - section_padding section1Padding; - diff --git a/definitions/bufr/section.1.4.def b/definitions/bufr/section.1.4.def index 18fb8c174..8287a5082 100644 --- a/definitions/bufr/section.1.4.def +++ b/definitions/bufr/section.1.4.def @@ -1,12 +1,4 @@ # Copyright 2005-2019 ECMWF. -# -# This software is licensed under the terms of the Apache Licence Version 2.0 -# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0. -# -# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by -# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction. -# - position offsetSection1; section_length[3] section1Length ; @@ -19,7 +11,7 @@ alias ls.centre=bufrHeaderCentre; unsigned[1] updateSequenceNumber : dump; -flags[1] section1Flags 'bufr/section1_flags.table' = 128 : hidden ; # = section 2 present +flags[1] section1Flags 'bufr/section1_flags.table' = 128 : hidden ; # = section 2 present unsigned[1] dataCategory : dump; unsigned[1] internationalDataSubCategory = 255 : dump; @@ -52,4 +44,3 @@ alias ls.masterTablesVersionNumber=masterTablesVersionNumber; alias ls.localTablesVersionNumber=localTablesVersionNumber; section_padding section1Padding; - diff --git a/definitions/bufr/section.2.def b/definitions/bufr/section.2.def index da3fd9fb0..4fb165c5d 100644 --- a/definitions/bufr/section.2.def +++ b/definitions/bufr/section.2.def @@ -1,11 +1,4 @@ # Copyright 2005-2019 ECMWF. -# -# This software is licensed under the terms of the Apache Licence Version 2.0 -# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0. -# -# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by -# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction. -# section_length[3] section2Length ; unsigned[1] reservedSection2 = 0; diff --git a/definitions/bufr/section.3.def b/definitions/bufr/section.3.def index f7ede0427..cbff5edf2 100644 --- a/definitions/bufr/section.3.def +++ b/definitions/bufr/section.3.def @@ -1,11 +1,4 @@ # Copyright 2005-2019 ECMWF. -# -# This software is licensed under the terms of the Apache Licence Version 2.0 -# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0. -# -# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by -# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction. -# constant defaultSequence=0; constant tablesMasterDir="bufr/tables/[masterTableNumber]/wmo/[masterTablesVersionNumber]" : hidden; diff --git a/definitions/bufr/section.4.def b/definitions/bufr/section.4.def index 65cc3e5e7..8fe6aed57 100644 --- a/definitions/bufr/section.4.def +++ b/definitions/bufr/section.4.def @@ -1,11 +1,4 @@ # Copyright 2005-2019 ECMWF. -# -# This software is licensed under the terms of the Apache Licence Version 2.0 -# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0. -# -# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by -# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction. -# position offsetSection4; section_length[3] section4Length ; diff --git a/definitions/bufr/section.5.def b/definitions/bufr/section.5.def index df7e6bda8..11d7381f6 100644 --- a/definitions/bufr/section.5.def +++ b/definitions/bufr/section.5.def @@ -1,11 +1,4 @@ # Copyright 2005-2019 ECMWF. -# -# This software is licensed under the terms of the Apache Licence Version 2.0 -# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0. -# -# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by -# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction. -# constant section5Length=4; ascii[4] '7777' = "7777" : read_only;