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

GRIB-74

This commit is contained in:
Shahram Najm 2014-07-16 14:47:24 +01:00
parent ff3f1df7a1
commit ba634428a5
2 changed files with 62 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -310,22 +310,22 @@
discipline = 0 ; discipline = 0 ;
parameterCategory = 0 ; parameterCategory = 0 ;
parameterNumber = 0 ; parameterNumber = 0 ;
scaledValueOfFirstFixedSurface = 2 ;
scaleFactorOfFirstFixedSurface = 0 ;
typeOfFirstFixedSurface = 103 ; typeOfFirstFixedSurface = 103 ;
typeOfStatisticalProcessing = 2 ; typeOfStatisticalProcessing = 2 ;
lengthOfTimeRange = 24 ; lengthOfTimeRange = 24 ;
scaledValueOfFirstFixedSurface = 2 ;
scaleFactorOfFirstFixedSurface = 0 ;
} }
#Minimum temperature at 2 metres in the last 24 hours #Minimum temperature at 2 metres in the last 24 hours
'K' = { 'K' = {
discipline = 0 ; discipline = 0 ;
parameterCategory = 0 ; parameterCategory = 0 ;
parameterNumber = 0 ; parameterNumber = 0 ;
lengthOfTimeRange = 24 ;
scaledValueOfFirstFixedSurface = 2 ;
scaleFactorOfFirstFixedSurface = 0 ; scaleFactorOfFirstFixedSurface = 0 ;
typeOfFirstFixedSurface = 103 ; typeOfFirstFixedSurface = 103 ;
typeOfStatisticalProcessing = 3 ; typeOfStatisticalProcessing = 3 ;
lengthOfTimeRange = 24 ;
scaledValueOfFirstFixedSurface = 2 ;
} }
#Montgomery potential #Montgomery potential
'm**2 s**-2' = { 'm**2 s**-2' = {
@ -716,22 +716,22 @@
discipline = 0 ; discipline = 0 ;
parameterCategory = 0 ; parameterCategory = 0 ;
parameterNumber = 0 ; parameterNumber = 0 ;
typeOfFirstFixedSurface = 103 ;
scaledValueOfFirstFixedSurface = 2 ; scaledValueOfFirstFixedSurface = 2 ;
lengthOfTimeRange = 6 ; lengthOfTimeRange = 6 ;
typeOfStatisticalProcessing = 2 ; typeOfStatisticalProcessing = 2 ;
scaleFactorOfFirstFixedSurface = 0 ; scaleFactorOfFirstFixedSurface = 0 ;
typeOfFirstFixedSurface = 103 ;
} }
#Minimum temperature at 2 metres in the last 6 hours #Minimum temperature at 2 metres in the last 6 hours
'K' = { 'K' = {
discipline = 0 ; discipline = 0 ;
parameterCategory = 0 ; parameterCategory = 0 ;
parameterNumber = 0 ; parameterNumber = 0 ;
scaledValueOfFirstFixedSurface = 2 ;
typeOfFirstFixedSurface = 103 ;
scaleFactorOfFirstFixedSurface = 0 ; scaleFactorOfFirstFixedSurface = 0 ;
typeOfStatisticalProcessing = 3 ; typeOfStatisticalProcessing = 3 ;
lengthOfTimeRange = 6 ; lengthOfTimeRange = 6 ;
scaledValueOfFirstFixedSurface = 2 ;
typeOfFirstFixedSurface = 103 ;
} }
#10 metre wind gust in the last 6 hours #10 metre wind gust in the last 6 hours
'm s**-1' = { 'm s**-1' = {
@ -9192,22 +9192,22 @@
discipline = 0 ; discipline = 0 ;
parameterCategory = 0 ; parameterCategory = 0 ;
parameterNumber = 0 ; parameterNumber = 0 ;
typeOfStatisticalProcessing = 2 ;
typeOfFirstFixedSurface = 103 ;
lengthOfTimeRange = 3 ; lengthOfTimeRange = 3 ;
scaledValueOfFirstFixedSurface = 2 ; scaledValueOfFirstFixedSurface = 2 ;
scaleFactorOfFirstFixedSurface = 0 ; scaleFactorOfFirstFixedSurface = 0 ;
typeOfStatisticalProcessing = 2 ;
typeOfFirstFixedSurface = 103 ;
} }
#Minimum temperature at 2 metres in the last 3 hours #Minimum temperature at 2 metres in the last 3 hours
'K' = { 'K' = {
discipline = 0 ; discipline = 0 ;
parameterCategory = 0 ; parameterCategory = 0 ;
parameterNumber = 0 ; parameterNumber = 0 ;
typeOfStatisticalProcessing = 3 ;
typeOfFirstFixedSurface = 103 ;
lengthOfTimeRange = 3 ; lengthOfTimeRange = 3 ;
scaledValueOfFirstFixedSurface = 2 ; scaledValueOfFirstFixedSurface = 2 ;
scaleFactorOfFirstFixedSurface = 0 ; scaleFactorOfFirstFixedSurface = 0 ;
typeOfStatisticalProcessing = 3 ;
typeOfFirstFixedSurface = 103 ;
} }
#10 metre wind gust in the last 3 hours #10 metre wind gust in the last 3 hours
'm s**-1' = { 'm s**-1' = {
@ -11146,14 +11146,14 @@
discipline = 0 ; discipline = 0 ;
parameterCategory = 2 ; parameterCategory = 2 ;
parameterNumber = 22 ; parameterNumber = 22 ;
scaleFactorOfFirstFixedSurface = 0 ;
scaledValueOfLowerLimit = 25 ; scaledValueOfLowerLimit = 25 ;
productDefinitionTemplateNumber = 9 ; productDefinitionTemplateNumber = 9 ;
typeOfFirstFixedSurface = 103 ;
scaleFactorOfLowerLimit = 0 ; scaleFactorOfLowerLimit = 0 ;
typeOfFirstFixedSurface = 103 ;
probabilityType = 3 ; probabilityType = 3 ;
typeOfStatisticalProcessing = 2 ; typeOfStatisticalProcessing = 2 ;
scaledValueOfFirstFixedSurface = 10 ; scaledValueOfFirstFixedSurface = 10 ;
scaleFactorOfFirstFixedSurface = 0 ;
} }
#2 metre temperature less than 273.15 K #2 metre temperature less than 273.15 K
'%' = { '%' = {
@ -11177,33 +11177,33 @@
discipline = 10 ; discipline = 10 ;
parameterCategory = 0 ; parameterCategory = 0 ;
parameterNumber = 3 ; parameterNumber = 3 ;
probabilityType = 3 ;
typeOfFirstFixedSurface = 101 ; typeOfFirstFixedSurface = 101 ;
productDefinitionTemplateNumber = 5 ; productDefinitionTemplateNumber = 5 ;
scaleFactorOfLowerLimit = 0 ; scaleFactorOfLowerLimit = 0 ;
scaledValueOfLowerLimit = 4 ; scaledValueOfLowerLimit = 4 ;
probabilityType = 3 ;
} }
#Significant wave height of at least 6 m #Significant wave height of at least 6 m
'%' = { '%' = {
discipline = 10 ; discipline = 10 ;
parameterCategory = 0 ; parameterCategory = 0 ;
parameterNumber = 3 ; parameterNumber = 3 ;
scaleFactorOfLowerLimit = 0 ;
scaledValueOfLowerLimit = 6 ;
productDefinitionTemplateNumber = 5 ; productDefinitionTemplateNumber = 5 ;
typeOfFirstFixedSurface = 101 ; typeOfFirstFixedSurface = 101 ;
probabilityType = 3 ; probabilityType = 3 ;
scaleFactorOfLowerLimit = 0 ;
scaledValueOfLowerLimit = 6 ;
} }
#Significant wave height of at least 8 m #Significant wave height of at least 8 m
'%' = { '%' = {
discipline = 10 ; discipline = 10 ;
parameterCategory = 0 ; parameterCategory = 0 ;
parameterNumber = 3 ; parameterNumber = 3 ;
scaledValueOfLowerLimit = 8 ;
typeOfFirstFixedSurface = 101 ; typeOfFirstFixedSurface = 101 ;
productDefinitionTemplateNumber = 5 ; productDefinitionTemplateNumber = 5 ;
scaleFactorOfLowerLimit = 0 ; scaleFactorOfLowerLimit = 0 ;
probabilityType = 3 ; probabilityType = 3 ;
scaledValueOfLowerLimit = 8 ;
} }
#Mean wave period of at least 8 s #Mean wave period of at least 8 s
'%' = { '%' = {
@ -16040,13 +16040,13 @@
discipline = 0 ; discipline = 0 ;
parameterCategory = 20 ; parameterCategory = 20 ;
parameterNumber = 2 ; parameterNumber = 2 ;
productDefinitionTemplateNumber = 44 ;
scaleFactorOfSecondSize = 7 ;
scaleFactorOfFirstSize = 8 ;
aerosolType = 62008 ; aerosolType = 62008 ;
scaledValueOfSecondSize = 5 ; scaleFactorOfFirstSize = 8 ;
scaledValueOfFirstSize = 3 ; scaleFactorOfSecondSize = 7 ;
productDefinitionTemplateNumber = 44 ;
typeOfSizeInterval = 2 ; typeOfSizeInterval = 2 ;
scaledValueOfFirstSize = 3 ;
scaledValueOfSecondSize = 5 ;
} }
#Sea Salt Aerosol (0.03 - 0.5 um) Mixing Ratio #Sea Salt Aerosol (0.03 - 0.5 um) Mixing Ratio
'kg kg**-1' = { 'kg kg**-1' = {
@ -16059,14 +16059,14 @@
discipline = 0 ; discipline = 0 ;
parameterCategory = 20 ; parameterCategory = 20 ;
parameterNumber = 2 ; parameterNumber = 2 ;
productDefinitionTemplateNumber = 44 ;
scaleFactorOfSecondSize = 6 ; scaleFactorOfSecondSize = 6 ;
scaleFactorOfFirstSize = 7 ; productDefinitionTemplateNumber = 44 ;
aerosolType = 62008 ;
scaledValueOfSecondSize = 5 ;
scaledValueOfFirstSize = 5 ;
typeOfSizeInterval = 2 ; typeOfSizeInterval = 2 ;
} scaledValueOfFirstSize = 5 ;
scaledValueOfSecondSize = 5 ;
aerosolType = 62008 ;
scaleFactorOfFirstSize = 7 ;
}
#Sea Salt Aerosol (0.5 - 5 um) Mixing Ratio #Sea Salt Aerosol (0.5 - 5 um) Mixing Ratio
'kg kg**-1' = { 'kg kg**-1' = {
discipline = 192 ; discipline = 192 ;
@ -16078,13 +16078,13 @@
discipline = 0 ; discipline = 0 ;
parameterCategory = 20 ; parameterCategory = 20 ;
parameterNumber = 2 ; parameterNumber = 2 ;
productDefinitionTemplateNumber = 44 ;
scaleFactorOfSecondSize = 5 ;
scaleFactorOfFirstSize = 6 ;
aerosolType = 62008 ;
scaledValueOfSecondSize = 2 ;
scaledValueOfFirstSize = 5 ;
typeOfSizeInterval = 2 ; typeOfSizeInterval = 2 ;
scaledValueOfFirstSize = 5 ;
scaledValueOfSecondSize = 2 ;
aerosolType = 62008 ;
scaleFactorOfFirstSize = 6 ;
scaleFactorOfSecondSize = 5 ;
productDefinitionTemplateNumber = 44 ;
} }
#Sea Salt Aerosol (5 - 20 um) Mixing Ratio #Sea Salt Aerosol (5 - 20 um) Mixing Ratio
'kg kg**-1' = { 'kg kg**-1' = {
@ -16097,13 +16097,13 @@
discipline = 0 ; discipline = 0 ;
parameterCategory = 20 ; parameterCategory = 20 ;
parameterNumber = 2 ; parameterNumber = 2 ;
productDefinitionTemplateNumber = 44 ;
scaleFactorOfSecondSize = 8 ;
scaleFactorOfFirstSize = 8 ;
aerosolType = 62001 ; aerosolType = 62001 ;
scaledValueOfSecondSize = 55 ; scaleFactorOfFirstSize = 8 ;
scaledValueOfFirstSize = 3 ; scaleFactorOfSecondSize = 8 ;
productDefinitionTemplateNumber = 44 ;
typeOfSizeInterval = 2 ; typeOfSizeInterval = 2 ;
scaledValueOfFirstSize = 3 ;
scaledValueOfSecondSize = 55 ;
} }
#Dust Aerosol (0.03 - 0.55 um) Mixing Ratio #Dust Aerosol (0.03 - 0.55 um) Mixing Ratio
'kg kg**-1' = { 'kg kg**-1' = {
@ -16116,13 +16116,13 @@
discipline = 0 ; discipline = 0 ;
parameterCategory = 20 ; parameterCategory = 20 ;
parameterNumber = 2 ; parameterNumber = 2 ;
productDefinitionTemplateNumber = 44 ;
scaleFactorOfSecondSize = 7 ;
scaleFactorOfFirstSize = 8 ;
aerosolType = 62001 ;
scaledValueOfSecondSize = 9 ;
scaledValueOfFirstSize = 55 ;
typeOfSizeInterval = 2 ; typeOfSizeInterval = 2 ;
scaledValueOfFirstSize = 55 ;
scaledValueOfSecondSize = 9 ;
aerosolType = 62001 ;
scaleFactorOfFirstSize = 8 ;
scaleFactorOfSecondSize = 7 ;
productDefinitionTemplateNumber = 44 ;
} }
#Dust Aerosol (0.55 - 0.9 um) Mixing Ratio #Dust Aerosol (0.55 - 0.9 um) Mixing Ratio
'kg kg**-1' = { 'kg kg**-1' = {
@ -16135,14 +16135,14 @@
discipline = 0 ; discipline = 0 ;
parameterCategory = 20 ; parameterCategory = 20 ;
parameterNumber = 2 ; parameterNumber = 2 ;
productDefinitionTemplateNumber = 44 ;
scaleFactorOfSecondSize = 5 ;
scaleFactorOfFirstSize = 7 ;
aerosolType = 62001 ;
scaledValueOfSecondSize = 2 ;
scaledValueOfFirstSize = 9 ; scaledValueOfFirstSize = 9 ;
scaledValueOfSecondSize = 2 ;
aerosolType = 62001 ;
scaleFactorOfFirstSize = 7 ;
scaleFactorOfSecondSize = 5 ;
productDefinitionTemplateNumber = 44 ;
typeOfSizeInterval = 2 ; typeOfSizeInterval = 2 ;
} }
#Dust Aerosol (0.9 - 20 um) Mixing Ratio #Dust Aerosol (0.9 - 20 um) Mixing Ratio
'kg kg**-1' = { 'kg kg**-1' = {
discipline = 192 ; discipline = 192 ;
@ -16155,8 +16155,8 @@
parameterCategory = 20 ; parameterCategory = 20 ;
parameterNumber = 2 ; parameterNumber = 2 ;
productDefinitionTemplateNumber = 44 ; productDefinitionTemplateNumber = 44 ;
aerosolType = 62016 ;
typeOfSizeInterval = 255 ; typeOfSizeInterval = 255 ;
aerosolType = 62016 ;
} }
#Hydrophobic Organic Matter Aerosol Mixing Ratio #Hydrophobic Organic Matter Aerosol Mixing Ratio
'kg kg**-1' = { 'kg kg**-1' = {
@ -16169,9 +16169,9 @@
discipline = 0 ; discipline = 0 ;
parameterCategory = 20 ; parameterCategory = 20 ;
parameterNumber = 2 ; parameterNumber = 2 ;
productDefinitionTemplateNumber = 44 ;
aerosolType = 62015 ; aerosolType = 62015 ;
typeOfSizeInterval = 255 ; typeOfSizeInterval = 255 ;
productDefinitionTemplateNumber = 44 ;
} }
#Hydrophilic Organic Matter Aerosol Mixing Ratio #Hydrophilic Organic Matter Aerosol Mixing Ratio
'kg kg**-1' = { 'kg kg**-1' = {
@ -16185,8 +16185,8 @@
parameterCategory = 20 ; parameterCategory = 20 ;
parameterNumber = 2 ; parameterNumber = 2 ;
productDefinitionTemplateNumber = 44 ; productDefinitionTemplateNumber = 44 ;
aerosolType = 62014 ;
typeOfSizeInterval = 255 ; typeOfSizeInterval = 255 ;
aerosolType = 62014 ;
} }
#Hydrophobic Black Carbon Aerosol Mixing Ratio #Hydrophobic Black Carbon Aerosol Mixing Ratio
'kg kg**-1' = { 'kg kg**-1' = {
@ -16199,9 +16199,9 @@
discipline = 0 ; discipline = 0 ;
parameterCategory = 20 ; parameterCategory = 20 ;
parameterNumber = 2 ; parameterNumber = 2 ;
typeOfSizeInterval = 255 ;
productDefinitionTemplateNumber = 44 ; productDefinitionTemplateNumber = 44 ;
aerosolType = 62013 ; aerosolType = 62013 ;
typeOfSizeInterval = 255 ;
} }
#Hydrophilic Black Carbon Aerosol Mixing Ratio #Hydrophilic Black Carbon Aerosol Mixing Ratio
'kg kg**-1' = { 'kg kg**-1' = {
@ -16214,9 +16214,9 @@
discipline = 0 ; discipline = 0 ;
parameterCategory = 20 ; parameterCategory = 20 ;
parameterNumber = 2 ; parameterNumber = 2 ;
productDefinitionTemplateNumber = 44 ;
aerosolType = 62006 ; aerosolType = 62006 ;
typeOfSizeInterval = 255 ; typeOfSizeInterval = 255 ;
productDefinitionTemplateNumber = 44 ;
} }
#Sulphate Aerosol Mixing Ratio #Sulphate Aerosol Mixing Ratio
'kg kg**-1' = { 'kg kg**-1' = {
@ -16647,8 +16647,8 @@
discipline = 0 ; discipline = 0 ;
parameterCategory = 20 ; parameterCategory = 20 ;
parameterNumber = 2 ; parameterNumber = 2 ;
productDefinitionTemplateNumber = 40 ;
constituentType = 8 ; constituentType = 8 ;
productDefinitionTemplateNumber = 40 ;
} }
#Sulphur dioxide #Sulphur dioxide
'kg kg**-1' = { 'kg kg**-1' = {
@ -16675,8 +16675,8 @@
discipline = 0 ; discipline = 0 ;
parameterCategory = 20 ; parameterCategory = 20 ;
parameterNumber = 2 ; parameterNumber = 2 ;
productDefinitionTemplateNumber = 40 ;
constituentType = 7 ; constituentType = 7 ;
productDefinitionTemplateNumber = 40 ;
} }
#Formaldehyde #Formaldehyde
'kg kg**-1' = { 'kg kg**-1' = {
@ -16713,8 +16713,8 @@
discipline = 0 ; discipline = 0 ;
parameterCategory = 20 ; parameterCategory = 20 ;
parameterNumber = 2 ; parameterNumber = 2 ;
productDefinitionTemplateNumber = 40 ;
constituentType = 60017 ; constituentType = 60017 ;
productDefinitionTemplateNumber = 40 ;
} }
#Nitrogen Oxides #Nitrogen Oxides
'kg kg**-1' = { 'kg kg**-1' = {

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

@ -112,8 +112,10 @@ if (extraDim) {
alias mars.levelist = dimension; alias mars.levelist = dimension;
alias mars.levtype = dimensionType; alias mars.levtype = dimensionType;
} else { } else {
# See GRIB-74 why we store the pressureUnits in a transient
transient tempPressureUnits=pressureUnits;
if (!(typeOfLevel is "surface")) { if (!(typeOfLevel is "surface")) {
if (pressureUnits is "Pa") { if (tempPressureUnits is "Pa") {
meta marsLevel scale(level,one,hundred) : read_only; meta marsLevel scale(level,one,hundred) : read_only;
alias mars.levelist=marsLevel; alias mars.levelist=marsLevel;
} else { } else {