From 182cd34ec56d73fae23dd1d9a16c8f2540a8ce23 Mon Sep 17 00:00:00 2001 From: Shahram Najm Date: Fri, 14 Sep 2018 12:50:48 +0100 Subject: [PATCH] Clean up comments etc --- definitions/grib2/local.98.11.def | 11 +--------- definitions/grib2/local.98.14.def | 4 +--- definitions/grib2/local.98.15.def | 15 +++----------- definitions/grib2/local.98.16.def | 6 +++--- definitions/grib2/local.98.18.def | 11 +--------- definitions/grib2/local.98.192.def | 11 +--------- definitions/grib2/local.98.20.def | 10 +--------- definitions/grib2/local.98.21.def | 12 +---------- definitions/grib2/local.98.24.def | 2 +- definitions/grib2/local.98.25.def | 10 +--------- definitions/grib2/local.98.26.def | 23 +++++++-------------- definitions/grib2/local.98.28.def | 11 +--------- definitions/grib2/local.98.30.def | 32 +++++++++++------------------- definitions/grib2/local.98.300.def | 12 +---------- definitions/grib2/local.98.36.def | 12 +---------- definitions/grib2/local.98.38.def | 12 +---------- definitions/grib2/local.98.39.def | 12 +---------- 17 files changed, 38 insertions(+), 168 deletions(-) diff --git a/definitions/grib2/local.98.11.def b/definitions/grib2/local.98.11.def index 9cf07e5a9..3676a5463 100644 --- a/definitions/grib2/local.98.11.def +++ b/definitions/grib2/local.98.11.def @@ -1,13 +1,4 @@ -# Copyright 2005-2018 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. -# - -# Definition 11, Supplementary data used by the analysis +# Local definition 11: Supplementary data used by the analysis unsigned[2] yearOfAnalysis = year : dump; unsigned[1] monthOfAnalysis = month : dump; diff --git a/definitions/grib2/local.98.14.def b/definitions/grib2/local.98.14.def index 34cace0c8..7ebc7708b 100644 --- a/definitions/grib2/local.98.14.def +++ b/definitions/grib2/local.98.14.def @@ -1,6 +1,4 @@ -# Copyright 2005-2018 ECMWF. - -# Definition 14, Brightness temperature +# Local definition 14: Brightness temperature unsigned[4] channelNumber : dump ; alias mars.channel = channelNumber; diff --git a/definitions/grib2/local.98.15.def b/definitions/grib2/local.98.15.def index 04362e8be..69837690f 100644 --- a/definitions/grib2/local.98.15.def +++ b/definitions/grib2/local.98.15.def @@ -1,18 +1,9 @@ -# Copyright 2005-2018 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. -# +# Local definition 15: Seasonal forecast data - -unsigned[2] systemNumber : dump ; -unsigned[2] methodNumber : dump ; +unsigned[2] systemNumber : dump; +unsigned[2] methodNumber : dump; alias system=systemNumber; alias method=methodNumber; alias local.systemNumber=systemNumber; alias local.methodNumber=methodNumber; - diff --git a/definitions/grib2/local.98.16.def b/definitions/grib2/local.98.16.def index eed714f51..c94fae1bb 100644 --- a/definitions/grib2/local.98.16.def +++ b/definitions/grib2/local.98.16.def @@ -1,7 +1,7 @@ -# Copyright 2005-2018 ECMWF. +# Local definition 16: Seasonal forecast monthly mean data -unsigned[2] systemNumber : dump ; -unsigned[2] methodNumber : dump ; +unsigned[2] systemNumber : dump; +unsigned[2] methodNumber : dump; alias local.systemNumber=systemNumber; alias local.methodNumber=methodNumber; diff --git a/definitions/grib2/local.98.18.def b/definitions/grib2/local.98.18.def index 63de74128..9fc5f239d 100644 --- a/definitions/grib2/local.98.18.def +++ b/definitions/grib2/local.98.18.def @@ -1,11 +1,4 @@ -# Copyright 2005-2018 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. -# +# Local definition 18: Multianalysis ensemble data codetable[1] dataOrigin "common/c-1.table" : dump; alias mars.origin=dataOrigin; @@ -22,5 +15,3 @@ consensus list(consensusCount) alias local.dataOrigin=dataOrigin; alias local.modelIdentifier=modelIdentifier; alias local.consensusCount=consensusCount; - - diff --git a/definitions/grib2/local.98.192.def b/definitions/grib2/local.98.192.def index 8f7edfe0b..eacf2ccf8 100644 --- a/definitions/grib2/local.98.192.def +++ b/definitions/grib2/local.98.192.def @@ -1,13 +1,4 @@ -# Copyright 2005-2018 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. -# - -# GRIB2 Local Definition 192: Multiple ECMWF local definitions +# Local definition 192: Multiple ECMWF local definitions unsigned[1] numberOfLocalDefinitions = 2 : dump; diff --git a/definitions/grib2/local.98.20.def b/definitions/grib2/local.98.20.def index 54abf2713..8b7f9e7af 100644 --- a/definitions/grib2/local.98.20.def +++ b/definitions/grib2/local.98.20.def @@ -1,11 +1,4 @@ -# Copyright 2005-2018 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. -# +# Local definition 20: 4D variational increments unsigned[1] iterationNumber : dump; alias number=iterationNumber; @@ -17,4 +10,3 @@ alias iteration = iterationNumber; alias local.iterationNumber =iterationNumber; alias local.totalNumberOfIterations=totalNumberOfIterations; - diff --git a/definitions/grib2/local.98.21.def b/definitions/grib2/local.98.21.def index 97de3e133..f46cb36a0 100644 --- a/definitions/grib2/local.98.21.def +++ b/definitions/grib2/local.98.21.def @@ -1,13 +1,4 @@ -# Copyright 2005-2018 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. -# - -# Definition 21 - Sensitive area predictions +# Local definition 21: Sensitive area predictions unsigned[2] forecastOrSingularVectorNumber : dump; @@ -39,4 +30,3 @@ unsigned[1] shapeOfVerificationArea : dump; # concept sensitiveAreaDomain(unknown,"sensitive_area_domain.def",conceptsMasterDir,conceptsLocalDir); alias mars.domain = marsDomain; - diff --git a/definitions/grib2/local.98.24.def b/definitions/grib2/local.98.24.def index 877b063d5..28fac0390 100644 --- a/definitions/grib2/local.98.24.def +++ b/definitions/grib2/local.98.24.def @@ -1,4 +1,4 @@ -# Copyright 2005-2018 ECMWF. +# Local definition 24: Satellite Channel Data unsigned[2] channelNumber : dump, can_be_missing; alias mars.channel = channelNumber; diff --git a/definitions/grib2/local.98.25.def b/definitions/grib2/local.98.25.def index be886be9d..0719d1b65 100644 --- a/definitions/grib2/local.98.25.def +++ b/definitions/grib2/local.98.25.def @@ -1,11 +1,4 @@ -# Copyright 2005-2018 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. -# +# Local definition 25: 4DVar model errors unsigned[1] componentIndex : dump; alias mars.number=componentIndex; @@ -16,4 +9,3 @@ unsigned[1] modelErrorType : dump; alias local.componentIndex=componentIndex; alias local.numberOfComponents=numberOfComponents; alias local.modelErrorType=modelErrorType; - diff --git a/definitions/grib2/local.98.26.def b/definitions/grib2/local.98.26.def index feb8c5268..49fd21214 100644 --- a/definitions/grib2/local.98.26.def +++ b/definitions/grib2/local.98.26.def @@ -1,18 +1,9 @@ -# Copyright 2005-2018 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. -# - -unsigned[4] referenceDate : dump ; -unsigned[4] climateDateFrom : dump; -unsigned[4] climateDateTo : dump ; - -alias local.referenceDate= referenceDate ; -alias local.climateDateFrom= climateDateFrom ; -alias local.climateDateTo= climateDateTo ; +# Local definition 26: MARS labelling or ensemble forecast data (with hindcast support) +unsigned[4] referenceDate : dump; +unsigned[4] climateDateFrom : dump; +unsigned[4] climateDateTo : dump; +alias local.referenceDate= referenceDate; +alias local.climateDateFrom= climateDateFrom; +alias local.climateDateTo= climateDateTo; diff --git a/definitions/grib2/local.98.28.def b/definitions/grib2/local.98.28.def index e3748a5ad..eeb30d063 100644 --- a/definitions/grib2/local.98.28.def +++ b/definitions/grib2/local.98.28.def @@ -1,16 +1,7 @@ -# Copyright 2005-2018 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. -# -# Definition 28 - COSMO local area EPS +# Local Definition 28 - COSMO local area EPS unsigned[4] baseDateEPS : dump; unsigned[2] baseTimeEPS : dump; unsigned[1] numberOfRepresentativeMember : dump; unsigned[1] numberOfMembersInCluster : dump; unsigned[1] totalInitialConditions : dump; - diff --git a/definitions/grib2/local.98.30.def b/definitions/grib2/local.98.30.def index c0cbc7a95..47591bf08 100644 --- a/definitions/grib2/local.98.30.def +++ b/definitions/grib2/local.98.30.def @@ -1,28 +1,20 @@ -# Copyright 2005-2018 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. -# +# Local definition 30: Forecasting Systems with Variable Resolution unsigned[1] oceanAtmosphereCoupling : dump; -unsigned[4] legBaseDate : dump ; -unsigned[2] legBaseTime : dump ; -unsigned[1] legNumber : dump ; -unsigned[4] referenceDate : dump ; -unsigned[4] climateDateFrom : dump ; -unsigned[4] climateDateTo : dump; +unsigned[4] legBaseDate : dump; +unsigned[2] legBaseTime : dump; +unsigned[1] legNumber : dump; +unsigned[4] referenceDate : dump; +unsigned[4] climateDateFrom : dump; +unsigned[4] climateDateTo : dump; alias local.oceanAtmosphereCoupling=oceanAtmosphereCoupling; -alias local.legBaseDate=legBaseDate ; -alias local.legBaseTime=legBaseTime ; -alias local.legNumber=legNumber ; -alias local.referenceDate=referenceDate ; -alias local.climateDateFrom=climateDateFrom ; +alias local.legBaseDate=legBaseDate; +alias local.legBaseTime=legBaseTime; +alias local.legNumber=legNumber; +alias local.referenceDate=referenceDate; +alias local.climateDateFrom=climateDateFrom; alias local.climateDateTo=climateDateTo; alias mars._leg_number = legNumber; - diff --git a/definitions/grib2/local.98.300.def b/definitions/grib2/local.98.300.def index 75477fe2f..c127da403 100644 --- a/definitions/grib2/local.98.300.def +++ b/definitions/grib2/local.98.300.def @@ -1,13 +1,4 @@ -# Copyright 2005-2018 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. -# - -# Definition 300 - Multi-dimensional parameters +# Local definition 300: Multi-dimensional parameters codetable[1] dimensionType "grib2/dimensionType.table"=0; @@ -19,4 +10,3 @@ alias dimension=dimensionNumber; unsigned[2] totalNumberOfdimensions; alias extraDimensionPresent=one; - diff --git a/definitions/grib2/local.98.36.def b/definitions/grib2/local.98.36.def index a627ec0ae..830638503 100644 --- a/definitions/grib2/local.98.36.def +++ b/definitions/grib2/local.98.36.def @@ -1,17 +1,7 @@ -# Copyright 2005-2018 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. -# - -# Definition 36 - MARS labelling for long window 4Dvar system (inspired by local def 1) +# Local definition 36: MARS labelling for long window 4Dvar system (inspired by local def 1) # Hours unsigned[2] offsetToEndOf4DvarWindow : dump; unsigned[2] lengthOf4DvarWindow : dump; alias anoffset=offsetToEndOf4DvarWindow; - diff --git a/definitions/grib2/local.98.38.def b/definitions/grib2/local.98.38.def index 897c3037c..238dde57c 100644 --- a/definitions/grib2/local.98.38.def +++ b/definitions/grib2/local.98.38.def @@ -1,13 +1,4 @@ -# Copyright 2005-2018 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. -# - -# Definition 38 - 4D variational increments for long window 4Dvar system (inspired by local def 20) +# Local definition 38: 4D variational increments for long window 4Dvar system (inspired by local def 20) unsigned[1] iterationNumber : dump; alias number=iterationNumber; @@ -25,4 +16,3 @@ unsigned[2] offsetToEndOf4DvarWindow : dump; unsigned[2] lengthOf4DvarWindow : dump; alias anoffset=offsetToEndOf4DvarWindow; - diff --git a/definitions/grib2/local.98.39.def b/definitions/grib2/local.98.39.def index e4aac6498..5d0964a7c 100644 --- a/definitions/grib2/local.98.39.def +++ b/definitions/grib2/local.98.39.def @@ -1,13 +1,4 @@ -# Copyright 2005-2018 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. -# - -# Definition 39 - 4DVar model errors for long window 4Dvar system (inspired by local def 25) +# Local definition 39: 4DVar model errors for long window 4Dvar system (inspired by local def 25) unsigned[1] componentIndex : dump; alias mars.number=componentIndex; @@ -23,4 +14,3 @@ alias local.modelErrorType=modelErrorType; unsigned[2] offsetToEndOf4DvarWindow : dump; unsigned[2] lengthOf4DvarWindow : dump; alias anoffset=offsetToEndOf4DvarWindow; -