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

Merge branches 'feature/ECC-1270-marsLevtype' and 'feature/remove_is_efas_is_uerra_only' into feature/ECC-1270-and-ECC-1287

This commit is contained in:
Shahram Najm 2021-09-28 12:11:55 +01:00
parent a26296fb3a 187115eef7
commit 948b0cff0a
27 changed files with 737 additions and 580 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
definitions/grib2/boot.def
View File

@ -18,7 +18,6 @@ constant grib2divider = 1000000;
alias extraDimensionPresent=zero;
alias is_tigge = zero;
alias is_s2s = zero;
transient is_efas = 0;
transient angleSubdivisions=grib2divider; # micro degrees
meta gts_header gts_header() : no_copy,hidden,read_only;

80
definitions/grib2/cfVarName.def
View File

@ -113,26 +113,6 @@
parameterCategory = 2 ;
parameterNumber = 1 ;
}
#Wind speed
'ws' = {
discipline = 0 ;
parameterCategory = 2 ;
parameterNumber = 1 ;
typeOfFirstFixedSurface = 103 ;
scaledValueOfFirstFixedSurface = 100 ;
scaleFactorOfFirstFixedSurface = 0 ;
is_uerra = 1 ;
}
#Wind speed
'ws' = {
discipline = 0 ;
parameterCategory = 2 ;
parameterNumber = 1 ;
typeOfFirstFixedSurface = 103 ;
scaledValueOfFirstFixedSurface = 200 ;
scaleFactorOfFirstFixedSurface = 0 ;
is_uerra = 1 ;
}
#Unbalanced component of temperature
'uctp' = {
discipline = 0 ;
@ -185,17 +165,6 @@
typeOfSecondFixedSurface = 255 ;
typeOfStatisticalProcessing = 1 ;
}
#10 metre wind gust since previous post-processing
'fg10' = {
discipline = 0 ;
parameterCategory = 2 ;
parameterNumber = 22 ;
scaleFactorOfFirstFixedSurface = 0 ;
scaledValueOfFirstFixedSurface = 10 ;
typeOfStatisticalProcessing = 2 ;
is_uerra = 1 ;
typeOfFirstFixedSurface = 103 ;
}
#Specific rain water content
'crwc' = {
discipline = 0 ;
@ -266,28 +235,6 @@
parameterCategory = 2 ;
parameterNumber = 37 ;
}
#Maximum temperature at 2 metres since previous post-processing
'mx2t' = {
discipline = 0 ;
parameterCategory = 0 ;
parameterNumber = 0 ;
typeOfFirstFixedSurface = 103 ;
scaleFactorOfFirstFixedSurface = 0 ;
scaledValueOfFirstFixedSurface = 2 ;
typeOfStatisticalProcessing = 2 ;
is_uerra = 1 ;
}
#Minimum temperature at 2 metres since previous post-processing
'mn2t' = {
discipline = 0 ;
parameterCategory = 0 ;
parameterNumber = 0 ;
typeOfStatisticalProcessing = 3 ;
is_uerra = 1 ;
typeOfFirstFixedSurface = 103 ;
scaleFactorOfFirstFixedSurface = 0 ;
scaledValueOfFirstFixedSurface = 2 ;
}
#Ozone mass mixing ratio
'o3' = {
discipline = 0 ;
@ -1107,7 +1054,6 @@
discipline = 0 ;
parameterCategory = 2 ;
parameterNumber = 22 ;
is_uerra = 0 ;
typeOfFirstFixedSurface = 103 ;
scaleFactorOfFirstFixedSurface = 0 ;
scaledValueOfFirstFixedSurface = 10 ;
@ -1901,7 +1847,6 @@
typeOfStatisticalProcessing = 1 ;
lengthOfTimeRange = 6 ;
indicatorOfUnitForTimeRange = 1 ;
is_uerra = 0 ;
}
#Evaporation in the last 24 hours
'eva24' = {
@ -1912,29 +1857,6 @@
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 1 ;
lengthOfTimeRange = 24 ;
is_uerra = 0 ;
}
#Total precipitation in the last 6 hours
'tp06' = {
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 52 ;
is_efas = 1 ;
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 1 ;
lengthOfTimeRange = 6 ;
indicatorOfUnitForTimeRange = 1 ;
}
#Total precipitation in the last 24 hours
'tp24' = {
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 52 ;
lengthOfTimeRange = 24 ;
indicatorOfUnitForTimeRange = 1 ;
is_efas = 1 ;
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 1 ;
}
#Fraction of snow cover
'fscov' = {
@ -2702,7 +2624,6 @@
discipline = 0 ;
parameterCategory = 0 ;
parameterNumber = 0 ;
is_uerra = 0 ;
typeOfStatisticalProcessing = 2 ;
typeOfFirstFixedSurface = 103 ;
scaleFactorOfFirstFixedSurface = 0 ;
@ -2715,7 +2636,6 @@
discipline = 0 ;
parameterCategory = 0 ;
parameterNumber = 0 ;
is_uerra = 0 ;
typeOfFirstFixedSurface = 103 ;
typeOfStatisticalProcessing = 3 ;
scaleFactorOfFirstFixedSurface = 0 ;

2
definitions/grib2/local.98.41.def
View File

@ -38,8 +38,6 @@ unsigned[2] anoffsetLast = missing(): dump, can_be_missing;
unsigned[2] anoffsetFrequency = missing(): dump, can_be_missing;
# Boolean
remove is_efas;
transient is_efas = 1;
transient lsdate_bug = 1: hidden; # See ECC-707
# Note: the key typeOfPostProcessing is in the PDTNs 70, 71, 72 and 73

22
definitions/grib2/localConcepts/egrr/cfVarName.def
View File

@ -1,26 +1,4 @@
# Automatically generated by ./create_def.pl, do not edit
#Maximum temperature at 2 metres since previous post-processing
'mx2t' = {
discipline = 0 ;
parameterCategory = 0 ;
parameterNumber = 0 ;
typeOfFirstFixedSurface = 103 ;
scaleFactorOfFirstFixedSurface = 1 ;
scaledValueOfFirstFixedSurface = 15 ;
typeOfStatisticalProcessing = 2 ;
is_uerra = 1 ;
}
#Minimum temperature at 2 metres since previous post-processing
'mn2t' = {
discipline = 0 ;
parameterCategory = 0 ;
parameterNumber = 0 ;
typeOfStatisticalProcessing = 3 ;
is_uerra = 1 ;
typeOfFirstFixedSurface = 103 ;
scaleFactorOfFirstFixedSurface = 1 ;
scaledValueOfFirstFixedSurface = 15 ;
}
#Maximum temperature at 2 metres in the last 6 hours
'mx2t6' = {
discipline = 0 ;

22
definitions/grib2/localConcepts/egrr/name.def
View File

@ -1,26 +1,4 @@
# Automatically generated by ./create_def.pl, do not edit
#Maximum temperature at 2 metres since previous post-processing
'Maximum temperature at 2 metres since previous post-processing' = {
discipline = 0 ;
parameterCategory = 0 ;
parameterNumber = 0 ;
is_uerra = 1 ;
scaledValueOfFirstFixedSurface = 15 ;
scaleFactorOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 2 ;
typeOfFirstFixedSurface = 103 ;
}
#Minimum temperature at 2 metres since previous post-processing
'Minimum temperature at 2 metres since previous post-processing' = {
discipline = 0 ;
parameterCategory = 0 ;
parameterNumber = 0 ;
scaledValueOfFirstFixedSurface = 15 ;
scaleFactorOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 3 ;
typeOfFirstFixedSurface = 103 ;
is_uerra = 1 ;
}
#Maximum temperature at 2 metres in the last 6 hours
'Maximum temperature at 2 metres in the last 6 hours' = {
discipline = 0 ;

22
definitions/grib2/localConcepts/egrr/paramId.def
View File

@ -1,26 +1,4 @@
# Automatically generated by ./create_def.pl, do not edit
#Maximum temperature at 2 metres since previous post-processing
'201' = {
discipline = 0 ;
parameterCategory = 0 ;
parameterNumber = 0 ;
scaledValueOfFirstFixedSurface = 15 ;
typeOfStatisticalProcessing = 2 ;
is_uerra = 1 ;
typeOfFirstFixedSurface = 103 ;
scaleFactorOfFirstFixedSurface = 1 ;
}
#Minimum temperature at 2 metres since previous post-processing
'202' = {
discipline = 0 ;
parameterCategory = 0 ;
parameterNumber = 0 ;
is_uerra = 1 ;
typeOfFirstFixedSurface = 103 ;
scaleFactorOfFirstFixedSurface = 1 ;
scaledValueOfFirstFixedSurface = 15 ;
typeOfStatisticalProcessing = 3 ;
}
#Maximum temperature at 2 metres in the last 6 hours
'121' = {
discipline = 0 ;

22
definitions/grib2/localConcepts/egrr/shortName.def
View File

@ -1,26 +1,4 @@
# Automatically generated by ./create_def.pl, do not edit
#Maximum temperature at 2 metres since previous post-processing
'mx2t' = {
discipline = 0 ;
parameterCategory = 0 ;
parameterNumber = 0 ;
typeOfFirstFixedSurface = 103 ;
scaleFactorOfFirstFixedSurface = 1 ;
scaledValueOfFirstFixedSurface = 15 ;
typeOfStatisticalProcessing = 2 ;
is_uerra = 1 ;
}
#Minimum temperature at 2 metres since previous post-processing
'mn2t' = {
discipline = 0 ;
parameterCategory = 0 ;
parameterNumber = 0 ;
typeOfStatisticalProcessing = 3 ;
is_uerra = 1 ;
typeOfFirstFixedSurface = 103 ;
scaleFactorOfFirstFixedSurface = 1 ;
scaledValueOfFirstFixedSurface = 15 ;
}
#Maximum temperature at 2 metres in the last 6 hours
'mx2t6' = {
discipline = 0 ;

22
definitions/grib2/localConcepts/egrr/units.def
View File

@ -1,26 +1,4 @@
# Automatically generated by ./create_def.pl, do not edit
#Maximum temperature at 2 metres since previous post-processing
'K' = {
discipline = 0 ;
parameterCategory = 0 ;
parameterNumber = 0 ;
is_uerra = 1 ;
scaledValueOfFirstFixedSurface = 15 ;
scaleFactorOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 2 ;
typeOfFirstFixedSurface = 103 ;
}
#Minimum temperature at 2 metres since previous post-processing
'K' = {
discipline = 0 ;
parameterCategory = 0 ;
parameterNumber = 0 ;
scaledValueOfFirstFixedSurface = 15 ;
scaleFactorOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 3 ;
typeOfFirstFixedSurface = 103 ;
is_uerra = 1 ;
}
#Maximum temperature at 2 metres in the last 6 hours
'K' = {
discipline = 0 ;

20
definitions/grib2/localConcepts/hydro/cfVarName.def Normal file
View File

@ -0,0 +1,20 @@
#Total precipitation in the last 6 hours
'tp06' = {
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 52 ;
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 1 ;
lengthOfTimeRange = 6 ;
indicatorOfUnitForTimeRange = 1 ;
}
#Total precipitation in the last 24 hours
'tp24' = {
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 52 ;
lengthOfTimeRange = 24 ;
indicatorOfUnitForTimeRange = 1 ;
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 1 ;
}

20
definitions/grib2/localConcepts/hydro/name.def Normal file
View File

@ -0,0 +1,20 @@
#Total precipitation in the last 6 hours
'Total precipitation in the last 6 hours' = {
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 52 ;
typeOfFirstFixedSurface = 1 ;
indicatorOfUnitForTimeRange = 1 ;
typeOfStatisticalProcessing = 1 ;
lengthOfTimeRange = 6 ;
}
#Total precipitation in the last 24 hours
'Total precipitation in the last 24 hours' = {
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 52 ;
typeOfFirstFixedSurface = 1 ;
indicatorOfUnitForTimeRange = 1 ;
typeOfStatisticalProcessing = 1 ;
lengthOfTimeRange = 24 ;
}

20
definitions/grib2/localConcepts/hydro/paramId.def Normal file
View File

@ -0,0 +1,20 @@
#Total precipitation in the last 6 hours
'260267' = {
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 52 ;
typeOfFirstFixedSurface = 1 ;
indicatorOfUnitForTimeRange = 1 ;
typeOfStatisticalProcessing = 1 ;
lengthOfTimeRange = 6 ;
}
#Total precipitation in the last 24 hours
'260268' = {
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 52 ;
typeOfFirstFixedSurface = 1 ;
indicatorOfUnitForTimeRange = 1 ;
typeOfStatisticalProcessing = 1 ;
lengthOfTimeRange = 24 ;
}

20
definitions/grib2/localConcepts/hydro/shortName.def Normal file
View File

@ -0,0 +1,20 @@
#Total precipitation in the last 6 hours
'tp06' = {
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 52 ;
typeOfFirstFixedSurface = 1 ;
indicatorOfUnitForTimeRange = 1 ;
typeOfStatisticalProcessing = 1 ;
lengthOfTimeRange = 6 ;
}
#Total precipitation in the last 24 hours
'tp24' = {
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 52 ;
typeOfFirstFixedSurface = 1 ;
indicatorOfUnitForTimeRange = 1 ;
typeOfStatisticalProcessing = 1 ;
lengthOfTimeRange = 24 ;
}

20
definitions/grib2/localConcepts/hydro/units.def Normal file
View File

@ -0,0 +1,20 @@
#Total precipitation in the last 6 hours
'kg m**-2' = {
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 52 ;
typeOfFirstFixedSurface = 1 ;
indicatorOfUnitForTimeRange = 1 ;
typeOfStatisticalProcessing = 1 ;
lengthOfTimeRange = 6 ;
}
#Total precipitation in the last 24 hours
'kg m**-2' = {
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 52 ;
typeOfFirstFixedSurface = 1 ;
indicatorOfUnitForTimeRange = 1 ;
typeOfStatisticalProcessing = 1 ;
lengthOfTimeRange = 24 ;
}

120
definitions/grib2/localConcepts/uerra/cfVarName.def Normal file
View File

@ -0,0 +1,120 @@
#Wind speed
'ws' = {
discipline = 0 ;
parameterCategory = 2 ;
parameterNumber = 1 ;
typeOfFirstFixedSurface = 103 ;
scaledValueOfFirstFixedSurface = 100 ;
scaleFactorOfFirstFixedSurface = 0 ;
}
#Wind speed
'ws' = {
discipline = 0 ;
parameterCategory = 2 ;
parameterNumber = 1 ;
typeOfFirstFixedSurface = 103 ;
scaledValueOfFirstFixedSurface = 200 ;
scaleFactorOfFirstFixedSurface = 0 ;
}
#10 metre wind gust since previous post-processing
'fg10' = {
discipline = 0 ;
parameterCategory = 2 ;
parameterNumber = 22 ;
scaleFactorOfFirstFixedSurface = 0 ;
scaledValueOfFirstFixedSurface = 10 ;
typeOfStatisticalProcessing = 2 ;
typeOfFirstFixedSurface = 103 ;
indicatorOfUnitForTimeRange = 1 ;
lengthOfTimeRange = 3 ;
}
#10 metre wind gust since previous post-processing
'fg10' = {
discipline = 0 ;
parameterCategory = 2 ;
parameterNumber = 22 ;
scaleFactorOfFirstFixedSurface = 0 ;
scaledValueOfFirstFixedSurface = 10 ;
typeOfStatisticalProcessing = 2 ;
typeOfFirstFixedSurface = 103 ;
indicatorOfUnitForTimeRange = 1 ;
lengthOfTimeRange = 1 ;
}
#Maximum temperature at 2 metres since previous post-processing
'mx2t' = {
discipline = 0 ;
parameterCategory = 0 ;
parameterNumber = 0 ;
typeOfFirstFixedSurface = 103 ;
scaleFactorOfFirstFixedSurface = 0 ;
scaledValueOfFirstFixedSurface = 2 ;
typeOfStatisticalProcessing = 2 ;
}
#Minimum temperature at 2 metres since previous post-processing
'mn2t' = {
discipline = 0 ;
parameterCategory = 0 ;
parameterNumber = 0 ;
typeOfStatisticalProcessing = 3 ;
typeOfFirstFixedSurface = 103 ;
scaleFactorOfFirstFixedSurface = 0 ;
scaledValueOfFirstFixedSurface = 2 ;
}
#Maximum temperature at 2 metres since previous post-processing
'mx2t' = {
discipline = 0 ;
parameterCategory = 0 ;
parameterNumber = 0 ;
typeOfFirstFixedSurface = 103 ;
scaleFactorOfFirstFixedSurface = 1 ;
scaledValueOfFirstFixedSurface = 15 ;
typeOfStatisticalProcessing = 2 ;
}
#Minimum temperature at 2 metres since previous post-processing
'mn2t' = {
discipline = 0 ;
parameterCategory = 0 ;
parameterNumber = 0 ;
typeOfStatisticalProcessing = 3 ;
typeOfFirstFixedSurface = 103 ;
scaleFactorOfFirstFixedSurface = 1 ;
scaledValueOfFirstFixedSurface = 15 ;
}
#Evaporation
'eva' = {
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 79 ;
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 1 ;
lengthOfTimeRange = 6 ;
indicatorOfUnitForTimeRange = 1 ;
}
#Evaporation
'eva' = {
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 79 ;
indicatorOfUnitForTimeRange = 1 ;
typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 1 ;
lengthOfTimeRange = 24 ;
}
#2 metre temperature
't2m' = {
discipline = 0 ;
parameterCategory = 0 ;
parameterNumber = 0 ;
typeOfFirstFixedSurface = 103 ;
scaledValueOfFirstFixedSurface = 15 ;
scaleFactorOfFirstFixedSurface = 1 ;
}
#Surface air relative humidity
'r2' = {
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 1 ;
typeOfFirstFixedSurface = 103 ;
scaledValueOfFirstFixedSurface = 15 ;
scaleFactorOfFirstFixedSurface = 1 ;
}

120
definitions/grib2/localConcepts/uerra/name.def Normal file
View File

@ -0,0 +1,120 @@
#Wind speed
'Wind speed' = {
discipline = 0 ;
parameterCategory = 2 ;
parameterNumber = 1 ;
typeOfFirstFixedSurface = 103 ;
scaledValueOfFirstFixedSurface = 100 ;
scaleFactorOfFirstFixedSurface = 0 ;
}
#Wind speed
'Wind speed' = {
discipline = 0 ;
parameterCategory = 2 ;
parameterNumber = 1 ;
typeOfFirstFixedSurface = 103 ;
scaledValueOfFirstFixedSurface = 200 ;
scaleFactorOfFirstFixedSurface = 0 ;
}
#10 metre wind gust since previous post-processing
'10 metre wind gust since previous post-processing' = {
discipline = 0 ;
parameterCategory = 2 ;
parameterNumber = 22 ;
typeOfFirstFixedSurface = 103 ;
scaledValueOfFirstFixedSurface = 10 ;
scaleFactorOfFirstFixedSurface = 0 ;
typeOfStatisticalProcessing = 2 ;
indicatorOfUnitForTimeRange = 1 ;
lengthOfTimeRange = 3 ;
}
#10 metre wind gust since previous post-processing
'10 metre wind gust since previous post-processing' = {
discipline = 0 ;
parameterCategory = 2 ;
parameterNumber = 22 ;
typeOfFirstFixedSurface = 103 ;
scaledValueOfFirstFixedSurface = 10 ;
scaleFactorOfFirstFixedSurface = 0 ;
typeOfStatisticalProcessing = 2 ;
indicatorOfUnitForTimeRange = 1 ;
lengthOfTimeRange = 1 ;
}
#Maximum temperature at 2 metres since previous post-processing
'Maximum temperature at 2 metres since previous post-processing' = {
discipline = 0 ;
parameterCategory = 0 ;
parameterNumber = 0 ;
typeOfFirstFixedSurface = 103 ;
scaledValueOfFirstFixedSurface = 2 ;
scaleFactorOfFirstFixedSurface = 0 ;
typeOfStatisticalProcessing = 2 ;
}
#Minimum temperature at 2 metres since previous post-processing
'Minimum temperature at 2 metres since previous post-processing' = {
discipline = 0 ;
parameterCategory = 0 ;
parameterNumber = 0 ;
typeOfFirstFixedSurface = 103 ;
scaledValueOfFirstFixedSurface = 2 ;
scaleFactorOfFirstFixedSurface = 0 ;
typeOfStatisticalProcessing = 3 ;
}
#Maximum temperature at 2 metres since previous post-processing
'Maximum temperature at 2 metres since previous post-processing' = {
discipline = 0 ;
parameterCategory = 0 ;
parameterNumber = 0 ;
typeOfFirstFixedSurface = 103 ;
scaledValueOfFirstFixedSurface = 15 ;
scaleFactorOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 2 ;
}
#Minimum temperature at 2 metres since previous post-processing
'Minimum temperature at 2 metres since previous post-processing' = {
discipline = 0 ;
parameterCategory = 0 ;
parameterNumber = 0 ;
typeOfFirstFixedSurface = 103 ;
scaledValueOfFirstFixedSurface = 15 ;
scaleFactorOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 3 ;
}
#Evaporation
'Evaporation' = {
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 79 ;
typeOfFirstFixedSurface = 1 ;
indicatorOfUnitForTimeRange = 1 ;
typeOfStatisticalProcessing = 1 ;
lengthOfTimeRange = 6 ;
}
#Evaporation
'Evaporation' = {
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 79 ;
typeOfFirstFixedSurface = 1 ;
indicatorOfUnitForTimeRange = 1 ;
typeOfStatisticalProcessing = 1 ;
lengthOfTimeRange = 24 ;
}
#2 metre temperature
'2 metre temperature' = {
discipline = 0 ;
parameterCategory = 0 ;
parameterNumber = 0 ;
typeOfFirstFixedSurface = 103 ;
scaleFactorOfFirstFixedSurface = 1 ;
scaledValueOfFirstFixedSurface = 15 ;
}
#Surface air relative humidity
'Surface air relative humidity' = {
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 1 ;
scaledValueOfFirstFixedSurface = 15 ;
scaleFactorOfFirstFixedSurface = 1 ;
typeOfFirstFixedSurface = 103 ;
}

120
definitions/grib2/localConcepts/uerra/paramId.def Normal file
View File

@ -0,0 +1,120 @@
#Wind speed
'10' = {
discipline = 0 ;
parameterCategory = 2 ;
parameterNumber = 1 ;
typeOfFirstFixedSurface = 103 ;
scaledValueOfFirstFixedSurface = 100 ;
scaleFactorOfFirstFixedSurface = 0 ;
}
#Wind speed
'10' = {
discipline = 0 ;
parameterCategory = 2 ;
parameterNumber = 1 ;
typeOfFirstFixedSurface = 103 ;
scaledValueOfFirstFixedSurface = 200 ;
scaleFactorOfFirstFixedSurface = 0 ;
}
#10 metre wind gust since previous post-processing
'49' = {
discipline = 0 ;
parameterCategory = 2 ;
parameterNumber = 22 ;
typeOfFirstFixedSurface = 103 ;
scaledValueOfFirstFixedSurface = 10 ;
scaleFactorOfFirstFixedSurface = 0 ;
typeOfStatisticalProcessing = 2 ;
indicatorOfUnitForTimeRange = 1 ;
lengthOfTimeRange = 3 ;
}
#10 metre wind gust since previous post-processing
'49' = {
discipline = 0 ;
parameterCategory = 2 ;
parameterNumber = 22 ;
typeOfFirstFixedSurface = 103 ;
scaledValueOfFirstFixedSurface = 10 ;
scaleFactorOfFirstFixedSurface = 0 ;
typeOfStatisticalProcessing = 2 ;
indicatorOfUnitForTimeRange = 1 ;
lengthOfTimeRange = 1 ;
}
#Maximum temperature at 2 metres since previous post-processing
'201' = {
discipline = 0 ;
parameterCategory = 0 ;
parameterNumber = 0 ;
typeOfFirstFixedSurface = 103 ;
scaledValueOfFirstFixedSurface = 2 ;
scaleFactorOfFirstFixedSurface = 0 ;
typeOfStatisticalProcessing = 2 ;
}
#Minimum temperature at 2 metres since previous post-processing
'202' = {
discipline = 0 ;
parameterCategory = 0 ;
parameterNumber = 0 ;
typeOfFirstFixedSurface = 103 ;
scaledValueOfFirstFixedSurface = 2 ;
scaleFactorOfFirstFixedSurface = 0 ;
typeOfStatisticalProcessing = 3 ;
}
#Maximum temperature at 2 metres since previous post-processing
'201' = {
discipline = 0 ;
parameterCategory = 0 ;
parameterNumber = 0 ;
typeOfFirstFixedSurface = 103 ;
scaledValueOfFirstFixedSurface = 15 ;
scaleFactorOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 2 ;
}
#Minimum temperature at 2 metres since previous post-processing
'202' = {
discipline = 0 ;
parameterCategory = 0 ;
parameterNumber = 0 ;
typeOfFirstFixedSurface = 103 ;
scaledValueOfFirstFixedSurface = 15 ;
scaleFactorOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 3 ;
}
#Evaporation
'260259' = {
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 79 ;
typeOfFirstFixedSurface = 1 ;
indicatorOfUnitForTimeRange = 1 ;
typeOfStatisticalProcessing = 1 ;
lengthOfTimeRange = 6 ;
}
#Evaporation
'260259' = {
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 79 ;
typeOfFirstFixedSurface = 1 ;
indicatorOfUnitForTimeRange = 1 ;
typeOfStatisticalProcessing = 1 ;
lengthOfTimeRange = 24 ;
}
#2 metre temperature
'167' = {
discipline = 0 ;
parameterCategory = 0 ;
parameterNumber = 0 ;
typeOfFirstFixedSurface = 103 ;
scaledValueOfFirstFixedSurface = 15 ;
scaleFactorOfFirstFixedSurface = 1 ;
}
#Surface air relative humidity
'260242' = {
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 1 ;
typeOfFirstFixedSurface = 103 ;
scaledValueOfFirstFixedSurface = 15 ;
scaleFactorOfFirstFixedSurface = 1 ;
}

120
definitions/grib2/localConcepts/uerra/shortName.def Normal file
View File

@ -0,0 +1,120 @@
#Wind speed
'ws' = {
discipline = 0 ;
parameterCategory = 2 ;
parameterNumber = 1 ;
typeOfFirstFixedSurface = 103 ;
scaledValueOfFirstFixedSurface = 100 ;
scaleFactorOfFirstFixedSurface = 0 ;
}
#Wind speed
'ws' = {
discipline = 0 ;
parameterCategory = 2 ;
parameterNumber = 1 ;
typeOfFirstFixedSurface = 103 ;
scaledValueOfFirstFixedSurface = 200 ;
scaleFactorOfFirstFixedSurface = 0 ;
}
#10 metre wind gust since previous post-processing
'10fg' = {
discipline = 0 ;
parameterCategory = 2 ;
parameterNumber = 22 ;
typeOfFirstFixedSurface = 103 ;
scaledValueOfFirstFixedSurface = 10 ;
scaleFactorOfFirstFixedSurface = 0 ;
typeOfStatisticalProcessing = 2 ;
indicatorOfUnitForTimeRange = 1 ;
lengthOfTimeRange = 3 ;
}
#10 metre wind gust since previous post-processing
'10fg' = {
discipline = 0 ;
parameterCategory = 2 ;
parameterNumber = 22 ;
typeOfFirstFixedSurface = 103 ;
scaledValueOfFirstFixedSurface = 10 ;
scaleFactorOfFirstFixedSurface = 0 ;
typeOfStatisticalProcessing = 2 ;
indicatorOfUnitForTimeRange = 1 ;
lengthOfTimeRange = 1 ;
}
#Maximum temperature at 2 metres since previous post-processing
'mx2t' = {
discipline = 0 ;
parameterCategory = 0 ;
parameterNumber = 0 ;
typeOfFirstFixedSurface = 103 ;
scaledValueOfFirstFixedSurface = 2 ;
scaleFactorOfFirstFixedSurface = 0 ;
typeOfStatisticalProcessing = 2 ;
}
#Minimum temperature at 2 metres since previous post-processing
'mn2t' = {
discipline = 0 ;
parameterCategory = 0 ;
parameterNumber = 0 ;
typeOfFirstFixedSurface = 103 ;
scaledValueOfFirstFixedSurface = 2 ;
scaleFactorOfFirstFixedSurface = 0 ;
typeOfStatisticalProcessing = 3 ;
}
#Maximum temperature at 2 metres since previous post-processing
'mx2t' = {
discipline = 0 ;
parameterCategory = 0 ;
parameterNumber = 0 ;
typeOfFirstFixedSurface = 103 ;
scaledValueOfFirstFixedSurface = 15 ;
scaleFactorOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 2 ;
}
#Minimum temperature at 2 metres since previous post-processing
'mn2t' = {
discipline = 0 ;
parameterCategory = 0 ;
parameterNumber = 0 ;
typeOfFirstFixedSurface = 103 ;
scaledValueOfFirstFixedSurface = 15 ;
scaleFactorOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 3 ;
}
#Evaporation
'eva' = {
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 79 ;
typeOfFirstFixedSurface = 1 ;
indicatorOfUnitForTimeRange = 1 ;
typeOfStatisticalProcessing = 1 ;
lengthOfTimeRange = 6 ;
}
#Evaporation
'eva' = {
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 79 ;
typeOfFirstFixedSurface = 1 ;
indicatorOfUnitForTimeRange = 1 ;
typeOfStatisticalProcessing = 1 ;
lengthOfTimeRange = 24 ;
}
#2 metre temperature
'2t' = {
discipline = 0 ;
parameterCategory = 0 ;
parameterNumber = 0 ;
typeOfFirstFixedSurface = 103 ;
scaledValueOfFirstFixedSurface = 15 ;
scaleFactorOfFirstFixedSurface = 1 ;
}
#Surface air relative humidity
'2r' = {
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 1 ;
typeOfFirstFixedSurface = 103 ;
scaledValueOfFirstFixedSurface = 15 ;
scaleFactorOfFirstFixedSurface = 1 ;
}

120
definitions/grib2/localConcepts/uerra/units.def Normal file
View File

@ -0,0 +1,120 @@
#Wind speed
'm s**-1' = {
discipline = 0 ;
parameterCategory = 2 ;
parameterNumber = 1 ;
typeOfFirstFixedSurface = 103 ;
scaledValueOfFirstFixedSurface = 100 ;
scaleFactorOfFirstFixedSurface = 0 ;
}
#Wind speed
'm s**-1' = {
discipline = 0 ;
parameterCategory = 2 ;
parameterNumber = 1 ;
typeOfFirstFixedSurface = 103 ;
scaledValueOfFirstFixedSurface = 200 ;
scaleFactorOfFirstFixedSurface = 0 ;
}
#10 metre wind gust since previous post-processing
'm s**-1' = {
discipline = 0 ;
parameterCategory = 2 ;
parameterNumber = 22 ;
typeOfFirstFixedSurface = 103 ;
scaledValueOfFirstFixedSurface = 10 ;
scaleFactorOfFirstFixedSurface = 0 ;
typeOfStatisticalProcessing = 2 ;
indicatorOfUnitForTimeRange = 1 ;
lengthOfTimeRange = 3 ;
}
#10 metre wind gust since previous post-processing
'm s**-1' = {
discipline = 0 ;
parameterCategory = 2 ;
parameterNumber = 22 ;
typeOfFirstFixedSurface = 103 ;
scaledValueOfFirstFixedSurface = 10 ;
scaleFactorOfFirstFixedSurface = 0 ;
typeOfStatisticalProcessing = 2 ;
indicatorOfUnitForTimeRange = 1 ;
lengthOfTimeRange = 1 ;
}
#Maximum temperature at 2 metres since previous post-processing
'K' = {
discipline = 0 ;
parameterCategory = 0 ;
parameterNumber = 0 ;
typeOfFirstFixedSurface = 103 ;
scaledValueOfFirstFixedSurface = 2 ;
scaleFactorOfFirstFixedSurface = 0 ;
typeOfStatisticalProcessing = 2 ;
}
#Minimum temperature at 2 metres since previous post-processing
'K' = {
discipline = 0 ;
parameterCategory = 0 ;
parameterNumber = 0 ;
typeOfFirstFixedSurface = 103 ;
scaledValueOfFirstFixedSurface = 2 ;
scaleFactorOfFirstFixedSurface = 0 ;
typeOfStatisticalProcessing = 3 ;
}
#Maximum temperature at 2 metres since previous post-processing
'K' = {
discipline = 0 ;
parameterCategory = 0 ;
parameterNumber = 0 ;
typeOfFirstFixedSurface = 103 ;
scaledValueOfFirstFixedSurface = 15 ;
scaleFactorOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 2 ;
}
#Minimum temperature at 2 metres since previous post-processing
'K' = {
discipline = 0 ;
parameterCategory = 0 ;
parameterNumber = 0 ;
typeOfFirstFixedSurface = 103 ;
scaledValueOfFirstFixedSurface = 15 ;
scaleFactorOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 3 ;
}
#Evaporation
'kg m**-2' = {
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 79 ;
typeOfFirstFixedSurface = 1 ;
indicatorOfUnitForTimeRange = 1 ;
typeOfStatisticalProcessing = 1 ;
lengthOfTimeRange = 6 ;
}
#Evaporation
'kg m**-2' = {
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 79 ;
typeOfFirstFixedSurface = 1 ;
indicatorOfUnitForTimeRange = 1 ;
typeOfStatisticalProcessing = 1 ;
lengthOfTimeRange = 24 ;
}
#2 metre temperature
'K' = {
discipline = 0 ;
parameterCategory = 0 ;
parameterNumber = 0 ;
typeOfFirstFixedSurface = 103 ;
scaleFactorOfFirstFixedSurface = 1 ;
scaledValueOfFirstFixedSurface = 15 ;
}
#Surface air relative humidity
'%' = {
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 1 ;
scaledValueOfFirstFixedSurface = 15 ;
scaleFactorOfFirstFixedSurface = 1 ;
typeOfFirstFixedSurface = 103 ;
}

80
definitions/grib2/name.def
View File

@ -113,26 +113,6 @@
parameterCategory = 2 ;
parameterNumber = 1 ;
}
#Wind speed
'Wind speed' = {
discipline = 0 ;
parameterCategory = 2 ;
parameterNumber = 1 ;
typeOfFirstFixedSurface = 103 ;
scaledValueOfFirstFixedSurface = 100 ;
scaleFactorOfFirstFixedSurface = 0 ;
is_uerra = 1 ;
}
#Wind speed
'Wind speed' = {
discipline = 0 ;
parameterCategory = 2 ;
parameterNumber = 1 ;
typeOfFirstFixedSurface = 103 ;
scaledValueOfFirstFixedSurface = 200 ;
scaleFactorOfFirstFixedSurface = 0 ;
is_uerra = 1 ;
}
#Unbalanced component of temperature
'Unbalanced component of temperature' = {
discipline = 0 ;
@ -185,17 +165,6 @@
typeOfSecondFixedSurface = 255 ;
typeOfStatisticalProcessing = 1 ;
}
#10 metre wind gust since previous post-processing
'10 metre wind gust since previous post-processing' = {
discipline = 0 ;
parameterCategory = 2 ;
parameterNumber = 22 ;
typeOfFirstFixedSurface = 103 ;
scaledValueOfFirstFixedSurface = 10 ;
scaleFactorOfFirstFixedSurface = 0 ;
typeOfStatisticalProcessing = 2 ;
is_uerra = 1 ;
}
#Specific rain water content
'Specific rain water content' = {
discipline = 0 ;
@ -266,28 +235,6 @@
parameterCategory = 2 ;
parameterNumber = 37 ;
}
#Maximum temperature at 2 metres since previous post-processing
'Maximum temperature at 2 metres since previous post-processing' = {
discipline = 0 ;
parameterCategory = 0 ;
parameterNumber = 0 ;
typeOfFirstFixedSurface = 103 ;
scaledValueOfFirstFixedSurface = 2 ;
scaleFactorOfFirstFixedSurface = 0 ;
typeOfStatisticalProcessing = 2 ;
is_uerra = 1 ;
}
#Minimum temperature at 2 metres since previous post-processing
'Minimum temperature at 2 metres since previous post-processing' = {
discipline = 0 ;
parameterCategory = 0 ;
parameterNumber = 0 ;
typeOfFirstFixedSurface = 103 ;
scaledValueOfFirstFixedSurface = 2 ;
scaleFactorOfFirstFixedSurface = 0 ;
typeOfStatisticalProcessing = 3 ;
is_uerra = 1 ;
}
#Ozone mass mixing ratio
'Ozone mass mixing ratio' = {
discipline = 0 ;
@ -1113,7 +1060,6 @@
indicatorOfUnitForTimeRange = 1 ;
typeOfStatisticalProcessing = 2 ;
lengthOfTimeRange = 3 ;
is_uerra = 0 ;
}
#Relative humidity with respect to water
'Relative humidity with respect to water' = {
@ -1901,7 +1847,6 @@
indicatorOfUnitForTimeRange = 1 ;
typeOfStatisticalProcessing = 1 ;
lengthOfTimeRange = 6 ;
is_uerra = 0 ;
}
#Evaporation in the last 24 hours
'Evaporation in the last 24 hours' = {
@ -1912,29 +1857,6 @@
indicatorOfUnitForTimeRange = 1 ;
typeOfStatisticalProcessing = 1 ;
lengthOfTimeRange = 24 ;
is_uerra = 0 ;
}
#Total precipitation in the last 6 hours
'Total precipitation in the last 6 hours' = {
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 52 ;
typeOfFirstFixedSurface = 1 ;
indicatorOfUnitForTimeRange = 1 ;
typeOfStatisticalProcessing = 1 ;
lengthOfTimeRange = 6 ;
is_efas = 1 ;
}
#Total precipitation in the last 24 hours
'Total precipitation in the last 24 hours' = {
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 52 ;
typeOfFirstFixedSurface = 1 ;
indicatorOfUnitForTimeRange = 1 ;
typeOfStatisticalProcessing = 1 ;
lengthOfTimeRange = 24 ;
is_efas = 1 ;
}
#Fraction of snow cover
'Fraction of snow cover' = {
@ -2708,7 +2630,6 @@
indicatorOfUnitForTimeRange = 1 ;
typeOfStatisticalProcessing = 2 ;
lengthOfTimeRange = 6 ;
is_uerra = 0 ;
}
#Minimum temperature at 2 metres in the last 6 hours
'Minimum temperature at 2 metres in the last 6 hours' = {
@ -2721,7 +2642,6 @@
indicatorOfUnitForTimeRange = 1 ;
typeOfStatisticalProcessing = 3 ;
lengthOfTimeRange = 6 ;
is_uerra = 0 ;
}
#Geopotential
'Geopotential' = {

80
definitions/grib2/paramId.def
View File

@ -113,26 +113,6 @@
parameterCategory = 2 ;
parameterNumber = 1 ;
}
#Wind speed
'10' = {
discipline = 0 ;
parameterCategory = 2 ;
parameterNumber = 1 ;
typeOfFirstFixedSurface = 103 ;
scaledValueOfFirstFixedSurface = 100 ;
scaleFactorOfFirstFixedSurface = 0 ;
is_uerra = 1 ;
}
#Wind speed
'10' = {
discipline = 0 ;
parameterCategory = 2 ;
parameterNumber = 1 ;
typeOfFirstFixedSurface = 103 ;
scaledValueOfFirstFixedSurface = 200 ;
scaleFactorOfFirstFixedSurface = 0 ;
is_uerra = 1 ;
}
#Unbalanced component of temperature
'21' = {
discipline = 0 ;
@ -185,17 +165,6 @@
typeOfSecondFixedSurface = 255 ;
typeOfStatisticalProcessing = 1 ;
}
#10 metre wind gust since previous post-processing
'49' = {
discipline = 0 ;
parameterCategory = 2 ;
parameterNumber = 22 ;
typeOfFirstFixedSurface = 103 ;
scaledValueOfFirstFixedSurface = 10 ;
scaleFactorOfFirstFixedSurface = 0 ;
typeOfStatisticalProcessing = 2 ;
is_uerra = 1 ;
}
#Specific rain water content
'75' = {
discipline = 0 ;
@ -266,28 +235,6 @@
parameterCategory = 2 ;
parameterNumber = 37 ;
}
#Maximum temperature at 2 metres since previous post-processing
'201' = {
discipline = 0 ;
parameterCategory = 0 ;
parameterNumber = 0 ;
typeOfFirstFixedSurface = 103 ;
scaledValueOfFirstFixedSurface = 2 ;
scaleFactorOfFirstFixedSurface = 0 ;
typeOfStatisticalProcessing = 2 ;
is_uerra = 1 ;
}
#Minimum temperature at 2 metres since previous post-processing
'202' = {
discipline = 0 ;
parameterCategory = 0 ;
parameterNumber = 0 ;
typeOfFirstFixedSurface = 103 ;
scaledValueOfFirstFixedSurface = 2 ;
scaleFactorOfFirstFixedSurface = 0 ;
typeOfStatisticalProcessing = 3 ;
is_uerra = 1 ;
}
#Ozone mass mixing ratio
'203' = {
discipline = 0 ;
@ -1113,7 +1060,6 @@
indicatorOfUnitForTimeRange = 1 ;
typeOfStatisticalProcessing = 2 ;
lengthOfTimeRange = 3 ;
is_uerra = 0 ;
}
#Relative humidity with respect to water
'228030' = {
@ -1901,7 +1847,6 @@
indicatorOfUnitForTimeRange = 1 ;
typeOfStatisticalProcessing = 1 ;
lengthOfTimeRange = 6 ;
is_uerra = 0 ;
}
#Evaporation in the last 24 hours
'260266' = {
@ -1912,29 +1857,6 @@
indicatorOfUnitForTimeRange = 1 ;
typeOfStatisticalProcessing = 1 ;
lengthOfTimeRange = 24 ;
is_uerra = 0 ;
}
#Total precipitation in the last 6 hours
'260267' = {
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 52 ;
typeOfFirstFixedSurface = 1 ;
indicatorOfUnitForTimeRange = 1 ;
typeOfStatisticalProcessing = 1 ;
lengthOfTimeRange = 6 ;
is_efas = 1 ;
}
#Total precipitation in the last 24 hours
'260268' = {
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 52 ;
typeOfFirstFixedSurface = 1 ;
indicatorOfUnitForTimeRange = 1 ;
typeOfStatisticalProcessing = 1 ;
lengthOfTimeRange = 24 ;
is_efas = 1 ;
}
#Fraction of snow cover
'260289' = {
@ -2708,7 +2630,6 @@
indicatorOfUnitForTimeRange = 1 ;
typeOfStatisticalProcessing = 2 ;
lengthOfTimeRange = 6 ;
is_uerra = 0 ;
}
#Minimum temperature at 2 metres in the last 6 hours
'122' = {
@ -2721,7 +2642,6 @@
indicatorOfUnitForTimeRange = 1 ;
typeOfStatisticalProcessing = 3 ;
lengthOfTimeRange = 6 ;
is_uerra = 0 ;
}
#Geopotential
'129' = {

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

@ -116,14 +116,6 @@ if ( ((section1Length > 21) or setCalendarId > 0) and deleteCalendarId == 0) {
template calendarIdentification "grib2/template.1.[calendarIdentificationTemplateNumber:l].def";
}
concept is_uerra(zero) {
'1' = {productionStatusOfProcessedData=10;}
'1' = {productionStatusOfProcessedData=11;}
'1' = {productionStatusOfProcessedData=9;}
'1' = {productionStatusOfProcessedData=8;}
'0' = {dummy=1;}
}
constant conceptsMasterDir="grib2" : hidden;
constant conceptsLocalDirAll="grib2/localConcepts/[centre:s]" : hidden;
constant conceptsLocalDirECMF="grib2/localConcepts/ecmf" : hidden;

19
definitions/grib2/section.4.def
View File

@ -23,6 +23,25 @@ if (centre==7 || centre==46) {
alias disableGrib1LocalSection=one;
}
concept datasetForLocal(unknown) {
# "tigge" = {productionStatusOfProcessedData=4;}
# "tigge" = {productionStatusOfProcessedData=5;}
# "s2s" = {productionStatusOfProcessedData=6;}
# "s2s" = {productionStatusOfProcessedData=7;}
"hydro" = {marsClass="ce";} # EFAS/GLOFAS
"hydro" = {marsClass="ul";} #ULYSSES
"uerra" = {productionStatusOfProcessedData=8;} # UERRA
"uerra" = {productionStatusOfProcessedData=9;} # UERRA
"uerra" = {productionStatusOfProcessedData=10;} # CARRA/CERRA
"uerra" = {productionStatusOfProcessedData=11;} # CARRA/CERRA
"unknown" = { dummy=1; }
}
if (!(datasetForLocal is "unknown")) {
constant conceptsDir2 = "grib2/localConcepts/[datasetForLocal]": hidden;
constant conceptsDir1 = "grib2": hidden;
}
codetable[2] productDefinitionTemplateNumber('4.0.table',masterDir,localDir) : dump;
if (section2Used == 1) {

80
definitions/grib2/shortName.def
View File

@ -113,26 +113,6 @@
parameterCategory = 2 ;
parameterNumber = 1 ;
}
#Wind speed
'ws' = {
discipline = 0 ;
parameterCategory = 2 ;
parameterNumber = 1 ;
typeOfFirstFixedSurface = 103 ;
scaledValueOfFirstFixedSurface = 100 ;
scaleFactorOfFirstFixedSurface = 0 ;
is_uerra = 1 ;
}
#Wind speed
'ws' = {
discipline = 0 ;
parameterCategory = 2 ;
parameterNumber = 1 ;
typeOfFirstFixedSurface = 103 ;
scaledValueOfFirstFixedSurface = 200 ;
scaleFactorOfFirstFixedSurface = 0 ;
is_uerra = 1 ;
}
#Unbalanced component of temperature
'uctp' = {
discipline = 0 ;
@ -185,17 +165,6 @@
typeOfSecondFixedSurface = 255 ;
typeOfStatisticalProcessing = 1 ;
}
#10 metre wind gust since previous post-processing
'10fg' = {
discipline = 0 ;
parameterCategory = 2 ;
parameterNumber = 22 ;
typeOfFirstFixedSurface = 103 ;
scaledValueOfFirstFixedSurface = 10 ;
scaleFactorOfFirstFixedSurface = 0 ;
typeOfStatisticalProcessing = 2 ;
is_uerra = 1 ;
}
#Specific rain water content
'crwc' = {
discipline = 0 ;
@ -266,28 +235,6 @@
parameterCategory = 2 ;
parameterNumber = 37 ;
}
#Maximum temperature at 2 metres since previous post-processing
'mx2t' = {
discipline = 0 ;
parameterCategory = 0 ;
parameterNumber = 0 ;
typeOfFirstFixedSurface = 103 ;
scaledValueOfFirstFixedSurface = 2 ;
scaleFactorOfFirstFixedSurface = 0 ;
typeOfStatisticalProcessing = 2 ;
is_uerra = 1 ;
}
#Minimum temperature at 2 metres since previous post-processing
'mn2t' = {
discipline = 0 ;
parameterCategory = 0 ;
parameterNumber = 0 ;
typeOfFirstFixedSurface = 103 ;
scaledValueOfFirstFixedSurface = 2 ;
scaleFactorOfFirstFixedSurface = 0 ;
typeOfStatisticalProcessing = 3 ;
is_uerra = 1 ;
}
#Ozone mass mixing ratio
'o3' = {
discipline = 0 ;
@ -1113,7 +1060,6 @@
indicatorOfUnitForTimeRange = 1 ;
typeOfStatisticalProcessing = 2 ;
lengthOfTimeRange = 3 ;
is_uerra = 0 ;
}
#Relative humidity with respect to water
'rhw' = {
@ -1901,7 +1847,6 @@
indicatorOfUnitForTimeRange = 1 ;
typeOfStatisticalProcessing = 1 ;
lengthOfTimeRange = 6 ;
is_uerra = 0 ;
}
#Evaporation in the last 24 hours
'eva24' = {
@ -1912,29 +1857,6 @@
indicatorOfUnitForTimeRange = 1 ;
typeOfStatisticalProcessing = 1 ;
lengthOfTimeRange = 24 ;
is_uerra = 0 ;
}
#Total precipitation in the last 6 hours
'tp06' = {
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 52 ;
typeOfFirstFixedSurface = 1 ;
indicatorOfUnitForTimeRange = 1 ;
typeOfStatisticalProcessing = 1 ;
lengthOfTimeRange = 6 ;
is_efas = 1 ;
}
#Total precipitation in the last 24 hours
'tp24' = {
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 52 ;
typeOfFirstFixedSurface = 1 ;
indicatorOfUnitForTimeRange = 1 ;
typeOfStatisticalProcessing = 1 ;
lengthOfTimeRange = 24 ;
is_efas = 1 ;
}
#Fraction of snow cover
'fscov' = {
@ -2708,7 +2630,6 @@
indicatorOfUnitForTimeRange = 1 ;
typeOfStatisticalProcessing = 2 ;
lengthOfTimeRange = 6 ;
is_uerra = 0 ;
}
#Minimum temperature at 2 metres in the last 6 hours
'mn2t6' = {
@ -2721,7 +2642,6 @@
indicatorOfUnitForTimeRange = 1 ;
typeOfStatisticalProcessing = 3 ;
lengthOfTimeRange = 6 ;
is_uerra = 0 ;
}
#Geopotential
'z' = {

80
definitions/grib2/units.def
View File

@ -113,26 +113,6 @@
parameterCategory = 2 ;
parameterNumber = 1 ;
}
#Wind speed
'm s**-1' = {
discipline = 0 ;
parameterCategory = 2 ;
parameterNumber = 1 ;
typeOfFirstFixedSurface = 103 ;
scaledValueOfFirstFixedSurface = 100 ;
scaleFactorOfFirstFixedSurface = 0 ;
is_uerra = 1 ;
}
#Wind speed
'm s**-1' = {
discipline = 0 ;
parameterCategory = 2 ;
parameterNumber = 1 ;
typeOfFirstFixedSurface = 103 ;
scaledValueOfFirstFixedSurface = 200 ;
scaleFactorOfFirstFixedSurface = 0 ;
is_uerra = 1 ;
}
#Unbalanced component of temperature
'K' = {
discipline = 0 ;
@ -185,17 +165,6 @@
typeOfSecondFixedSurface = 255 ;
typeOfStatisticalProcessing = 1 ;
}
#10 metre wind gust since previous post-processing
'm s**-1' = {
discipline = 0 ;
parameterCategory = 2 ;
parameterNumber = 22 ;
typeOfFirstFixedSurface = 103 ;
scaledValueOfFirstFixedSurface = 10 ;
scaleFactorOfFirstFixedSurface = 0 ;
typeOfStatisticalProcessing = 2 ;
is_uerra = 1 ;
}
#Specific rain water content
'kg kg**-1' = {
discipline = 0 ;
@ -266,28 +235,6 @@
parameterCategory = 2 ;
parameterNumber = 37 ;
}
#Maximum temperature at 2 metres since previous post-processing
'K' = {
discipline = 0 ;
parameterCategory = 0 ;
parameterNumber = 0 ;
typeOfFirstFixedSurface = 103 ;
scaledValueOfFirstFixedSurface = 2 ;
scaleFactorOfFirstFixedSurface = 0 ;
typeOfStatisticalProcessing = 2 ;
is_uerra = 1 ;
}
#Minimum temperature at 2 metres since previous post-processing
'K' = {
discipline = 0 ;
parameterCategory = 0 ;
parameterNumber = 0 ;
typeOfFirstFixedSurface = 103 ;
scaledValueOfFirstFixedSurface = 2 ;
scaleFactorOfFirstFixedSurface = 0 ;
typeOfStatisticalProcessing = 3 ;
is_uerra = 1 ;
}
#Ozone mass mixing ratio
'kg kg**-1' = {
discipline = 0 ;
@ -1113,7 +1060,6 @@
indicatorOfUnitForTimeRange = 1 ;
typeOfStatisticalProcessing = 2 ;
lengthOfTimeRange = 3 ;
is_uerra = 0 ;
}
#Relative humidity with respect to water
'%' = {
@ -1901,7 +1847,6 @@
indicatorOfUnitForTimeRange = 1 ;
typeOfStatisticalProcessing = 1 ;
lengthOfTimeRange = 6 ;
is_uerra = 0 ;
}
#Evaporation in the last 24 hours
'kg m**-2' = {
@ -1912,29 +1857,6 @@
indicatorOfUnitForTimeRange = 1 ;
typeOfStatisticalProcessing = 1 ;
lengthOfTimeRange = 24 ;
is_uerra = 0 ;
}
#Total precipitation in the last 6 hours
'kg m**-2' = {
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 52 ;
typeOfFirstFixedSurface = 1 ;
indicatorOfUnitForTimeRange = 1 ;
typeOfStatisticalProcessing = 1 ;
lengthOfTimeRange = 6 ;
is_efas = 1 ;
}
#Total precipitation in the last 24 hours
'kg m**-2' = {
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 52 ;
typeOfFirstFixedSurface = 1 ;
indicatorOfUnitForTimeRange = 1 ;
typeOfStatisticalProcessing = 1 ;
lengthOfTimeRange = 24 ;
is_efas = 1 ;
}
#Fraction of snow cover
'Proportion' = {
@ -2708,7 +2630,6 @@
indicatorOfUnitForTimeRange = 1 ;
typeOfStatisticalProcessing = 2 ;
lengthOfTimeRange = 6 ;
is_uerra = 0 ;
}
#Minimum temperature at 2 metres in the last 6 hours
'K' = {
@ -2721,7 +2642,6 @@
indicatorOfUnitForTimeRange = 1 ;
typeOfStatisticalProcessing = 3 ;
lengthOfTimeRange = 6 ;
is_uerra = 0 ;
}
#Geopotential
'm**2 s**-2' = {

1
tests/CMakeLists.txt
View File

@ -84,7 +84,6 @@ if( HAVE_BUILD_TOOLS )
grib_ecc-1195
grib_ecc-1212
grib_ecc-1230
grib_ecc-1255
grib_ecc-1258
grib_ecc-1260
grib_ecc-1261

43
tests/grib_ecc-1255.sh
View File

@ -1,43 +0,0 @@
#!/bin/sh
# (C) Copyright 2005- ECMWF.
#
# This software is licensed under the terms of the Apache Licence Version 2.0
# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
#
# 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.
#
. ./include.sh
set -u
label="grib_ecc-1255-test"
tempGrib=temp.$label.grib
tempFilt1=temp.1.$label.filt
tempFilt2=temp.2.$label.filt
sample_grib2=$ECCODES_SAMPLES_PATH/GRIB2.tmpl
# Non-EFAS GRIB
# -----------------
cat > $tempFilt1 <<EOF
print "is_efas=[is_efas]";
EOF
result=`${tools_dir}/grib_filter $tempFilt1 $sample_grib2`
[ "$result" = "is_efas=0" ]
# EFAS GRIB
# -----------
cat > $tempFilt2 <<EOF
set setLocalDefinition = 1;
set localDefinitionNumber = 41; # sets is_efas to 1
write;
EOF
${tools_dir}/grib_filter -o $tempGrib $tempFilt2 $sample_grib2
result=`${tools_dir}/grib_filter $tempFilt1 $tempGrib`
[ "$result" = "is_efas=1" ]
# Clean up
rm -f $tempGrib $tempFilt1 $tempFilt2

33
tests/grib_efas.sh
View File

@ -20,33 +20,32 @@ temp3=temp3.$label.grib
# Stream EFAS
# ---------------------------
# Create a starting GRIB with a basic local definition for MARS
${tools_dir}/grib_set -s tablesVersion=19,setLocalDefinition=1,stream=efas $ECCODES_SAMPLES_PATH/GRIB2.tmpl $sample
# Check is_efas key
grib_check_key_equals $sample is_efas 0
# The MARS class must be set to categorise the EFAS parameters as 'hydrological'
# See key 'datasetForLocal'
${tools_dir}/grib_set -s tablesVersion=19,setLocalDefinition=1,class=ce,stream=efas $ECCODES_SAMPLES_PATH/GRIB2.tmpl $sample
# Test a non-ensemble, instantaneous field
${tools_dir}/grib_set -s productDefinitionTemplateNumber=0 $sample $temp1
${tools_dir}/grib_set -s setLocalDefinition=1,localDefinitionNumber=41 $temp1 $temp2
grib_check_key_equals $temp2 is_efas,productDefinitionTemplateNumber '1 70'
grib_check_key_equals $temp2 productDefinitionTemplateNumber '70'
grib_check_key_exists $temp2 isFillup,dateOfForecast,timeOfForecast,anoffset
# Test an ensemble, instantaneous field
${tools_dir}/grib_set -s productDefinitionTemplateNumber=1,number=13 $sample $temp1
${tools_dir}/grib_set -s setLocalDefinition=1,localDefinitionNumber=41 $temp1 $temp2
grib_check_key_equals $temp2 is_efas,number,productDefinitionTemplateNumber '1 13 71'
grib_check_key_equals $temp2 number,productDefinitionTemplateNumber '13 71'
# Test a non-ensemble, non-instantaneous field
${tools_dir}/grib_set -s productDefinitionTemplateNumber=8,stepType=accum $sample $temp1
${tools_dir}/grib_set -s setLocalDefinition=1,localDefinitionNumber=41 $temp1 $temp2
grib_check_key_equals $temp2 is_efas,productDefinitionTemplateNumber,typeOfStatisticalProcessing '1 72 1'
grib_check_key_equals $temp2 productDefinitionTemplateNumber,typeOfStatisticalProcessing '72 1'
# Test an ensemble, non-instantaneous field (plus mars.origin tests)
${tools_dir}/grib_set -s productDefinitionTemplateNumber=11,stepType=accum $sample $temp1
${tools_dir}/grib_set -s \
setLocalDefinition=1,localDefinitionNumber=41,type=pf,inputOriginatingCentre=ecmf,typeOfPostProcessing=1 \
$temp1 $temp2
grib_check_key_equals $temp2 is_efas,productDefinitionTemplateNumber,typeOfStatisticalProcessing '1 73 1'
grib_check_key_equals $temp2 productDefinitionTemplateNumber,typeOfStatisticalProcessing '73 1'
grib_check_key_equals $temp2 mars.origin 'ecmf'
grib_check_key_equals $temp2 mars.model 'lisflood'
@ -57,10 +56,10 @@ grib_check_key_equals $temp2 mars.model 'geff'
# Parameter tests
${tools_dir}/grib_set -s paramId=260267 $temp2 $temp3
grib_check_key_equals $temp3 paramId,is_efas,lengthOfTimeRange '260267 1 6'
grib_check_key_equals $temp3 paramId,lengthOfTimeRange '260267 6'
${tools_dir}/grib_set -s paramId=260268 $temp2 $temp3
grib_check_key_equals $temp3 paramId,is_efas,lengthOfTimeRange '260268 1 24'
grib_check_key_equals $temp3 paramId,lengthOfTimeRange '260268 24'
# Use stepType
${tools_dir}/grib_set -s localDefinitionNumber=41,stepType=accum $sample $temp1
@ -75,18 +74,22 @@ grib_check_key_equals $temp1 anoffsetFirst,anoffsetLast,anoffsetFrequency "MISSI
# MARS step
types="sfo fu go"
for t in $types; do
${tools_dir}/grib_set -s setLocalDefinition=1,localDefinitionNumber=41,type=$t,stepType=accum,stepRange=12-36,paramId=260268 \
${tools_dir}/grib_set -s \
setLocalDefinition=1,localDefinitionNumber=41,type=$t,stepType=accum,stepRange=12-36 \
$sample $temp1
grib_check_key_equals $temp1 mars.step 36 # end step (ECC-701)
grib_check_key_exists $temp1 mars.anoffset
${tools_dir}/grib_set -s paramId=260268 $temp1 $temp2
grib_check_key_equals $temp2 mars.step 36 # end step (ECC-701)
grib_check_key_exists $temp2 mars.anoffset
#${tools_dir}/grib_dump -Da $temp1 | grep mars.step
done
types="fc pf cf"
for t in $types; do
${tools_dir}/grib_set -s setLocalDefinition=1,localDefinitionNumber=41,type=$t,stepType=accum,stepRange=12-36,paramId=260268 \
${tools_dir}/grib_set -s \
setLocalDefinition=1,localDefinitionNumber=41,type=$t,stepType=accum,stepRange=12-36 \
$sample $temp1
grib_check_key_equals $temp1 mars.step 36 # end step
${tools_dir}/grib_set -s paramId=260268 $temp1 $temp2
grib_check_key_equals $temp2 mars.step 36 # end step
#${tools_dir}/grib_dump -Da $temp1 | grep mars.step
done