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

Merge branch 'develop' into feature/modernisation-inheritance

This commit is contained in:
shahramn 2024-05-13 14:02:08 +01:00
parent 22bd62c276 501dc2c125
commit 1514b7350d
16 changed files with 158 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
definitions/grib2/cfVarName.def
View File

@ -4795,28 +4795,28 @@
typeOfStatisticalProcessing = 0 ;
}
#Time-mean snow density
'mrsn' = {
'avg_rsn' = {
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 61 ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean low vegetation cover
'mcvl' = {
'avg_cvl' = {
discipline = 2 ;
parameterCategory = 0 ;
parameterNumber = 53 ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean high vegetation cover
'mcvh' = {
'avg_cvh' = {
discipline = 2 ;
parameterCategory = 0 ;
parameterNumber = 54 ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean sea ice area fraction
'mci' = {
'avg_ci' = {
discipline = 10 ;
parameterCategory = 2 ;
parameterNumber = 0 ;
@ -4824,7 +4824,7 @@
typeOfStatisticalProcessing = 0 ;
}
#Time-mean sea surface temperature
'msst' = {
'avg_sst' = {
discipline = 10 ;
parameterCategory = 3 ;
parameterNumber = 0 ;
@ -4832,21 +4832,21 @@
typeOfStatisticalProcessing = 0 ;
}
#Time-mean leaf area index, low vegetation
'mlai_lv' = {
'avg_lai_lv' = {
discipline = 2 ;
parameterCategory = 0 ;
parameterNumber = 55 ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean leaf area index, high vegetation
'mlai_hv' = {
'avg_lai_hv' = {
discipline = 2 ;
parameterCategory = 0 ;
parameterNumber = 56 ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean total column liquid water
'mtclw' = {
'avg_tclw' = {
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 69 ;
@ -4855,7 +4855,7 @@
typeOfStatisticalProcessing = 0 ;
}
#Time-mean total column cloud ice water
'mtciw' = {
'avg_tciw' = {
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 70 ;
@ -4864,7 +4864,7 @@
typeOfStatisticalProcessing = 0 ;
}
#Time-mean 2 metre specific humidity
'm2sh' = {
'avg_2sh' = {
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 0 ;
@ -4875,7 +4875,7 @@
typeOfStatisticalProcessing = 0 ;
}
#Time-mean lake mix-layer temperature
'mlmlt' = {
'avg_lmlt' = {
discipline = 1 ;
parameterCategory = 2 ;
parameterNumber = 1 ;
@ -4884,7 +4884,7 @@
typeOfStatisticalProcessing = 0 ;
}
#Time-mean lake mix-layer depth
'mlmld' = {
'avg_lmld' = {
discipline = 1 ;
parameterCategory = 2 ;
parameterNumber = 0 ;
@ -4893,7 +4893,7 @@
typeOfStatisticalProcessing = 0 ;
}
#Time-mean 2 metre relative humidity
'm2r' = {
'avg_2r' = {
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 1 ;
@ -4903,70 +4903,70 @@
typeOfStatisticalProcessing = 0 ;
}
#Time-mean fraction of snow cover
'mfscov' = {
'avg_fscov' = {
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 121 ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean soil temperature
'msot' = {
'avg_sot' = {
discipline = 2 ;
parameterCategory = 3 ;
parameterNumber = 18 ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean snow depth
'msde' = {
'avg_sde' = {
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 11 ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean snow cover
'msnowc' = {
'avg_snowc' = {
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 42 ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean geopotential
'mz' = {
'avg_z' = {
discipline = 0 ;
parameterCategory = 3 ;
parameterNumber = 4 ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean temperature
'mt' = {
'avg_t' = {
discipline = 0 ;
parameterCategory = 0 ;
parameterNumber = 0 ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean U component of wind
'mu' = {
'avg_u' = {
discipline = 0 ;
parameterCategory = 2 ;
parameterNumber = 2 ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean V component of wind
'mv' = {
'avg_v' = {
discipline = 0 ;
parameterCategory = 2 ;
parameterNumber = 3 ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean specific humidity
'mq' = {
'avg_q' = {
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 0 ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean surface pressure
'msp' = {
'avg_sp' = {
discipline = 0 ;
parameterCategory = 3 ;
parameterNumber = 0 ;
@ -4974,14 +4974,14 @@
typeOfStatisticalProcessing = 0 ;
}
#Time-mean vertical velocity
'mw' = {
'avg_w' = {
discipline = 0 ;
parameterCategory = 2 ;
parameterNumber = 8 ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean total column water
'mtcw' = {
'avg_tcw' = {
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 51 ;
@ -4990,7 +4990,7 @@
typeOfStatisticalProcessing = 0 ;
}
#Time-mean total column vertically-integrated water vapour
'mtcwv' = {
'avg_tcwv' = {
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 64 ;
@ -4999,7 +4999,7 @@
typeOfStatisticalProcessing = 0 ;
}
#Time-mean mean sea level pressure
'mmsl' = {
'avg_msl' = {
discipline = 0 ;
parameterCategory = 3 ;
parameterNumber = 0 ;
@ -5007,21 +5007,21 @@
typeOfStatisticalProcessing = 0 ;
}
#Time-mean relative humidity
'mr' = {
'avg_r' = {
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean boundary layer height
'mblh' = {
'avg_blh' = {
discipline = 0 ;
parameterCategory = 3 ;
parameterNumber = 18 ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean 10 metre U wind component
'm10u' = {
'avg_10u' = {
discipline = 0 ;
parameterCategory = 2 ;
parameterNumber = 2 ;
@ -5031,7 +5031,7 @@
typeOfStatisticalProcessing = 0 ;
}
#Time-mean 10 metre V wind component
'm10v' = {
'avg_10v' = {
discipline = 0 ;
parameterCategory = 2 ;
parameterNumber = 3 ;
@ -5041,7 +5041,7 @@
typeOfStatisticalProcessing = 0 ;
}
#Time-mean 2 metre dewpoint temperature
'm2d' = {
'avg_2d' = {
discipline = 0 ;
parameterCategory = 0 ;
parameterNumber = 6 ;
@ -5051,14 +5051,14 @@
typeOfStatisticalProcessing = 0 ;
}
#Time-mean temperature of snow layer
'mtsn' = {
'avg_tsn' = {
discipline = 2 ;
parameterCategory = 3 ;
parameterNumber = 28 ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean forecast surface roughness
'mfsr' = {
'avg_fsr' = {
discipline = 2 ;
parameterCategory = 0 ;
parameterNumber = 1 ;
@ -5066,7 +5066,7 @@
typeOfStatisticalProcessing = 0 ;
}
#Time-mean forecast logarithm of surface roughness for heat
'mflsr' = {
'avg_flsr' = {
discipline = 0 ;
parameterCategory = 2 ;
parameterNumber = 54 ;

10
definitions/grib2/localConcepts/cerise/cfVarName.def
View File

@ -153,7 +153,7 @@
typeOfStatisticalProcessing = 1 ;
}
#Time-mean snow depth
'msd_m' = {
'avg_sd_m' = {
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 1 ;
@ -161,7 +161,7 @@
typeOfStatisticalProcessing = 0 ;
}
#Time-mean low cloud cover
'mlcc_frac' = {
'avg_lcc_frac' = {
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 6 ;
@ -169,7 +169,7 @@
typeOfStatisticalProcessing = 0 ;
}
#Time-mean medium cloud cover
'mmcc_frac' = {
'avg_mcc_frac' = {
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 6 ;
@ -177,7 +177,7 @@
typeOfStatisticalProcessing = 0 ;
}
#Time-mean high cloud cover
'mhcc_frac' = {
'avg_hcc_frac' = {
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 6 ;
@ -185,7 +185,7 @@
typeOfStatisticalProcessing = 0 ;
}
#Time-mean forecast albedo
'mfal_frac' = {
'avg_fal_frac' = {
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 19 ;

10
definitions/grib2/localConcepts/cerise/shortName.def
View File

@ -153,7 +153,7 @@
typeOfStatisticalProcessing = 1 ;
}
#Time-mean snow depth
'msd_m' = {
'avg_sd_m' = {
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 1 ;
@ -161,7 +161,7 @@
typeOfStatisticalProcessing = 0 ;
}
#Time-mean low cloud cover
'mlcc_frac' = {
'avg_lcc_frac' = {
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 6 ;
@ -169,7 +169,7 @@
typeOfStatisticalProcessing = 0 ;
}
#Time-mean medium cloud cover
'mmcc_frac' = {
'avg_mcc_frac' = {
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 6 ;
@ -177,7 +177,7 @@
typeOfStatisticalProcessing = 0 ;
}
#Time-mean high cloud cover
'mhcc_frac' = {
'avg_hcc_frac' = {
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 6 ;
@ -185,7 +185,7 @@
typeOfStatisticalProcessing = 0 ;
}
#Time-mean forecast albedo
'mfal_frac' = {
'avg_fal_frac' = {
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 19 ;

10
definitions/grib2/localConcepts/ecmf/cfVarName.def
View File

@ -13832,7 +13832,7 @@
typeOfStatisticalProcessing = 1 ;
}
#Time-mean snow depth
'msd_m' = {
'avg_sd_m' = {
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 1 ;
@ -13840,7 +13840,7 @@
typeOfStatisticalProcessing = 0 ;
}
#Time-mean low cloud cover
'mlcc_frac' = {
'avg_lcc_frac' = {
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 6 ;
@ -13848,7 +13848,7 @@
typeOfStatisticalProcessing = 0 ;
}
#Time-mean medium cloud cover
'mmcc_frac' = {
'avg_mcc_frac' = {
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 6 ;
@ -13856,7 +13856,7 @@
typeOfStatisticalProcessing = 0 ;
}
#Time-mean high cloud cover
'mhcc_frac' = {
'avg_hcc_frac' = {
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 6 ;
@ -13864,7 +13864,7 @@
typeOfStatisticalProcessing = 0 ;
}
#Time-mean forecast albedo
'mfal_frac' = {
'avg_fal_frac' = {
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 19 ;

10
definitions/grib2/localConcepts/ecmf/shortName.def
View File

@ -13832,7 +13832,7 @@
typeOfStatisticalProcessing = 1 ;
}
#Time-mean snow depth
'msd_m' = {
'avg_sd_m' = {
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 1 ;
@ -13840,7 +13840,7 @@
typeOfStatisticalProcessing = 0 ;
}
#Time-mean low cloud cover
'mlcc_frac' = {
'avg_lcc_frac' = {
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 6 ;
@ -13848,7 +13848,7 @@
typeOfStatisticalProcessing = 0 ;
}
#Time-mean medium cloud cover
'mmcc_frac' = {
'avg_mcc_frac' = {
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 6 ;
@ -13856,7 +13856,7 @@
typeOfStatisticalProcessing = 0 ;
}
#Time-mean high cloud cover
'mhcc_frac' = {
'avg_hcc_frac' = {
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 6 ;
@ -13864,7 +13864,7 @@
typeOfStatisticalProcessing = 0 ;
}
#Time-mean forecast albedo
'mfal_frac' = {
'avg_fal_frac' = {
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 19 ;

8
definitions/grib2/localConcepts/era6/cfName.def
View File

@ -42,6 +42,14 @@
typeOfFirstFixedSurface = 1 ;
typeOfSecondFixedSurface = 8 ;
}
#Albedo (climatological)
'surface_albedo' = {
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 19 ;
parameterNumber = 193 ;
typeOfGeneratingProcess = 9 ;
}
#Evaporation
'lwe_thickness_of_water_evaporation_amount' = {
localTablesVersion = 1 ;

8
definitions/grib2/localConcepts/era6/name.def
View File

@ -124,6 +124,14 @@
typeOfFirstFixedSurface = 1 ;
typeOfSecondFixedSurface = 8 ;
}
#Albedo (climatological)
'Albedo (climatological)' = {
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 19 ;
parameterNumber = 193 ;
typeOfGeneratingProcess = 9 ;
}
#Evaporation
'Evaporation' = {
localTablesVersion = 1 ;

8
definitions/grib2/localConcepts/era6/paramId.def
View File

@ -124,6 +124,14 @@
typeOfFirstFixedSurface = 1 ;
typeOfSecondFixedSurface = 8 ;
}
#Albedo (climatological)
'174' = {
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 19 ;
parameterNumber = 193 ;
typeOfGeneratingProcess = 9 ;
}
#Evaporation
'182' = {
localTablesVersion = 1 ;

8
definitions/grib2/localConcepts/era6/shortName.def
View File

@ -124,6 +124,14 @@
typeOfFirstFixedSurface = 1 ;
typeOfSecondFixedSurface = 8 ;
}
#Albedo (climatological)
'al' = {
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 19 ;
parameterNumber = 193 ;
typeOfGeneratingProcess = 9 ;
}
#Evaporation
'e' = {
localTablesVersion = 1 ;

8
definitions/grib2/localConcepts/era6/units.def
View File

@ -124,6 +124,14 @@
typeOfFirstFixedSurface = 1 ;
typeOfSecondFixedSurface = 8 ;
}
#Albedo (climatological)
'(0 - 1)' = {
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 19 ;
parameterNumber = 193 ;
typeOfGeneratingProcess = 9 ;
}
#Evaporation
'm of water equivalent' = {
localTablesVersion = 1 ;

70
definitions/grib2/shortName.def
View File

@ -4795,28 +4795,28 @@
typeOfStatisticalProcessing = 0 ;
}
#Time-mean snow density
'mrsn' = {
'avg_rsn' = {
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 61 ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean low vegetation cover
'mcvl' = {
'avg_cvl' = {
discipline = 2 ;
parameterCategory = 0 ;
parameterNumber = 53 ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean high vegetation cover
'mcvh' = {
'avg_cvh' = {
discipline = 2 ;
parameterCategory = 0 ;
parameterNumber = 54 ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean sea ice area fraction
'mci' = {
'avg_ci' = {
discipline = 10 ;
parameterCategory = 2 ;
parameterNumber = 0 ;
@ -4824,7 +4824,7 @@
typeOfStatisticalProcessing = 0 ;
}
#Time-mean sea surface temperature
'msst' = {
'avg_sst' = {
discipline = 10 ;
parameterCategory = 3 ;
parameterNumber = 0 ;
@ -4832,21 +4832,21 @@
typeOfStatisticalProcessing = 0 ;
}
#Time-mean leaf area index, low vegetation
'mlai_lv' = {
'avg_lai_lv' = {
discipline = 2 ;
parameterCategory = 0 ;
parameterNumber = 55 ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean leaf area index, high vegetation
'mlai_hv' = {
'avg_lai_hv' = {
discipline = 2 ;
parameterCategory = 0 ;
parameterNumber = 56 ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean total column liquid water
'mtclw' = {
'avg_tclw' = {
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 69 ;
@ -4855,7 +4855,7 @@
typeOfStatisticalProcessing = 0 ;
}
#Time-mean total column cloud ice water
'mtciw' = {
'avg_tciw' = {
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 70 ;
@ -4864,7 +4864,7 @@
typeOfStatisticalProcessing = 0 ;
}
#Time-mean 2 metre specific humidity
'm2sh' = {
'avg_2sh' = {
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 0 ;
@ -4875,7 +4875,7 @@
typeOfStatisticalProcessing = 0 ;
}
#Time-mean lake mix-layer temperature
'mlmlt' = {
'avg_lmlt' = {
discipline = 1 ;
parameterCategory = 2 ;
parameterNumber = 1 ;
@ -4884,7 +4884,7 @@
typeOfStatisticalProcessing = 0 ;
}
#Time-mean lake mix-layer depth
'mlmld' = {
'avg_lmld' = {
discipline = 1 ;
parameterCategory = 2 ;
parameterNumber = 0 ;
@ -4893,7 +4893,7 @@
typeOfStatisticalProcessing = 0 ;
}
#Time-mean 2 metre relative humidity
'm2r' = {
'avg_2r' = {
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 1 ;
@ -4903,70 +4903,70 @@
typeOfStatisticalProcessing = 0 ;
}
#Time-mean fraction of snow cover
'mfscov' = {
'avg_fscov' = {
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 121 ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean soil temperature
'msot' = {
'avg_sot' = {
discipline = 2 ;
parameterCategory = 3 ;
parameterNumber = 18 ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean snow depth
'msde' = {
'avg_sde' = {
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 11 ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean snow cover
'msnowc' = {
'avg_snowc' = {
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 42 ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean geopotential
'mz' = {
'avg_z' = {
discipline = 0 ;
parameterCategory = 3 ;
parameterNumber = 4 ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean temperature
'mt' = {
'avg_t' = {
discipline = 0 ;
parameterCategory = 0 ;
parameterNumber = 0 ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean U component of wind
'mu' = {
'avg_u' = {
discipline = 0 ;
parameterCategory = 2 ;
parameterNumber = 2 ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean V component of wind
'mv' = {
'avg_v' = {
discipline = 0 ;
parameterCategory = 2 ;
parameterNumber = 3 ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean specific humidity
'mq' = {
'avg_q' = {
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 0 ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean surface pressure
'msp' = {
'avg_sp' = {
discipline = 0 ;
parameterCategory = 3 ;
parameterNumber = 0 ;
@ -4974,14 +4974,14 @@
typeOfStatisticalProcessing = 0 ;
}
#Time-mean vertical velocity
'mw' = {
'avg_w' = {
discipline = 0 ;
parameterCategory = 2 ;
parameterNumber = 8 ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean total column water
'mtcw' = {
'avg_tcw' = {
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 51 ;
@ -4990,7 +4990,7 @@
typeOfStatisticalProcessing = 0 ;
}
#Time-mean total column vertically-integrated water vapour
'mtcwv' = {
'avg_tcwv' = {
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 64 ;
@ -4999,7 +4999,7 @@
typeOfStatisticalProcessing = 0 ;
}
#Time-mean mean sea level pressure
'mmsl' = {
'avg_msl' = {
discipline = 0 ;
parameterCategory = 3 ;
parameterNumber = 0 ;
@ -5007,21 +5007,21 @@
typeOfStatisticalProcessing = 0 ;
}
#Time-mean relative humidity
'mr' = {
'avg_r' = {
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean boundary layer height
'mblh' = {
'avg_blh' = {
discipline = 0 ;
parameterCategory = 3 ;
parameterNumber = 18 ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean 10 metre U wind component
'm10u' = {
'avg_10u' = {
discipline = 0 ;
parameterCategory = 2 ;
parameterNumber = 2 ;
@ -5031,7 +5031,7 @@
typeOfStatisticalProcessing = 0 ;
}
#Time-mean 10 metre V wind component
'm10v' = {
'avg_10v' = {
discipline = 0 ;
parameterCategory = 2 ;
parameterNumber = 3 ;
@ -5041,7 +5041,7 @@
typeOfStatisticalProcessing = 0 ;
}
#Time-mean 2 metre dewpoint temperature
'm2d' = {
'avg_2d' = {
discipline = 0 ;
parameterCategory = 0 ;
parameterNumber = 6 ;
@ -5051,14 +5051,14 @@
typeOfStatisticalProcessing = 0 ;
}
#Time-mean temperature of snow layer
'mtsn' = {
'avg_tsn' = {
discipline = 2 ;
parameterCategory = 3 ;
parameterNumber = 28 ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean forecast surface roughness
'mfsr' = {
'avg_fsr' = {
discipline = 2 ;
parameterCategory = 0 ;
parameterNumber = 1 ;
@ -5066,7 +5066,7 @@
typeOfStatisticalProcessing = 0 ;
}
#Time-mean forecast logarithm of surface roughness for heat
'mflsr' = {
'avg_flsr' = {
discipline = 0 ;
parameterCategory = 2 ;
parameterNumber = 54 ;

40
definitions/grib2/template.4.20.def
View File

@ -1,60 +1,60 @@
# (C) Copyright 2005- ECMWF.
# TEMPLATE 4.20, Radar product
codetable[1] parameterCategory ('4.1.[discipline:l].table',masterDir,localDir) : dump;
codetable[1] parameterCategory('4.1.[discipline:l].table',masterDir,localDir) : dump;
# Parameter number
codetable[1] parameterNumber ('4.2.[discipline:l].[parameterCategory:l].table',masterDir,localDir) : dump;
codetable[1] parameterNumber('4.2.[discipline:l].[parameterCategory:l].table',masterDir,localDir) : dump;
meta parameterUnits codetable_units(parameterNumber) : dump;
meta parameterName codetable_title(parameterNumber) : dump;
codetable[1] typeOfGeneratingProcess ('4.3.table',masterDir,localDir) : dump;
codetable[1] typeOfGeneratingProcess('4.3.table',masterDir,localDir) : dump;
# Number of radar sites used
unsigned[1] numberOfRadarSitesUsed : dump;
unsigned[1] numberOfRadarSitesUsed : dump;
codetable[1] indicatorOfUnitOfTimeRange ('4.4.table',masterDir,localDir) : dump;
alias indicatorOfUnitForForecastTime = indicatorOfUnitOfTimeRange;
codetable[1] indicatorOfUnitForForecastTime('4.4.table',masterDir,localDir) : dump;
alias indicatorOfUnitOfTimeRange = indicatorOfUnitForForecastTime;
include "grib2/stepUnits.def"
# Site latitude (in microdegrees)
unsigned[4] siteLatitude : dump;
unsigned[4] siteLatitude : dump;
# Site longitude (in microdegrees)
unsigned[4] siteLongitude : dump;
unsigned[4] siteLongitude : dump;
# Site elevation (meters)
unsigned[2] siteElevation : dump;
unsigned[2] siteElevation : dump;
# Site ID (alphanumeric)
unsigned[4] siteId : dump;
unsigned[4] siteId : dump;
# Site ID (numeric)
unsigned[2] siteId : dump;
unsigned[2] siteId : dump;
# Operating mode
codetable[1] operatingMode ('4.12.table',masterDir,localDir) : dump;
codetable[1] operatingMode('4.12.table',masterDir,localDir) : dump;
# Reflectivity calibration constant (tenths of dB)
unsigned[1] reflectivityCalibrationConstant : dump;
unsigned[1] reflectivityCalibrationConstant : dump;
# Quality control indicator
codetable[1] qualityControlIndicator ('4.13.table',masterDir,localDir) : dump;
codetable[1] qualityControlIndicator('4.13.table',masterDir,localDir) : dump;
# Clutter filter indicator
codetable[1] clutterFilterIndicator ('4.14.table',masterDir,localDir) : dump;
codetable[1] clutterFilterIndicator('4.14.table',masterDir,localDir) : dump;
# Constant antenna elevation angle (tenths of degree true)
unsigned[1] constantAntennaElevationAngle : dump;
unsigned[1] constantAntennaElevationAngle : dump;
# Accumulation interval (minutes)
unsigned[2] accumulationInterval : dump;
unsigned[2] accumulationInterval : dump;
# Reference reflectivity for echo top (dB)
unsigned[1] referenceReflectivityForEchoTop : dump;
unsigned[1] referenceReflectivityForEchoTop : dump;
# Range bin spacing (meters)
unsigned[3] rangeBinSpacing : dump;
unsigned[3] rangeBinSpacing : dump;
# Radial angular spacing (tenths of degree true)
unsigned[2] radialAngularSpacing : dump;
unsigned[2] radialAngularSpacing : dump;

4
definitions/grib2/template.4.forecast_time.def
View File

@ -9,8 +9,8 @@ unsigned[1] minutesAfterDataCutoff = missing() : edition_specific,can_be_missin
alias minutesAfterReferenceTimeOfDataCutoff=minutesAfterDataCutoff;
# Indicator of unit for forecastTime (ECC-1709)
codetable[1] indicatorOfUnitOfTimeRange ('4.4.table',masterDir,localDir) : dump;
alias indicatorOfUnitForForecastTime = indicatorOfUnitOfTimeRange;
codetable[1] indicatorOfUnitForForecastTime ('4.4.table',masterDir,localDir) : dump;
alias indicatorOfUnitOfTimeRange = indicatorOfUnitForForecastTime;
include "grib2/stepUnits.def"

4
definitions/grib2/template.4.forecast_time_44.def
View File

@ -11,8 +11,8 @@ unsigned[1] minutesAfterDataCutoff = missing() : edition_specific,can_be_missin
alias minutesAfterReferenceTimeOfDataCutoff=minutesAfterDataCutoff;
# Indicator of unit for forecastTime (ECC-1709)
codetable[1] indicatorOfUnitOfTimeRange ('4.4.table',masterDir,localDir) : dump;
alias indicatorOfUnitForForecastTime = indicatorOfUnitOfTimeRange;
codetable[1] indicatorOfUnitForForecastTime ('4.4.table',masterDir,localDir) : dump;
alias indicatorOfUnitOfTimeRange = indicatorOfUnitForForecastTime;
include "grib2/stepUnits.def"

4
definitions/grib2/template.4.localtime.def
View File

@ -34,7 +34,7 @@ localTimeForecastList list(numberOfForecastsUsedInLocalTime)
unsigned[1] secondOfForecastUsedInLocalTime=0 : dump, edition_specific;
# Indicator of unit of time for ForecastTime
codetable[1] indicatorOfUnitForForecastTime ('4.4.table',masterDir,localDir)=1 : dump;
codetable[1] indicatorOfUnitForForecastTime('4.4.table',masterDir,localDir)=1 : dump;
# Length of the time range over which statistical processing is done, in units defined by the previous octet
unsigned[4] forecastTime=0 : dump;
@ -43,7 +43,7 @@ localTimeForecastList list(numberOfForecastsUsedInLocalTime)
unsigned[1] numberOfTimeIncrementsOfForecastsUsedInLocalTime=1 : dump;
# Indicator of unit of time for the increment between the successive steps used
codetable[1] indicatorOfUnitForTimeIncrement ('4.4.table',masterDir,localDir)=255 : dump;
codetable[1] indicatorOfUnitForTimeIncrement('4.4.table',masterDir,localDir)=255 : dump;
# Time increment between successive fields, in units defined by the previous octet
unsigned[4] timeIncrement=0 : dump;

4
tests/grib_ecc-1806.sh
View File

@ -42,11 +42,11 @@ test_conversion()
test_conversion 174098 262000 sithick
test_conversion 151163 262104 t20d
test_conversion 151145 262124 zos
test_conversion 130232 235135 mw
test_conversion 130232 235135 avg_w
test_conversion 172146 235033 msshf
test_conversion 172147 235034 mslhf
test_conversion 55 228004 mean2t
test_conversion 56 235168 m2d
test_conversion 56 235168 avg_2d
test_conversion 172169 235035 msdwswrf
test_conversion 172175 235036 msdwlwrf
test_conversion 172176 235037 msnswrf