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

ECC-1864: GRIB2: Update WMO encoding in soil temperature parameters and add time-mean variant

This commit is contained in:
Shahram Najm 2024-07-19 14:50:29 +00:00
parent b8cc5ce460
commit 4de7599137
16 changed files with 321 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
definitions/grib2/cfVarName.def
View File

@ -3114,8 +3114,8 @@
#Soil temperature top 20 cm
'st20' = {
discipline = 2 ;
parameterCategory = 0 ;
parameterNumber = 2 ;
parameterCategory = 3 ;
parameterNumber = 18 ;
typeOfFirstFixedSurface = 106 ;
typeOfSecondFixedSurface = 106 ;
scaledValueOfFirstFixedSurface = 0 ;
@ -3126,14 +3126,14 @@
#Soil temperature top 100 cm
'st100' = {
discipline = 2 ;
parameterCategory = 0 ;
parameterNumber = 2 ;
parameterCategory = 3 ;
parameterNumber = 18 ;
typeOfFirstFixedSurface = 106 ;
typeOfSecondFixedSurface = 106 ;
scaledValueOfFirstFixedSurface = 0 ;
scaleFactorOfFirstFixedSurface = 0 ;
scaledValueOfSecondFixedSurface = 10 ;
scaleFactorOfSecondFixedSurface = 1 ;
scaledValueOfSecondFixedSurface = 1 ;
scaleFactorOfSecondFixedSurface = 0 ;
}
#Atmosphere emission mass flux of Methane from Wetlands
'e_WLCH4' = {
@ -4984,6 +4984,32 @@
scaleFactorOfSecondFixedSurface = 0 ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean soil temperature top 20 cm
'avg_st20' = {
discipline = 2 ;
parameterCategory = 3 ;
parameterNumber = 18 ;
typeOfFirstFixedSurface = 106 ;
typeOfSecondFixedSurface = 106 ;
scaledValueOfFirstFixedSurface = 0 ;
scaleFactorOfFirstFixedSurface = 0 ;
scaledValueOfSecondFixedSurface = 2 ;
scaleFactorOfSecondFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean soil temperature top 100 cm
'avg_st100' = {
discipline = 2 ;
parameterCategory = 3 ;
parameterNumber = 18 ;
typeOfFirstFixedSurface = 106 ;
typeOfSecondFixedSurface = 106 ;
scaledValueOfFirstFixedSurface = 0 ;
scaleFactorOfFirstFixedSurface = 0 ;
scaledValueOfSecondFixedSurface = 1 ;
scaleFactorOfSecondFixedSurface = 0 ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean most-unstable CAPE
'avg_mucape' = {
discipline = 0 ;
@ -11276,12 +11302,6 @@
scaledValueOfFirstFixedSurface = 10 ;
scaleFactorOfFirstFixedSurface = 0 ;
}
#Soil temperature
'st' = {
discipline = 2 ;
parameterCategory = 0 ;
parameterNumber = 2 ;
}
#Snow depth water equivalent
'sd' = {
discipline = 0 ;

6
definitions/grib2/cfVarName.legacy.def
View File

@ -180,3 +180,9 @@
parameterCategory = 0 ;
parameterNumber = 24 ;
}
#Soil temperature
'st' = {
discipline = 2 ;
parameterCategory = 0 ;
parameterNumber = 2 ;
}

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

@ -199,6 +199,32 @@
scaleFactorOfSecondFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Soil temperature top 20 cm
'st20' = {
discipline = 2 ;
parameterCategory = 0 ;
parameterNumber = 2 ;
typeOfFirstFixedSurface = 106 ;
typeOfSecondFixedSurface = 106 ;
scaledValueOfFirstFixedSurface = 0 ;
scaleFactorOfFirstFixedSurface = 0 ;
scaledValueOfSecondFixedSurface = 2 ;
scaleFactorOfSecondFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Soil temperature top 100 cm
'st100' = {
discipline = 2 ;
parameterCategory = 0 ;
parameterNumber = 2 ;
typeOfFirstFixedSurface = 106 ;
typeOfSecondFixedSurface = 106 ;
scaledValueOfFirstFixedSurface = 0 ;
scaleFactorOfFirstFixedSurface = 0 ;
scaledValueOfSecondFixedSurface = 10 ;
scaleFactorOfSecondFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Eastward surface sea water velocity
'ocu' = {
discipline = 10 ;

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

@ -199,6 +199,32 @@
scaleFactorOfSecondFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Soil temperature top 20 cm
'Soil temperature top 20 cm' = {
discipline = 2 ;
parameterCategory = 0 ;
parameterNumber = 2 ;
typeOfFirstFixedSurface = 106 ;
typeOfSecondFixedSurface = 106 ;
scaledValueOfFirstFixedSurface = 0 ;
scaleFactorOfFirstFixedSurface = 0 ;
scaledValueOfSecondFixedSurface = 2 ;
scaleFactorOfSecondFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Soil temperature top 100 cm
'Soil temperature top 100 cm' = {
discipline = 2 ;
parameterCategory = 0 ;
parameterNumber = 2 ;
typeOfFirstFixedSurface = 106 ;
typeOfSecondFixedSurface = 106 ;
scaledValueOfFirstFixedSurface = 0 ;
scaleFactorOfFirstFixedSurface = 0 ;
scaledValueOfSecondFixedSurface = 10 ;
scaleFactorOfSecondFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Eastward surface sea water velocity
'Eastward surface sea water velocity' = {
discipline = 10 ;

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

@ -199,6 +199,32 @@
scaleFactorOfSecondFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Soil temperature top 20 cm
'228095' = {
discipline = 2 ;
parameterCategory = 0 ;
parameterNumber = 2 ;
typeOfFirstFixedSurface = 106 ;
typeOfSecondFixedSurface = 106 ;
scaledValueOfFirstFixedSurface = 0 ;
scaleFactorOfFirstFixedSurface = 0 ;
scaledValueOfSecondFixedSurface = 2 ;
scaleFactorOfSecondFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Soil temperature top 100 cm
'228096' = {
discipline = 2 ;
parameterCategory = 0 ;
parameterNumber = 2 ;
typeOfFirstFixedSurface = 106 ;
typeOfSecondFixedSurface = 106 ;
scaledValueOfFirstFixedSurface = 0 ;
scaleFactorOfFirstFixedSurface = 0 ;
scaledValueOfSecondFixedSurface = 10 ;
scaleFactorOfSecondFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Eastward surface sea water velocity
'151131' = {
discipline = 10 ;

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

@ -199,6 +199,32 @@
scaleFactorOfSecondFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Soil temperature top 20 cm
'st20' = {
discipline = 2 ;
parameterCategory = 0 ;
parameterNumber = 2 ;
typeOfFirstFixedSurface = 106 ;
typeOfSecondFixedSurface = 106 ;
scaledValueOfFirstFixedSurface = 0 ;
scaleFactorOfFirstFixedSurface = 0 ;
scaledValueOfSecondFixedSurface = 2 ;
scaleFactorOfSecondFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Soil temperature top 100 cm
'st100' = {
discipline = 2 ;
parameterCategory = 0 ;
parameterNumber = 2 ;
typeOfFirstFixedSurface = 106 ;
typeOfSecondFixedSurface = 106 ;
scaledValueOfFirstFixedSurface = 0 ;
scaleFactorOfFirstFixedSurface = 0 ;
scaledValueOfSecondFixedSurface = 10 ;
scaleFactorOfSecondFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Eastward surface sea water velocity
'ocu' = {
discipline = 10 ;

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

@ -199,6 +199,32 @@
scaleFactorOfSecondFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Soil temperature top 20 cm
'K' = {
discipline = 2 ;
parameterCategory = 0 ;
parameterNumber = 2 ;
typeOfFirstFixedSurface = 106 ;
typeOfSecondFixedSurface = 106 ;
scaledValueOfFirstFixedSurface = 0 ;
scaleFactorOfFirstFixedSurface = 0 ;
scaledValueOfSecondFixedSurface = 2 ;
scaleFactorOfSecondFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Soil temperature top 100 cm
'K' = {
discipline = 2 ;
parameterCategory = 0 ;
parameterNumber = 2 ;
typeOfFirstFixedSurface = 106 ;
typeOfSecondFixedSurface = 106 ;
scaledValueOfFirstFixedSurface = 0 ;
scaleFactorOfFirstFixedSurface = 0 ;
scaledValueOfSecondFixedSurface = 10 ;
scaleFactorOfSecondFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Eastward surface sea water velocity
'm s**-1' = {
discipline = 10 ;

44
definitions/grib2/name.def
View File

@ -3114,8 +3114,8 @@
#Soil temperature top 20 cm
'Soil temperature top 20 cm' = {
discipline = 2 ;
parameterCategory = 0 ;
parameterNumber = 2 ;
parameterCategory = 3 ;
parameterNumber = 18 ;
typeOfFirstFixedSurface = 106 ;
typeOfSecondFixedSurface = 106 ;
scaledValueOfFirstFixedSurface = 0 ;
@ -3126,14 +3126,14 @@
#Soil temperature top 100 cm
'Soil temperature top 100 cm' = {
discipline = 2 ;
parameterCategory = 0 ;
parameterNumber = 2 ;
parameterCategory = 3 ;
parameterNumber = 18 ;
typeOfFirstFixedSurface = 106 ;
typeOfSecondFixedSurface = 106 ;
scaledValueOfFirstFixedSurface = 0 ;
scaleFactorOfFirstFixedSurface = 0 ;
scaledValueOfSecondFixedSurface = 10 ;
scaleFactorOfSecondFixedSurface = 1 ;
scaledValueOfSecondFixedSurface = 1 ;
scaleFactorOfSecondFixedSurface = 0 ;
}
#Atmosphere emission mass flux of Methane from Wetlands
'Atmosphere emission mass flux of Methane from Wetlands' = {
@ -4984,6 +4984,32 @@
scaleFactorOfSecondFixedSurface = 0 ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean soil temperature top 20 cm
'Time-mean soil temperature top 20 cm' = {
discipline = 2 ;
parameterCategory = 3 ;
parameterNumber = 18 ;
typeOfFirstFixedSurface = 106 ;
typeOfSecondFixedSurface = 106 ;
scaledValueOfFirstFixedSurface = 0 ;
scaleFactorOfFirstFixedSurface = 0 ;
scaledValueOfSecondFixedSurface = 2 ;
scaleFactorOfSecondFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean soil temperature top 100 cm
'Time-mean soil temperature top 100 cm' = {
discipline = 2 ;
parameterCategory = 3 ;
parameterNumber = 18 ;
typeOfFirstFixedSurface = 106 ;
typeOfSecondFixedSurface = 106 ;
scaledValueOfFirstFixedSurface = 0 ;
scaleFactorOfFirstFixedSurface = 0 ;
scaledValueOfSecondFixedSurface = 1 ;
scaleFactorOfSecondFixedSurface = 0 ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean most-unstable CAPE
'Time-mean most-unstable CAPE' = {
discipline = 0 ;
@ -11276,12 +11302,6 @@
scaledValueOfFirstFixedSurface = 10 ;
scaleFactorOfFirstFixedSurface = 0 ;
}
#Soil temperature
'Soil temperature' = {
discipline = 2 ;
parameterCategory = 0 ;
parameterNumber = 2 ;
}
#Snow depth water equivalent
'Snow depth water equivalent' = {
discipline = 0 ;

6
definitions/grib2/name.legacy.def
View File

@ -180,3 +180,9 @@
parameterCategory = 0 ;
parameterNumber = 24 ;
}
#Soil temperature
'Soil temperature' = {
discipline = 2 ;
parameterCategory = 0 ;
parameterNumber = 2 ;
}

44
definitions/grib2/paramId.def
View File

@ -3114,8 +3114,8 @@
#Soil temperature top 20 cm
'228095' = {
discipline = 2 ;
parameterCategory = 0 ;
parameterNumber = 2 ;
parameterCategory = 3 ;
parameterNumber = 18 ;
typeOfFirstFixedSurface = 106 ;
typeOfSecondFixedSurface = 106 ;
scaledValueOfFirstFixedSurface = 0 ;
@ -3126,14 +3126,14 @@
#Soil temperature top 100 cm
'228096' = {
discipline = 2 ;
parameterCategory = 0 ;
parameterNumber = 2 ;
parameterCategory = 3 ;
parameterNumber = 18 ;
typeOfFirstFixedSurface = 106 ;
typeOfSecondFixedSurface = 106 ;
scaledValueOfFirstFixedSurface = 0 ;
scaleFactorOfFirstFixedSurface = 0 ;
scaledValueOfSecondFixedSurface = 10 ;
scaleFactorOfSecondFixedSurface = 1 ;
scaledValueOfSecondFixedSurface = 1 ;
scaleFactorOfSecondFixedSurface = 0 ;
}
#Atmosphere emission mass flux of Methane from Wetlands
'228104' = {
@ -4984,6 +4984,32 @@
scaleFactorOfSecondFixedSurface = 0 ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean soil temperature top 20 cm
'235115' = {
discipline = 2 ;
parameterCategory = 3 ;
parameterNumber = 18 ;
typeOfFirstFixedSurface = 106 ;
typeOfSecondFixedSurface = 106 ;
scaledValueOfFirstFixedSurface = 0 ;
scaleFactorOfFirstFixedSurface = 0 ;
scaledValueOfSecondFixedSurface = 2 ;
scaleFactorOfSecondFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean soil temperature top 100 cm
'235116' = {
discipline = 2 ;
parameterCategory = 3 ;
parameterNumber = 18 ;
typeOfFirstFixedSurface = 106 ;
typeOfSecondFixedSurface = 106 ;
scaledValueOfFirstFixedSurface = 0 ;
scaleFactorOfFirstFixedSurface = 0 ;
scaledValueOfSecondFixedSurface = 1 ;
scaleFactorOfSecondFixedSurface = 0 ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean most-unstable CAPE
'235117' = {
discipline = 0 ;
@ -11276,12 +11302,6 @@
scaledValueOfFirstFixedSurface = 10 ;
scaleFactorOfFirstFixedSurface = 0 ;
}
#Soil temperature
'228139' = {
discipline = 2 ;
parameterCategory = 0 ;
parameterNumber = 2 ;
}
#Snow depth water equivalent
'228141' = {
discipline = 0 ;

6
definitions/grib2/paramId.legacy.def
View File

@ -180,3 +180,9 @@
parameterCategory = 0 ;
parameterNumber = 24 ;
}
#Soil temperature
'228139' = {
discipline = 2 ;
parameterCategory = 0 ;
parameterNumber = 2 ;
}

44
definitions/grib2/shortName.def
View File

@ -3114,8 +3114,8 @@
#Soil temperature top 20 cm
'st20' = {
discipline = 2 ;
parameterCategory = 0 ;
parameterNumber = 2 ;
parameterCategory = 3 ;
parameterNumber = 18 ;
typeOfFirstFixedSurface = 106 ;
typeOfSecondFixedSurface = 106 ;
scaledValueOfFirstFixedSurface = 0 ;
@ -3126,14 +3126,14 @@
#Soil temperature top 100 cm
'st100' = {
discipline = 2 ;
parameterCategory = 0 ;
parameterNumber = 2 ;
parameterCategory = 3 ;
parameterNumber = 18 ;
typeOfFirstFixedSurface = 106 ;
typeOfSecondFixedSurface = 106 ;
scaledValueOfFirstFixedSurface = 0 ;
scaleFactorOfFirstFixedSurface = 0 ;
scaledValueOfSecondFixedSurface = 10 ;
scaleFactorOfSecondFixedSurface = 1 ;
scaledValueOfSecondFixedSurface = 1 ;
scaleFactorOfSecondFixedSurface = 0 ;
}
#Atmosphere emission mass flux of Methane from Wetlands
'e_WLCH4' = {
@ -4984,6 +4984,32 @@
scaleFactorOfSecondFixedSurface = 0 ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean soil temperature top 20 cm
'avg_st20' = {
discipline = 2 ;
parameterCategory = 3 ;
parameterNumber = 18 ;
typeOfFirstFixedSurface = 106 ;
typeOfSecondFixedSurface = 106 ;
scaledValueOfFirstFixedSurface = 0 ;
scaleFactorOfFirstFixedSurface = 0 ;
scaledValueOfSecondFixedSurface = 2 ;
scaleFactorOfSecondFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean soil temperature top 100 cm
'avg_st100' = {
discipline = 2 ;
parameterCategory = 3 ;
parameterNumber = 18 ;
typeOfFirstFixedSurface = 106 ;
typeOfSecondFixedSurface = 106 ;
scaledValueOfFirstFixedSurface = 0 ;
scaleFactorOfFirstFixedSurface = 0 ;
scaledValueOfSecondFixedSurface = 1 ;
scaleFactorOfSecondFixedSurface = 0 ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean most-unstable CAPE
'avg_mucape' = {
discipline = 0 ;
@ -11276,12 +11302,6 @@
scaledValueOfFirstFixedSurface = 10 ;
scaleFactorOfFirstFixedSurface = 0 ;
}
#Soil temperature
'st' = {
discipline = 2 ;
parameterCategory = 0 ;
parameterNumber = 2 ;
}
#Snow depth water equivalent
'sd' = {
discipline = 0 ;

6
definitions/grib2/shortName.legacy.def
View File

@ -180,3 +180,9 @@
parameterCategory = 0 ;
parameterNumber = 24 ;
}
#Soil temperature
'st' = {
discipline = 2 ;
parameterCategory = 0 ;
parameterNumber = 2 ;
}

44
definitions/grib2/units.def
View File

@ -3114,8 +3114,8 @@
#Soil temperature top 20 cm
'K' = {
discipline = 2 ;
parameterCategory = 0 ;
parameterNumber = 2 ;
parameterCategory = 3 ;
parameterNumber = 18 ;
typeOfFirstFixedSurface = 106 ;
typeOfSecondFixedSurface = 106 ;
scaledValueOfFirstFixedSurface = 0 ;
@ -3126,14 +3126,14 @@
#Soil temperature top 100 cm
'K' = {
discipline = 2 ;
parameterCategory = 0 ;
parameterNumber = 2 ;
parameterCategory = 3 ;
parameterNumber = 18 ;
typeOfFirstFixedSurface = 106 ;
typeOfSecondFixedSurface = 106 ;
scaledValueOfFirstFixedSurface = 0 ;
scaleFactorOfFirstFixedSurface = 0 ;
scaledValueOfSecondFixedSurface = 10 ;
scaleFactorOfSecondFixedSurface = 1 ;
scaledValueOfSecondFixedSurface = 1 ;
scaleFactorOfSecondFixedSurface = 0 ;
}
#Atmosphere emission mass flux of Methane from Wetlands
'kg m**-2 s**-1' = {
@ -4984,6 +4984,32 @@
scaleFactorOfSecondFixedSurface = 0 ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean soil temperature top 20 cm
'K' = {
discipline = 2 ;
parameterCategory = 3 ;
parameterNumber = 18 ;
typeOfFirstFixedSurface = 106 ;
typeOfSecondFixedSurface = 106 ;
scaledValueOfFirstFixedSurface = 0 ;
scaleFactorOfFirstFixedSurface = 0 ;
scaledValueOfSecondFixedSurface = 2 ;
scaleFactorOfSecondFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean soil temperature top 100 cm
'K' = {
discipline = 2 ;
parameterCategory = 3 ;
parameterNumber = 18 ;
typeOfFirstFixedSurface = 106 ;
typeOfSecondFixedSurface = 106 ;
scaledValueOfFirstFixedSurface = 0 ;
scaleFactorOfFirstFixedSurface = 0 ;
scaledValueOfSecondFixedSurface = 1 ;
scaleFactorOfSecondFixedSurface = 0 ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean most-unstable CAPE
'J kg**-1' = {
discipline = 0 ;
@ -11276,12 +11302,6 @@
scaledValueOfFirstFixedSurface = 10 ;
scaleFactorOfFirstFixedSurface = 0 ;
}
#Soil temperature
'K' = {
discipline = 2 ;
parameterCategory = 0 ;
parameterNumber = 2 ;
}
#Snow depth water equivalent
'kg m**-2' = {
discipline = 0 ;

6
definitions/grib2/units.legacy.def
View File

@ -180,3 +180,9 @@
parameterCategory = 0 ;
parameterNumber = 24 ;
}
#Soil temperature
'K' = {
discipline = 2 ;
parameterCategory = 0 ;
parameterNumber = 2 ;
}

2
tests/grib_level.sh
View File

@ -117,7 +117,7 @@ grib_check_key_equals $temp2 level 5
# Related to ECC-530: make sure GRIB2 parameters with typeOfSecondFixedSurface
# have correct parameter definitions (grib_set does not cause scale factor/value loss)
params="228086 228087 228095 228096 228170 228171 228139"
params="228086 228087 228095 228096 228170 228171"
for pid in $params; do
${tools_dir}/grib_set -s paramId=$pid $sample_g2 $temp
grib_check_key_equals $temp paramId $pid