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

ECC-1469: GRIB2: Modifications to parameter encodings to reflect standard practice for Destination Earth

This commit is contained in:
Shahram Najm 2022-11-17 14:02:27 +00:00
parent c48ef82a31
commit 31a0855fdf
13 changed files with 109 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
definitions/grib2/cfName.def
View File

@ -4,12 +4,22 @@
discipline = 10 ;
parameterCategory = 2 ;
parameterNumber = 0 ;
typeOfFirstFixedSurface = 1 ;
}
#Total column vertically-integrated water vapour
'lwe_thickness_of_atmosphere_mass_content_of_water_vapor' = {
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 64 ;
typeOfFirstFixedSurface = 1 ;
typeOfSecondFixedSurface = 8 ;
}
#Boundary layer dissipation
'kinetic_energy_dissipation_in_atmosphere_boundary_layer' = {
discipline = 0 ;
parameterCategory = 2 ;
parameterNumber = 20 ;
typeOfStatisticalProcessing = 1 ;
}
#Surface short-wave radiation downwards
'surface_downwelling_shortwave_flux_in_air' = {
@ -32,12 +42,16 @@
discipline = 0 ;
parameterCategory = 2 ;
parameterNumber = 38 ;
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 1 ;
}
#Northward turbulent surface stress
'surface_downward_northward_stress' = {
discipline = 0 ;
parameterCategory = 2 ;
parameterNumber = 37 ;
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 1 ;
}
#Ozone mass mixing ratio
'mass_fraction_of_ozone_in_air' = {
@ -271,12 +285,6 @@
parameterCategory = 2 ;
parameterNumber = 12 ;
}
#Boundary layer dissipation
'kinetic_energy_dissipation_in_atmosphere_boundary_layer' = {
discipline = 0 ;
parameterCategory = 2 ;
parameterNumber = 20 ;
}
#Surface sensible heat flux
'surface_upward_sensible_heat_flux' = {
discipline = 0 ;

24
definitions/grib2/cfVarName.def
View File

@ -136,6 +136,7 @@
discipline = 10 ;
parameterCategory = 2 ;
parameterNumber = 0 ;
typeOfFirstFixedSurface = 1 ;
}
#Snow density
'rsn' = {
@ -212,6 +213,15 @@
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 64 ;
typeOfFirstFixedSurface = 1 ;
typeOfSecondFixedSurface = 8 ;
}
#Boundary layer dissipation
'bld' = {
discipline = 0 ;
parameterCategory = 2 ;
parameterNumber = 20 ;
typeOfStatisticalProcessing = 1 ;
}
#Surface short-wave radiation downwards
'ssrd' = {
@ -226,8 +236,8 @@
discipline = 0 ;
parameterCategory = 5 ;
parameterNumber = 3 ;
typeOfStatisticalProcessing = 1 ;
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 1 ;
}
#Top net short-wave radiation
'tsr' = {
@ -242,12 +252,16 @@
discipline = 0 ;
parameterCategory = 2 ;
parameterNumber = 38 ;
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 1 ;
}
#Northward turbulent surface stress
'nsss' = {
discipline = 0 ;
parameterCategory = 2 ;
parameterNumber = 37 ;
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 1 ;
}
#Eastward gravity wave surface stress
'lgws' = {
@ -5131,12 +5145,6 @@
parameterCategory = 2 ;
parameterNumber = 12 ;
}
#Boundary layer dissipation
'bld' = {
discipline = 0 ;
parameterCategory = 2 ;
parameterNumber = 20 ;
}
#Surface sensible heat flux
'sshf' = {
discipline = 0 ;
@ -5562,6 +5570,7 @@
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 52 ;
typeOfFirstFixedSurface = 1 ;
}
#Total snowfall rate water equivalent
'tsrwe' = {
@ -5586,6 +5595,7 @@
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 56 ;
typeOfFirstFixedSurface = 1 ;
}
#Total snowfall rate
'tsrate' = {

1
definitions/grib2/localConcepts/s2s/cfName.def
View File

@ -4,6 +4,7 @@
discipline = 10 ;
parameterCategory = 2 ;
parameterNumber = 0 ;
typeOfFirstFixedSurface = 1 ;
}
#Sea surface practical salinity
'sea_surface_salinity' = {

1
definitions/grib2/localConcepts/s2s/cfVarName.def
View File

@ -4,6 +4,7 @@
discipline = 10 ;
parameterCategory = 2 ;
parameterNumber = 0 ;
typeOfFirstFixedSurface = 1 ;
}
#Maximum temperature at 2 metres in the last 6 hours
'mx2t6' = {

1
definitions/grib2/localConcepts/s2s/name.def
View File

@ -4,6 +4,7 @@
discipline = 10 ;
parameterCategory = 2 ;
parameterNumber = 0 ;
typeOfFirstFixedSurface = 1 ;
}
#Maximum temperature at 2 metres in the last 6 hours
'Maximum temperature at 2 metres in the last 6 hours' = {

1
definitions/grib2/localConcepts/s2s/paramId.def
View File

@ -4,6 +4,7 @@
discipline = 10 ;
parameterCategory = 2 ;
parameterNumber = 0 ;
typeOfFirstFixedSurface = 1 ;
}
#Maximum temperature at 2 metres in the last 6 hours
'121' = {

1
definitions/grib2/localConcepts/s2s/shortName.def
View File

@ -4,6 +4,7 @@
discipline = 10 ;
parameterCategory = 2 ;
parameterNumber = 0 ;
typeOfFirstFixedSurface = 1 ;
}
#Maximum temperature at 2 metres in the last 6 hours
'mx2t6' = {

1
definitions/grib2/localConcepts/s2s/units.def
View File

@ -4,6 +4,7 @@
discipline = 10 ;
parameterCategory = 2 ;
parameterNumber = 0 ;
typeOfFirstFixedSurface = 1 ;
}
#Maximum temperature at 2 metres in the last 6 hours
'K' = {

22
definitions/grib2/name.def
View File

@ -136,6 +136,7 @@
discipline = 10 ;
parameterCategory = 2 ;
parameterNumber = 0 ;
typeOfFirstFixedSurface = 1 ;
}
#Snow density
'Snow density' = {
@ -212,6 +213,15 @@
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 64 ;
typeOfFirstFixedSurface = 1 ;
typeOfSecondFixedSurface = 8 ;
}
#Boundary layer dissipation
'Boundary layer dissipation' = {
discipline = 0 ;
parameterCategory = 2 ;
parameterNumber = 20 ;
typeOfStatisticalProcessing = 1 ;
}
#Surface short-wave radiation downwards
'Surface short-wave radiation downwards' = {
@ -242,12 +252,16 @@
discipline = 0 ;
parameterCategory = 2 ;
parameterNumber = 38 ;
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 1 ;
}
#Northward turbulent surface stress
'Northward turbulent surface stress' = {
discipline = 0 ;
parameterCategory = 2 ;
parameterNumber = 37 ;
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 1 ;
}
#Eastward gravity wave surface stress
'Eastward gravity wave surface stress' = {
@ -5131,12 +5145,6 @@
parameterCategory = 2 ;
parameterNumber = 12 ;
}
#Boundary layer dissipation
'Boundary layer dissipation' = {
discipline = 0 ;
parameterCategory = 2 ;
parameterNumber = 20 ;
}
#Surface sensible heat flux
'Surface sensible heat flux' = {
discipline = 0 ;
@ -5562,6 +5570,7 @@
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 52 ;
typeOfFirstFixedSurface = 1 ;
}
#Total snowfall rate water equivalent
'Total snowfall rate water equivalent' = {
@ -5586,6 +5595,7 @@
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 56 ;
typeOfFirstFixedSurface = 1 ;
}
#Total snowfall rate
'Total snowfall rate' = {

22
definitions/grib2/paramId.def
View File

@ -136,6 +136,7 @@
discipline = 10 ;
parameterCategory = 2 ;
parameterNumber = 0 ;
typeOfFirstFixedSurface = 1 ;
}
#Snow density
'33' = {
@ -212,6 +213,15 @@
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 64 ;
typeOfFirstFixedSurface = 1 ;
typeOfSecondFixedSurface = 8 ;
}
#Boundary layer dissipation
'145' = {
discipline = 0 ;
parameterCategory = 2 ;
parameterNumber = 20 ;
typeOfStatisticalProcessing = 1 ;
}
#Surface short-wave radiation downwards
'169' = {
@ -242,12 +252,16 @@
discipline = 0 ;
parameterCategory = 2 ;
parameterNumber = 38 ;
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 1 ;
}
#Northward turbulent surface stress
'181' = {
discipline = 0 ;
parameterCategory = 2 ;
parameterNumber = 37 ;
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 1 ;
}
#Eastward gravity wave surface stress
'195' = {
@ -5131,12 +5145,6 @@
parameterCategory = 2 ;
parameterNumber = 12 ;
}
#Boundary layer dissipation
'145' = {
discipline = 0 ;
parameterCategory = 2 ;
parameterNumber = 20 ;
}
#Surface sensible heat flux
'146' = {
discipline = 0 ;
@ -5562,6 +5570,7 @@
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 52 ;
typeOfFirstFixedSurface = 1 ;
}
#Total snowfall rate water equivalent
'260049' = {
@ -5586,6 +5595,7 @@
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 56 ;
typeOfFirstFixedSurface = 1 ;
}
#Total snowfall rate
'260053' = {

22
definitions/grib2/shortName.def
View File

@ -136,6 +136,7 @@
discipline = 10 ;
parameterCategory = 2 ;
parameterNumber = 0 ;
typeOfFirstFixedSurface = 1 ;
}
#Snow density
'rsn' = {
@ -212,6 +213,15 @@
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 64 ;
typeOfFirstFixedSurface = 1 ;
typeOfSecondFixedSurface = 8 ;
}
#Boundary layer dissipation
'bld' = {
discipline = 0 ;
parameterCategory = 2 ;
parameterNumber = 20 ;
typeOfStatisticalProcessing = 1 ;
}
#Surface short-wave radiation downwards
'ssrd' = {
@ -242,12 +252,16 @@
discipline = 0 ;
parameterCategory = 2 ;
parameterNumber = 38 ;
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 1 ;
}
#Northward turbulent surface stress
'nsss' = {
discipline = 0 ;
parameterCategory = 2 ;
parameterNumber = 37 ;
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 1 ;
}
#Eastward gravity wave surface stress
'lgws' = {
@ -5131,12 +5145,6 @@
parameterCategory = 2 ;
parameterNumber = 12 ;
}
#Boundary layer dissipation
'bld' = {
discipline = 0 ;
parameterCategory = 2 ;
parameterNumber = 20 ;
}
#Surface sensible heat flux
'sshf' = {
discipline = 0 ;
@ -5562,6 +5570,7 @@
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 52 ;
typeOfFirstFixedSurface = 1 ;
}
#Total snowfall rate water equivalent
'tsrwe' = {
@ -5586,6 +5595,7 @@
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 56 ;
typeOfFirstFixedSurface = 1 ;
}
#Total snowfall rate
'tsrate' = {

22
definitions/grib2/units.def
View File

@ -136,6 +136,7 @@
discipline = 10 ;
parameterCategory = 2 ;
parameterNumber = 0 ;
typeOfFirstFixedSurface = 1 ;
}
#Snow density
'kg m**-3' = {
@ -212,6 +213,15 @@
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 64 ;
typeOfFirstFixedSurface = 1 ;
typeOfSecondFixedSurface = 8 ;
}
#Boundary layer dissipation
'J m**-2' = {
discipline = 0 ;
parameterCategory = 2 ;
parameterNumber = 20 ;
typeOfStatisticalProcessing = 1 ;
}
#Surface short-wave radiation downwards
'J m**-2' = {
@ -242,12 +252,16 @@
discipline = 0 ;
parameterCategory = 2 ;
parameterNumber = 38 ;
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 1 ;
}
#Northward turbulent surface stress
'N m**-2 s' = {
discipline = 0 ;
parameterCategory = 2 ;
parameterNumber = 37 ;
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 1 ;
}
#Eastward gravity wave surface stress
'N m**-2 s' = {
@ -5131,12 +5145,6 @@
parameterCategory = 2 ;
parameterNumber = 12 ;
}
#Boundary layer dissipation
'J m**-2' = {
discipline = 0 ;
parameterCategory = 2 ;
parameterNumber = 20 ;
}
#Surface sensible heat flux
'J m**-2' = {
discipline = 0 ;
@ -5562,6 +5570,7 @@
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 52 ;
typeOfFirstFixedSurface = 1 ;
}
#Total snowfall rate water equivalent
'kg m**-2 s**-1' = {
@ -5586,6 +5595,7 @@
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 56 ;
typeOfFirstFixedSurface = 1 ;
}
#Total snowfall rate
'm s**-1' = {

11
tests/grib_cfNames.sh
View File

@ -18,17 +18,22 @@ sample2=$ECCODES_SAMPLES_PATH/GRIB2.tmpl
${tools_dir}/grib_set -s discipline=192,parameterCategory=128,parameterNumber=137 $sample2 $temp
grib_check_key_equals $temp cfName lwe_thickness_of_atmosphere_mass_content_of_water_vapor
${tools_dir}/grib_set -s discipline=0,parameterNumber=20,parameterCategory=2 $sample2 $temp
${tools_dir}/grib_set -s productDefinitionTemplateNumber=8,discipline=0,parameterNumber=20,parameterCategory=2,typeOfStatisticalProcessing=1 $sample2 $temp
grib_check_key_equals $temp cfName kinetic_energy_dissipation_in_atmosphere_boundary_layer
${tools_dir}/grib_set -s paramId=145 $sample2 $temp
${tools_dir}/grib_set -s stepType=accum,discipline=0,parameterNumber=20,parameterCategory=2 $sample2 $temp
grib_check_key_equals $temp cfName kinetic_energy_dissipation_in_atmosphere_boundary_layer
${tools_dir}/grib_set -s productDefinitionTemplateNumber=8,paramId=145 $sample2 $temp
grib_check_key_equals $temp cfName kinetic_energy_dissipation_in_atmosphere_boundary_layer
${tools_dir}/grib_set -s stepType=accum,paramId=145 $sample2 $temp
grib_check_key_equals $temp cfName kinetic_energy_dissipation_in_atmosphere_boundary_layer
${tools_dir}/grib_set -s paramId=137 $sample2 $temp
grib_check_key_equals $temp cfName lwe_thickness_of_atmosphere_mass_content_of_water_vapor
${tools_dir}/grib_set -s indicatorOfParameter=137,table2Version=128 $sample1 $temp
grib_check_key_equals $temp cfName lwe_thickness_of_atmosphere_mass_content_of_water_vapor
${tools_dir}/grib_set -s paramId=145 $sample2 $temp
${tools_dir}/grib_set -s productDefinitionTemplateNumber=8,paramId=145 $sample2 $temp
grib_check_key_equals $temp cfName kinetic_energy_dissipation_in_atmosphere_boundary_layer
${tools_dir}/grib_set -s indicatorOfParameter=122,table2Version=1 $sample1 $temp