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

Merge branch 'hotfix/2.10.1'

This commit is contained in:
Shahram Najm 2019-01-03 14:11:55 +00:00
parent 5fd46bca0d 451f381d07
commit 9b195698e8
11 changed files with 350 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION.cmake
View File

@ -1 +1 @@
set( ${PROJECT_NAME}_VERSION_STR "2.10.0" )
set( ${PROJECT_NAME}_VERSION_STR "2.10.1" )

66
definitions/grib2/cfVarName.def
View File

@ -227,6 +227,72 @@
probabilityType = 3 ;
scaleFactorOfFirstFixedSurface = 0 ;
}
#Probability of temperature standardized anomaly greater than 1 standard deviation
'ptsa_gt_1stdev' = {
discipline = 0 ;
parameterCategory = 0 ;
parameterNumber = 0 ;
scaleFactorOfLowerLimit = 0 ;
productDefinitionTemplateNumber = 9 ;
typeOfStatisticalProcessing = 10 ;
scaledValueOfLowerLimit = 1 ;
probabilityType = 3 ;
}
#Probability of temperature standardized anomaly greater than 1.5 standard deviation
'ptsa_gt_1p5stdev' = {
discipline = 0 ;
parameterCategory = 0 ;
parameterNumber = 0 ;
typeOfStatisticalProcessing = 10 ;
scaledValueOfLowerLimit = 15 ;
probabilityType = 3 ;
scaleFactorOfLowerLimit = 1 ;
productDefinitionTemplateNumber = 9 ;
}
#Probability of temperature standardized anomaly greater than 2 standard deviation
'ptsa_gt_2stdev' = {
discipline = 0 ;
parameterCategory = 0 ;
parameterNumber = 0 ;
productDefinitionTemplateNumber = 9 ;
typeOfStatisticalProcessing = 10 ;
scaledValueOfLowerLimit = 2 ;
probabilityType = 3 ;
scaleFactorOfLowerLimit = 0 ;
}
#Probability of temperature standardized anomaly less than -1 standard deviation
'ptsa_lt_1stdev' = {
discipline = 0 ;
parameterCategory = 0 ;
parameterNumber = 0 ;
scaleFactorOfLowerLimit = 0 ;
productDefinitionTemplateNumber = 9 ;
typeOfStatisticalProcessing = 10 ;
scaledValueOfLowerLimit = -1 ;
probabilityType = 0 ;
}
#Probability of temperature standardized anomaly less than -1.5 standard deviation
'ptsa_lt_1p5stdev' = {
discipline = 0 ;
parameterCategory = 0 ;
parameterNumber = 0 ;
probabilityType = 0 ;
scaleFactorOfLowerLimit = 1 ;
productDefinitionTemplateNumber = 9 ;
typeOfStatisticalProcessing = 10 ;
scaledValueOfLowerLimit = -15 ;
}
#Probability of temperature standardized anomaly less than -2 standard deviation
'ptsa_lt_2stdev' = {
discipline = 0 ;
parameterCategory = 0 ;
parameterNumber = 0 ;
typeOfStatisticalProcessing = 10 ;
scaledValueOfLowerLimit = -2 ;
probabilityType = 0 ;
scaleFactorOfLowerLimit = 0 ;
productDefinitionTemplateNumber = 9 ;
}
#10 metre wind gust in the last 3 hours
'fg310' = {
discipline = 0 ;

66
definitions/grib2/name.def
View File

@ -227,6 +227,72 @@
productDefinitionTemplateNumber = 9 ;
typeOfFirstFixedSurface = 103 ;
}
#Probability of temperature standardized anomaly greater than 1 standard deviation
'Probability of temperature standardized anomaly greater than 1 standard deviation' = {
discipline = 0 ;
parameterCategory = 0 ;
parameterNumber = 0 ;
scaledValueOfLowerLimit = 1 ;
productDefinitionTemplateNumber = 9 ;
probabilityType = 3 ;
typeOfStatisticalProcessing = 10 ;
scaleFactorOfLowerLimit = 0 ;
}
#Probability of temperature standardized anomaly greater than 1.5 standard deviation
'Probability of temperature standardized anomaly greater than 1.5 standard deviation' = {
discipline = 0 ;
parameterCategory = 0 ;
parameterNumber = 0 ;
scaleFactorOfLowerLimit = 1 ;
scaledValueOfLowerLimit = 15 ;
productDefinitionTemplateNumber = 9 ;
probabilityType = 3 ;
typeOfStatisticalProcessing = 10 ;
}
#Probability of temperature standardized anomaly greater than 2 standard deviation
'Probability of temperature standardized anomaly greater than 2 standard deviation' = {
discipline = 0 ;
parameterCategory = 0 ;
parameterNumber = 0 ;
productDefinitionTemplateNumber = 9 ;
probabilityType = 3 ;
typeOfStatisticalProcessing = 10 ;
scaleFactorOfLowerLimit = 0 ;
scaledValueOfLowerLimit = 2 ;
}
#Probability of temperature standardized anomaly less than -1 standard deviation
'Probability of temperature standardized anomaly less than -1 standard deviation' = {
discipline = 0 ;
parameterCategory = 0 ;
parameterNumber = 0 ;
probabilityType = 0 ;
typeOfStatisticalProcessing = 10 ;
scaleFactorOfLowerLimit = 0 ;
scaledValueOfLowerLimit = -1 ;
productDefinitionTemplateNumber = 9 ;
}
#Probability of temperature standardized anomaly less than -1.5 standard deviation
'Probability of temperature standardized anomaly less than -1.5 standard deviation' = {
discipline = 0 ;
parameterCategory = 0 ;
parameterNumber = 0 ;
typeOfStatisticalProcessing = 10 ;
scaleFactorOfLowerLimit = 1 ;
scaledValueOfLowerLimit = -15 ;
productDefinitionTemplateNumber = 9 ;
probabilityType = 0 ;
}
#Probability of temperature standardized anomaly less than -2 standard deviation
'Probability of temperature standardized anomaly less than -2 standard deviation' = {
discipline = 0 ;
parameterCategory = 0 ;
parameterNumber = 0 ;
scaleFactorOfLowerLimit = 0 ;
scaledValueOfLowerLimit = -2 ;
productDefinitionTemplateNumber = 9 ;
probabilityType = 0 ;
typeOfStatisticalProcessing = 10 ;
}
#10 metre wind gust in the last 3 hours
'10 metre wind gust in the last 3 hours' = {
discipline = 0 ;

66
definitions/grib2/paramId.def
View File

@ -227,6 +227,72 @@
typeOfStatisticalProcessing = 2 ;
scaledValueOfLowerLimit = 10 ;
}
#Probability of temperature standardized anomaly greater than 1 standard deviation
'133093' = {
discipline = 0 ;
parameterCategory = 0 ;
parameterNumber = 0 ;
typeOfStatisticalProcessing = 10 ;
scaledValueOfLowerLimit = 1 ;
probabilityType = 3 ;
scaleFactorOfLowerLimit = 0 ;
productDefinitionTemplateNumber = 9 ;
}
#Probability of temperature standardized anomaly greater than 1.5 standard deviation
'133094' = {
discipline = 0 ;
parameterCategory = 0 ;
parameterNumber = 0 ;
productDefinitionTemplateNumber = 9 ;
typeOfStatisticalProcessing = 10 ;
scaledValueOfLowerLimit = 15 ;
probabilityType = 3 ;
scaleFactorOfLowerLimit = 1 ;
}
#Probability of temperature standardized anomaly greater than 2 standard deviation
'133095' = {
discipline = 0 ;
parameterCategory = 0 ;
parameterNumber = 0 ;
typeOfStatisticalProcessing = 10 ;
scaledValueOfLowerLimit = 2 ;
probabilityType = 3 ;
scaleFactorOfLowerLimit = 0 ;
productDefinitionTemplateNumber = 9 ;
}
#Probability of temperature standardized anomaly less than -1 standard deviation
'133096' = {
discipline = 0 ;
parameterCategory = 0 ;
parameterNumber = 0 ;
probabilityType = 0 ;
scaleFactorOfLowerLimit = 0 ;
productDefinitionTemplateNumber = 9 ;
typeOfStatisticalProcessing = 10 ;
scaledValueOfLowerLimit = -1 ;
}
#Probability of temperature standardized anomaly less than -1.5 standard deviation
'133097' = {
discipline = 0 ;
parameterCategory = 0 ;
parameterNumber = 0 ;
productDefinitionTemplateNumber = 9 ;
typeOfStatisticalProcessing = 10 ;
scaledValueOfLowerLimit = -15 ;
probabilityType = 0 ;
scaleFactorOfLowerLimit = 1 ;
}
#Probability of temperature standardized anomaly less than -2 standard deviation
'133098' = {
discipline = 0 ;
parameterCategory = 0 ;
parameterNumber = 0 ;
productDefinitionTemplateNumber = 9 ;
typeOfStatisticalProcessing = 10 ;
scaledValueOfLowerLimit = -2 ;
probabilityType = 0 ;
scaleFactorOfLowerLimit = 0 ;
}
#10 metre wind gust in the last 3 hours
'228028' = {
discipline = 0 ;

3
definitions/grib2/products_uerra.def
View File

@ -35,9 +35,10 @@ if(typeOfFirstFixedSurface == 118) {
alias mars.levtype = levTypeName;
}
# See GRIB-871 and ECC-854
if(typeOfFirstFixedSurface == 151 && typeOfSecondFixedSurface == 151) {
alias level = bottomLevel;
alias mars.levelist = level;
#alias mars.levelist = level;
}
alias mars.expver = marsExpver;

3
definitions/grib2/section.1.def
View File

@ -105,10 +105,13 @@ concept stepType {
"max" = {selectStepTemplateInterval=1; stepTypeInternal="max";}
"min" = {selectStepTemplateInterval=1; stepTypeInternal="min";}
"diff" = {selectStepTemplateInterval=1; stepTypeInternal="diff";}
"sdiff" = {selectStepTemplateInterval=1; stepTypeInternal="sdiff";}
"rms" = {selectStepTemplateInterval=1; stepTypeInternal="rms";}
"sd" = {selectStepTemplateInterval=1; stepTypeInternal="sd";}
"cov" = {selectStepTemplateInterval=1; stepTypeInternal="cov";}
"ratio" = {selectStepTemplateInterval=1; stepTypeInternal="ratio";}
"stdanom" = {selectStepTemplateInterval=1; stepTypeInternal="stdanom";}
"sum" = {selectStepTemplateInterval=1; stepTypeInternal="sum";}
}
transient setCalendarId = 0 ;

66
definitions/grib2/shortName.def
View File

@ -227,6 +227,72 @@
probabilityType = 3 ;
scaleFactorOfFirstFixedSurface = 0 ;
}
#Probability of temperature standardized anomaly greater than 1 standard deviation
'ptsa_gt_1stdev' = {
discipline = 0 ;
parameterCategory = 0 ;
parameterNumber = 0 ;
scaleFactorOfLowerLimit = 0 ;
productDefinitionTemplateNumber = 9 ;
typeOfStatisticalProcessing = 10 ;
scaledValueOfLowerLimit = 1 ;
probabilityType = 3 ;
}
#Probability of temperature standardized anomaly greater than 1.5 standard deviation
'ptsa_gt_1p5stdev' = {
discipline = 0 ;
parameterCategory = 0 ;
parameterNumber = 0 ;
typeOfStatisticalProcessing = 10 ;
scaledValueOfLowerLimit = 15 ;
probabilityType = 3 ;
scaleFactorOfLowerLimit = 1 ;
productDefinitionTemplateNumber = 9 ;
}
#Probability of temperature standardized anomaly greater than 2 standard deviation
'ptsa_gt_2stdev' = {
discipline = 0 ;
parameterCategory = 0 ;
parameterNumber = 0 ;
productDefinitionTemplateNumber = 9 ;
typeOfStatisticalProcessing = 10 ;
scaledValueOfLowerLimit = 2 ;
probabilityType = 3 ;
scaleFactorOfLowerLimit = 0 ;
}
#Probability of temperature standardized anomaly less than -1 standard deviation
'ptsa_lt_1stdev' = {
discipline = 0 ;
parameterCategory = 0 ;
parameterNumber = 0 ;
scaleFactorOfLowerLimit = 0 ;
productDefinitionTemplateNumber = 9 ;
typeOfStatisticalProcessing = 10 ;
scaledValueOfLowerLimit = -1 ;
probabilityType = 0 ;
}
#Probability of temperature standardized anomaly less than -1.5 standard deviation
'ptsa_lt_1p5stdev' = {
discipline = 0 ;
parameterCategory = 0 ;
parameterNumber = 0 ;
probabilityType = 0 ;
scaleFactorOfLowerLimit = 1 ;
productDefinitionTemplateNumber = 9 ;
typeOfStatisticalProcessing = 10 ;
scaledValueOfLowerLimit = -15 ;
}
#Probability of temperature standardized anomaly less than -2 standard deviation
'ptsa_lt_2stdev' = {
discipline = 0 ;
parameterCategory = 0 ;
parameterNumber = 0 ;
typeOfStatisticalProcessing = 10 ;
scaledValueOfLowerLimit = -2 ;
probabilityType = 0 ;
scaleFactorOfLowerLimit = 0 ;
productDefinitionTemplateNumber = 9 ;
}
#10 metre wind gust in the last 3 hours
'10fg3' = {
discipline = 0 ;

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

@ -69,6 +69,8 @@ concept_nofail vertical.typeOfLevel (unknown) {
'pressureFromGroundLayer' = {typeOfFirstFixedSurface=108;typeOfSecondFixedSurface=108;}
'potentialVorticity' = {typeOfFirstFixedSurface=109; typeOfSecondFixedSurface=255;}
'eta' = {typeOfFirstFixedSurface=111; typeOfSecondFixedSurface=255;}
'soil' = {typeOfFirstFixedSurface=151; typeOfSecondFixedSurface=255;}
'soilLayer' = {typeOfFirstFixedSurface=151; typeOfSecondFixedSurface=151;}
# In the case of Generalized vertical height coordinates, NV must be 6
'generalVertical' = {genVertHeightCoords=1; typeOfFirstFixedSurface=150; NV=6;}
@ -102,6 +104,7 @@ if (typeOfSecondFixedSurface == 255) {
scaledValueOfSecondFixedSurface,
pressureUnits) :dump;
alias level=topLevel; # (see GRIB-725)
}
alias ls.level=level;
alias vertical.level=level;
@ -134,4 +137,10 @@ if (extraDim) {
unalias mars.levelist;
}
}
# See ECC-854
if(typeOfFirstFixedSurface == 151 && typeOfSecondFixedSurface == 151) {
alias mars.levelist = bottomLevel;
}
alias ls.typeOfLevel=typeOfLevel;

5
definitions/grib2/template.4.statistical.def
View File

@ -68,11 +68,14 @@ if (numberOfTimeRange == 1 || numberOfTimeRange == 2) {
"accum" = {typeOfStatisticalProcessing=1;typeOfTimeIncrement=2;}
"max" = {typeOfStatisticalProcessing=2;}
"min" = {typeOfStatisticalProcessing=3;}
"diff" = {typeOfStatisticalProcessing=4;}
"diff" = {typeOfStatisticalProcessing=4;} # end-start
"rms" = {typeOfStatisticalProcessing=5;}
"sd" = {typeOfStatisticalProcessing=6;}
"cov" = {typeOfStatisticalProcessing=7;}
"sdiff" = {typeOfStatisticalProcessing=8;} # start-end
"ratio" = {typeOfStatisticalProcessing=9;}
"stdanom" = {typeOfStatisticalProcessing=10;}
"sum" = {typeOfStatisticalProcessing=11;}
}
meta startStep step_in_units(forecastTime,indicatorOfUnitOfTimeRange,stepUnits,
indicatorOfUnitForTimeRange,lengthOfTimeRange) : no_copy;

66
definitions/grib2/units.def
View File

@ -227,6 +227,72 @@
productDefinitionTemplateNumber = 9 ;
typeOfFirstFixedSurface = 103 ;
}
#Probability of temperature standardized anomaly greater than 1 standard deviation
'%' = {
discipline = 0 ;
parameterCategory = 0 ;
parameterNumber = 0 ;
scaledValueOfLowerLimit = 1 ;
productDefinitionTemplateNumber = 9 ;
probabilityType = 3 ;
typeOfStatisticalProcessing = 10 ;
scaleFactorOfLowerLimit = 0 ;
}
#Probability of temperature standardized anomaly greater than 1.5 standard deviation
'%' = {
discipline = 0 ;
parameterCategory = 0 ;
parameterNumber = 0 ;
scaleFactorOfLowerLimit = 1 ;
scaledValueOfLowerLimit = 15 ;
productDefinitionTemplateNumber = 9 ;
probabilityType = 3 ;
typeOfStatisticalProcessing = 10 ;
}
#Probability of temperature standardized anomaly greater than 2 standard deviation
'%' = {
discipline = 0 ;
parameterCategory = 0 ;
parameterNumber = 0 ;
productDefinitionTemplateNumber = 9 ;
probabilityType = 3 ;
typeOfStatisticalProcessing = 10 ;
scaleFactorOfLowerLimit = 0 ;
scaledValueOfLowerLimit = 2 ;
}
#Probability of temperature standardized anomaly less than -1 standard deviation
'%' = {
discipline = 0 ;
parameterCategory = 0 ;
parameterNumber = 0 ;
probabilityType = 0 ;
typeOfStatisticalProcessing = 10 ;
scaleFactorOfLowerLimit = 0 ;
scaledValueOfLowerLimit = -1 ;
productDefinitionTemplateNumber = 9 ;
}
#Probability of temperature standardized anomaly less than -1.5 standard deviation
'%' = {
discipline = 0 ;
parameterCategory = 0 ;
parameterNumber = 0 ;
typeOfStatisticalProcessing = 10 ;
scaleFactorOfLowerLimit = 1 ;
scaledValueOfLowerLimit = -15 ;
productDefinitionTemplateNumber = 9 ;
probabilityType = 0 ;
}
#Probability of temperature standardized anomaly less than -2 standard deviation
'%' = {
discipline = 0 ;
parameterCategory = 0 ;
parameterNumber = 0 ;
scaleFactorOfLowerLimit = 0 ;
scaledValueOfLowerLimit = -2 ;
productDefinitionTemplateNumber = 9 ;
probabilityType = 0 ;
typeOfStatisticalProcessing = 10 ;
}
#10 metre wind gust in the last 3 hours
'm s**-1' = {
discipline = 0 ;

2
version.sh
View File

@ -15,7 +15,7 @@ PACKAGE_NAME='eccodes'
# Package version
ECCODES_MAJOR_VERSION=2
ECCODES_MINOR_VERSION=10
ECCODES_REVISION_VERSION=0
ECCODES_REVISION_VERSION=1
ECCODES_CURRENT=1
ECCODES_REVISION=0