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

ECC-1882: GRIB2: Adapt recently added On-Demand DT encodings to fit generalised approach

This commit is contained in:
Shahram Najm 2024-08-12 09:31:36 +00:00
parent 29f64e6cf3
commit 1db0056878
8 changed files with 208 additions and 228 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
definitions/grib1/localConcepts/ecmf/name.def
View File

@ -15024,11 +15024,6 @@
table2Version = 172 ;
indicatorOfParameter = 147 ;
}
#Time-mean surface net radiation flux (SW and LW)
'Time-mean surface net radiation flux (SW and LW)' = {
table2Version = 172 ;
indicatorOfParameter = 149 ;
}
#Mean short-wave heating rate
'Mean short-wave heating rate' = {
table2Version = 172 ;

5
definitions/grib1/localConcepts/ecmf/paramId.def
View File

@ -15024,11 +15024,6 @@
table2Version = 172 ;
indicatorOfParameter = 147 ;
}
#Time-mean surface net radiation flux (SW and LW)
'172149' = {
table2Version = 172 ;
indicatorOfParameter = 149 ;
}
#Mean short-wave heating rate
'172153' = {
table2Version = 172 ;

5
definitions/grib1/localConcepts/ecmf/shortName.def
View File

@ -15024,11 +15024,6 @@
table2Version = 172 ;
indicatorOfParameter = 147 ;
}
#Time-mean surface net radiation flux (SW and LW)
'msnrf' = {
table2Version = 172 ;
indicatorOfParameter = 149 ;
}
#Mean short-wave heating rate
'mswhr' = {
table2Version = 172 ;

5
definitions/grib1/localConcepts/ecmf/units.def
View File

@ -15024,11 +15024,6 @@
table2Version = 172 ;
indicatorOfParameter = 147 ;
}
#Time-mean surface net radiation flux (SW and LW)
'W m**-2' = {
table2Version = 172 ;
indicatorOfParameter = 149 ;
}
#Mean short-wave heating rate
'K s**-1' = {
table2Version = 172 ;

104
definitions/grib2/name.def
View File

@ -3539,14 +3539,6 @@
parameterNumber = 46 ;
typeOfFirstFixedSurface = 8 ;
}
#Time-mean top net radiation flux (SW and LW)
'Time-mean top net radiation flux (SW and LW)' = {
discipline = 0 ;
parameterCategory = 19 ;
parameterNumber = 46 ;
typeOfFirstFixedSurface = 8 ;
typeOfStatisticalProcessing = 0 ;
}
#Global irradiance on tilted surfaces
'Global irradiance on tilted surfaces' = {
discipline = 0 ;
@ -3705,22 +3697,6 @@
typeOfSecondFixedSurface = 8 ;
typeOfStatisticalProcessing = 1 ;
}
#Maximum total column integrated graupel (snow pellets)
'Maximum total column integrated graupel (snow pellets)' = {
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 74 ;
typeOfFirstFixedSurface = 1 ;
typeOfSecondFixedSurface = 8 ;
typeOfStatisticalProcessing = 2 ;
}
#Minimum visibility
'Minimum visibility' = {
discipline = 0 ;
parameterCategory = 19 ;
parameterNumber = 0 ;
typeOfStatisticalProcessing = 3 ;
}
#Geometric height of theta level above ground
'Geometric height of theta level above ground' = {
discipline = 0 ;
@ -3845,26 +3821,6 @@
parameterNumber = 16 ;
typeOfFirstFixedSurface = 1 ;
}
#Time-maximum 2 metre relative humidity
'Time-maximum 2 metre relative humidity' = {
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 1 ;
typeOfFirstFixedSurface = 103 ;
scaledValueOfFirstFixedSurface = 2 ;
scaleFactorOfFirstFixedSurface = 0 ;
typeOfStatisticalProcessing = 2 ;
}
#Time-minimum 2 metre relative humidity
'Time-minimum 2 metre relative humidity' = {
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 1 ;
typeOfFirstFixedSurface = 103 ;
scaledValueOfFirstFixedSurface = 2 ;
scaleFactorOfFirstFixedSurface = 0 ;
typeOfStatisticalProcessing = 3 ;
}
#Surface roughness for heat
'Surface roughness for heat' = {
discipline = 0 ;
@ -5127,6 +5083,22 @@
parameterNumber = 12 ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean surface net radiation flux (SW and LW)
'Time-mean surface net radiation flux (SW and LW)' = {
discipline = 0 ;
parameterCategory = 19 ;
parameterNumber = 46 ;
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean top net radiation flux (SW and LW)
'Time-mean top net radiation flux (SW and LW)' = {
discipline = 0 ;
parameterCategory = 19 ;
parameterNumber = 46 ;
typeOfFirstFixedSurface = 8 ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean mean sea level pressure
'Time-mean mean sea level pressure' = {
discipline = 0 ;
@ -5348,6 +5320,16 @@
parameterNumber = 25 ;
typeOfStatisticalProcessing = 2 ;
}
#Time-maximum 2 metre relative humidity
'Time-maximum 2 metre relative humidity' = {
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 1 ;
typeOfFirstFixedSurface = 103 ;
scaledValueOfFirstFixedSurface = 2 ;
scaleFactorOfFirstFixedSurface = 0 ;
typeOfStatisticalProcessing = 2 ;
}
#Time-maximum most-unstable CAPE
'Time-maximum most-unstable CAPE' = {
discipline = 0 ;
@ -5358,6 +5340,15 @@
scaleFactorOfFirstFixedSurface = missing() ;
typeOfStatisticalProcessing = 2 ;
}
#Time-maximum total column vertically-integrated graupel (snow pellets)
'Time-maximum total column vertically-integrated graupel (snow pellets)' = {
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 74 ;
typeOfFirstFixedSurface = 1 ;
typeOfSecondFixedSurface = 8 ;
typeOfStatisticalProcessing = 2 ;
}
#Time-minimum volumetric soil moisture
'Time-minimum volumetric soil moisture' = {
discipline = 2 ;
@ -5365,6 +5356,23 @@
parameterNumber = 25 ;
typeOfStatisticalProcessing = 3 ;
}
#Time-minimum 2 metre relative humidity
'Time-minimum 2 metre relative humidity' = {
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 1 ;
typeOfFirstFixedSurface = 103 ;
scaledValueOfFirstFixedSurface = 2 ;
scaleFactorOfFirstFixedSurface = 0 ;
typeOfStatisticalProcessing = 3 ;
}
#Time-minimum visibility
'Time-minimum visibility' = {
discipline = 0 ;
parameterCategory = 19 ;
parameterNumber = 0 ;
typeOfStatisticalProcessing = 3 ;
}
#Time-minimum most-unstable CAPE
'Time-minimum most-unstable CAPE' = {
discipline = 0 ;
@ -11061,14 +11069,6 @@
parameterNumber = 40 ;
typeOfStatisticalProcessing = 1 ;
}
#Time-mean surface net radiation flux (SW and LW)
'Time-mean surface net radiation flux (SW and LW)' = {
discipline = 0 ;
parameterCategory = 19 ;
parameterNumber = 46 ;
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Surface runoff
'Surface runoff' = {
discipline = 2 ;

104
definitions/grib2/paramId.def
View File

@ -3539,14 +3539,6 @@
parameterNumber = 46 ;
typeOfFirstFixedSurface = 8 ;
}
#Time-mean top net radiation flux (SW and LW)
'231020' = {
discipline = 0 ;
parameterCategory = 19 ;
parameterNumber = 46 ;
typeOfFirstFixedSurface = 8 ;
typeOfStatisticalProcessing = 0 ;
}
#Global irradiance on tilted surfaces
'231021' = {
discipline = 0 ;
@ -3705,22 +3697,6 @@
typeOfSecondFixedSurface = 8 ;
typeOfStatisticalProcessing = 1 ;
}
#Maximum total column integrated graupel (snow pellets)
'231042' = {
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 74 ;
typeOfFirstFixedSurface = 1 ;
typeOfSecondFixedSurface = 8 ;
typeOfStatisticalProcessing = 2 ;
}
#Minimum visibility
'231043' = {
discipline = 0 ;
parameterCategory = 19 ;
parameterNumber = 0 ;
typeOfStatisticalProcessing = 3 ;
}
#Geometric height of theta level above ground
'231044' = {
discipline = 0 ;
@ -3845,26 +3821,6 @@
parameterNumber = 16 ;
typeOfFirstFixedSurface = 1 ;
}
#Time-maximum 2 metre relative humidity
'231061' = {
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 1 ;
typeOfFirstFixedSurface = 103 ;
scaledValueOfFirstFixedSurface = 2 ;
scaleFactorOfFirstFixedSurface = 0 ;
typeOfStatisticalProcessing = 2 ;
}
#Time-minimum 2 metre relative humidity
'231062' = {
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 1 ;
typeOfFirstFixedSurface = 103 ;
scaledValueOfFirstFixedSurface = 2 ;
scaleFactorOfFirstFixedSurface = 0 ;
typeOfStatisticalProcessing = 3 ;
}
#Surface roughness for heat
'231063' = {
discipline = 0 ;
@ -5127,6 +5083,22 @@
parameterNumber = 12 ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean surface net radiation flux (SW and LW)
'235149' = {
discipline = 0 ;
parameterCategory = 19 ;
parameterNumber = 46 ;
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean top net radiation flux (SW and LW)
'235150' = {
discipline = 0 ;
parameterCategory = 19 ;
parameterNumber = 46 ;
typeOfFirstFixedSurface = 8 ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean mean sea level pressure
'235151' = {
discipline = 0 ;
@ -5348,6 +5320,16 @@
parameterNumber = 25 ;
typeOfStatisticalProcessing = 2 ;
}
#Time-maximum 2 metre relative humidity
'237092' = {
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 1 ;
typeOfFirstFixedSurface = 103 ;
scaledValueOfFirstFixedSurface = 2 ;
scaleFactorOfFirstFixedSurface = 0 ;
typeOfStatisticalProcessing = 2 ;
}
#Time-maximum most-unstable CAPE
'237117' = {
discipline = 0 ;
@ -5358,6 +5340,15 @@
scaleFactorOfFirstFixedSurface = missing() ;
typeOfStatisticalProcessing = 2 ;
}
#Time-maximum total column vertically-integrated graupel (snow pellets)
'237120' = {
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 74 ;
typeOfFirstFixedSurface = 1 ;
typeOfSecondFixedSurface = 8 ;
typeOfStatisticalProcessing = 2 ;
}
#Time-minimum volumetric soil moisture
'238077' = {
discipline = 2 ;
@ -5365,6 +5356,23 @@
parameterNumber = 25 ;
typeOfStatisticalProcessing = 3 ;
}
#Time-minimum 2 metre relative humidity
'238092' = {
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 1 ;
typeOfFirstFixedSurface = 103 ;
scaledValueOfFirstFixedSurface = 2 ;
scaleFactorOfFirstFixedSurface = 0 ;
typeOfStatisticalProcessing = 3 ;
}
#Time-minimum visibility
'238105' = {
discipline = 0 ;
parameterCategory = 19 ;
parameterNumber = 0 ;
typeOfStatisticalProcessing = 3 ;
}
#Time-minimum most-unstable CAPE
'238117' = {
discipline = 0 ;
@ -11061,14 +11069,6 @@
parameterNumber = 40 ;
typeOfStatisticalProcessing = 1 ;
}
#Time-mean surface net radiation flux (SW and LW)
'172149' = {
discipline = 0 ;
parameterCategory = 19 ;
parameterNumber = 46 ;
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Surface runoff
'174008' = {
discipline = 2 ;

104
definitions/grib2/shortName.def
View File

@ -3539,14 +3539,6 @@
parameterNumber = 46 ;
typeOfFirstFixedSurface = 8 ;
}
#Time-mean top net radiation flux (SW and LW)
'mtnrf' = {
discipline = 0 ;
parameterCategory = 19 ;
parameterNumber = 46 ;
typeOfFirstFixedSurface = 8 ;
typeOfStatisticalProcessing = 0 ;
}
#Global irradiance on tilted surfaces
'gits' = {
discipline = 0 ;
@ -3705,22 +3697,6 @@
typeOfSecondFixedSurface = 8 ;
typeOfStatisticalProcessing = 1 ;
}
#Maximum total column integrated graupel (snow pellets)
'maxtcg' = {
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 74 ;
typeOfFirstFixedSurface = 1 ;
typeOfSecondFixedSurface = 8 ;
typeOfStatisticalProcessing = 2 ;
}
#Minimum visibility
'minvis' = {
discipline = 0 ;
parameterCategory = 19 ;
parameterNumber = 0 ;
typeOfStatisticalProcessing = 3 ;
}
#Geometric height of theta level above ground
'hthg' = {
discipline = 0 ;
@ -3845,26 +3821,6 @@
parameterNumber = 16 ;
typeOfFirstFixedSurface = 1 ;
}
#Time-maximum 2 metre relative humidity
'mx2r' = {
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 1 ;
typeOfFirstFixedSurface = 103 ;
scaledValueOfFirstFixedSurface = 2 ;
scaleFactorOfFirstFixedSurface = 0 ;
typeOfStatisticalProcessing = 2 ;
}
#Time-minimum 2 metre relative humidity
'mn2r' = {
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 1 ;
typeOfFirstFixedSurface = 103 ;
scaledValueOfFirstFixedSurface = 2 ;
scaleFactorOfFirstFixedSurface = 0 ;
typeOfStatisticalProcessing = 3 ;
}
#Surface roughness for heat
'srhe' = {
discipline = 0 ;
@ -5127,6 +5083,22 @@
parameterNumber = 12 ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean surface net radiation flux (SW and LW)
'avg_snrf' = {
discipline = 0 ;
parameterCategory = 19 ;
parameterNumber = 46 ;
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean top net radiation flux (SW and LW)
'avg_tnrf' = {
discipline = 0 ;
parameterCategory = 19 ;
parameterNumber = 46 ;
typeOfFirstFixedSurface = 8 ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean mean sea level pressure
'avg_msl' = {
discipline = 0 ;
@ -5348,6 +5320,16 @@
parameterNumber = 25 ;
typeOfStatisticalProcessing = 2 ;
}
#Time-maximum 2 metre relative humidity
'max_2r' = {
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 1 ;
typeOfFirstFixedSurface = 103 ;
scaledValueOfFirstFixedSurface = 2 ;
scaleFactorOfFirstFixedSurface = 0 ;
typeOfStatisticalProcessing = 2 ;
}
#Time-maximum most-unstable CAPE
'max_mucape' = {
discipline = 0 ;
@ -5358,6 +5340,15 @@
scaleFactorOfFirstFixedSurface = missing() ;
typeOfStatisticalProcessing = 2 ;
}
#Time-maximum total column vertically-integrated graupel (snow pellets)
'max_tcolg' = {
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 74 ;
typeOfFirstFixedSurface = 1 ;
typeOfSecondFixedSurface = 8 ;
typeOfStatisticalProcessing = 2 ;
}
#Time-minimum volumetric soil moisture
'min_vsw' = {
discipline = 2 ;
@ -5365,6 +5356,23 @@
parameterNumber = 25 ;
typeOfStatisticalProcessing = 3 ;
}
#Time-minimum 2 metre relative humidity
'min_2r' = {
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 1 ;
typeOfFirstFixedSurface = 103 ;
scaledValueOfFirstFixedSurface = 2 ;
scaleFactorOfFirstFixedSurface = 0 ;
typeOfStatisticalProcessing = 3 ;
}
#Time-minimum visibility
'min_vis' = {
discipline = 0 ;
parameterCategory = 19 ;
parameterNumber = 0 ;
typeOfStatisticalProcessing = 3 ;
}
#Time-minimum most-unstable CAPE
'min_mucape' = {
discipline = 0 ;
@ -11061,14 +11069,6 @@
parameterNumber = 40 ;
typeOfStatisticalProcessing = 1 ;
}
#Time-mean surface net radiation flux (SW and LW)
'msnrf' = {
discipline = 0 ;
parameterCategory = 19 ;
parameterNumber = 46 ;
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Surface runoff
'sro' = {
discipline = 2 ;

104
definitions/grib2/units.def
View File

@ -3539,14 +3539,6 @@
parameterNumber = 46 ;
typeOfFirstFixedSurface = 8 ;
}
#Time-mean top net radiation flux (SW and LW)
'W m**-2' = {
discipline = 0 ;
parameterCategory = 19 ;
parameterNumber = 46 ;
typeOfFirstFixedSurface = 8 ;
typeOfStatisticalProcessing = 0 ;
}
#Global irradiance on tilted surfaces
'W m**-2' = {
discipline = 0 ;
@ -3705,22 +3697,6 @@
typeOfSecondFixedSurface = 8 ;
typeOfStatisticalProcessing = 1 ;
}
#Maximum total column integrated graupel (snow pellets)
'kg m**-2' = {
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 74 ;
typeOfFirstFixedSurface = 1 ;
typeOfSecondFixedSurface = 8 ;
typeOfStatisticalProcessing = 2 ;
}
#Minimum visibility
'm' = {
discipline = 0 ;
parameterCategory = 19 ;
parameterNumber = 0 ;
typeOfStatisticalProcessing = 3 ;
}
#Geometric height of theta level above ground
'm' = {
discipline = 0 ;
@ -3845,26 +3821,6 @@
parameterNumber = 16 ;
typeOfFirstFixedSurface = 1 ;
}
#Time-maximum 2 metre relative humidity
'%' = {
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 1 ;
typeOfFirstFixedSurface = 103 ;
scaledValueOfFirstFixedSurface = 2 ;
scaleFactorOfFirstFixedSurface = 0 ;
typeOfStatisticalProcessing = 2 ;
}
#Time-minimum 2 metre relative humidity
'%' = {
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 1 ;
typeOfFirstFixedSurface = 103 ;
scaledValueOfFirstFixedSurface = 2 ;
scaleFactorOfFirstFixedSurface = 0 ;
typeOfStatisticalProcessing = 3 ;
}
#Surface roughness for heat
'm' = {
discipline = 0 ;
@ -5127,6 +5083,22 @@
parameterNumber = 12 ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean surface net radiation flux (SW and LW)
'W m**-2' = {
discipline = 0 ;
parameterCategory = 19 ;
parameterNumber = 46 ;
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean top net radiation flux (SW and LW)
'W m**-2' = {
discipline = 0 ;
parameterCategory = 19 ;
parameterNumber = 46 ;
typeOfFirstFixedSurface = 8 ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean mean sea level pressure
'Pa' = {
discipline = 0 ;
@ -5348,6 +5320,16 @@
parameterNumber = 25 ;
typeOfStatisticalProcessing = 2 ;
}
#Time-maximum 2 metre relative humidity
'%' = {
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 1 ;
typeOfFirstFixedSurface = 103 ;
scaledValueOfFirstFixedSurface = 2 ;
scaleFactorOfFirstFixedSurface = 0 ;
typeOfStatisticalProcessing = 2 ;
}
#Time-maximum most-unstable CAPE
'J kg**-1' = {
discipline = 0 ;
@ -5358,6 +5340,15 @@
scaleFactorOfFirstFixedSurface = missing() ;
typeOfStatisticalProcessing = 2 ;
}
#Time-maximum total column vertically-integrated graupel (snow pellets)
'kg m**-2' = {
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 74 ;
typeOfFirstFixedSurface = 1 ;
typeOfSecondFixedSurface = 8 ;
typeOfStatisticalProcessing = 2 ;
}
#Time-minimum volumetric soil moisture
'm**3 m**-3' = {
discipline = 2 ;
@ -5365,6 +5356,23 @@
parameterNumber = 25 ;
typeOfStatisticalProcessing = 3 ;
}
#Time-minimum 2 metre relative humidity
'%' = {
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 1 ;
typeOfFirstFixedSurface = 103 ;
scaledValueOfFirstFixedSurface = 2 ;
scaleFactorOfFirstFixedSurface = 0 ;
typeOfStatisticalProcessing = 3 ;
}
#Time-minimum visibility
'm' = {
discipline = 0 ;
parameterCategory = 19 ;
parameterNumber = 0 ;
typeOfStatisticalProcessing = 3 ;
}
#Time-minimum most-unstable CAPE
'J kg**-1' = {
discipline = 0 ;
@ -11061,14 +11069,6 @@
parameterNumber = 40 ;
typeOfStatisticalProcessing = 1 ;
}
#Time-mean surface net radiation flux (SW and LW)
'W m**-2' = {
discipline = 0 ;
parameterCategory = 19 ;
parameterNumber = 46 ;
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Surface runoff
'kg m**-2' = {
discipline = 2 ;