Skip to content

Commit a213878

Browse files
shahramnshahramn
committed
Merge branch 'hotfix/2.27.1'
2 parents 0b24e78 + f5e2499 commit a213878

11 files changed

+347
-8
lines changed

‎CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ cmake_minimum_required( VERSION 3.12 FATAL_ERROR )
2121
find_package( ecbuild 3.7 REQUIRED HINTS ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../ecbuild)
2222

2323
# Initialise project
24-
project( eccodes VERSION 2.27.0 LANGUAGES C )
24+
project( eccodes VERSION 2.27.1 LANGUAGES C )
2525

2626
###############################################################################
2727
# system checks needed for eccodes_config.h and some options like MEMFS

‎definitions/grib2/cfVarName.def

+66
Original file line numberDiff line numberDiff line change
@@ -2199,6 +2199,72 @@
21992199
typeOfFirstFixedSurface = 103 ;
22002200
scaleFactorOfFirstFixedSurface = 0 ;
22012201
}
2202+
#Urban cover
2203+
'cur' = {
2204+
discipline = 2 ;
2205+
parameterCategory = 6 ;
2206+
parameterNumber = 0 ;
2207+
}
2208+
#Road Cover
2209+
'cro' = {
2210+
discipline = 2 ;
2211+
parameterCategory = 6 ;
2212+
parameterNumber = 1 ;
2213+
}
2214+
#Building cover
2215+
'cbu' = {
2216+
discipline = 2 ;
2217+
parameterCategory = 6 ;
2218+
parameterNumber = 2 ;
2219+
}
2220+
#Building height
2221+
'bldh' = {
2222+
discipline = 2 ;
2223+
parameterCategory = 6 ;
2224+
parameterNumber = 3 ;
2225+
}
2226+
#Vertical-to-horizontal area ratio
2227+
'hwr' = {
2228+
discipline = 2 ;
2229+
parameterCategory = 6 ;
2230+
parameterNumber = 4 ;
2231+
}
2232+
#Standard deviation of building height
2233+
'bhstd' = {
2234+
discipline = 2 ;
2235+
parameterCategory = 6 ;
2236+
parameterNumber = 5 ;
2237+
}
2238+
#Wetland cover
2239+
'cwe' = {
2240+
discipline = 2 ;
2241+
parameterCategory = 0 ;
2242+
parameterNumber = 45 ;
2243+
}
2244+
#Wetland type
2245+
'twe' = {
2246+
discipline = 2 ;
2247+
parameterCategory = 0 ;
2248+
parameterNumber = 46 ;
2249+
}
2250+
#Irrigation cover
2251+
'cirr' = {
2252+
discipline = 2 ;
2253+
parameterCategory = 0 ;
2254+
parameterNumber = 47 ;
2255+
}
2256+
#C4 crop cover
2257+
'c4cr' = {
2258+
discipline = 2 ;
2259+
parameterCategory = 0 ;
2260+
parameterNumber = 48 ;
2261+
}
2262+
#C4 grass cover
2263+
'c4gr' = {
2264+
discipline = 2 ;
2265+
parameterCategory = 0 ;
2266+
parameterNumber = 49 ;
2267+
}
22022268
#Mean temperature tendency due to short-wave radiation
22032269
'mttswr' = {
22042270
discipline = 0 ;

‎definitions/grib2/name.def

+66
Original file line numberDiff line numberDiff line change
@@ -2199,6 +2199,72 @@
21992199
scaledValueOfFirstFixedSurface = 100 ;
22002200
scaleFactorOfFirstFixedSurface = 0 ;
22012201
}
2202+
#Urban cover
2203+
'Urban cover' = {
2204+
discipline = 2 ;
2205+
parameterCategory = 6 ;
2206+
parameterNumber = 0 ;
2207+
}
2208+
#Road Cover
2209+
'Road Cover' = {
2210+
discipline = 2 ;
2211+
parameterCategory = 6 ;
2212+
parameterNumber = 1 ;
2213+
}
2214+
#Building cover
2215+
'Building cover' = {
2216+
discipline = 2 ;
2217+
parameterCategory = 6 ;
2218+
parameterNumber = 2 ;
2219+
}
2220+
#Building height
2221+
'Building height' = {
2222+
discipline = 2 ;
2223+
parameterCategory = 6 ;
2224+
parameterNumber = 3 ;
2225+
}
2226+
#Vertical-to-horizontal area ratio
2227+
'Vertical-to-horizontal area ratio' = {
2228+
discipline = 2 ;
2229+
parameterCategory = 6 ;
2230+
parameterNumber = 4 ;
2231+
}
2232+
#Standard deviation of building height
2233+
'Standard deviation of building height' = {
2234+
discipline = 2 ;
2235+
parameterCategory = 6 ;
2236+
parameterNumber = 5 ;
2237+
}
2238+
#Wetland cover
2239+
'Wetland cover' = {
2240+
discipline = 2 ;
2241+
parameterCategory = 0 ;
2242+
parameterNumber = 45 ;
2243+
}
2244+
#Wetland type
2245+
'Wetland type' = {
2246+
discipline = 2 ;
2247+
parameterCategory = 0 ;
2248+
parameterNumber = 46 ;
2249+
}
2250+
#Irrigation cover
2251+
'Irrigation cover' = {
2252+
discipline = 2 ;
2253+
parameterCategory = 0 ;
2254+
parameterNumber = 47 ;
2255+
}
2256+
#C4 crop cover
2257+
'C4 crop cover' = {
2258+
discipline = 2 ;
2259+
parameterCategory = 0 ;
2260+
parameterNumber = 48 ;
2261+
}
2262+
#C4 grass cover
2263+
'C4 grass cover' = {
2264+
discipline = 2 ;
2265+
parameterCategory = 0 ;
2266+
parameterNumber = 49 ;
2267+
}
22022268
#Mean temperature tendency due to short-wave radiation
22032269
'Mean temperature tendency due to short-wave radiation' = {
22042270
discipline = 0 ;

‎definitions/grib2/paramId.def

+66
Original file line numberDiff line numberDiff line change
@@ -2199,6 +2199,72 @@
21992199
scaledValueOfFirstFixedSurface = 100 ;
22002200
scaleFactorOfFirstFixedSurface = 0 ;
22012201
}
2202+
#Urban cover
2203+
'229001' = {
2204+
discipline = 2 ;
2205+
parameterCategory = 6 ;
2206+
parameterNumber = 0 ;
2207+
}
2208+
#Road Cover
2209+
'229002' = {
2210+
discipline = 2 ;
2211+
parameterCategory = 6 ;
2212+
parameterNumber = 1 ;
2213+
}
2214+
#Building cover
2215+
'229003' = {
2216+
discipline = 2 ;
2217+
parameterCategory = 6 ;
2218+
parameterNumber = 2 ;
2219+
}
2220+
#Building height
2221+
'229004' = {
2222+
discipline = 2 ;
2223+
parameterCategory = 6 ;
2224+
parameterNumber = 3 ;
2225+
}
2226+
#Vertical-to-horizontal area ratio
2227+
'229005' = {
2228+
discipline = 2 ;
2229+
parameterCategory = 6 ;
2230+
parameterNumber = 4 ;
2231+
}
2232+
#Standard deviation of building height
2233+
'229006' = {
2234+
discipline = 2 ;
2235+
parameterCategory = 6 ;
2236+
parameterNumber = 5 ;
2237+
}
2238+
#Wetland cover
2239+
'229007' = {
2240+
discipline = 2 ;
2241+
parameterCategory = 0 ;
2242+
parameterNumber = 45 ;
2243+
}
2244+
#Wetland type
2245+
'229008' = {
2246+
discipline = 2 ;
2247+
parameterCategory = 0 ;
2248+
parameterNumber = 46 ;
2249+
}
2250+
#Irrigation cover
2251+
'229009' = {
2252+
discipline = 2 ;
2253+
parameterCategory = 0 ;
2254+
parameterNumber = 47 ;
2255+
}
2256+
#C4 crop cover
2257+
'229010' = {
2258+
discipline = 2 ;
2259+
parameterCategory = 0 ;
2260+
parameterNumber = 48 ;
2261+
}
2262+
#C4 grass cover
2263+
'229011' = {
2264+
discipline = 2 ;
2265+
parameterCategory = 0 ;
2266+
parameterNumber = 49 ;
2267+
}
22022268
#Mean temperature tendency due to short-wave radiation
22032269
'235001' = {
22042270
discipline = 0 ;

‎definitions/grib2/shortName.def

+66
Original file line numberDiff line numberDiff line change
@@ -2199,6 +2199,72 @@
21992199
scaledValueOfFirstFixedSurface = 100 ;
22002200
scaleFactorOfFirstFixedSurface = 0 ;
22012201
}
2202+
#Urban cover
2203+
'cur' = {
2204+
discipline = 2 ;
2205+
parameterCategory = 6 ;
2206+
parameterNumber = 0 ;
2207+
}
2208+
#Road Cover
2209+
'cro' = {
2210+
discipline = 2 ;
2211+
parameterCategory = 6 ;
2212+
parameterNumber = 1 ;
2213+
}
2214+
#Building cover
2215+
'cbu' = {
2216+
discipline = 2 ;
2217+
parameterCategory = 6 ;
2218+
parameterNumber = 2 ;
2219+
}
2220+
#Building height
2221+
'bldh' = {
2222+
discipline = 2 ;
2223+
parameterCategory = 6 ;
2224+
parameterNumber = 3 ;
2225+
}
2226+
#Vertical-to-horizontal area ratio
2227+
'hwr' = {
2228+
discipline = 2 ;
2229+
parameterCategory = 6 ;
2230+
parameterNumber = 4 ;
2231+
}
2232+
#Standard deviation of building height
2233+
'bhstd' = {
2234+
discipline = 2 ;
2235+
parameterCategory = 6 ;
2236+
parameterNumber = 5 ;
2237+
}
2238+
#Wetland cover
2239+
'cwe' = {
2240+
discipline = 2 ;
2241+
parameterCategory = 0 ;
2242+
parameterNumber = 45 ;
2243+
}
2244+
#Wetland type
2245+
'twe' = {
2246+
discipline = 2 ;
2247+
parameterCategory = 0 ;
2248+
parameterNumber = 46 ;
2249+
}
2250+
#Irrigation cover
2251+
'cirr' = {
2252+
discipline = 2 ;
2253+
parameterCategory = 0 ;
2254+
parameterNumber = 47 ;
2255+
}
2256+
#C4 crop cover
2257+
'c4cr' = {
2258+
discipline = 2 ;
2259+
parameterCategory = 0 ;
2260+
parameterNumber = 48 ;
2261+
}
2262+
#C4 grass cover
2263+
'c4gr' = {
2264+
discipline = 2 ;
2265+
parameterCategory = 0 ;
2266+
parameterNumber = 49 ;
2267+
}
22022268
#Mean temperature tendency due to short-wave radiation
22032269
'mttswr' = {
22042270
discipline = 0 ;

‎definitions/grib2/template.4.horizontal.def

+4-1
Original file line numberDiff line numberDiff line change
@@ -82,11 +82,14 @@ if (extraDim) {
8282
}
8383
}
8484

85-
# See ECC-854, ECC-1435
85+
# See ECC-854, ECC-1435, ECC-1451, ECC-1462
8686
if( (typeOfFirstFixedSurface == 151 && typeOfSecondFixedSurface == 151) ||
8787
(typeOfFirstFixedSurface == 152 && typeOfSecondFixedSurface == 152) ||
88+
(typeOfFirstFixedSurface == 168 && typeOfSecondFixedSurface == 168) ||
8889
(typeOfFirstFixedSurface == 114 && typeOfSecondFixedSurface == 114) ) {
8990
alias mars.levelist = bottomLevel;
91+
alias ls.level = bottomLevel;
92+
alias vertical.level = bottomLevel;
9093
}
9194

9295
alias ls.typeOfLevel=typeOfLevel;

‎definitions/grib2/units.def

+66
Original file line numberDiff line numberDiff line change
@@ -2199,6 +2199,72 @@
21992199
scaledValueOfFirstFixedSurface = 100 ;
22002200
scaleFactorOfFirstFixedSurface = 0 ;
22012201
}
2202+
#Urban cover
2203+
'(0 - 1)' = {
2204+
discipline = 2 ;
2205+
parameterCategory = 6 ;
2206+
parameterNumber = 0 ;
2207+
}
2208+
#Road Cover
2209+
'(0 - 1)' = {
2210+
discipline = 2 ;
2211+
parameterCategory = 6 ;
2212+
parameterNumber = 1 ;
2213+
}
2214+
#Building cover
2215+
'(0 - 1)' = {
2216+
discipline = 2 ;
2217+
parameterCategory = 6 ;
2218+
parameterNumber = 2 ;
2219+
}
2220+
#Building height
2221+
'm' = {
2222+
discipline = 2 ;
2223+
parameterCategory = 6 ;
2224+
parameterNumber = 3 ;
2225+
}
2226+
#Vertical-to-horizontal area ratio
2227+
'm**2 m**-2' = {
2228+
discipline = 2 ;
2229+
parameterCategory = 6 ;
2230+
parameterNumber = 4 ;
2231+
}
2232+
#Standard deviation of building height
2233+
'm' = {
2234+
discipline = 2 ;
2235+
parameterCategory = 6 ;
2236+
parameterNumber = 5 ;
2237+
}
2238+
#Wetland cover
2239+
'(0 - 1)' = {
2240+
discipline = 2 ;
2241+
parameterCategory = 0 ;
2242+
parameterNumber = 45 ;
2243+
}
2244+
#Wetland type
2245+
'Code table 4.239' = {
2246+
discipline = 2 ;
2247+
parameterCategory = 0 ;
2248+
parameterNumber = 46 ;
2249+
}
2250+
#Irrigation cover
2251+
'(0 - 1)' = {
2252+
discipline = 2 ;
2253+
parameterCategory = 0 ;
2254+
parameterNumber = 47 ;
2255+
}
2256+
#C4 crop cover
2257+
'(0 - 1)' = {
2258+
discipline = 2 ;
2259+
parameterCategory = 0 ;
2260+
parameterNumber = 48 ;
2261+
}
2262+
#C4 grass cover
2263+
'(0 - 1)' = {
2264+
discipline = 2 ;
2265+
parameterCategory = 0 ;
2266+
parameterNumber = 49 ;
2267+
}
22022268
#Mean temperature tendency due to short-wave radiation
22032269
'K s**-1' = {
22042270
discipline = 0 ;

‎definitions/mars/class.table

+3
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@
4040
39 gw Global Wildfire Information System
4141
40 e6 ERA6
4242
41 l6 ERA6/LAND
43+
42 ef EFAS (European flood awareness system)
44+
43 gf GLOFAS (Global flood awareness system)
45+
44 gg Greenhouse Gases
4346
99 te Test
4447
100 at Austria
4548
101 be Belgium

0 commit comments

Comments
 (0)