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 release/2.35.0

This commit is contained in:
shahramn 2024-04-08 14:40:58 +01:00
parent 1e077b9279 0945dec141
commit 5601acb48c
18 changed files with 1030 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -152,6 +152,64 @@
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 1 ;
}
#Time-mean snow depth
'msd_m' = {
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 254 ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean low cloud cover
'mlcc_frac' = {
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 6 ;
parameterNumber = 193 ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean medium cloud cover
'mmcc_frac' = {
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 6 ;
parameterNumber = 194 ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean high cloud cover
'mhcc_frac' = {
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 6 ;
parameterNumber = 195 ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean forecast albedo
'mfal_frac' = {
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 19 ;
parameterNumber = 193 ;
typeOfStatisticalProcessing = 0 ;
}
#Mean large-scale precipitation rate
'mlsprt' = {
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 196 ;
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Mean convective precipitation rate
'cprate' = {
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 195 ;
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Mean total snowfall rate
'mtsfr' = {
localTablesVersion = 1 ;
@ -170,6 +228,15 @@
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Mean runoff rate
'mrort' = {
localTablesVersion = 1 ;
discipline = 2 ;
parameterCategory = 0 ;
parameterNumber = 201 ;
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Mean total precipitation rate
'tprate' = {
localTablesVersion = 1 ;
@ -178,4 +245,14 @@
parameterNumber = 193 ;
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Mean total cloud cover
'meantcc' = {
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 6 ;
parameterNumber = 192 ;
typeOfFirstFixedSurface = 1 ;
typeOfSecondFixedSurface = 8 ;
typeOfStatisticalProcessing = 0 ;
}

77
definitions/grib2/localConcepts/cerise/name.def
View File

@ -152,6 +152,64 @@
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 1 ;
}
#Time-mean snow depth
'Time-mean snow depth' = {
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 254 ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean low cloud cover
'Time-mean low cloud cover' = {
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 6 ;
parameterNumber = 193 ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean medium cloud cover
'Time-mean medium cloud cover' = {
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 6 ;
parameterNumber = 194 ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean high cloud cover
'Time-mean high cloud cover' = {
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 6 ;
parameterNumber = 195 ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean forecast albedo
'Time-mean forecast albedo' = {
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 19 ;
parameterNumber = 193 ;
typeOfStatisticalProcessing = 0 ;
}
#Mean large-scale precipitation rate
'Mean large-scale precipitation rate' = {
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 196 ;
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Mean convective precipitation rate
'Mean convective precipitation rate' = {
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 195 ;
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Mean total snowfall rate
'Mean total snowfall rate' = {
localTablesVersion = 1 ;
@ -170,6 +228,15 @@
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Mean runoff rate
'Mean runoff rate' = {
localTablesVersion = 1 ;
discipline = 2 ;
parameterCategory = 0 ;
parameterNumber = 201 ;
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Mean total precipitation rate
'Mean total precipitation rate' = {
localTablesVersion = 1 ;
@ -178,4 +245,14 @@
parameterNumber = 193 ;
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Mean total cloud cover
'Mean total cloud cover' = {
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 6 ;
parameterNumber = 192 ;
typeOfFirstFixedSurface = 1 ;
typeOfSecondFixedSurface = 8 ;
typeOfStatisticalProcessing = 0 ;
}

77
definitions/grib2/localConcepts/cerise/paramId.def
View File

@ -152,6 +152,64 @@
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 1 ;
}
#Time-mean snow depth
'235141' = {
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 254 ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean low cloud cover
'235186' = {
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 6 ;
parameterNumber = 193 ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean medium cloud cover
'235187' = {
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 6 ;
parameterNumber = 194 ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean high cloud cover
'235188' = {
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 6 ;
parameterNumber = 195 ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean forecast albedo
'235243' = {
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 19 ;
parameterNumber = 193 ;
typeOfStatisticalProcessing = 0 ;
}
#Mean large-scale precipitation rate
'172142' = {
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 196 ;
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Mean convective precipitation rate
'172143' = {
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 195 ;
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Mean total snowfall rate
'172144' = {
localTablesVersion = 1 ;
@ -170,6 +228,15 @@
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Mean runoff rate
'172205' = {
localTablesVersion = 1 ;
discipline = 2 ;
parameterCategory = 0 ;
parameterNumber = 201 ;
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Mean total precipitation rate
'172228' = {
localTablesVersion = 1 ;
@ -178,4 +245,14 @@
parameterNumber = 193 ;
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Mean total cloud cover
'228006' = {
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 6 ;
parameterNumber = 192 ;
typeOfFirstFixedSurface = 1 ;
typeOfSecondFixedSurface = 8 ;
typeOfStatisticalProcessing = 0 ;
}

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

@ -152,6 +152,64 @@
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 1 ;
}
#Time-mean snow depth
'msd_m' = {
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 254 ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean low cloud cover
'mlcc_frac' = {
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 6 ;
parameterNumber = 193 ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean medium cloud cover
'mmcc_frac' = {
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 6 ;
parameterNumber = 194 ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean high cloud cover
'mhcc_frac' = {
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 6 ;
parameterNumber = 195 ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean forecast albedo
'mfal_frac' = {
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 19 ;
parameterNumber = 193 ;
typeOfStatisticalProcessing = 0 ;
}
#Mean large-scale precipitation rate
'mlsprt' = {
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 196 ;
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Mean convective precipitation rate
'cprate' = {
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 195 ;
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Mean total snowfall rate
'mtsfr' = {
localTablesVersion = 1 ;
@ -170,6 +228,15 @@
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Mean runoff rate
'mrort' = {
localTablesVersion = 1 ;
discipline = 2 ;
parameterCategory = 0 ;
parameterNumber = 201 ;
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Mean total precipitation rate
'tprate' = {
localTablesVersion = 1 ;
@ -178,4 +245,14 @@
parameterNumber = 193 ;
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Mean total cloud cover
'meantcc' = {
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 6 ;
parameterNumber = 192 ;
typeOfFirstFixedSurface = 1 ;
typeOfSecondFixedSurface = 8 ;
typeOfStatisticalProcessing = 0 ;
}

77
definitions/grib2/localConcepts/cerise/units.def
View File

@ -152,6 +152,64 @@
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 1 ;
}
#Time-mean snow depth
'm of water equivalent' = {
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 254 ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean low cloud cover
'(0 - 1)' = {
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 6 ;
parameterNumber = 193 ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean medium cloud cover
'(0 - 1)' = {
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 6 ;
parameterNumber = 194 ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean high cloud cover
'(0 - 1)' = {
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 6 ;
parameterNumber = 195 ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean forecast albedo
'(0 - 1)' = {
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 19 ;
parameterNumber = 193 ;
typeOfStatisticalProcessing = 0 ;
}
#Mean large-scale precipitation rate
'm s**-1' = {
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 196 ;
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Mean convective precipitation rate
'm s**-1' = {
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 195 ;
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Mean total snowfall rate
'm of water equivalent s**-1' = {
localTablesVersion = 1 ;
@ -170,6 +228,15 @@
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Mean runoff rate
'm s**-1' = {
localTablesVersion = 1 ;
discipline = 2 ;
parameterCategory = 0 ;
parameterNumber = 201 ;
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Mean total precipitation rate
'm s**-1' = {
localTablesVersion = 1 ;
@ -178,4 +245,14 @@
parameterNumber = 193 ;
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Mean total cloud cover
'(0 - 1)' = {
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 6 ;
parameterNumber = 192 ;
typeOfFirstFixedSurface = 1 ;
typeOfSecondFixedSurface = 8 ;
typeOfStatisticalProcessing = 0 ;
}

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

@ -2579,6 +2579,24 @@
parameterCategory = 171 ;
parameterNumber = 122 ;
}
#Mean surface runoff rate
'msror' = {
localTablesVersion = 1 ;
discipline = 2 ;
parameterCategory = 0 ;
parameterNumber = 202 ;
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Mean sub-surface runoff rate
'mssror' = {
localTablesVersion = 1 ;
discipline = 2 ;
parameterCategory = 0 ;
parameterNumber = 204 ;
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Volcanic ash aerosol mixing ratio
'aermr13' = {
discipline = 192 ;
@ -13825,6 +13843,46 @@
typeOfSecondFixedSurface = 255 ;
typeOfStatisticalProcessing = 1 ;
}
#Time-mean snow depth
'msd_m' = {
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 254 ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean low cloud cover
'mlcc_frac' = {
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 6 ;
parameterNumber = 193 ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean medium cloud cover
'mmcc_frac' = {
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 6 ;
parameterNumber = 194 ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean high cloud cover
'mhcc_frac' = {
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 6 ;
parameterNumber = 195 ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean forecast albedo
'mfal_frac' = {
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 19 ;
parameterNumber = 193 ;
typeOfStatisticalProcessing = 0 ;
}
#Covariance between 2-metre temperature and volumetric soil water layer 1
'covar_t2m_swvl1' = {
localTablesVersion = 1 ;
@ -18987,21 +19045,30 @@
}
#Mean large-scale precipitation rate
'mlsprt' = {
discipline = 192 ;
parameterCategory = 172 ;
parameterNumber = 142 ;
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 196 ;
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Mean convective precipitation rate
'cprate' = {
discipline = 192 ;
parameterCategory = 172 ;
parameterNumber = 143 ;
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 195 ;
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Mean total snowfall rate
'mtsfr' = {
discipline = 192 ;
parameterCategory = 172 ;
parameterNumber = 144 ;
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 198 ;
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Boundary layer dissipation
'bldrate' = {
@ -19083,9 +19150,12 @@
}
#Evaporation
'erate' = {
discipline = 192 ;
parameterCategory = 172 ;
parameterNumber = 182 ;
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 199 ;
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Mean sunshine duration rate
'msdr' = {
@ -19113,9 +19183,12 @@
}
#Mean runoff rate
'mrort' = {
discipline = 192 ;
parameterCategory = 172 ;
parameterNumber = 205 ;
localTablesVersion = 1 ;
discipline = 2 ;
parameterCategory = 0 ;
parameterNumber = 201 ;
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Top net solar radiation, clear sky
'p208.172' = {
@ -19149,9 +19222,12 @@
}
#Mean total precipitation rate
'tprate' = {
discipline = 192 ;
parameterCategory = 172 ;
parameterNumber = 228 ;
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 193 ;
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Convective snowfall
'p239.172' = {
@ -21849,9 +21925,13 @@
}
#Mean total cloud cover
'meantcc' = {
discipline = 192 ;
parameterCategory = 228 ;
parameterNumber = 6 ;
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 6 ;
parameterNumber = 192 ;
typeOfFirstFixedSurface = 1 ;
typeOfSecondFixedSurface = 8 ;
typeOfStatisticalProcessing = 0 ;
}
#Surface temperature significance
'sts' = {

24
definitions/grib2/localConcepts/ecmf/cfVarName.legacy.def
View File

@ -1369,3 +1369,27 @@
parameterCategory = 172 ;
parameterNumber = 228 ;
}
#Mean large-scale precipitation rate
'mlsprt' = {
discipline = 192 ;
parameterCategory = 172 ;
parameterNumber = 142 ;
}
#Mean convective precipitation rate
'cprate' = {
discipline = 192 ;
parameterCategory = 172 ;
parameterNumber = 143 ;
}
#Mean runoff rate
'mrort' = {
discipline = 192 ;
parameterCategory = 172 ;
parameterNumber = 205 ;
}
#Mean total cloud cover
'meantcc' = {
discipline = 192 ;
parameterCategory = 228 ;
parameterNumber = 6 ;
}

122
definitions/grib2/localConcepts/ecmf/name.def
View File

@ -2579,6 +2579,24 @@
parameterCategory = 171 ;
parameterNumber = 122 ;
}
#Mean surface runoff rate
'Mean surface runoff rate' = {
localTablesVersion = 1 ;
discipline = 2 ;
parameterCategory = 0 ;
parameterNumber = 202 ;
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Mean sub-surface runoff rate
'Mean sub-surface runoff rate' = {
localTablesVersion = 1 ;
discipline = 2 ;
parameterCategory = 0 ;
parameterNumber = 204 ;
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Volcanic ash aerosol mixing ratio
'Volcanic ash aerosol mixing ratio' = {
discipline = 192 ;
@ -13825,6 +13843,46 @@
typeOfSecondFixedSurface = 255 ;
typeOfStatisticalProcessing = 1 ;
}
#Time-mean snow depth
'Time-mean snow depth' = {
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 254 ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean low cloud cover
'Time-mean low cloud cover' = {
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 6 ;
parameterNumber = 193 ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean medium cloud cover
'Time-mean medium cloud cover' = {
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 6 ;
parameterNumber = 194 ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean high cloud cover
'Time-mean high cloud cover' = {
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 6 ;
parameterNumber = 195 ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean forecast albedo
'Time-mean forecast albedo' = {
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 19 ;
parameterNumber = 193 ;
typeOfStatisticalProcessing = 0 ;
}
#Covariance between 2-metre temperature and volumetric soil water layer 1
'Covariance between 2-metre temperature and volumetric soil water layer 1' = {
localTablesVersion = 1 ;
@ -18987,21 +19045,30 @@
}
#Mean large-scale precipitation rate
'Mean large-scale precipitation rate' = {
discipline = 192 ;
parameterCategory = 172 ;
parameterNumber = 142 ;
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 196 ;
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Mean convective precipitation rate
'Mean convective precipitation rate' = {
discipline = 192 ;
parameterCategory = 172 ;
parameterNumber = 143 ;
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 195 ;
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Mean total snowfall rate
'Mean total snowfall rate' = {
discipline = 192 ;
parameterCategory = 172 ;
parameterNumber = 144 ;
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 198 ;
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Boundary layer dissipation
'Boundary layer dissipation' = {
@ -19083,9 +19150,12 @@
}
#Evaporation
'Evaporation' = {
discipline = 192 ;
parameterCategory = 172 ;
parameterNumber = 182 ;
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 199 ;
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Mean sunshine duration rate
'Mean sunshine duration rate' = {
@ -19113,9 +19183,12 @@
}
#Mean runoff rate
'Mean runoff rate' = {
discipline = 192 ;
parameterCategory = 172 ;
parameterNumber = 205 ;
localTablesVersion = 1 ;
discipline = 2 ;
parameterCategory = 0 ;
parameterNumber = 201 ;
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Top net solar radiation, clear sky
'Top net solar radiation, clear sky' = {
@ -19149,9 +19222,12 @@
}
#Mean total precipitation rate
'Mean total precipitation rate' = {
discipline = 192 ;
parameterCategory = 172 ;
parameterNumber = 228 ;
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 193 ;
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Convective snowfall
'Convective snowfall' = {
@ -21849,9 +21925,13 @@
}
#Mean total cloud cover
'Mean total cloud cover' = {
discipline = 192 ;
parameterCategory = 228 ;
parameterNumber = 6 ;
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 6 ;
parameterNumber = 192 ;
typeOfFirstFixedSurface = 1 ;
typeOfSecondFixedSurface = 8 ;
typeOfStatisticalProcessing = 0 ;
}
#Surface temperature significance
'Surface temperature significance' = {

24
definitions/grib2/localConcepts/ecmf/name.legacy.def
View File

@ -1369,3 +1369,27 @@
parameterCategory = 172 ;
parameterNumber = 228 ;
}
#Mean large-scale precipitation rate
'Mean large-scale precipitation rate' = {
discipline = 192 ;
parameterCategory = 172 ;
parameterNumber = 142 ;
}
#Mean convective precipitation rate
'Mean convective precipitation rate' = {
discipline = 192 ;
parameterCategory = 172 ;
parameterNumber = 143 ;
}
#Mean runoff rate
'Mean runoff rate' = {
discipline = 192 ;
parameterCategory = 172 ;
parameterNumber = 205 ;
}
#Mean total cloud cover
'Mean total cloud cover' = {
discipline = 192 ;
parameterCategory = 228 ;
parameterNumber = 6 ;
}

122
definitions/grib2/localConcepts/ecmf/paramId.def
View File

@ -2579,6 +2579,24 @@
parameterCategory = 171 ;
parameterNumber = 122 ;
}
#Mean surface runoff rate
'172008' = {
localTablesVersion = 1 ;
discipline = 2 ;
parameterCategory = 0 ;
parameterNumber = 202 ;
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Mean sub-surface runoff rate
'172009' = {
localTablesVersion = 1 ;
discipline = 2 ;
parameterCategory = 0 ;
parameterNumber = 204 ;
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Volcanic ash aerosol mixing ratio
'210013' = {
discipline = 192 ;
@ -13825,6 +13843,46 @@
typeOfSecondFixedSurface = 255 ;
typeOfStatisticalProcessing = 1 ;
}
#Time-mean snow depth
'235141' = {
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 254 ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean low cloud cover
'235186' = {
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 6 ;
parameterNumber = 193 ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean medium cloud cover
'235187' = {
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 6 ;
parameterNumber = 194 ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean high cloud cover
'235188' = {
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 6 ;
parameterNumber = 195 ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean forecast albedo
'235243' = {
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 19 ;
parameterNumber = 193 ;
typeOfStatisticalProcessing = 0 ;
}
#Covariance between 2-metre temperature and volumetric soil water layer 1
'254001' = {
localTablesVersion = 1 ;
@ -18987,21 +19045,30 @@
}
#Mean large-scale precipitation rate
'172142' = {
discipline = 192 ;
parameterCategory = 172 ;
parameterNumber = 142 ;
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 196 ;
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Mean convective precipitation rate
'172143' = {
discipline = 192 ;
parameterCategory = 172 ;
parameterNumber = 143 ;
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 195 ;
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Mean total snowfall rate
'172144' = {
discipline = 192 ;
parameterCategory = 172 ;
parameterNumber = 144 ;
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 198 ;
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Boundary layer dissipation
'172145' = {
@ -19083,9 +19150,12 @@
}
#Evaporation
'172182' = {
discipline = 192 ;
parameterCategory = 172 ;
parameterNumber = 182 ;
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 199 ;
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Mean sunshine duration rate
'172189' = {
@ -19113,9 +19183,12 @@
}
#Mean runoff rate
'172205' = {
discipline = 192 ;
parameterCategory = 172 ;
parameterNumber = 205 ;
localTablesVersion = 1 ;
discipline = 2 ;
parameterCategory = 0 ;
parameterNumber = 201 ;
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Top net solar radiation, clear sky
'172208' = {
@ -19149,9 +19222,12 @@
}
#Mean total precipitation rate
'172228' = {
discipline = 192 ;
parameterCategory = 172 ;
parameterNumber = 228 ;
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 193 ;
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Convective snowfall
'172239' = {
@ -21849,9 +21925,13 @@
}
#Mean total cloud cover
'228006' = {
discipline = 192 ;
parameterCategory = 228 ;
parameterNumber = 6 ;
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 6 ;
parameterNumber = 192 ;
typeOfFirstFixedSurface = 1 ;
typeOfSecondFixedSurface = 8 ;
typeOfStatisticalProcessing = 0 ;
}
#Surface temperature significance
'234139' = {

24
definitions/grib2/localConcepts/ecmf/paramId.legacy.def
View File

@ -1369,3 +1369,27 @@
parameterCategory = 172 ;
parameterNumber = 228 ;
}
#Mean large-scale precipitation rate
'172142' = {
discipline = 192 ;
parameterCategory = 172 ;
parameterNumber = 142 ;
}
#Mean convective precipitation rate
'172143' = {
discipline = 192 ;
parameterCategory = 172 ;
parameterNumber = 143 ;
}
#Mean runoff rate
'172205' = {
discipline = 192 ;
parameterCategory = 172 ;
parameterNumber = 205 ;
}
#Mean total cloud cover
'228006' = {
discipline = 192 ;
parameterCategory = 228 ;
parameterNumber = 6 ;
}

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

@ -2579,6 +2579,24 @@
parameterCategory = 171 ;
parameterNumber = 122 ;
}
#Mean surface runoff rate
'msror' = {
localTablesVersion = 1 ;
discipline = 2 ;
parameterCategory = 0 ;
parameterNumber = 202 ;
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Mean sub-surface runoff rate
'mssror' = {
localTablesVersion = 1 ;
discipline = 2 ;
parameterCategory = 0 ;
parameterNumber = 204 ;
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Volcanic ash aerosol mixing ratio
'aermr13' = {
discipline = 192 ;
@ -13825,6 +13843,46 @@
typeOfSecondFixedSurface = 255 ;
typeOfStatisticalProcessing = 1 ;
}
#Time-mean snow depth
'msd_m' = {
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 254 ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean low cloud cover
'mlcc_frac' = {
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 6 ;
parameterNumber = 193 ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean medium cloud cover
'mmcc_frac' = {
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 6 ;
parameterNumber = 194 ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean high cloud cover
'mhcc_frac' = {
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 6 ;
parameterNumber = 195 ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean forecast albedo
'mfal_frac' = {
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 19 ;
parameterNumber = 193 ;
typeOfStatisticalProcessing = 0 ;
}
#Covariance between 2-metre temperature and volumetric soil water layer 1
'covar_t2m_swvl1' = {
localTablesVersion = 1 ;
@ -18987,21 +19045,30 @@
}
#Mean large-scale precipitation rate
'mlsprt' = {
discipline = 192 ;
parameterCategory = 172 ;
parameterNumber = 142 ;
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 196 ;
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Mean convective precipitation rate
'cprate' = {
discipline = 192 ;
parameterCategory = 172 ;
parameterNumber = 143 ;
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 195 ;
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Mean total snowfall rate
'mtsfr' = {
discipline = 192 ;
parameterCategory = 172 ;
parameterNumber = 144 ;
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 198 ;
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Boundary layer dissipation
'bldrate' = {
@ -19083,9 +19150,12 @@
}
#Evaporation
'erate' = {
discipline = 192 ;
parameterCategory = 172 ;
parameterNumber = 182 ;
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 199 ;
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Mean sunshine duration rate
'msdr' = {
@ -19113,9 +19183,12 @@
}
#Mean runoff rate
'mrort' = {
discipline = 192 ;
parameterCategory = 172 ;
parameterNumber = 205 ;
localTablesVersion = 1 ;
discipline = 2 ;
parameterCategory = 0 ;
parameterNumber = 201 ;
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Top net solar radiation, clear sky
'~' = {
@ -19149,9 +19222,12 @@
}
#Mean total precipitation rate
'tprate' = {
discipline = 192 ;
parameterCategory = 172 ;
parameterNumber = 228 ;
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 193 ;
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Convective snowfall
'~' = {
@ -21849,9 +21925,13 @@
}
#Mean total cloud cover
'meantcc' = {
discipline = 192 ;
parameterCategory = 228 ;
parameterNumber = 6 ;
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 6 ;
parameterNumber = 192 ;
typeOfFirstFixedSurface = 1 ;
typeOfSecondFixedSurface = 8 ;
typeOfStatisticalProcessing = 0 ;
}
#Surface temperature significance
'sts' = {

24
definitions/grib2/localConcepts/ecmf/shortName.legacy.def
View File

@ -1369,3 +1369,27 @@
parameterCategory = 172 ;
parameterNumber = 228 ;
}
#Mean large-scale precipitation rate
'mlsprt' = {
discipline = 192 ;
parameterCategory = 172 ;
parameterNumber = 142 ;
}
#Mean convective precipitation rate
'cprate' = {
discipline = 192 ;
parameterCategory = 172 ;
parameterNumber = 143 ;
}
#Mean runoff rate
'mrort' = {
discipline = 192 ;
parameterCategory = 172 ;
parameterNumber = 205 ;
}
#Mean total cloud cover
'meantcc' = {
discipline = 192 ;
parameterCategory = 228 ;
parameterNumber = 6 ;
}

122
definitions/grib2/localConcepts/ecmf/units.def
View File

@ -2579,6 +2579,24 @@
parameterCategory = 171 ;
parameterNumber = 122 ;
}
#Mean surface runoff rate
'm s**-1' = {
localTablesVersion = 1 ;
discipline = 2 ;
parameterCategory = 0 ;
parameterNumber = 202 ;
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Mean sub-surface runoff rate
'm s**-1' = {
localTablesVersion = 1 ;
discipline = 2 ;
parameterCategory = 0 ;
parameterNumber = 204 ;
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Volcanic ash aerosol mixing ratio
'kg kg**-1' = {
discipline = 192 ;
@ -13825,6 +13843,46 @@
typeOfSecondFixedSurface = 255 ;
typeOfStatisticalProcessing = 1 ;
}
#Time-mean snow depth
'm of water equivalent' = {
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 254 ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean low cloud cover
'(0 - 1)' = {
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 6 ;
parameterNumber = 193 ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean medium cloud cover
'(0 - 1)' = {
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 6 ;
parameterNumber = 194 ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean high cloud cover
'(0 - 1)' = {
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 6 ;
parameterNumber = 195 ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean forecast albedo
'(0 - 1)' = {
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 19 ;
parameterNumber = 193 ;
typeOfStatisticalProcessing = 0 ;
}
#Covariance between 2-metre temperature and volumetric soil water layer 1
'K m**3 m**-3' = {
localTablesVersion = 1 ;
@ -18987,21 +19045,30 @@
}
#Mean large-scale precipitation rate
'm s**-1' = {
discipline = 192 ;
parameterCategory = 172 ;
parameterNumber = 142 ;
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 196 ;
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Mean convective precipitation rate
'm s**-1' = {
discipline = 192 ;
parameterCategory = 172 ;
parameterNumber = 143 ;
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 195 ;
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Mean total snowfall rate
'm of water equivalent s**-1' = {
discipline = 192 ;
parameterCategory = 172 ;
parameterNumber = 144 ;
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 198 ;
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Boundary layer dissipation
'W m**-2' = {
@ -19083,9 +19150,12 @@
}
#Evaporation
'm of water equivalent s**-1' = {
discipline = 192 ;
parameterCategory = 172 ;
parameterNumber = 182 ;
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 199 ;
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Mean sunshine duration rate
's s**-1' = {
@ -19113,9 +19183,12 @@
}
#Mean runoff rate
'm s**-1' = {
discipline = 192 ;
parameterCategory = 172 ;
parameterNumber = 205 ;
localTablesVersion = 1 ;
discipline = 2 ;
parameterCategory = 0 ;
parameterNumber = 201 ;
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Top net solar radiation, clear sky
'W m**-2' = {
@ -19149,9 +19222,12 @@
}
#Mean total precipitation rate
'm s**-1' = {
discipline = 192 ;
parameterCategory = 172 ;
parameterNumber = 228 ;
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 193 ;
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 0 ;
}
#Convective snowfall
'm of water equivalent s**-1' = {
@ -21849,9 +21925,13 @@
}
#Mean total cloud cover
'(0 - 1)' = {
discipline = 192 ;
parameterCategory = 228 ;
parameterNumber = 6 ;
localTablesVersion = 1 ;
discipline = 0 ;
parameterCategory = 6 ;
parameterNumber = 192 ;
typeOfFirstFixedSurface = 1 ;
typeOfSecondFixedSurface = 8 ;
typeOfStatisticalProcessing = 0 ;
}
#Surface temperature significance
'%' = {

24
definitions/grib2/localConcepts/ecmf/units.legacy.def
View File

@ -1369,3 +1369,27 @@
parameterCategory = 172 ;
parameterNumber = 228 ;
}
#Mean large-scale precipitation rate
'm s**-1' = {
discipline = 192 ;
parameterCategory = 172 ;
parameterNumber = 142 ;
}
#Mean convective precipitation rate
'm s**-1' = {
discipline = 192 ;
parameterCategory = 172 ;
parameterNumber = 143 ;
}
#Mean runoff rate
'm s**-1' = {
discipline = 192 ;
parameterCategory = 172 ;
parameterNumber = 205 ;
}
#Mean total cloud cover
'(0 - 1)' = {
discipline = 192 ;
parameterCategory = 228 ;
parameterNumber = 6 ;
}

17
src/grib_accessor_class_g1_half_byte_codeflag.cc
View File

@ -115,13 +115,11 @@ static void dump(grib_accessor* a, grib_dumper* dumper)
static int unpack_long(grib_accessor* a, long* val, size_t* len)
{
unsigned char dat = 0;
if (*len < 1) {
grib_context_log(a->context, GRIB_LOG_ERROR, "Wrong size for %s it contains %d values ", a->name, 1);
*len = 0;
*len = 1;
return GRIB_ARRAY_TOO_SMALL;
}
dat = grib_handle_of_accessor(a)->buffer->data[a->offset] & 0x0f;
unsigned char dat = grib_handle_of_accessor(a)->buffer->data[a->offset] & 0x0f;
*val = dat;
*len = 1;
@ -130,18 +128,17 @@ static int unpack_long(grib_accessor* a, long* val, size_t* len)
static int pack_long(grib_accessor* a, const long* val, size_t* len)
{
int ret = 0;
if (*len < 1) {
grib_context_log(a->context, GRIB_LOG_ERROR, "Wrong size for %s it contains %d values ", a->name, 1);
*len = 0;
*len = 1;
return GRIB_ARRAY_TOO_SMALL;
}
/* printf("HALF BYTE pack long %ld %02x\n",*val,grib_handle_of_accessor(a)->buffer->data[a->offset]);*/
// printf("HALF BYTE pack long %ld %02x\n",*val,grib_handle_of_accessor(a)->buffer->data[a->offset]);
grib_handle_of_accessor(a)->buffer->data[a->offset] = (a->parent->h->buffer->data[a->offset] & 0xf0) | (*val & 0x0f);
/* printf("HALF BYTE pack long %ld %02x\n",*val,grib_handle_of_accessor(a)->buffer->data[a->offset]);*/
// printf("HALF BYTE pack long %ld %02x\n",*val,grib_handle_of_accessor(a)->buffer->data[a->offset]);
*len = 1;
return ret;
return GRIB_SUCCESS;
}
static int get_native_type(grib_accessor* a)

22
src/grib_accessor_class_smart_table.cc
View File

@ -8,10 +8,6 @@
* virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
*/
/*****************************************
* Enrico Fucile
****************************************/
#include "grib_api_internal.h"
#include <cctype>
@ -253,10 +249,10 @@ static grib_smart_table* load_table(grib_accessor* a)
next = next->next;
}
/* Note: self->widthOfCode is chosen so that 2^width is bigger than the maximum descriptor code,
* which for BUFR4 is the Table C operator 243255
*/
size = (1ULL << self->widthOfCode); /* = 2^self->widthOfCode (as a 64 bit number) */
// Note: self->widthOfCode is chosen so that 2^width is bigger than the maximum descriptor code,
// which for BUFR4 is the Table C operator 243255
//
size = (1ULL << self->widthOfCode); // = 2^self->widthOfCode (as a 64 bit number)
t = (grib_smart_table*)grib_context_malloc_clear_persistent(c, sizeof(grib_smart_table));
t->entries = (grib_smart_table_entry*)grib_context_malloc_clear_persistent(c, size * sizeof(grib_smart_table_entry));
@ -344,7 +340,7 @@ static int grib_load_smart_table(grib_context* c, const char* filename,
*p = 0;
numberOfColumns = 0;
/* The highest possible descriptor code must fit into t->numberOfEntries */
// The highest possible descriptor code must fit into t->numberOfEntries
DEBUG_ASSERT(code < t->numberOfEntries);
while (*s) {
char* tcol = t->entries[code].column[numberOfColumns];
@ -455,7 +451,7 @@ static int get_table_codes(grib_accessor* a)
if (!self->dirty)
return 0;
table_size = (1 << self->widthOfCode); /* 2 ^ self->widthOfCode */
table_size = (1 << self->widthOfCode); // 2 ^ self->widthOfCode
if (!self->table)
self->table = load_table(a);
@ -523,8 +519,8 @@ static void destroy(grib_context* context, grib_accessor* a)
static int get_native_type(grib_accessor* a)
{
int type = GRIB_TYPE_LONG;
/*printf("---------- %s flags=%ld GRIB_ACCESSOR_FLAG_STRING_TYPE=%d\n",
a->name,a->flags,GRIB_ACCESSOR_FLAG_STRING_TYPE);*/
//printf("---------- %s flags=%ld GRIB_ACCESSOR_FLAG_STRING_TYPE=%d\n",
// a->name,a->flags,GRIB_ACCESSOR_FLAG_STRING_TYPE);
if (a->flags & GRIB_ACCESSOR_FLAG_STRING_TYPE)
type = GRIB_TYPE_STRING;
return type;
@ -546,7 +542,7 @@ static int unpack_long(grib_accessor* a, long* val, size_t* len)
if (*len < self->tableCodesSize) {
grib_context_log(a->context, GRIB_LOG_ERROR,
"Wrong size (%zu) for %s, it contains %zu values", *len, a->name, self->tableCodesSize);
*len = 0;
*len = self->tableCodesSize;
return GRIB_ARRAY_TOO_SMALL;
}

6
src/grib_accessor_class_transient_darray.cc
View File

@ -159,7 +159,8 @@ static int unpack_double(grib_accessor* a, double* val, size_t* len)
value_count(a, &count);
if (*len < count) {
grib_context_log(a->context, GRIB_LOG_ERROR, "Wrong size for %s (setting %ld, required %ld) ", a->name, *len, count);
grib_context_log(a->context, GRIB_LOG_ERROR, "Wrong size for %s (setting %zu, required %ld)", a->name, *len, count);
*len = count;
return GRIB_ARRAY_TOO_SMALL;
}
@ -178,7 +179,8 @@ static int unpack_long(grib_accessor* a, long* val, size_t* len)
value_count(a, &count);
if (*len < count) {
grib_context_log(a->context, GRIB_LOG_ERROR, "Wrong size for %s (setting %ld, required %ld) ", a->name, *len, count);
grib_context_log(a->context, GRIB_LOG_ERROR, "Wrong size for %s (setting %zu, required %ld)", a->name, *len, count);
*len = count;
return GRIB_ARRAY_TOO_SMALL;
}