diff --git a/definitions/grib2/cfVarName.def b/definitions/grib2/cfVarName.def index 11a166b74..a971d120c 100644 --- a/definitions/grib2/cfVarName.def +++ b/definitions/grib2/cfVarName.def @@ -4112,14 +4112,6 @@ parameterCategory = 4 ; parameterNumber = 14 ; } -#Time-integrated surface direct short wave radiation flux -'tidirswrf' = { - discipline = 0 ; - parameterCategory = 4 ; - parameterNumber = 13 ; - typeOfFirstFixedSurface = 1 ; - typeOfStatisticalProcessing = 1 ; - } #Evaporation in the last 6 hours 'eva06' = { discipline = 0 ; @@ -4278,14 +4270,6 @@ parameterCategory = 3 ; parameterNumber = 19 ; } -#Accumulated surface downward short-wave radiation flux, clear sky -'adswrf_cs' = { - discipline = 0 ; - parameterCategory = 4 ; - parameterNumber = 52 ; - typeOfFirstFixedSurface = 1 ; - typeOfStatisticalProcessing = 1 ; - } #Accumulated surface upward short-wave radiation flux, clear sky 'auswrf_cs' = { discipline = 0 ; @@ -4294,14 +4278,6 @@ typeOfFirstFixedSurface = 1 ; typeOfStatisticalProcessing = 1 ; } -#Accumulated surface downward long-wave radiation flux, clear sky -'adlwrf_cs' = { - discipline = 0 ; - parameterCategory = 5 ; - parameterNumber = 8 ; - typeOfFirstFixedSurface = 1 ; - typeOfStatisticalProcessing = 1 ; - } #Percolation 'perc' = { discipline = 1 ; @@ -8715,12 +8691,6 @@ parameterCategory = 3 ; parameterNumber = 19 ; } -#Standard deviation of sub-grid scale orography -'sdsgso' = { - discipline = 0 ; - parameterCategory = 3 ; - parameterNumber = 20 ; - } #Net short-wave radiation flux (top of atmosphere) 'nswrt' = { discipline = 0 ; @@ -8847,12 +8817,6 @@ parameterCategory = 6 ; parameterNumber = 10 ; } -#Cloud base -'cdcb' = { - discipline = 0 ; - parameterCategory = 6 ; - parameterNumber = 11 ; - } #Cloud top 'cdct' = { discipline = 0 ; diff --git a/definitions/grib2/localConcepts/uerra/cfVarName.def b/definitions/grib2/localConcepts/uerra/cfVarName.def index d18461817..20387cdfc 100644 --- a/definitions/grib2/localConcepts/uerra/cfVarName.def +++ b/definitions/grib2/localConcepts/uerra/cfVarName.def @@ -148,6 +148,18 @@ typeOfFirstFixedSurface = 1 ; typeOfSecondFixedSurface = 8 ; } +#Standard deviation of sub-grid scale orography +'sdsgso' = { + discipline = 0 ; + parameterCategory = 3 ; + parameterNumber = 20 ; + } +#Cloud base +'cdcb' = { + discipline = 0 ; + parameterCategory = 6 ; + parameterNumber = 11 ; + } #2 metre relative humidity 'r2' = { discipline = 0 ; @@ -177,6 +189,30 @@ typeOfStatisticalProcessing = 1 ; lengthOfTimeRange = 24 ; } +#Time-integrated surface direct short wave radiation flux +'tidirswrf' = { + discipline = 0 ; + parameterCategory = 4 ; + parameterNumber = 13 ; + typeOfFirstFixedSurface = 1 ; + typeOfStatisticalProcessing = 1 ; + } +#Accumulated surface downward short-wave radiation flux, clear sky +'adswrf_cs' = { + discipline = 0 ; + parameterCategory = 4 ; + parameterNumber = 52 ; + typeOfFirstFixedSurface = 1 ; + typeOfStatisticalProcessing = 1 ; + } +#Accumulated surface downward long-wave radiation flux, clear sky +'adlwrf_cs' = { + discipline = 0 ; + parameterCategory = 5 ; + parameterNumber = 8 ; + typeOfFirstFixedSurface = 1 ; + typeOfStatisticalProcessing = 1 ; + } #Sea ice surface temperature 'sist' = { discipline = 10 ; diff --git a/definitions/grib2/localConcepts/uerra/name.def b/definitions/grib2/localConcepts/uerra/name.def index 330d3e841..644409a2c 100644 --- a/definitions/grib2/localConcepts/uerra/name.def +++ b/definitions/grib2/localConcepts/uerra/name.def @@ -148,6 +148,18 @@ typeOfFirstFixedSurface = 1 ; typeOfSecondFixedSurface = 8 ; } +#Standard deviation of sub-grid scale orography +'Standard deviation of sub-grid scale orography' = { + discipline = 0 ; + parameterCategory = 3 ; + parameterNumber = 20 ; + } +#Cloud base +'Cloud base' = { + discipline = 0 ; + parameterCategory = 6 ; + parameterNumber = 11 ; + } #2 metre relative humidity '2 metre relative humidity' = { discipline = 0 ; @@ -177,6 +189,30 @@ typeOfStatisticalProcessing = 1 ; lengthOfTimeRange = 24 ; } +#Time-integrated surface direct short wave radiation flux +'Time-integrated surface direct short wave radiation flux' = { + discipline = 0 ; + parameterCategory = 4 ; + parameterNumber = 13 ; + typeOfFirstFixedSurface = 1 ; + typeOfStatisticalProcessing = 1 ; + } +#Accumulated surface downward short-wave radiation flux, clear sky +'Accumulated surface downward short-wave radiation flux, clear sky' = { + discipline = 0 ; + parameterCategory = 4 ; + parameterNumber = 52 ; + typeOfFirstFixedSurface = 1 ; + typeOfStatisticalProcessing = 1 ; + } +#Accumulated surface downward long-wave radiation flux, clear sky +'Accumulated surface downward long-wave radiation flux, clear sky' = { + discipline = 0 ; + parameterCategory = 5 ; + parameterNumber = 8 ; + typeOfFirstFixedSurface = 1 ; + typeOfStatisticalProcessing = 1 ; + } #Sea ice surface temperature 'Sea ice surface temperature' = { discipline = 10 ; diff --git a/definitions/grib2/localConcepts/uerra/paramId.def b/definitions/grib2/localConcepts/uerra/paramId.def index 7e4f5941e..db4f09f5d 100644 --- a/definitions/grib2/localConcepts/uerra/paramId.def +++ b/definitions/grib2/localConcepts/uerra/paramId.def @@ -148,6 +148,18 @@ typeOfFirstFixedSurface = 1 ; typeOfSecondFixedSurface = 8 ; } +#Standard deviation of sub-grid scale orography +'260085' = { + discipline = 0 ; + parameterCategory = 3 ; + parameterNumber = 20 ; + } +#Cloud base +'260107' = { + discipline = 0 ; + parameterCategory = 6 ; + parameterNumber = 11 ; + } #2 metre relative humidity '260242' = { discipline = 0 ; @@ -177,6 +189,30 @@ typeOfStatisticalProcessing = 1 ; lengthOfTimeRange = 24 ; } +#Time-integrated surface direct short wave radiation flux +'260264' = { + discipline = 0 ; + parameterCategory = 4 ; + parameterNumber = 13 ; + typeOfFirstFixedSurface = 1 ; + typeOfStatisticalProcessing = 1 ; + } +#Accumulated surface downward short-wave radiation flux, clear sky +'260423' = { + discipline = 0 ; + parameterCategory = 4 ; + parameterNumber = 52 ; + typeOfFirstFixedSurface = 1 ; + typeOfStatisticalProcessing = 1 ; + } +#Accumulated surface downward long-wave radiation flux, clear sky +'260428' = { + discipline = 0 ; + parameterCategory = 5 ; + parameterNumber = 8 ; + typeOfFirstFixedSurface = 1 ; + typeOfStatisticalProcessing = 1 ; + } #Sea ice surface temperature '260649' = { discipline = 10 ; diff --git a/definitions/grib2/localConcepts/uerra/shortName.def b/definitions/grib2/localConcepts/uerra/shortName.def index 95eed7a09..839d6dc5d 100644 --- a/definitions/grib2/localConcepts/uerra/shortName.def +++ b/definitions/grib2/localConcepts/uerra/shortName.def @@ -148,6 +148,18 @@ typeOfFirstFixedSurface = 1 ; typeOfSecondFixedSurface = 8 ; } +#Standard deviation of sub-grid scale orography +'sdsgso' = { + discipline = 0 ; + parameterCategory = 3 ; + parameterNumber = 20 ; + } +#Cloud base +'cdcb' = { + discipline = 0 ; + parameterCategory = 6 ; + parameterNumber = 11 ; + } #2 metre relative humidity '2r' = { discipline = 0 ; @@ -177,6 +189,30 @@ typeOfStatisticalProcessing = 1 ; lengthOfTimeRange = 24 ; } +#Time-integrated surface direct short wave radiation flux +'tidirswrf' = { + discipline = 0 ; + parameterCategory = 4 ; + parameterNumber = 13 ; + typeOfFirstFixedSurface = 1 ; + typeOfStatisticalProcessing = 1 ; + } +#Accumulated surface downward short-wave radiation flux, clear sky +'adswrf_cs' = { + discipline = 0 ; + parameterCategory = 4 ; + parameterNumber = 52 ; + typeOfFirstFixedSurface = 1 ; + typeOfStatisticalProcessing = 1 ; + } +#Accumulated surface downward long-wave radiation flux, clear sky +'adlwrf_cs' = { + discipline = 0 ; + parameterCategory = 5 ; + parameterNumber = 8 ; + typeOfFirstFixedSurface = 1 ; + typeOfStatisticalProcessing = 1 ; + } #Sea ice surface temperature 'sist' = { discipline = 10 ; diff --git a/definitions/grib2/localConcepts/uerra/units.def b/definitions/grib2/localConcepts/uerra/units.def index 2766aadab..87cb31619 100644 --- a/definitions/grib2/localConcepts/uerra/units.def +++ b/definitions/grib2/localConcepts/uerra/units.def @@ -148,6 +148,18 @@ typeOfFirstFixedSurface = 1 ; typeOfSecondFixedSurface = 8 ; } +#Standard deviation of sub-grid scale orography +'m' = { + discipline = 0 ; + parameterCategory = 3 ; + parameterNumber = 20 ; + } +#Cloud base +'m' = { + discipline = 0 ; + parameterCategory = 6 ; + parameterNumber = 11 ; + } #2 metre relative humidity '%' = { discipline = 0 ; @@ -177,6 +189,30 @@ typeOfStatisticalProcessing = 1 ; lengthOfTimeRange = 24 ; } +#Time-integrated surface direct short wave radiation flux +'J m**-2' = { + discipline = 0 ; + parameterCategory = 4 ; + parameterNumber = 13 ; + typeOfFirstFixedSurface = 1 ; + typeOfStatisticalProcessing = 1 ; + } +#Accumulated surface downward short-wave radiation flux, clear sky +'J m**-2' = { + discipline = 0 ; + parameterCategory = 4 ; + parameterNumber = 52 ; + typeOfFirstFixedSurface = 1 ; + typeOfStatisticalProcessing = 1 ; + } +#Accumulated surface downward long-wave radiation flux, clear sky +'J m**-2' = { + discipline = 0 ; + parameterCategory = 5 ; + parameterNumber = 8 ; + typeOfFirstFixedSurface = 1 ; + typeOfStatisticalProcessing = 1 ; + } #Sea ice surface temperature 'K' = { discipline = 10 ; diff --git a/definitions/grib2/name.def b/definitions/grib2/name.def index 4960cdbd3..e3d67ea58 100644 --- a/definitions/grib2/name.def +++ b/definitions/grib2/name.def @@ -4112,14 +4112,6 @@ parameterCategory = 4 ; parameterNumber = 14 ; } -#Time-integrated surface direct short wave radiation flux -'Time-integrated surface direct short wave radiation flux' = { - discipline = 0 ; - parameterCategory = 4 ; - parameterNumber = 13 ; - typeOfFirstFixedSurface = 1 ; - typeOfStatisticalProcessing = 1 ; - } #Evaporation in the last 6 hours 'Evaporation in the last 6 hours' = { discipline = 0 ; @@ -4278,14 +4270,6 @@ parameterCategory = 3 ; parameterNumber = 19 ; } -#Accumulated surface downward short-wave radiation flux, clear sky -'Accumulated surface downward short-wave radiation flux, clear sky' = { - discipline = 0 ; - parameterCategory = 4 ; - parameterNumber = 52 ; - typeOfFirstFixedSurface = 1 ; - typeOfStatisticalProcessing = 1 ; - } #Accumulated surface upward short-wave radiation flux, clear sky 'Accumulated surface upward short-wave radiation flux, clear sky' = { discipline = 0 ; @@ -4294,14 +4278,6 @@ typeOfFirstFixedSurface = 1 ; typeOfStatisticalProcessing = 1 ; } -#Accumulated surface downward long-wave radiation flux, clear sky -'Accumulated surface downward long-wave radiation flux, clear sky' = { - discipline = 0 ; - parameterCategory = 5 ; - parameterNumber = 8 ; - typeOfFirstFixedSurface = 1 ; - typeOfStatisticalProcessing = 1 ; - } #Percolation 'Percolation' = { discipline = 1 ; @@ -8715,12 +8691,6 @@ parameterCategory = 3 ; parameterNumber = 19 ; } -#Standard deviation of sub-grid scale orography -'Standard deviation of sub-grid scale orography' = { - discipline = 0 ; - parameterCategory = 3 ; - parameterNumber = 20 ; - } #Net short-wave radiation flux (top of atmosphere) 'Net short-wave radiation flux (top of atmosphere)' = { discipline = 0 ; @@ -8847,12 +8817,6 @@ parameterCategory = 6 ; parameterNumber = 10 ; } -#Cloud base -'Cloud base' = { - discipline = 0 ; - parameterCategory = 6 ; - parameterNumber = 11 ; - } #Cloud top 'Cloud top' = { discipline = 0 ; diff --git a/definitions/grib2/paramId.def b/definitions/grib2/paramId.def index f1cdd37ce..460a72267 100644 --- a/definitions/grib2/paramId.def +++ b/definitions/grib2/paramId.def @@ -4112,14 +4112,6 @@ parameterCategory = 4 ; parameterNumber = 14 ; } -#Time-integrated surface direct short wave radiation flux -'260264' = { - discipline = 0 ; - parameterCategory = 4 ; - parameterNumber = 13 ; - typeOfFirstFixedSurface = 1 ; - typeOfStatisticalProcessing = 1 ; - } #Evaporation in the last 6 hours '260265' = { discipline = 0 ; @@ -4278,14 +4270,6 @@ parameterCategory = 3 ; parameterNumber = 19 ; } -#Accumulated surface downward short-wave radiation flux, clear sky -'260423' = { - discipline = 0 ; - parameterCategory = 4 ; - parameterNumber = 52 ; - typeOfFirstFixedSurface = 1 ; - typeOfStatisticalProcessing = 1 ; - } #Accumulated surface upward short-wave radiation flux, clear sky '260427' = { discipline = 0 ; @@ -4294,14 +4278,6 @@ typeOfFirstFixedSurface = 1 ; typeOfStatisticalProcessing = 1 ; } -#Accumulated surface downward long-wave radiation flux, clear sky -'260428' = { - discipline = 0 ; - parameterCategory = 5 ; - parameterNumber = 8 ; - typeOfFirstFixedSurface = 1 ; - typeOfStatisticalProcessing = 1 ; - } #Percolation '260430' = { discipline = 1 ; @@ -8715,12 +8691,6 @@ parameterCategory = 3 ; parameterNumber = 19 ; } -#Standard deviation of sub-grid scale orography -'260085' = { - discipline = 0 ; - parameterCategory = 3 ; - parameterNumber = 20 ; - } #Net short-wave radiation flux (top of atmosphere) '260086' = { discipline = 0 ; @@ -8847,12 +8817,6 @@ parameterCategory = 6 ; parameterNumber = 10 ; } -#Cloud base -'260107' = { - discipline = 0 ; - parameterCategory = 6 ; - parameterNumber = 11 ; - } #Cloud top '260108' = { discipline = 0 ; diff --git a/definitions/grib2/shortName.def b/definitions/grib2/shortName.def index 2081a7de9..59b894090 100644 --- a/definitions/grib2/shortName.def +++ b/definitions/grib2/shortName.def @@ -4112,14 +4112,6 @@ parameterCategory = 4 ; parameterNumber = 14 ; } -#Time-integrated surface direct short wave radiation flux -'tidirswrf' = { - discipline = 0 ; - parameterCategory = 4 ; - parameterNumber = 13 ; - typeOfFirstFixedSurface = 1 ; - typeOfStatisticalProcessing = 1 ; - } #Evaporation in the last 6 hours 'eva06' = { discipline = 0 ; @@ -4278,14 +4270,6 @@ parameterCategory = 3 ; parameterNumber = 19 ; } -#Accumulated surface downward short-wave radiation flux, clear sky -'adswrf_cs' = { - discipline = 0 ; - parameterCategory = 4 ; - parameterNumber = 52 ; - typeOfFirstFixedSurface = 1 ; - typeOfStatisticalProcessing = 1 ; - } #Accumulated surface upward short-wave radiation flux, clear sky 'auswrf_cs' = { discipline = 0 ; @@ -4294,14 +4278,6 @@ typeOfFirstFixedSurface = 1 ; typeOfStatisticalProcessing = 1 ; } -#Accumulated surface downward long-wave radiation flux, clear sky -'adlwrf_cs' = { - discipline = 0 ; - parameterCategory = 5 ; - parameterNumber = 8 ; - typeOfFirstFixedSurface = 1 ; - typeOfStatisticalProcessing = 1 ; - } #Percolation 'perc' = { discipline = 1 ; @@ -8715,12 +8691,6 @@ parameterCategory = 3 ; parameterNumber = 19 ; } -#Standard deviation of sub-grid scale orography -'sdsgso' = { - discipline = 0 ; - parameterCategory = 3 ; - parameterNumber = 20 ; - } #Net short-wave radiation flux (top of atmosphere) 'nswrt' = { discipline = 0 ; @@ -8847,12 +8817,6 @@ parameterCategory = 6 ; parameterNumber = 10 ; } -#Cloud base -'cdcb' = { - discipline = 0 ; - parameterCategory = 6 ; - parameterNumber = 11 ; - } #Cloud top 'cdct' = { discipline = 0 ; diff --git a/definitions/grib2/units.def b/definitions/grib2/units.def index ba4fc8fd6..8888c66ed 100644 --- a/definitions/grib2/units.def +++ b/definitions/grib2/units.def @@ -4112,14 +4112,6 @@ parameterCategory = 4 ; parameterNumber = 14 ; } -#Time-integrated surface direct short wave radiation flux -'J m**-2' = { - discipline = 0 ; - parameterCategory = 4 ; - parameterNumber = 13 ; - typeOfFirstFixedSurface = 1 ; - typeOfStatisticalProcessing = 1 ; - } #Evaporation in the last 6 hours 'kg m**-2' = { discipline = 0 ; @@ -4278,14 +4270,6 @@ parameterCategory = 3 ; parameterNumber = 19 ; } -#Accumulated surface downward short-wave radiation flux, clear sky -'J m**-2' = { - discipline = 0 ; - parameterCategory = 4 ; - parameterNumber = 52 ; - typeOfFirstFixedSurface = 1 ; - typeOfStatisticalProcessing = 1 ; - } #Accumulated surface upward short-wave radiation flux, clear sky 'J m**-2' = { discipline = 0 ; @@ -4294,14 +4278,6 @@ typeOfFirstFixedSurface = 1 ; typeOfStatisticalProcessing = 1 ; } -#Accumulated surface downward long-wave radiation flux, clear sky -'J m**-2' = { - discipline = 0 ; - parameterCategory = 5 ; - parameterNumber = 8 ; - typeOfFirstFixedSurface = 1 ; - typeOfStatisticalProcessing = 1 ; - } #Percolation 'kg m**-2' = { discipline = 1 ; @@ -8715,12 +8691,6 @@ parameterCategory = 3 ; parameterNumber = 19 ; } -#Standard deviation of sub-grid scale orography -'m' = { - discipline = 0 ; - parameterCategory = 3 ; - parameterNumber = 20 ; - } #Net short-wave radiation flux (top of atmosphere) 'W m**-2' = { discipline = 0 ; @@ -8847,12 +8817,6 @@ parameterCategory = 6 ; parameterNumber = 10 ; } -#Cloud base -'m' = { - discipline = 0 ; - parameterCategory = 6 ; - parameterNumber = 11 ; - } #Cloud top 'm' = { discipline = 0 ; diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 9b7110b9c..6e318c03d 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -292,6 +292,7 @@ if( HAVE_BUILD_TOOLS ) codes_set_samples_path codes_compare_keys codes_dump_content + codes_to_double grib_dump grib_dump_debug grib_dump_json diff --git a/tests/codes_to_double.sh b/tests/codes_to_double.sh new file mode 100755 index 000000000..ceb7c21c5 --- /dev/null +++ b/tests/codes_to_double.sh @@ -0,0 +1,44 @@ +#!/bin/sh +# (C) Copyright 2005- 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. +# + +. ./include.ctest.sh + +label="codes_to_double_test" +tempFilt=temp.$label.filt +tempLog=temp.$label.log +tempRef=temp.$label.ref + +sample_grib2=$ECCODES_SAMPLES_PATH/GRIB2.tmpl + +cat >$tempFilt< $tempLog + +cat >$tempRef<