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

Merge branch 'develop' of github.com:ecmwf/eccodes into develop

This commit is contained in:
Shahram Najm 2023-08-14 11:52:29 +01:00
parent a4e1f27c99 d92c9c0992
commit 4576946af9
12 changed files with 225 additions and 180 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
definitions/grib2/cfVarName.def
View File

@ -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 ;

36
definitions/grib2/localConcepts/uerra/cfVarName.def
View File

@ -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 ;

36
definitions/grib2/localConcepts/uerra/name.def
View File

@ -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 ;

36
definitions/grib2/localConcepts/uerra/paramId.def
View File

@ -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 ;

36
definitions/grib2/localConcepts/uerra/shortName.def
View File

@ -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 ;

36
definitions/grib2/localConcepts/uerra/units.def
View File

@ -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 ;

36
definitions/grib2/name.def
View File

@ -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 ;

36
definitions/grib2/paramId.def
View File

@ -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 ;

36
definitions/grib2/shortName.def
View File

@ -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 ;

36
definitions/grib2/units.def
View File

@ -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 ;

1
tests/CMakeLists.txt
View File

@ -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

44
tests/codes_to_double.sh Executable file
View File

@ -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<<EOF
transient aa = 156;
meta aad to_double(aa,0,3,0);
print "aa=[aad]";
transient xx = "45.5e3";
meta xxd to_double(xx,0,6,0);
print "xx=[xxd:d]";
transient yy = "45.9";
meta yyd to_double(yy,0,2,0);
print "yy=[yyd:s]";
EOF
${tools_dir}/grib_filter $tempFilt $sample_grib2 > $tempLog
cat >$tempRef<<EOF
aa=156
xx=45500
yy=45
EOF
diff $tempRef $tempLog
# Clean up
rm -f $tempFilt $tempLog $tempRef