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/mtg2

This commit is contained in:
Sebastien Villaume 2023-10-05 14:10:50 +01:00
parent ceab3776ae 66c7e6d73c
commit 4e93671397
45 changed files with 935 additions and 482 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmake/FindAEC.cmake
View File

@ -22,14 +22,15 @@
# libaec_DIR
# LIBAEC_PATH
# libaec_PATH
# libaec_ROOT
find_path( AEC_INCLUDE_DIR libaec.h
PATHS ${AEC_DIR} ${AEC_PATH} ${LIBAEC_DIR} ${libaec_DIR} ${LIBAEC_PATH} ${libaec_PATH} ENV AEC_DIR ENV AEC_PATH ENV LIBAEC_DIR ENV libaec_DIR ENV LIBAEC_PATH ENV libaec_PATH
PATHS ${AEC_DIR} ${AEC_PATH} ${LIBAEC_DIR} ${libaec_DIR} ${LIBAEC_PATH} ${libaec_PATH} ${libaec_ROOT} ENV AEC_DIR ENV AEC_PATH ENV LIBAEC_DIR ENV libaec_DIR ENV LIBAEC_PATH ENV libaec_PATH ENV libaec_ROOT
PATH_SUFFIXES include include/aec NO_DEFAULT_PATH )
find_path( AEC_INCLUDE_DIR libaec.h PATH_SUFFIXES include include/aec )
find_library( AEC_LIBRARY NAMES aec
PATHS ${AEC_DIR} ${AEC_PATH} ${LIBAEC_DIR} ${libaec_DIR} ${LIBAEC_PATH} ${libaec_PATH} ENV AEC_DIR ENV AEC_PATH ENV LIBAEC_DIR ENV libaec_DIR ENV LIBAEC_PATH ENV libaec_PATH
PATHS ${AEC_DIR} ${AEC_PATH} ${LIBAEC_DIR} ${libaec_DIR} ${LIBAEC_PATH} ${libaec_PATH} ${libaec_ROOT} ENV AEC_DIR ENV AEC_PATH ENV LIBAEC_DIR ENV libaec_DIR ENV LIBAEC_PATH ENV libaec_PATH ENV libaec_ROOT
PATH_SUFFIXES lib lib64 lib/aec lib64/aec NO_DEFAULT_PATH )
find_library( AEC_LIBRARY NAMES aec PATH_SUFFIXES lib lib64 lib/aec lib64/aec )

16
definitions/grib1/localConcepts/ecmf/cfVarName.def
View File

@ -294,7 +294,7 @@
table2Version = 128 ;
indicatorOfParameter = 48 ;
}
#10 metre wind gust since previous post-processing
#Maximum 10 metre wind gust since previous post-processing
'fg10' = {
table2Version = 128 ;
indicatorOfParameter = 49 ;
@ -659,7 +659,7 @@
table2Version = 128 ;
indicatorOfParameter = 122 ;
}
#10 metre wind gust in the last 6 hours
#Maximum 10 metre wind gust in the last 6 hours
'p10fg6' = {
table2Version = 128 ;
indicatorOfParameter = 123 ;
@ -1169,7 +1169,7 @@
table2Version = 128 ;
indicatorOfParameter = 159 ;
}
#Standard deviation of orography
#Standard deviation of sub-gridscale orography
'sdor' = {
table2Version = 128 ;
indicatorOfParameter = 160 ;
@ -9879,7 +9879,7 @@
table2Version = 228 ;
indicatorOfParameter = 20 ;
}
#Total sky direct solar radiation at surface
#Total sky direct short-wave (solar) radiation at surface
'fdir' = {
table2Version = 228 ;
indicatorOfParameter = 21 ;
@ -9914,7 +9914,7 @@
table2Version = 228 ;
indicatorOfParameter = 27 ;
}
#10 metre wind gust in the last 3 hours
#Maximum 10 metre wind gust in the last 3 hours
'fg310' = {
table2Version = 228 ;
indicatorOfParameter = 28 ;
@ -10089,12 +10089,12 @@
table2Version = 228 ;
indicatorOfParameter = 94 ;
}
#Surface solar radiation downward clear-sky
#Surface short-wave (solar) radiation downward clear-sky
'ssrdc' = {
table2Version = 228 ;
indicatorOfParameter = 129 ;
}
#Surface thermal radiation downward clear-sky
#Surface long-wave (thermal) radiation downward clear-sky
'strdc' = {
table2Version = 228 ;
indicatorOfParameter = 130 ;
@ -16314,7 +16314,7 @@
table2Version = 210 ;
indicatorOfParameter = 54 ;
}
#Carbon Dioxide
#Carbon dioxide mass mixing ratio
'co2' = {
table2Version = 210 ;
indicatorOfParameter = 61 ;

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

@ -294,8 +294,8 @@
table2Version = 128 ;
indicatorOfParameter = 48 ;
}
#10 metre wind gust since previous post-processing
'10 metre wind gust since previous post-processing' = {
#Maximum 10 metre wind gust since previous post-processing
'Maximum 10 metre wind gust since previous post-processing' = {
table2Version = 128 ;
indicatorOfParameter = 49 ;
}
@ -659,8 +659,8 @@
table2Version = 128 ;
indicatorOfParameter = 122 ;
}
#10 metre wind gust in the last 6 hours
'10 metre wind gust in the last 6 hours' = {
#Maximum 10 metre wind gust in the last 6 hours
'Maximum 10 metre wind gust in the last 6 hours' = {
table2Version = 128 ;
indicatorOfParameter = 123 ;
}
@ -1169,8 +1169,8 @@
table2Version = 128 ;
indicatorOfParameter = 159 ;
}
#Standard deviation of orography
'Standard deviation of orography' = {
#Standard deviation of sub-gridscale orography
'Standard deviation of sub-gridscale orography' = {
table2Version = 128 ;
indicatorOfParameter = 160 ;
}
@ -9879,8 +9879,8 @@
table2Version = 228 ;
indicatorOfParameter = 20 ;
}
#Total sky direct solar radiation at surface
'Total sky direct solar radiation at surface' = {
#Total sky direct short-wave (solar) radiation at surface
'Total sky direct short-wave (solar) radiation at surface' = {
table2Version = 228 ;
indicatorOfParameter = 21 ;
}
@ -9914,8 +9914,8 @@
table2Version = 228 ;
indicatorOfParameter = 27 ;
}
#10 metre wind gust in the last 3 hours
'10 metre wind gust in the last 3 hours' = {
#Maximum 10 metre wind gust in the last 3 hours
'Maximum 10 metre wind gust in the last 3 hours' = {
table2Version = 228 ;
indicatorOfParameter = 28 ;
}
@ -10089,13 +10089,13 @@
table2Version = 228 ;
indicatorOfParameter = 94 ;
}
#Surface solar radiation downward clear-sky
'Surface solar radiation downward clear-sky' = {
#Surface short-wave (solar) radiation downward clear-sky
'Surface short-wave (solar) radiation downward clear-sky' = {
table2Version = 228 ;
indicatorOfParameter = 129 ;
}
#Surface thermal radiation downward clear-sky
'Surface thermal radiation downward clear-sky' = {
#Surface long-wave (thermal) radiation downward clear-sky
'Surface long-wave (thermal) radiation downward clear-sky' = {
table2Version = 228 ;
indicatorOfParameter = 130 ;
}
@ -16314,8 +16314,8 @@
table2Version = 210 ;
indicatorOfParameter = 54 ;
}
#Carbon Dioxide
'Carbon Dioxide' = {
#Carbon dioxide mass mixing ratio
'Carbon dioxide mass mixing ratio' = {
table2Version = 210 ;
indicatorOfParameter = 61 ;
}

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

@ -294,7 +294,7 @@
table2Version = 128 ;
indicatorOfParameter = 48 ;
}
#10 metre wind gust since previous post-processing
#Maximum 10 metre wind gust since previous post-processing
'49' = {
table2Version = 128 ;
indicatorOfParameter = 49 ;
@ -659,7 +659,7 @@
table2Version = 128 ;
indicatorOfParameter = 122 ;
}
#10 metre wind gust in the last 6 hours
#Maximum 10 metre wind gust in the last 6 hours
'123' = {
table2Version = 128 ;
indicatorOfParameter = 123 ;
@ -1169,7 +1169,7 @@
table2Version = 128 ;
indicatorOfParameter = 159 ;
}
#Standard deviation of orography
#Standard deviation of sub-gridscale orography
'160' = {
table2Version = 128 ;
indicatorOfParameter = 160 ;
@ -9879,7 +9879,7 @@
table2Version = 228 ;
indicatorOfParameter = 20 ;
}
#Total sky direct solar radiation at surface
#Total sky direct short-wave (solar) radiation at surface
'228021' = {
table2Version = 228 ;
indicatorOfParameter = 21 ;
@ -9914,7 +9914,7 @@
table2Version = 228 ;
indicatorOfParameter = 27 ;
}
#10 metre wind gust in the last 3 hours
#Maximum 10 metre wind gust in the last 3 hours
'228028' = {
table2Version = 228 ;
indicatorOfParameter = 28 ;
@ -10089,12 +10089,12 @@
table2Version = 228 ;
indicatorOfParameter = 94 ;
}
#Surface solar radiation downward clear-sky
#Surface short-wave (solar) radiation downward clear-sky
'228129' = {
table2Version = 228 ;
indicatorOfParameter = 129 ;
}
#Surface thermal radiation downward clear-sky
#Surface long-wave (thermal) radiation downward clear-sky
'228130' = {
table2Version = 228 ;
indicatorOfParameter = 130 ;
@ -16314,7 +16314,7 @@
table2Version = 210 ;
indicatorOfParameter = 54 ;
}
#Carbon Dioxide
#Carbon dioxide mass mixing ratio
'210061' = {
table2Version = 210 ;
indicatorOfParameter = 61 ;

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

@ -294,7 +294,7 @@
table2Version = 128 ;
indicatorOfParameter = 48 ;
}
#10 metre wind gust since previous post-processing
#Maximum 10 metre wind gust since previous post-processing
'10fg' = {
table2Version = 128 ;
indicatorOfParameter = 49 ;
@ -659,7 +659,7 @@
table2Version = 128 ;
indicatorOfParameter = 122 ;
}
#10 metre wind gust in the last 6 hours
#Maximum 10 metre wind gust in the last 6 hours
'10fg6' = {
table2Version = 128 ;
indicatorOfParameter = 123 ;
@ -1169,7 +1169,7 @@
table2Version = 128 ;
indicatorOfParameter = 159 ;
}
#Standard deviation of orography
#Standard deviation of sub-gridscale orography
'sdor' = {
table2Version = 128 ;
indicatorOfParameter = 160 ;
@ -9879,7 +9879,7 @@
table2Version = 228 ;
indicatorOfParameter = 20 ;
}
#Total sky direct solar radiation at surface
#Total sky direct short-wave (solar) radiation at surface
'fdir' = {
table2Version = 228 ;
indicatorOfParameter = 21 ;
@ -9914,7 +9914,7 @@
table2Version = 228 ;
indicatorOfParameter = 27 ;
}
#10 metre wind gust in the last 3 hours
#Maximum 10 metre wind gust in the last 3 hours
'10fg3' = {
table2Version = 228 ;
indicatorOfParameter = 28 ;
@ -10089,12 +10089,12 @@
table2Version = 228 ;
indicatorOfParameter = 94 ;
}
#Surface solar radiation downward clear-sky
#Surface short-wave (solar) radiation downward clear-sky
'ssrdc' = {
table2Version = 228 ;
indicatorOfParameter = 129 ;
}
#Surface thermal radiation downward clear-sky
#Surface long-wave (thermal) radiation downward clear-sky
'strdc' = {
table2Version = 228 ;
indicatorOfParameter = 130 ;
@ -16314,7 +16314,7 @@
table2Version = 210 ;
indicatorOfParameter = 54 ;
}
#Carbon Dioxide
#Carbon dioxide mass mixing ratio
'co2' = {
table2Version = 210 ;
indicatorOfParameter = 61 ;

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

@ -294,7 +294,7 @@
table2Version = 128 ;
indicatorOfParameter = 48 ;
}
#10 metre wind gust since previous post-processing
#Maximum 10 metre wind gust since previous post-processing
'm s**-1' = {
table2Version = 128 ;
indicatorOfParameter = 49 ;
@ -659,7 +659,7 @@
table2Version = 128 ;
indicatorOfParameter = 122 ;
}
#10 metre wind gust in the last 6 hours
#Maximum 10 metre wind gust in the last 6 hours
'm s**-1' = {
table2Version = 128 ;
indicatorOfParameter = 123 ;
@ -1169,7 +1169,7 @@
table2Version = 128 ;
indicatorOfParameter = 159 ;
}
#Standard deviation of orography
#Standard deviation of sub-gridscale orography
'm' = {
table2Version = 128 ;
indicatorOfParameter = 160 ;
@ -9879,7 +9879,7 @@
table2Version = 228 ;
indicatorOfParameter = 20 ;
}
#Total sky direct solar radiation at surface
#Total sky direct short-wave (solar) radiation at surface
'J m**-2' = {
table2Version = 228 ;
indicatorOfParameter = 21 ;
@ -9914,7 +9914,7 @@
table2Version = 228 ;
indicatorOfParameter = 27 ;
}
#10 metre wind gust in the last 3 hours
#Maximum 10 metre wind gust in the last 3 hours
'm s**-1' = {
table2Version = 228 ;
indicatorOfParameter = 28 ;
@ -10089,12 +10089,12 @@
table2Version = 228 ;
indicatorOfParameter = 94 ;
}
#Surface solar radiation downward clear-sky
#Surface short-wave (solar) radiation downward clear-sky
'J m**-2' = {
table2Version = 228 ;
indicatorOfParameter = 129 ;
}
#Surface thermal radiation downward clear-sky
#Surface long-wave (thermal) radiation downward clear-sky
'J m**-2' = {
table2Version = 228 ;
indicatorOfParameter = 130 ;
@ -16314,7 +16314,7 @@
table2Version = 210 ;
indicatorOfParameter = 54 ;
}
#Carbon Dioxide
#Carbon dioxide mass mixing ratio
'kg kg**-1' = {
table2Version = 210 ;
indicatorOfParameter = 61 ;

14
definitions/grib1/section.1.def
View File

@ -23,15 +23,14 @@ section_length[3] section1Length;
meta section1Pointer section_pointer(offsetSection1,section1Length,1);
constant wrongPadding=0;
# GRIB tables Version No.
# GRIB tables Version No.
# (currently 3 for international exchange)
unsigned[1] table2Version : edition_specific,dump;
unsigned[1] table2Version : edition_specific,dump;
alias gribTablesVersionNo=table2Version;
#assert(section1Length > 5);
# Identification of originating/generating centre
# Identification of originating/generating centre
codetable[1] centre 'common/c-1.table' : dump,string_type;
alias identificationOfOriginatingGeneratingCentre=centre;
meta centreDescription codetable_title(centre);
@ -40,8 +39,7 @@ alias parameter.centre=centre;
alias originatingCentre=centre;
alias ls.centre = centre;
# Generating process identification number
# (allocated by originating centre)
# Generating process identification number
unsigned[1] generatingProcessIdentifier : dump;
alias generatingProcessIdentificationNumber=generatingProcessIdentifier;
alias process=generatingProcessIdentifier;
@ -269,7 +267,6 @@ if(((section1Length > 40) or new() or setLocalDefinition> 0) and deleteLocalDefi
}
template_nofail marsKeywords "mars/grib.[stream:s].[type:s].def";
#template marsKeywords "mars/grib.[stream:s].[type:s].def";
}
else
@ -286,13 +283,12 @@ if(((section1Length > 40) or new() or setLocalDefinition> 0) and deleteLocalDefi
else
{
constant localUsePresent = 0 : edition_specific;
# template defaultMarsLabeling "mars/default_labeling.def";
}
section_padding section1Padding : read_only;
#if (!wrongPadding) {
# padtoeven evenpadding_sec1(offsetSection1,section1Length);
# padtoeven evenpadding_sec1(offsetSection1,section1Length);
#}
concept shortNameECMF (defaultShortName,"shortName.def",conceptsMasterDir,conceptsLocalDirECMF) : no_copy;

83
definitions/grib2/cfVarName.def
View File

@ -206,7 +206,7 @@
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 1 ;
}
#10 metre wind gust since previous post-processing
#Maximum 10 metre wind gust since previous post-processing
'fg10' = {
discipline = 0 ;
parameterCategory = 2 ;
@ -326,6 +326,12 @@
parameterCategory = 3 ;
parameterNumber = 18 ;
}
#Standard deviation of sub-gridscale orography
'sdor' = {
discipline = 0 ;
parameterCategory = 3 ;
parameterNumber = 20 ;
}
#Anisotropy of sub-gridscale orography
'isor' = {
discipline = 0 ;
@ -2424,6 +2430,14 @@
scaledValueOfFirstFixedSurface = 26315 ;
scaleFactorOfFirstFixedSurface = 2 ;
}
#Total sky direct short-wave (solar) radiation at surface
'fdir' = {
discipline = 0 ;
parameterCategory = 4 ;
parameterNumber = 13 ;
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 1 ;
}
#Surface direct short-wave radiation, clear sky
'cdir' = {
discipline = 0 ;
@ -2432,6 +2446,13 @@
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 1 ;
}
#Cloud base height
'cbh' = {
discipline = 0 ;
parameterCategory = 6 ;
parameterNumber = 11 ;
typeOfFirstFixedSurface = 2 ;
}
#0 degrees C isothermal level (atm)
'deg0l' = {
discipline = 0 ;
@ -2441,7 +2462,7 @@
scaledValueOfFirstFixedSurface = 27315 ;
scaleFactorOfFirstFixedSurface = 2 ;
}
#10 metre wind gust in the last 3 hours
#Maximum 10 metre wind gust in the last 3 hours
'fg310' = {
discipline = 0 ;
parameterCategory = 2 ;
@ -2754,6 +2775,22 @@
is_chemical_srcsink = 1 ;
sourceSinkChemicalPhysicalProcess = 10 ;
}
#Surface short-wave (solar) radiation downward clear-sky
'ssrdc' = {
discipline = 0 ;
parameterCategory = 4 ;
parameterNumber = 52 ;
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 1 ;
}
#Surface long-wave (thermal) radiation downward clear-sky
'strdc' = {
discipline = 0 ;
parameterCategory = 5 ;
parameterNumber = 8 ;
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 1 ;
}
#Convective precipitation
'cp' = {
discipline = 0 ;
@ -7564,12 +7601,54 @@
parameterCategory = 0 ;
parameterNumber = 20 ;
}
#10 metre wind speed
'wind' = {
discipline = 10 ;
parameterCategory = 0 ;
parameterNumber = 40 ;
typeOfFirstFixedSurface = 102 ;
scaledValueOfFirstFixedSurface = 10 ;
scaleFactorOfFirstFixedSurface = 0 ;
}
#Altimeter wave height
'awh' = {
discipline = 10 ;
parameterCategory = 0 ;
parameterNumber = 37 ;
}
#Altimeter corrected wave height
'acwh' = {
discipline = 10 ;
parameterCategory = 0 ;
parameterNumber = 38 ;
}
#Altimeter range relative correction
'arrc' = {
discipline = 10 ;
parameterCategory = 0 ;
parameterNumber = 39 ;
}
#10 metre wind direction
'dwi' = {
discipline = 10 ;
parameterCategory = 0 ;
parameterNumber = 41 ;
typeOfFirstFixedSurface = 102 ;
scaledValueOfFirstFixedSurface = 10 ;
scaleFactorOfFirstFixedSurface = 0 ;
}
#2D wave spectra (single)
'd2fd' = {
discipline = 10 ;
parameterCategory = 0 ;
parameterNumber = 86 ;
}
#Wave spectral kurtosis
'wsk' = {
discipline = 10 ;
parameterCategory = 0 ;
parameterNumber = 43 ;
}
#Benjamin-Feir index
'bfi' = {
discipline = 10 ;

9
definitions/grib2/localConcepts/destine/cfName.def Normal file
View File

@ -0,0 +1,9 @@
# Automatically generated by ./create_def.pl, do not edit
#Carbon dioxide mass mixing ratio
'mass_fraction_of_carbon_dioxide_in_air' = {
discipline = 0 ;
parameterCategory = 20 ;
parameterNumber = 2 ;
constituentType = 3 ;
is_chemical = 1 ;
}

9
definitions/grib2/localConcepts/destine/name.def Normal file
View File

@ -0,0 +1,9 @@
# Automatically generated by ./create_def.pl, do not edit
#Carbon dioxide mass mixing ratio
'Carbon dioxide mass mixing ratio' = {
discipline = 0 ;
parameterCategory = 20 ;
parameterNumber = 2 ;
constituentType = 3 ;
is_chemical = 1 ;
}

9
definitions/grib2/localConcepts/destine/paramId.def Normal file
View File

@ -0,0 +1,9 @@
# Automatically generated by ./create_def.pl, do not edit
#Carbon dioxide mass mixing ratio
'210061' = {
discipline = 0 ;
parameterCategory = 20 ;
parameterNumber = 2 ;
constituentType = 3 ;
is_chemical = 1 ;
}

9
definitions/grib2/localConcepts/destine/shortName.def Normal file
View File

@ -0,0 +1,9 @@
# Automatically generated by ./create_def.pl, do not edit
#Carbon dioxide mass mixing ratio
'co2' = {
discipline = 0 ;
parameterCategory = 20 ;
parameterNumber = 2 ;
constituentType = 3 ;
is_chemical = 1 ;
}

9
definitions/grib2/localConcepts/destine/units.def Normal file
View File

@ -0,0 +1,9 @@
# Automatically generated by ./create_def.pl, do not edit
#Carbon dioxide mass mixing ratio
'kg kg**-1' = {
discipline = 0 ;
parameterCategory = 20 ;
parameterNumber = 2 ;
constituentType = 3 ;
is_chemical = 1 ;
}

2
definitions/grib2/localConcepts/ecmf/cfName.def
View File

@ -518,7 +518,7 @@
parameterCategory = 151 ;
parameterNumber = 154 ;
}
#Carbon Dioxide
#Carbon dioxide mass mixing ratio
'mass_fraction_of_carbon_dioxide_in_air' = {
discipline = 192 ;
parameterCategory = 210 ;

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

@ -542,7 +542,7 @@
parameterCategory = 128 ;
parameterNumber = 120 ;
}
#10 metre wind gust in the last 6 hours
#Maximum 10 metre wind gust in the last 6 hours
'p10fg6' = {
discipline = 192 ;
parameterCategory = 128 ;
@ -661,12 +661,6 @@
parameterCategory = 128 ;
parameterNumber = 158 ;
}
#Standard deviation of orography
'sdor' = {
discipline = 192 ;
parameterCategory = 128 ;
parameterNumber = 160 ;
}
#Total cloud cover
'tcc' = {
localTablesVersion = 1 ;
@ -13635,18 +13629,6 @@
typeOfStatisticalProcessing = 1 ;
is_chemical = 1 ;
}
#Total sky direct solar radiation at surface
'fdir' = {
discipline = 192 ;
parameterCategory = 228 ;
parameterNumber = 21 ;
}
#Cloud base height
'cbh' = {
discipline = 192 ;
parameterCategory = 228 ;
parameterNumber = 23 ;
}
#Horizontal visibility
'hvis' = {
discipline = 192 ;
@ -13809,18 +13791,6 @@
scaleFactorOfSecondWavelength = missing() ;
is_aerosol_optical = 1 ;
}
#Surface solar radiation downward clear-sky
'ssrdc' = {
discipline = 192 ;
parameterCategory = 228 ;
parameterNumber = 129 ;
}
#Surface thermal radiation downward clear-sky
'strdc' = {
discipline = 192 ;
parameterCategory = 228 ;
parameterNumber = 130 ;
}
#Accumulated freezing rain
'fzra' = {
localTablesVersion = 1 ;
@ -16477,48 +16447,12 @@
parameterCategory = 140 ;
parameterNumber = 243 ;
}
#10 metre wind speed
'wind' = {
discipline = 192 ;
parameterCategory = 140 ;
parameterNumber = 245 ;
}
#Altimeter wave height
'awh' = {
discipline = 192 ;
parameterCategory = 140 ;
parameterNumber = 246 ;
}
#Altimeter corrected wave height
'acwh' = {
discipline = 192 ;
parameterCategory = 140 ;
parameterNumber = 247 ;
}
#Altimeter range relative correction
'arrc' = {
discipline = 192 ;
parameterCategory = 140 ;
parameterNumber = 248 ;
}
#10 metre wind direction
'dwi' = {
discipline = 192 ;
parameterCategory = 140 ;
parameterNumber = 249 ;
}
#2D wave spectra (multiple)
'd2sp' = {
discipline = 192 ;
parameterCategory = 140 ;
parameterNumber = 250 ;
}
#Wave spectral kurtosis
'wsk' = {
discipline = 192 ;
parameterCategory = 140 ;
parameterNumber = 252 ;
}
#Wave spectral peakedness
'wsp' = {
discipline = 192 ;
@ -20467,7 +20401,7 @@
parameterCategory = 210 ;
parameterNumber = 54 ;
}
#Carbon Dioxide
#Carbon dioxide mass mixing ratio
'co2' = {
discipline = 192 ;
parameterCategory = 210 ;

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

@ -1243,3 +1243,69 @@
parameterCategory = 128 ;
parameterNumber = 240 ;
}
#Altimeter wave height
'awh' = {
discipline = 192 ;
parameterCategory = 140 ;
parameterNumber = 246 ;
}
#Altimeter corrected wave height
'acwh' = {
discipline = 192 ;
parameterCategory = 140 ;
parameterNumber = 247 ;
}
#Altimeter range relative correction
'arrc' = {
discipline = 192 ;
parameterCategory = 140 ;
parameterNumber = 248 ;
}
#Total sky direct solar radiation at surface
'fdir' = {
discipline = 192 ;
parameterCategory = 228 ;
parameterNumber = 21 ;
}
#Surface solar radiation downward clear-sky
'ssrdc' = {
discipline = 192 ;
parameterCategory = 228 ;
parameterNumber = 129 ;
}
#Surface thermal radiation downward clear-sky
'strdc' = {
discipline = 192 ;
parameterCategory = 228 ;
parameterNumber = 130 ;
}
#Standard deviation of orography
'sdor' = {
discipline = 192 ;
parameterCategory = 128 ;
parameterNumber = 160 ;
}
#Cloud base height
'cbh' = {
discipline = 192 ;
parameterCategory = 228 ;
parameterNumber = 23 ;
}
#Wave spectral kurtosis
'wsk' = {
discipline = 192 ;
parameterCategory = 140 ;
parameterNumber = 252 ;
}
#10 metre wind speed
'wind' = {
discipline = 192 ;
parameterCategory = 140 ;
parameterNumber = 245 ;
}
#10 metre wind direction
'dwi' = {
discipline = 192 ;
parameterCategory = 140 ;
parameterNumber = 249 ;
}

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

@ -542,8 +542,8 @@
parameterCategory = 128 ;
parameterNumber = 120 ;
}
#10 metre wind gust in the last 6 hours
'10 metre wind gust in the last 6 hours' = {
#Maximum 10 metre wind gust in the last 6 hours
'Maximum 10 metre wind gust in the last 6 hours' = {
discipline = 192 ;
parameterCategory = 128 ;
parameterNumber = 123 ;
@ -661,12 +661,6 @@
parameterCategory = 128 ;
parameterNumber = 158 ;
}
#Standard deviation of orography
'Standard deviation of orography' = {
discipline = 192 ;
parameterCategory = 128 ;
parameterNumber = 160 ;
}
#Total cloud cover
'Total cloud cover' = {
localTablesVersion = 1 ;
@ -13635,18 +13629,6 @@
typeOfStatisticalProcessing = 1 ;
is_chemical = 1 ;
}
#Total sky direct solar radiation at surface
'Total sky direct solar radiation at surface' = {
discipline = 192 ;
parameterCategory = 228 ;
parameterNumber = 21 ;
}
#Cloud base height
'Cloud base height' = {
discipline = 192 ;
parameterCategory = 228 ;
parameterNumber = 23 ;
}
#Horizontal visibility
'Horizontal visibility' = {
discipline = 192 ;
@ -13809,18 +13791,6 @@
scaleFactorOfSecondWavelength = missing() ;
is_aerosol_optical = 1 ;
}
#Surface solar radiation downward clear-sky
'Surface solar radiation downward clear-sky' = {
discipline = 192 ;
parameterCategory = 228 ;
parameterNumber = 129 ;
}
#Surface thermal radiation downward clear-sky
'Surface thermal radiation downward clear-sky' = {
discipline = 192 ;
parameterCategory = 228 ;
parameterNumber = 130 ;
}
#Accumulated freezing rain
'Accumulated freezing rain' = {
localTablesVersion = 1 ;
@ -16477,48 +16447,12 @@
parameterCategory = 140 ;
parameterNumber = 243 ;
}
#10 metre wind speed
'10 metre wind speed' = {
discipline = 192 ;
parameterCategory = 140 ;
parameterNumber = 245 ;
}
#Altimeter wave height
'Altimeter wave height' = {
discipline = 192 ;
parameterCategory = 140 ;
parameterNumber = 246 ;
}
#Altimeter corrected wave height
'Altimeter corrected wave height' = {
discipline = 192 ;
parameterCategory = 140 ;
parameterNumber = 247 ;
}
#Altimeter range relative correction
'Altimeter range relative correction' = {
discipline = 192 ;
parameterCategory = 140 ;
parameterNumber = 248 ;
}
#10 metre wind direction
'10 metre wind direction' = {
discipline = 192 ;
parameterCategory = 140 ;
parameterNumber = 249 ;
}
#2D wave spectra (multiple)
'2D wave spectra (multiple)' = {
discipline = 192 ;
parameterCategory = 140 ;
parameterNumber = 250 ;
}
#Wave spectral kurtosis
'Wave spectral kurtosis' = {
discipline = 192 ;
parameterCategory = 140 ;
parameterNumber = 252 ;
}
#Wave spectral peakedness
'Wave spectral peakedness' = {
discipline = 192 ;
@ -20467,8 +20401,8 @@
parameterCategory = 210 ;
parameterNumber = 54 ;
}
#Carbon Dioxide
'Carbon Dioxide' = {
#Carbon dioxide mass mixing ratio
'Carbon dioxide mass mixing ratio' = {
discipline = 192 ;
parameterCategory = 210 ;
parameterNumber = 61 ;

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

@ -1243,3 +1243,69 @@
parameterCategory = 128 ;
parameterNumber = 240 ;
}
#Altimeter wave height
'Altimeter wave height' = {
discipline = 192 ;
parameterCategory = 140 ;
parameterNumber = 246 ;
}
#Altimeter corrected wave height
'Altimeter corrected wave height' = {
discipline = 192 ;
parameterCategory = 140 ;
parameterNumber = 247 ;
}
#Altimeter range relative correction
'Altimeter range relative correction' = {
discipline = 192 ;
parameterCategory = 140 ;
parameterNumber = 248 ;
}
#Total sky direct solar radiation at surface
'Total sky direct solar radiation at surface' = {
discipline = 192 ;
parameterCategory = 228 ;
parameterNumber = 21 ;
}
#Surface solar radiation downward clear-sky
'Surface solar radiation downward clear-sky' = {
discipline = 192 ;
parameterCategory = 228 ;
parameterNumber = 129 ;
}
#Surface thermal radiation downward clear-sky
'Surface thermal radiation downward clear-sky' = {
discipline = 192 ;
parameterCategory = 228 ;
parameterNumber = 130 ;
}
#Standard deviation of orography
'Standard deviation of orography' = {
discipline = 192 ;
parameterCategory = 128 ;
parameterNumber = 160 ;
}
#Cloud base height
'Cloud base height' = {
discipline = 192 ;
parameterCategory = 228 ;
parameterNumber = 23 ;
}
#Wave spectral kurtosis
'Wave spectral kurtosis' = {
discipline = 192 ;
parameterCategory = 140 ;
parameterNumber = 252 ;
}
#10 metre wind speed
'10 metre wind speed' = {
discipline = 192 ;
parameterCategory = 140 ;
parameterNumber = 245 ;
}
#10 metre wind direction
'10 metre wind direction' = {
discipline = 192 ;
parameterCategory = 140 ;
parameterNumber = 249 ;
}

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

@ -542,7 +542,7 @@
parameterCategory = 128 ;
parameterNumber = 120 ;
}
#10 metre wind gust in the last 6 hours
#Maximum 10 metre wind gust in the last 6 hours
'123' = {
discipline = 192 ;
parameterCategory = 128 ;
@ -661,12 +661,6 @@
parameterCategory = 128 ;
parameterNumber = 158 ;
}
#Standard deviation of orography
'160' = {
discipline = 192 ;
parameterCategory = 128 ;
parameterNumber = 160 ;
}
#Total cloud cover
'164' = {
localTablesVersion = 1 ;
@ -13635,18 +13629,6 @@
typeOfStatisticalProcessing = 1 ;
is_chemical = 1 ;
}
#Total sky direct solar radiation at surface
'228021' = {
discipline = 192 ;
parameterCategory = 228 ;
parameterNumber = 21 ;
}
#Cloud base height
'228023' = {
discipline = 192 ;
parameterCategory = 228 ;
parameterNumber = 23 ;
}
#Horizontal visibility
'228025' = {
discipline = 192 ;
@ -13809,18 +13791,6 @@
scaleFactorOfSecondWavelength = missing() ;
is_aerosol_optical = 1 ;
}
#Surface solar radiation downward clear-sky
'228129' = {
discipline = 192 ;
parameterCategory = 228 ;
parameterNumber = 129 ;
}
#Surface thermal radiation downward clear-sky
'228130' = {
discipline = 192 ;
parameterCategory = 228 ;
parameterNumber = 130 ;
}
#Accumulated freezing rain
'228216' = {
localTablesVersion = 1 ;
@ -16477,48 +16447,12 @@
parameterCategory = 140 ;
parameterNumber = 243 ;
}
#10 metre wind speed
'140245' = {
discipline = 192 ;
parameterCategory = 140 ;
parameterNumber = 245 ;
}
#Altimeter wave height
'140246' = {
discipline = 192 ;
parameterCategory = 140 ;
parameterNumber = 246 ;
}
#Altimeter corrected wave height
'140247' = {
discipline = 192 ;
parameterCategory = 140 ;
parameterNumber = 247 ;
}
#Altimeter range relative correction
'140248' = {
discipline = 192 ;
parameterCategory = 140 ;
parameterNumber = 248 ;
}
#10 metre wind direction
'140249' = {
discipline = 192 ;
parameterCategory = 140 ;
parameterNumber = 249 ;
}
#2D wave spectra (multiple)
'140250' = {
discipline = 192 ;
parameterCategory = 140 ;
parameterNumber = 250 ;
}
#Wave spectral kurtosis
'140252' = {
discipline = 192 ;
parameterCategory = 140 ;
parameterNumber = 252 ;
}
#Wave spectral peakedness
'140254' = {
discipline = 192 ;
@ -20467,7 +20401,7 @@
parameterCategory = 210 ;
parameterNumber = 54 ;
}
#Carbon Dioxide
#Carbon dioxide mass mixing ratio
'210061' = {
discipline = 192 ;
parameterCategory = 210 ;

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

@ -1243,3 +1243,69 @@
parameterCategory = 128 ;
parameterNumber = 240 ;
}
#Altimeter wave height
'140246' = {
discipline = 192 ;
parameterCategory = 140 ;
parameterNumber = 246 ;
}
#Altimeter corrected wave height
'140247' = {
discipline = 192 ;
parameterCategory = 140 ;
parameterNumber = 247 ;
}
#Altimeter range relative correction
'140248' = {
discipline = 192 ;
parameterCategory = 140 ;
parameterNumber = 248 ;
}
#Total sky direct solar radiation at surface
'228021' = {
discipline = 192 ;
parameterCategory = 228 ;
parameterNumber = 21 ;
}
#Surface solar radiation downward clear-sky
'228129' = {
discipline = 192 ;
parameterCategory = 228 ;
parameterNumber = 129 ;
}
#Surface thermal radiation downward clear-sky
'228130' = {
discipline = 192 ;
parameterCategory = 228 ;
parameterNumber = 130 ;
}
#Standard deviation of orography
'160' = {
discipline = 192 ;
parameterCategory = 128 ;
parameterNumber = 160 ;
}
#Cloud base height
'228023' = {
discipline = 192 ;
parameterCategory = 228 ;
parameterNumber = 23 ;
}
#Wave spectral kurtosis
'140252' = {
discipline = 192 ;
parameterCategory = 140 ;
parameterNumber = 252 ;
}
#10 metre wind speed
'140245' = {
discipline = 192 ;
parameterCategory = 140 ;
parameterNumber = 245 ;
}
#10 metre wind direction
'140249' = {
discipline = 192 ;
parameterCategory = 140 ;
parameterNumber = 249 ;
}

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

@ -542,7 +542,7 @@
parameterCategory = 128 ;
parameterNumber = 120 ;
}
#10 metre wind gust in the last 6 hours
#Maximum 10 metre wind gust in the last 6 hours
'10fg6' = {
discipline = 192 ;
parameterCategory = 128 ;
@ -661,12 +661,6 @@
parameterCategory = 128 ;
parameterNumber = 158 ;
}
#Standard deviation of orography
'sdor' = {
discipline = 192 ;
parameterCategory = 128 ;
parameterNumber = 160 ;
}
#Total cloud cover
'tcc' = {
localTablesVersion = 1 ;
@ -13635,18 +13629,6 @@
typeOfStatisticalProcessing = 1 ;
is_chemical = 1 ;
}
#Total sky direct solar radiation at surface
'fdir' = {
discipline = 192 ;
parameterCategory = 228 ;
parameterNumber = 21 ;
}
#Cloud base height
'cbh' = {
discipline = 192 ;
parameterCategory = 228 ;
parameterNumber = 23 ;
}
#Horizontal visibility
'hvis' = {
discipline = 192 ;
@ -13809,18 +13791,6 @@
scaleFactorOfSecondWavelength = missing() ;
is_aerosol_optical = 1 ;
}
#Surface solar radiation downward clear-sky
'ssrdc' = {
discipline = 192 ;
parameterCategory = 228 ;
parameterNumber = 129 ;
}
#Surface thermal radiation downward clear-sky
'strdc' = {
discipline = 192 ;
parameterCategory = 228 ;
parameterNumber = 130 ;
}
#Accumulated freezing rain
'fzra' = {
localTablesVersion = 1 ;
@ -16477,48 +16447,12 @@
parameterCategory = 140 ;
parameterNumber = 243 ;
}
#10 metre wind speed
'wind' = {
discipline = 192 ;
parameterCategory = 140 ;
parameterNumber = 245 ;
}
#Altimeter wave height
'awh' = {
discipline = 192 ;
parameterCategory = 140 ;
parameterNumber = 246 ;
}
#Altimeter corrected wave height
'acwh' = {
discipline = 192 ;
parameterCategory = 140 ;
parameterNumber = 247 ;
}
#Altimeter range relative correction
'arrc' = {
discipline = 192 ;
parameterCategory = 140 ;
parameterNumber = 248 ;
}
#10 metre wind direction
'dwi' = {
discipline = 192 ;
parameterCategory = 140 ;
parameterNumber = 249 ;
}
#2D wave spectra (multiple)
'2dsp' = {
discipline = 192 ;
parameterCategory = 140 ;
parameterNumber = 250 ;
}
#Wave spectral kurtosis
'wsk' = {
discipline = 192 ;
parameterCategory = 140 ;
parameterNumber = 252 ;
}
#Wave spectral peakedness
'wsp' = {
discipline = 192 ;
@ -20467,7 +20401,7 @@
parameterCategory = 210 ;
parameterNumber = 54 ;
}
#Carbon Dioxide
#Carbon dioxide mass mixing ratio
'co2' = {
discipline = 192 ;
parameterCategory = 210 ;

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

@ -1243,3 +1243,69 @@
parameterCategory = 128 ;
parameterNumber = 240 ;
}
#Altimeter wave height
'awh' = {
discipline = 192 ;
parameterCategory = 140 ;
parameterNumber = 246 ;
}
#Altimeter corrected wave height
'acwh' = {
discipline = 192 ;
parameterCategory = 140 ;
parameterNumber = 247 ;
}
#Altimeter range relative correction
'arrc' = {
discipline = 192 ;
parameterCategory = 140 ;
parameterNumber = 248 ;
}
#Total sky direct solar radiation at surface
'fdir' = {
discipline = 192 ;
parameterCategory = 228 ;
parameterNumber = 21 ;
}
#Surface solar radiation downward clear-sky
'ssrdc' = {
discipline = 192 ;
parameterCategory = 228 ;
parameterNumber = 129 ;
}
#Surface thermal radiation downward clear-sky
'strdc' = {
discipline = 192 ;
parameterCategory = 228 ;
parameterNumber = 130 ;
}
#Standard deviation of orography
'sdor' = {
discipline = 192 ;
parameterCategory = 128 ;
parameterNumber = 160 ;
}
#Cloud base height
'cbh' = {
discipline = 192 ;
parameterCategory = 228 ;
parameterNumber = 23 ;
}
#Wave spectral kurtosis
'wsk' = {
discipline = 192 ;
parameterCategory = 140 ;
parameterNumber = 252 ;
}
#10 metre wind speed
'wind' = {
discipline = 192 ;
parameterCategory = 140 ;
parameterNumber = 245 ;
}
#10 metre wind direction
'dwi' = {
discipline = 192 ;
parameterCategory = 140 ;
parameterNumber = 249 ;
}

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

@ -542,7 +542,7 @@
parameterCategory = 128 ;
parameterNumber = 120 ;
}
#10 metre wind gust in the last 6 hours
#Maximum 10 metre wind gust in the last 6 hours
'm s**-1' = {
discipline = 192 ;
parameterCategory = 128 ;
@ -661,12 +661,6 @@
parameterCategory = 128 ;
parameterNumber = 158 ;
}
#Standard deviation of orography
'm' = {
discipline = 192 ;
parameterCategory = 128 ;
parameterNumber = 160 ;
}
#Total cloud cover
'(0 - 1)' = {
localTablesVersion = 1 ;
@ -13635,18 +13629,6 @@
typeOfStatisticalProcessing = 1 ;
is_chemical = 1 ;
}
#Total sky direct solar radiation at surface
'J m**-2' = {
discipline = 192 ;
parameterCategory = 228 ;
parameterNumber = 21 ;
}
#Cloud base height
'm' = {
discipline = 192 ;
parameterCategory = 228 ;
parameterNumber = 23 ;
}
#Horizontal visibility
'm' = {
discipline = 192 ;
@ -13809,18 +13791,6 @@
scaleFactorOfSecondWavelength = missing() ;
is_aerosol_optical = 1 ;
}
#Surface solar radiation downward clear-sky
'J m**-2' = {
discipline = 192 ;
parameterCategory = 228 ;
parameterNumber = 129 ;
}
#Surface thermal radiation downward clear-sky
'J m**-2' = {
discipline = 192 ;
parameterCategory = 228 ;
parameterNumber = 130 ;
}
#Accumulated freezing rain
'm' = {
localTablesVersion = 1 ;
@ -16477,48 +16447,12 @@
parameterCategory = 140 ;
parameterNumber = 243 ;
}
#10 metre wind speed
'm s**-1' = {
discipline = 192 ;
parameterCategory = 140 ;
parameterNumber = 245 ;
}
#Altimeter wave height
'm' = {
discipline = 192 ;
parameterCategory = 140 ;
parameterNumber = 246 ;
}
#Altimeter corrected wave height
'm' = {
discipline = 192 ;
parameterCategory = 140 ;
parameterNumber = 247 ;
}
#Altimeter range relative correction
'~' = {
discipline = 192 ;
parameterCategory = 140 ;
parameterNumber = 248 ;
}
#10 metre wind direction
'degrees' = {
discipline = 192 ;
parameterCategory = 140 ;
parameterNumber = 249 ;
}
#2D wave spectra (multiple)
'm**2 s radian**-1' = {
discipline = 192 ;
parameterCategory = 140 ;
parameterNumber = 250 ;
}
#Wave spectral kurtosis
'dimensionless' = {
discipline = 192 ;
parameterCategory = 140 ;
parameterNumber = 252 ;
}
#Wave spectral peakedness
'dimensionless' = {
discipline = 192 ;
@ -20467,7 +20401,7 @@
parameterCategory = 210 ;
parameterNumber = 54 ;
}
#Carbon Dioxide
#Carbon dioxide mass mixing ratio
'kg kg**-1' = {
discipline = 192 ;
parameterCategory = 210 ;

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

@ -1243,3 +1243,69 @@
parameterCategory = 128 ;
parameterNumber = 240 ;
}
#Altimeter wave height
'm' = {
discipline = 192 ;
parameterCategory = 140 ;
parameterNumber = 246 ;
}
#Altimeter corrected wave height
'm' = {
discipline = 192 ;
parameterCategory = 140 ;
parameterNumber = 247 ;
}
#Altimeter range relative correction
'~' = {
discipline = 192 ;
parameterCategory = 140 ;
parameterNumber = 248 ;
}
#Total sky direct solar radiation at surface
'J m**-2' = {
discipline = 192 ;
parameterCategory = 228 ;
parameterNumber = 21 ;
}
#Surface solar radiation downward clear-sky
'J m**-2' = {
discipline = 192 ;
parameterCategory = 228 ;
parameterNumber = 129 ;
}
#Surface thermal radiation downward clear-sky
'J m**-2' = {
discipline = 192 ;
parameterCategory = 228 ;
parameterNumber = 130 ;
}
#Standard deviation of orography
'm' = {
discipline = 192 ;
parameterCategory = 128 ;
parameterNumber = 160 ;
}
#Cloud base height
'm' = {
discipline = 192 ;
parameterCategory = 228 ;
parameterNumber = 23 ;
}
#Wave spectral kurtosis
'dimensionless' = {
discipline = 192 ;
parameterCategory = 140 ;
parameterNumber = 252 ;
}
#10 metre wind speed
'm s**-1' = {
discipline = 192 ;
parameterCategory = 140 ;
parameterNumber = 245 ;
}
#10 metre wind direction
'degrees' = {
discipline = 192 ;
parameterCategory = 140 ;
parameterNumber = 249 ;
}

6
definitions/grib2/localConcepts/uerra/cfVarName.def
View File

@ -17,7 +17,7 @@
scaledValueOfFirstFixedSurface = 200 ;
scaleFactorOfFirstFixedSurface = 0 ;
}
#10 metre wind gust since previous post-processing
#Maximum 10 metre wind gust since previous post-processing
'fg10' = {
discipline = 0 ;
parameterCategory = 2 ;
@ -29,7 +29,7 @@
typeOfStatisticalProcessing = 2 ;
lengthOfTimeRange = 3 ;
}
#10 metre wind gust since previous post-processing
#Maximum 10 metre wind gust since previous post-processing
'fg10' = {
discipline = 0 ;
parameterCategory = 2 ;
@ -41,7 +41,7 @@
typeOfStatisticalProcessing = 2 ;
lengthOfTimeRange = 1 ;
}
#10 metre wind gust since previous post-processing
#Maximum 10 metre wind gust since previous post-processing
'fg10' = {
discipline = 0 ;
parameterCategory = 2 ;

12
definitions/grib2/localConcepts/uerra/name.def
View File

@ -17,8 +17,8 @@
scaledValueOfFirstFixedSurface = 200 ;
scaleFactorOfFirstFixedSurface = 0 ;
}
#10 metre wind gust since previous post-processing
'10 metre wind gust since previous post-processing' = {
#Maximum 10 metre wind gust since previous post-processing
'Maximum 10 metre wind gust since previous post-processing' = {
discipline = 0 ;
parameterCategory = 2 ;
parameterNumber = 22 ;
@ -29,8 +29,8 @@
typeOfStatisticalProcessing = 2 ;
lengthOfTimeRange = 3 ;
}
#10 metre wind gust since previous post-processing
'10 metre wind gust since previous post-processing' = {
#Maximum 10 metre wind gust since previous post-processing
'Maximum 10 metre wind gust since previous post-processing' = {
discipline = 0 ;
parameterCategory = 2 ;
parameterNumber = 22 ;
@ -41,8 +41,8 @@
typeOfStatisticalProcessing = 2 ;
lengthOfTimeRange = 1 ;
}
#10 metre wind gust since previous post-processing
'10 metre wind gust since previous post-processing' = {
#Maximum 10 metre wind gust since previous post-processing
'Maximum 10 metre wind gust since previous post-processing' = {
discipline = 0 ;
parameterCategory = 2 ;
parameterNumber = 22 ;

6
definitions/grib2/localConcepts/uerra/paramId.def
View File

@ -17,7 +17,7 @@
scaledValueOfFirstFixedSurface = 200 ;
scaleFactorOfFirstFixedSurface = 0 ;
}
#10 metre wind gust since previous post-processing
#Maximum 10 metre wind gust since previous post-processing
'49' = {
discipline = 0 ;
parameterCategory = 2 ;
@ -29,7 +29,7 @@
typeOfStatisticalProcessing = 2 ;
lengthOfTimeRange = 3 ;
}
#10 metre wind gust since previous post-processing
#Maximum 10 metre wind gust since previous post-processing
'49' = {
discipline = 0 ;
parameterCategory = 2 ;
@ -41,7 +41,7 @@
typeOfStatisticalProcessing = 2 ;
lengthOfTimeRange = 1 ;
}
#10 metre wind gust since previous post-processing
#Maximum 10 metre wind gust since previous post-processing
'49' = {
discipline = 0 ;
parameterCategory = 2 ;

6
definitions/grib2/localConcepts/uerra/shortName.def
View File

@ -17,7 +17,7 @@
scaledValueOfFirstFixedSurface = 200 ;
scaleFactorOfFirstFixedSurface = 0 ;
}
#10 metre wind gust since previous post-processing
#Maximum 10 metre wind gust since previous post-processing
'10fg' = {
discipline = 0 ;
parameterCategory = 2 ;
@ -29,7 +29,7 @@
typeOfStatisticalProcessing = 2 ;
lengthOfTimeRange = 3 ;
}
#10 metre wind gust since previous post-processing
#Maximum 10 metre wind gust since previous post-processing
'10fg' = {
discipline = 0 ;
parameterCategory = 2 ;
@ -41,7 +41,7 @@
typeOfStatisticalProcessing = 2 ;
lengthOfTimeRange = 1 ;
}
#10 metre wind gust since previous post-processing
#Maximum 10 metre wind gust since previous post-processing
'10fg' = {
discipline = 0 ;
parameterCategory = 2 ;

6
definitions/grib2/localConcepts/uerra/units.def
View File

@ -17,7 +17,7 @@
scaledValueOfFirstFixedSurface = 200 ;
scaleFactorOfFirstFixedSurface = 0 ;
}
#10 metre wind gust since previous post-processing
#Maximum 10 metre wind gust since previous post-processing
'm s**-1' = {
discipline = 0 ;
parameterCategory = 2 ;
@ -29,7 +29,7 @@
typeOfStatisticalProcessing = 2 ;
lengthOfTimeRange = 3 ;
}
#10 metre wind gust since previous post-processing
#Maximum 10 metre wind gust since previous post-processing
'm s**-1' = {
discipline = 0 ;
parameterCategory = 2 ;
@ -41,7 +41,7 @@
typeOfStatisticalProcessing = 2 ;
lengthOfTimeRange = 1 ;
}
#10 metre wind gust since previous post-processing
#Maximum 10 metre wind gust since previous post-processing
'm s**-1' = {
discipline = 0 ;
parameterCategory = 2 ;

1
definitions/grib2/marsLevtypeConcept.def
View File

@ -3,6 +3,7 @@
'sfc' = {typeOfFirstFixedSurface=1; typeOfSecondFixedSurface=8;}
'o2d' = {typeOfFirstFixedSurface=1; typeOfSecondFixedSurface=9;}
'sfc' = {typeOfFirstFixedSurface=1; typeOfSecondFixedSurface=162;}
'sfc' = {typeOfFirstFixedSurface=2; typeOfSecondFixedSurface=255;}
'sfc' = {typeOfFirstFixedSurface=7; typeOfSecondFixedSurface=255;}
'sfc' = {typeOfFirstFixedSurface=8; typeOfSecondFixedSurface=255;}
'sfc' = {typeOfFirstFixedSurface=17; typeOfSecondFixedSurface=255;}

87
definitions/grib2/name.def
View File

@ -206,8 +206,8 @@
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 1 ;
}
#10 metre wind gust since previous post-processing
'10 metre wind gust since previous post-processing' = {
#Maximum 10 metre wind gust since previous post-processing
'Maximum 10 metre wind gust since previous post-processing' = {
discipline = 0 ;
parameterCategory = 2 ;
parameterNumber = 22 ;
@ -326,6 +326,12 @@
parameterCategory = 3 ;
parameterNumber = 18 ;
}
#Standard deviation of sub-gridscale orography
'Standard deviation of sub-gridscale orography' = {
discipline = 0 ;
parameterCategory = 3 ;
parameterNumber = 20 ;
}
#Anisotropy of sub-gridscale orography
'Anisotropy of sub-gridscale orography' = {
discipline = 0 ;
@ -2424,6 +2430,14 @@
scaledValueOfFirstFixedSurface = 26315 ;
scaleFactorOfFirstFixedSurface = 2 ;
}
#Total sky direct short-wave (solar) radiation at surface
'Total sky direct short-wave (solar) radiation at surface' = {
discipline = 0 ;
parameterCategory = 4 ;
parameterNumber = 13 ;
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 1 ;
}
#Surface direct short-wave radiation, clear sky
'Surface direct short-wave radiation, clear sky' = {
discipline = 0 ;
@ -2432,6 +2446,13 @@
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 1 ;
}
#Cloud base height
'Cloud base height' = {
discipline = 0 ;
parameterCategory = 6 ;
parameterNumber = 11 ;
typeOfFirstFixedSurface = 2 ;
}
#0 degrees C isothermal level (atm)
'0 degrees C isothermal level (atm)' = {
discipline = 0 ;
@ -2441,8 +2462,8 @@
scaledValueOfFirstFixedSurface = 27315 ;
scaleFactorOfFirstFixedSurface = 2 ;
}
#10 metre wind gust in the last 3 hours
'10 metre wind gust in the last 3 hours' = {
#Maximum 10 metre wind gust in the last 3 hours
'Maximum 10 metre wind gust in the last 3 hours' = {
discipline = 0 ;
parameterCategory = 2 ;
parameterNumber = 22 ;
@ -2754,6 +2775,22 @@
is_chemical_srcsink = 1 ;
sourceSinkChemicalPhysicalProcess = 10 ;
}
#Surface short-wave (solar) radiation downward clear-sky
'Surface short-wave (solar) radiation downward clear-sky' = {
discipline = 0 ;
parameterCategory = 4 ;
parameterNumber = 52 ;
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 1 ;
}
#Surface long-wave (thermal) radiation downward clear-sky
'Surface long-wave (thermal) radiation downward clear-sky' = {
discipline = 0 ;
parameterCategory = 5 ;
parameterNumber = 8 ;
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 1 ;
}
#Convective precipitation
'Convective precipitation' = {
discipline = 0 ;
@ -7564,12 +7601,54 @@
parameterCategory = 0 ;
parameterNumber = 20 ;
}
#10 metre wind speed
'10 metre wind speed' = {
discipline = 10 ;
parameterCategory = 0 ;
parameterNumber = 40 ;
typeOfFirstFixedSurface = 102 ;
scaledValueOfFirstFixedSurface = 10 ;
scaleFactorOfFirstFixedSurface = 0 ;
}
#Altimeter wave height
'Altimeter wave height' = {
discipline = 10 ;
parameterCategory = 0 ;
parameterNumber = 37 ;
}
#Altimeter corrected wave height
'Altimeter corrected wave height' = {
discipline = 10 ;
parameterCategory = 0 ;
parameterNumber = 38 ;
}
#Altimeter range relative correction
'Altimeter range relative correction' = {
discipline = 10 ;
parameterCategory = 0 ;
parameterNumber = 39 ;
}
#10 metre wind direction
'10 metre wind direction' = {
discipline = 10 ;
parameterCategory = 0 ;
parameterNumber = 41 ;
typeOfFirstFixedSurface = 102 ;
scaledValueOfFirstFixedSurface = 10 ;
scaleFactorOfFirstFixedSurface = 0 ;
}
#2D wave spectra (single)
'2D wave spectra (single)' = {
discipline = 10 ;
parameterCategory = 0 ;
parameterNumber = 86 ;
}
#Wave spectral kurtosis
'Wave spectral kurtosis' = {
discipline = 10 ;
parameterCategory = 0 ;
parameterNumber = 43 ;
}
#Benjamin-Feir index
'Benjamin-Feir index' = {
discipline = 10 ;

83
definitions/grib2/paramId.def
View File

@ -206,7 +206,7 @@
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 1 ;
}
#10 metre wind gust since previous post-processing
#Maximum 10 metre wind gust since previous post-processing
'49' = {
discipline = 0 ;
parameterCategory = 2 ;
@ -326,6 +326,12 @@
parameterCategory = 3 ;
parameterNumber = 18 ;
}
#Standard deviation of sub-gridscale orography
'160' = {
discipline = 0 ;
parameterCategory = 3 ;
parameterNumber = 20 ;
}
#Anisotropy of sub-gridscale orography
'161' = {
discipline = 0 ;
@ -2424,6 +2430,14 @@
scaledValueOfFirstFixedSurface = 26315 ;
scaleFactorOfFirstFixedSurface = 2 ;
}
#Total sky direct short-wave (solar) radiation at surface
'228021' = {
discipline = 0 ;
parameterCategory = 4 ;
parameterNumber = 13 ;
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 1 ;
}
#Surface direct short-wave radiation, clear sky
'228022' = {
discipline = 0 ;
@ -2432,6 +2446,13 @@
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 1 ;
}
#Cloud base height
'228023' = {
discipline = 0 ;
parameterCategory = 6 ;
parameterNumber = 11 ;
typeOfFirstFixedSurface = 2 ;
}
#0 degrees C isothermal level (atm)
'228024' = {
discipline = 0 ;
@ -2441,7 +2462,7 @@
scaledValueOfFirstFixedSurface = 27315 ;
scaleFactorOfFirstFixedSurface = 2 ;
}
#10 metre wind gust in the last 3 hours
#Maximum 10 metre wind gust in the last 3 hours
'228028' = {
discipline = 0 ;
parameterCategory = 2 ;
@ -2754,6 +2775,22 @@
is_chemical_srcsink = 1 ;
sourceSinkChemicalPhysicalProcess = 10 ;
}
#Surface short-wave (solar) radiation downward clear-sky
'228129' = {
discipline = 0 ;
parameterCategory = 4 ;
parameterNumber = 52 ;
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 1 ;
}
#Surface long-wave (thermal) radiation downward clear-sky
'228130' = {
discipline = 0 ;
parameterCategory = 5 ;
parameterNumber = 8 ;
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 1 ;
}
#Convective precipitation
'228143' = {
discipline = 0 ;
@ -7564,12 +7601,54 @@
parameterCategory = 0 ;
parameterNumber = 20 ;
}
#10 metre wind speed
'140245' = {
discipline = 10 ;
parameterCategory = 0 ;
parameterNumber = 40 ;
typeOfFirstFixedSurface = 102 ;
scaledValueOfFirstFixedSurface = 10 ;
scaleFactorOfFirstFixedSurface = 0 ;
}
#Altimeter wave height
'140246' = {
discipline = 10 ;
parameterCategory = 0 ;
parameterNumber = 37 ;
}
#Altimeter corrected wave height
'140247' = {
discipline = 10 ;
parameterCategory = 0 ;
parameterNumber = 38 ;
}
#Altimeter range relative correction
'140248' = {
discipline = 10 ;
parameterCategory = 0 ;
parameterNumber = 39 ;
}
#10 metre wind direction
'140249' = {
discipline = 10 ;
parameterCategory = 0 ;
parameterNumber = 41 ;
typeOfFirstFixedSurface = 102 ;
scaledValueOfFirstFixedSurface = 10 ;
scaleFactorOfFirstFixedSurface = 0 ;
}
#2D wave spectra (single)
'140251' = {
discipline = 10 ;
parameterCategory = 0 ;
parameterNumber = 86 ;
}
#Wave spectral kurtosis
'140252' = {
discipline = 10 ;
parameterCategory = 0 ;
parameterNumber = 43 ;
}
#Benjamin-Feir index
'140253' = {
discipline = 10 ;

83
definitions/grib2/shortName.def
View File

@ -206,7 +206,7 @@
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 1 ;
}
#10 metre wind gust since previous post-processing
#Maximum 10 metre wind gust since previous post-processing
'10fg' = {
discipline = 0 ;
parameterCategory = 2 ;
@ -326,6 +326,12 @@
parameterCategory = 3 ;
parameterNumber = 18 ;
}
#Standard deviation of sub-gridscale orography
'sdor' = {
discipline = 0 ;
parameterCategory = 3 ;
parameterNumber = 20 ;
}
#Anisotropy of sub-gridscale orography
'isor' = {
discipline = 0 ;
@ -2424,6 +2430,14 @@
scaledValueOfFirstFixedSurface = 26315 ;
scaleFactorOfFirstFixedSurface = 2 ;
}
#Total sky direct short-wave (solar) radiation at surface
'fdir' = {
discipline = 0 ;
parameterCategory = 4 ;
parameterNumber = 13 ;
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 1 ;
}
#Surface direct short-wave radiation, clear sky
'cdir' = {
discipline = 0 ;
@ -2432,6 +2446,13 @@
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 1 ;
}
#Cloud base height
'cbh' = {
discipline = 0 ;
parameterCategory = 6 ;
parameterNumber = 11 ;
typeOfFirstFixedSurface = 2 ;
}
#0 degrees C isothermal level (atm)
'deg0l' = {
discipline = 0 ;
@ -2441,7 +2462,7 @@
scaledValueOfFirstFixedSurface = 27315 ;
scaleFactorOfFirstFixedSurface = 2 ;
}
#10 metre wind gust in the last 3 hours
#Maximum 10 metre wind gust in the last 3 hours
'10fg3' = {
discipline = 0 ;
parameterCategory = 2 ;
@ -2754,6 +2775,22 @@
is_chemical_srcsink = 1 ;
sourceSinkChemicalPhysicalProcess = 10 ;
}
#Surface short-wave (solar) radiation downward clear-sky
'ssrdc' = {
discipline = 0 ;
parameterCategory = 4 ;
parameterNumber = 52 ;
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 1 ;
}
#Surface long-wave (thermal) radiation downward clear-sky
'strdc' = {
discipline = 0 ;
parameterCategory = 5 ;
parameterNumber = 8 ;
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 1 ;
}
#Convective precipitation
'cp' = {
discipline = 0 ;
@ -7564,12 +7601,54 @@
parameterCategory = 0 ;
parameterNumber = 20 ;
}
#10 metre wind speed
'wind' = {
discipline = 10 ;
parameterCategory = 0 ;
parameterNumber = 40 ;
typeOfFirstFixedSurface = 102 ;
scaledValueOfFirstFixedSurface = 10 ;
scaleFactorOfFirstFixedSurface = 0 ;
}
#Altimeter wave height
'awh' = {
discipline = 10 ;
parameterCategory = 0 ;
parameterNumber = 37 ;
}
#Altimeter corrected wave height
'acwh' = {
discipline = 10 ;
parameterCategory = 0 ;
parameterNumber = 38 ;
}
#Altimeter range relative correction
'arrc' = {
discipline = 10 ;
parameterCategory = 0 ;
parameterNumber = 39 ;
}
#10 metre wind direction
'dwi' = {
discipline = 10 ;
parameterCategory = 0 ;
parameterNumber = 41 ;
typeOfFirstFixedSurface = 102 ;
scaledValueOfFirstFixedSurface = 10 ;
scaleFactorOfFirstFixedSurface = 0 ;
}
#2D wave spectra (single)
'2dfd' = {
discipline = 10 ;
parameterCategory = 0 ;
parameterNumber = 86 ;
}
#Wave spectral kurtosis
'wsk' = {
discipline = 10 ;
parameterCategory = 0 ;
parameterNumber = 43 ;
}
#Benjamin-Feir index
'bfi' = {
discipline = 10 ;

18
definitions/grib2/tables/local/ecmf/1/4.2.0.1.table
View File

@ -1,13 +1,13 @@
# Code table 4.2 - discipline=0 category=1 for ECMWF
192 192 Snow evaporation rate (kg m-2 s-1)
193 193 Total precipitation (m)
193 193 Total precipitation rate (m s-1)
194 194 Accumulated freezing rain (m)
195 195 Convective precipitation (m)
196 196 Large-scale precipitation (m)
197 197 Snow evaporation (m of water equivalent)
198 198 Snowfall (m of water equivalent)
199 199 Evaporation (m of water equivalent)
200 200 Potential evaporation (m)
201 201 Convective snowfall (m of water equivalent)
202 202 Large-scale snowfall (m of water equivalent)
195 195 Convective precipitation rate (m s-1)
196 196 Large-scale precipitation rate (m s-1)
197 197 Snow evaporation rate (m of water equivalent s-1)
198 198 Snowfall rate (m of water equivalent s-1)
199 199 Evaporation rate (m of water equivalent s-1)
200 200 Potential evaporation rate (m s-1)
201 201 Convective snowfall rate (m of water equivalent s-1)
202 202 Large-scale snowfall rate (m of water equivalent s-1)
254 254 Snow depth (m of water equivalent)

8
definitions/grib2/tables/local/ecmf/1/4.2.2.0.table
View File

@ -8,9 +8,9 @@
198 198 GPP coefficient from Biogenic Flux Adjustment System
199 199 Rec coefficient from Biogenic Flux Adjustment System
200 200 Surface roughness length for heat (m)
201 201 Water runoff (m)
202 202 Surface runoff (m)
203 203 Snow melt (m of water equivalent)
204 204 Sub-surface runoff (m)
201 201 Water runoff and drainage rate (m s-1)
202 202 Surface runoff rate (m s-1)
203 203 Snow melt rate (m of water equivalent s-1)
204 204 Sub-surface runoff rate (m s-1)
205 205 Skin reservoir content (m of water equivalent)
255 255 Missing

83
definitions/grib2/units.def
View File

@ -206,7 +206,7 @@
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 1 ;
}
#10 metre wind gust since previous post-processing
#Maximum 10 metre wind gust since previous post-processing
'm s**-1' = {
discipline = 0 ;
parameterCategory = 2 ;
@ -326,6 +326,12 @@
parameterCategory = 3 ;
parameterNumber = 18 ;
}
#Standard deviation of sub-gridscale orography
'm' = {
discipline = 0 ;
parameterCategory = 3 ;
parameterNumber = 20 ;
}
#Anisotropy of sub-gridscale orography
'Numeric' = {
discipline = 0 ;
@ -2424,6 +2430,14 @@
scaledValueOfFirstFixedSurface = 26315 ;
scaleFactorOfFirstFixedSurface = 2 ;
}
#Total sky direct short-wave (solar) radiation at surface
'J m**-2' = {
discipline = 0 ;
parameterCategory = 4 ;
parameterNumber = 13 ;
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 1 ;
}
#Surface direct short-wave radiation, clear sky
'J m**-2' = {
discipline = 0 ;
@ -2432,6 +2446,13 @@
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 1 ;
}
#Cloud base height
'm' = {
discipline = 0 ;
parameterCategory = 6 ;
parameterNumber = 11 ;
typeOfFirstFixedSurface = 2 ;
}
#0 degrees C isothermal level (atm)
'm' = {
discipline = 0 ;
@ -2441,7 +2462,7 @@
scaledValueOfFirstFixedSurface = 27315 ;
scaleFactorOfFirstFixedSurface = 2 ;
}
#10 metre wind gust in the last 3 hours
#Maximum 10 metre wind gust in the last 3 hours
'm s**-1' = {
discipline = 0 ;
parameterCategory = 2 ;
@ -2754,6 +2775,22 @@
is_chemical_srcsink = 1 ;
sourceSinkChemicalPhysicalProcess = 10 ;
}
#Surface short-wave (solar) radiation downward clear-sky
'J m**-2' = {
discipline = 0 ;
parameterCategory = 4 ;
parameterNumber = 52 ;
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 1 ;
}
#Surface long-wave (thermal) radiation downward clear-sky
'J m**-2' = {
discipline = 0 ;
parameterCategory = 5 ;
parameterNumber = 8 ;
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 1 ;
}
#Convective precipitation
'kg m**-2' = {
discipline = 0 ;
@ -7564,12 +7601,54 @@
parameterCategory = 0 ;
parameterNumber = 20 ;
}
#10 metre wind speed
'm s**-1' = {
discipline = 10 ;
parameterCategory = 0 ;
parameterNumber = 40 ;
typeOfFirstFixedSurface = 102 ;
scaledValueOfFirstFixedSurface = 10 ;
scaleFactorOfFirstFixedSurface = 0 ;
}
#Altimeter wave height
'm' = {
discipline = 10 ;
parameterCategory = 0 ;
parameterNumber = 37 ;
}
#Altimeter corrected wave height
'm' = {
discipline = 10 ;
parameterCategory = 0 ;
parameterNumber = 38 ;
}
#Altimeter range relative correction
'~' = {
discipline = 10 ;
parameterCategory = 0 ;
parameterNumber = 39 ;
}
#10 metre wind direction
'degrees' = {
discipline = 10 ;
parameterCategory = 0 ;
parameterNumber = 41 ;
typeOfFirstFixedSurface = 102 ;
scaledValueOfFirstFixedSurface = 10 ;
scaleFactorOfFirstFixedSurface = 0 ;
}
#2D wave spectra (single)
'm**2 s radian**-1' = {
discipline = 10 ;
parameterCategory = 0 ;
parameterNumber = 86 ;
}
#Wave spectral kurtosis
'dimensionless' = {
discipline = 10 ;
parameterCategory = 0 ;
parameterNumber = 43 ;
}
#Benjamin-Feir index
'dimensionless' = {
discipline = 10 ;

7
src/grib_accessor_class_bytes.cc
View File

@ -165,8 +165,9 @@ static int pack_string(grib_accessor* a, const char* val, size_t* len)
size_t i = 0, slen = strlen(val);
if (slen != expected_slen || *len != expected_slen) {
grib_context_log(c, GRIB_LOG_ERROR,"pack_string: key %s is %lu bytes. Expected a string with %lu characters",
a->name, expected_blen, expected_slen);
grib_context_log(c, GRIB_LOG_ERROR,
"%s: Key %s is %lu bytes. Expected a string with %lu characters (actual length=%zu)",
__func__, a->name, expected_blen, expected_slen, *len);
return GRIB_WRONG_ARRAY_SIZE;
}
@ -176,7 +177,7 @@ static int pack_string(grib_accessor* a, const char* val, size_t* len)
for (i = 0; i < (slen/2); i++) {
unsigned int byteVal = 0;
if (sscanf(val + 2*i, "%02x", &byteVal) != 1) {
grib_context_log(c, GRIB_LOG_ERROR,"pack_string: Invalid hex byte specfication '%.2s'",val + 2*i);
grib_context_log(c, GRIB_LOG_ERROR,"%s: Invalid hex byte specfication '%.2s'", __func__, val + 2*i);
grib_context_free(c, bytearray);
return GRIB_INVALID_KEY_VALUE;
}

10
src/grib_accessor_class_gen.cc
View File

@ -469,7 +469,10 @@ static int pack_long(grib_accessor* a, const long* v, size_t* len)
grib_context_free(c, val);
return ret;
}
grib_context_log(c, GRIB_LOG_ERROR, "Should not grib_pack %s as long", a->name);
grib_context_log(c, GRIB_LOG_ERROR, "Should not pack '%s' as an integer", a->name);
if (a->cclass->pack_string && a->cclass->pack_string != &pack_string) {
grib_context_log(c, GRIB_LOG_ERROR, "Try packing as a string");
}
return GRIB_NOT_IMPLEMENTED;
}
@ -507,7 +510,10 @@ static int pack_double(grib_accessor* a, const double* v, size_t* len)
if (do_pack_as_long) {
return pack_double_array_as_long(a, v, len);
}
grib_context_log(c, GRIB_LOG_ERROR, "Should not grib_pack %s as double", a->name);
grib_context_log(c, GRIB_LOG_ERROR, "Should not pack '%s' as a double", a->name);
if (a->cclass->pack_string && a->cclass->pack_string != &pack_string) {
grib_context_log(c, GRIB_LOG_ERROR, "Try packing as a string");
}
return GRIB_NOT_IMPLEMENTED;
}

7
src/grib_accessor_class_non_alpha.cc
View File

@ -7,9 +7,6 @@
* In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
* virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
*/
/***********************************************************
* Enrico Fucile
***********************************************************/
#include "grib_api_internal.h"
/*
@ -181,13 +178,13 @@ static int pack_string(grib_accessor* a, const char* val, size_t* len)
static int pack_long(grib_accessor* a, const long* v, size_t* len)
{
grib_context_log(a->context, GRIB_LOG_ERROR, " Should not pack %s as long", a->name);
grib_context_log(a->context, GRIB_LOG_ERROR, "Should not pack %s as an integer", a->name);
return GRIB_NOT_IMPLEMENTED;
}
static int pack_double(grib_accessor* a, const double* v, size_t* len)
{
grib_context_log(a->context, GRIB_LOG_ERROR, " Should not pack %s as double", a->name);
grib_context_log(a->context, GRIB_LOG_ERROR, "Should not pack %s as a double", a->name);
return GRIB_NOT_IMPLEMENTED;
}

7
src/grib_accessor_class_to_integer.cc
View File

@ -7,9 +7,6 @@
* In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
* virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
*/
/***********************************************************
* Enrico Fucile
***********************************************************/
#include "grib_api_internal.h"
/*
@ -206,13 +203,13 @@ static int pack_string(grib_accessor* a, const char* val, size_t* len)
static int pack_long(grib_accessor* a, const long* v, size_t* len)
{
grib_context_log(a->context, GRIB_LOG_ERROR, " Should not pack %s as long", a->name);
grib_context_log(a->context, GRIB_LOG_ERROR, "Should not pack %s as an integer", a->name);
return GRIB_NOT_IMPLEMENTED;
}
static int pack_double(grib_accessor* a, const double* v, size_t* len)
{
grib_context_log(a->context, GRIB_LOG_ERROR, " Should not pack %s as double", a->name);
grib_context_log(a->context, GRIB_LOG_ERROR, "Should not pack %s as a double", a->name);
return GRIB_NOT_IMPLEMENTED;
}

15
src/grib_iterator_class_gaussian_reduced.cc
View File

@ -8,11 +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 <cmath>
@ -87,6 +82,8 @@ static void init_class(grib_iterator_class* c)
}
/* END_CLASS_IMP */
#define ITER "Reduced Gaussian grid Geoiterator"
static int next(grib_iterator* iter, double* lat, double* lon, double* val)
{
grib_iterator_gaussian_reduced* self = (grib_iterator_gaussian_reduced*)iter;
@ -190,7 +187,7 @@ static int iterate_reduced_gaussian_subarea_legacy(grib_iterator* iter, grib_han
if (iter->e >= iter->nv) {
size_t np = count_subarea_points(h, get_reduced_row, pl, plsize, lon_first, lon_last);
grib_context_log(h->context, GRIB_LOG_ERROR,
"Reduced Gaussian Geoiterator (sub-area legacy). Num points=%ld, size(values)=%ld", np, iter->nv);
"%s (sub-area legacy). Num points=%zu, size(values)=%zu", ITER, np, iter->nv);
return GRIB_WRONG_GRID;
}
@ -256,7 +253,7 @@ static int iterate_reduced_gaussian_subarea(grib_iterator* iter, grib_handle* h,
/* Only print error message on the second pass */
size_t np = count_subarea_points(h, get_reduced_row, pl, plsize, lon_first, lon_last);
grib_context_log(h->context, GRIB_LOG_ERROR,
"Reduced Gaussian Geoiterator (sub-area). Num points=%ld, size(values)=%ld", np, iter->nv);
"%s (sub-area). Num points=%zu, size(values)=%zu", ITER, np, iter->nv);
return GRIB_WRONG_GRID;
}
self->los[iter->e] = lon2;
@ -315,7 +312,7 @@ static int init(grib_iterator* iter, grib_handle* h, grib_arguments* args)
if ((ret = grib_get_long_internal(h, sorder, &order)) != GRIB_SUCCESS)
return ret;
if (order == 0) {
grib_context_log(h->context, GRIB_LOG_ERROR, "Invalid Gaussian grid: N cannot be 0!");
grib_context_log(h->context, GRIB_LOG_ERROR, "%s: Invalid grid: N cannot be 0!", ITER);
return GRIB_WRONG_GRID;
}
if ((ret = grib_get_long_internal(h, snj, &nj)) != GRIB_SUCCESS)
@ -385,7 +382,7 @@ static int init(grib_iterator* iter, grib_handle* h, grib_arguments* args)
/*Try now as NON-global*/
ret = iterate_reduced_gaussian_subarea(iter, h, lat_first, lon_first, lat_last, lon_last, lats, pl, plsize, numlats);
if (ret != GRIB_SUCCESS)
grib_context_log(h->context, GRIB_LOG_ERROR, "Failed to initialise reduced Gaussian iterator (global)");
grib_context_log(h->context, GRIB_LOG_ERROR, "%s: Failed to initialise iterator (global)", ITER);
goto finalise;
}

16
src/grib_iterator_class_lambert_azimuthal_equal_area.cc
View File

@ -81,6 +81,8 @@ static void init_class(grib_iterator_class* c)
}
/* END_CLASS_IMP */
#define ITER "Lambert azimuthal equal area Geoiterator"
static int next(grib_iterator* iter, double* lat, double* lon, double* val)
{
grib_iterator_lambert_azimuthal_equal_area* self = (grib_iterator_lambert_azimuthal_equal_area*)iter;
@ -227,12 +229,12 @@ static int init_oblate(grib_handle* h,
/* Allocate latitude and longitude arrays */
self->lats = (double*)grib_context_malloc(h->context, nv * sizeof(double));
if (!self->lats) {
grib_context_log(h->context, GRIB_LOG_ERROR, "Error allocating %ld bytes", nv * sizeof(double));
grib_context_log(h->context, GRIB_LOG_ERROR, "%s: Error allocating %zu bytes", ITER, nv * sizeof(double));
return GRIB_OUT_OF_MEMORY;
}
self->lons = (double*)grib_context_malloc(h->context, nv * sizeof(double));
if (!self->lats) {
grib_context_log(h->context, GRIB_LOG_ERROR, "Error allocating %ld bytes", nv * sizeof(double));
grib_context_log(h->context, GRIB_LOG_ERROR, "%s: Error allocating %zu bytes", ITER, nv * sizeof(double));
return GRIB_OUT_OF_MEMORY;
}
lats = self->lats;
@ -308,14 +310,12 @@ static int init_sphere(grib_handle* h,
Dy = jScansPositively == 1 ? Dy / 1000 : -Dy / 1000;
self->lats = (double*)grib_context_malloc(h->context, nv * sizeof(double));
if (!self->lats) {
grib_context_log(h->context, GRIB_LOG_ERROR,
"Error allocating %ld bytes", nv * sizeof(double));
grib_context_log(h->context, GRIB_LOG_ERROR, "%s: Error allocating %zu bytes", ITER, nv * sizeof(double));
return GRIB_OUT_OF_MEMORY;
}
self->lons = (double*)grib_context_malloc(h->context, nv * sizeof(double));
if (!self->lats) {
grib_context_log(h->context, GRIB_LOG_ERROR,
"Error allocating %ld bytes", nv * sizeof(double));
grib_context_log(h->context, GRIB_LOG_ERROR, "%s: Error allocating %zu bytes", ITER, nv * sizeof(double));
return GRIB_OUT_OF_MEMORY;
}
lats = self->lats;
@ -435,9 +435,7 @@ static int init(grib_iterator* iter, grib_handle* h, grib_arguments* args)
return err;
if (iter->nv != nx * ny) {
grib_context_log(h->context, GRIB_LOG_ERROR,
"Wrong number of points (%ld!=%ldx%ld)",
iter->nv, nx, ny);
grib_context_log(h->context, GRIB_LOG_ERROR, "%s: Wrong number of points (%zu!=%ldx%ld)", ITER, iter->nv, nx, ny);
return GRIB_WRONG_GRID;
}
if ((err = grib_get_double_internal(h, slatFirstInDegrees, &latFirstInDegrees)) != GRIB_SUCCESS)

14
src/grib_iterator_class_regular.cc
View File

@ -98,6 +98,7 @@ static void init_class(grib_iterator_class* c)
}
/* END_CLASS_IMP */
#define ITER "Regular grid Geoiterator"
static int next(grib_iterator* iter, double* lat, double* lon, double* val)
{
@ -148,7 +149,7 @@ static int init(grib_iterator* iter, grib_handle* h, grib_arguments* args)
long Ni; /* Number of points along a parallel = Nx */
long Nj; /* Number of points along a meridian = Ny */
double idir, lon1, lon2;
double idir, idir_coded, lon1, lon2;
long loi;
const char* s_lon1 = grib_arguments_get_name(h, args, self->carg++);
@ -163,22 +164,23 @@ static int init(grib_iterator* iter, grib_handle* h, grib_arguments* args)
return ret;
if ((ret = grib_get_double_internal(h, s_idir, &idir))) // can be GRIB_MISSING_DOUBLE
return ret;
idir_coded = idir;
if ((ret = grib_get_long_internal(h, s_Ni, &Ni)))
return ret;
if (grib_is_missing(h, s_Ni, &ret) && ret == GRIB_SUCCESS) {
grib_context_log(h->context, GRIB_LOG_ERROR, "Key %s cannot be 'missing' for a regular grid!", s_Ni);
grib_context_log(h->context, GRIB_LOG_ERROR, "%s: Key %s cannot be 'missing' for a regular grid!", ITER, s_Ni);
return GRIB_WRONG_GRID;
}
if ((ret = grib_get_long_internal(h, s_Nj, &Nj)))
return ret;
if (grib_is_missing(h, s_Nj, &ret) && ret == GRIB_SUCCESS) {
grib_context_log(h->context, GRIB_LOG_ERROR, "Key %s cannot be 'missing' for a regular grid!", s_Nj);
grib_context_log(h->context, GRIB_LOG_ERROR, "%s: Key %s cannot be 'missing' for a regular grid!", ITER, s_Nj);
return GRIB_WRONG_GRID;
}
if (Ni*Nj != iter->nv) {
grib_context_log(h->context, GRIB_LOG_ERROR, "Geoiterator: Ni*Nj!=numberOfDataPoints (%ld*%ld!=%zu)", Ni,Nj,iter->nv);
grib_context_log(h->context, GRIB_LOG_ERROR, "%s: Ni*Nj!=numberOfDataPoints (%ld*%ld!=%zu)", ITER, Ni, Nj, iter->nv);
return GRIB_WRONG_GRID;
}
@ -223,6 +225,10 @@ static int init(grib_iterator* iter, grib_handle* h, grib_arguments* args)
self->las = (double*)grib_context_malloc(h->context, Nj * sizeof(double));
self->los = (double*)grib_context_malloc(h->context, Ni * sizeof(double));
if (idir != idir_coded) {
grib_context_log(h->context, GRIB_LOG_DEBUG, "%s: Using idir=%g (coded value=%g)", ITER, idir, idir_coded);
}
for (loi = 0; loi < Ni; loi++) {
self->los[loi] = lon1;
lon1 += idir;

3
tests/grib_check_param_concepts.sh
View File

@ -24,6 +24,8 @@ $EXEC ${test_dir}/grib_check_param_concepts paramId $ECCODES_DEFINITION_PATH/gri
$EXEC ${test_dir}/grib_check_param_concepts paramId $ECCODES_DEFINITION_PATH/grib2/localConcepts/tigge/paramId.def
$EXEC ${test_dir}/grib_check_param_concepts paramId $ECCODES_DEFINITION_PATH/grib2/localConcepts/s2s/paramId.def
$EXEC ${test_dir}/grib_check_param_concepts paramId $ECCODES_DEFINITION_PATH/grib2/localConcepts/era6/paramId.def
$EXEC ${test_dir}/grib_check_param_concepts paramId $ECCODES_DEFINITION_PATH/grib2/localConcepts/destine/paramId.def
$EXEC ${test_dir}/grib_check_param_concepts shortName $ECCODES_DEFINITION_PATH/grib2/shortName.def
$EXEC ${test_dir}/grib_check_param_concepts shortName $ECCODES_DEFINITION_PATH/grib2/localConcepts/ecmf/shortName.def
@ -32,6 +34,7 @@ $EXEC ${test_dir}/grib_check_param_concepts shortName $ECCODES_DEFINITION_PATH/g
$EXEC ${test_dir}/grib_check_param_concepts shortName $ECCODES_DEFINITION_PATH/grib2/localConcepts/tigge/shortName.def
$EXEC ${test_dir}/grib_check_param_concepts shortName $ECCODES_DEFINITION_PATH/grib2/localConcepts/s2s/shortName.def
$EXEC ${test_dir}/grib_check_param_concepts shortName $ECCODES_DEFINITION_PATH/grib2/localConcepts/era6/shortName.def
$EXEC ${test_dir}/grib_check_param_concepts shortName $ECCODES_DEFINITION_PATH/grib2/localConcepts/destine/shortName.def
# Check the group: name.def paramId.def shortName.def units.def cfVarName.def
# ----------------------------------------------------------------------------

10
tests/grib_ecc-1167.sh
View File

@ -32,6 +32,7 @@ grib_check_key_equals $temp2 uuidOfHGrid '10991111111111111111115000110000'
# Test errors
# --------------
set +e
# Invalid HEX
${tools_dir}/grib_set -s uuidOfHGrid=DEZZBEef10203040b00b1e50001100FF $temp1 $temp2 2>$errlog
@ -40,6 +41,15 @@ set -e
[ $status -ne 0 ]
grep -q "Invalid hex byte specfication 'ZZ'" $errlog
# Packing as an integer
set +e
${tools_dir}/grib_set -s uuidOfHGrid=12345 $temp1 $temp2 2>$errlog
status=$?
set -e
[ $status -ne 0 ]
grep -q "Should not pack 'uuidOfHGrid' as an integer" $errlog
grep -q "Try packing as a string" $errlog
# Clean up
rm -f $temp1 $temp2 $errlog