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

Merge branch 'develop' of ssh://software.ecmwf.int:7999/eccodes/eccodes into develop

This commit is contained in:
Enrico Fucile 2015-06-09 07:52:46 +01:00
parent 19976dc20a 32f2831bc5
commit d554c8fd66
8 changed files with 52 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
definitions/grib1/2.233.253.table
View File

@ -168,8 +168,8 @@
200 tke TKE TKE m**2 s**-2
201 grpl GRPL Graupel kg m**-2
204 hail HAIL Hail kg m**-2
209 lgt LGT Lightning -
210 refl REFL Simulated reflectivity dBz
211 lgt LGT Lightning -
212 pdep PDEP Pressure departure Pa
213 vdiv VDIV Vertical Divergence s**-1
214 upom UPOM Updraft omega ms*-1

4
definitions/grib1/3.233.table
View File

@ -7,7 +7,7 @@
5 lcl Adiabatic condensation level (parcel lifted from surface)
6 umx Maximum wind speed level
7 trp Tropopause level
8 sfc Nominal top of atmosphere
8 toa Nominal top of atmosphere
9 9 Sea bottom
# 10-19 Reserved
20 tl Isothermal level Temperature in 1/100 K
@ -51,7 +51,7 @@
196 dsw South-western facing surface (HIRLAM Extension)
197 dw Western facing surface (HIRLAM Extension)
198 dw North-western facing surface (HIRLAM Extension)
200 sfc Entire atmosphere considered as a single layer 0 (2 octets)
200 atm Entire atmosphere considered as a single layer 0 (2 octets)
201 201 Entire ocean considered as a single layer 0 (2 octets)
# 202-209 Reserved
210 pl Isobaric surface (Pa) (ECMWF extension)

10
definitions/grib1/localConcepts/eidb/cfName.def
View File

@ -1618,16 +1618,16 @@
table2Version = 253 ;
indicatorOfParameter = 204 ;
}
#Lightning
'Lightning' = {
table2Version = 253 ;
indicatorOfParameter = 209 ;
}
#Simulated reflectivity
'Simulated reflectivity' = {
table2Version = 253 ;
indicatorOfParameter = 210 ;
}
#Lightning
'Lightning' = {
table2Version = 253 ;
indicatorOfParameter = 211 ;
}
#Pressure departure
'Pressure departure' = {
table2Version = 253 ;

10
definitions/grib1/localConcepts/eidb/name.def
View File

@ -1618,16 +1618,16 @@
table2Version = 253 ;
indicatorOfParameter = 204 ;
}
#Lightning
'Lightning' = {
table2Version = 253 ;
indicatorOfParameter = 209 ;
}
#Simulated reflectivity
'Simulated reflectivity' = {
table2Version = 253 ;
indicatorOfParameter = 210 ;
}
#Lightning
'Lightning' = {
table2Version = 253 ;
indicatorOfParameter = 211 ;
}
#Pressure departure
'Pressure departure' = {
table2Version = 253 ;

10
definitions/grib1/localConcepts/eidb/paramId.def
View File

@ -1618,16 +1618,16 @@
table2Version = 253 ;
indicatorOfParameter = 204 ;
}
#Lightning
'233253209' = {
table2Version = 253 ;
indicatorOfParameter = 209 ;
}
#Simulated reflectivity
'233253210' = {
table2Version = 253 ;
indicatorOfParameter = 210 ;
}
#Lightning
'233253211' = {
table2Version = 253 ;
indicatorOfParameter = 211 ;
}
#Pressure departure
'233253212' = {
table2Version = 253 ;

10
definitions/grib1/localConcepts/eidb/shortName.def
View File

@ -1618,16 +1618,16 @@
table2Version = 253 ;
indicatorOfParameter = 204 ;
}
#Lightning
'lgt' = {
table2Version = 253 ;
indicatorOfParameter = 209 ;
}
#Simulated reflectivity
'refl' = {
table2Version = 253 ;
indicatorOfParameter = 210 ;
}
#Lightning
'lgt' = {
table2Version = 253 ;
indicatorOfParameter = 211 ;
}
#Pressure departure
'pdep' = {
table2Version = 253 ;

10
definitions/grib1/localConcepts/eidb/units.def
View File

@ -1618,16 +1618,16 @@
table2Version = 253 ;
indicatorOfParameter = 204 ;
}
#Lightning
'-' = {
table2Version = 253 ;
indicatorOfParameter = 209 ;
}
#Simulated reflectivity
'dBz' = {
table2Version = 253 ;
indicatorOfParameter = 210 ;
}
#Lightning
'-' = {
table2Version = 253 ;
indicatorOfParameter = 211 ;
}
#Pressure departure
'Pa' = {
table2Version = 253 ;

27
src/grib_context.c
View File

@ -320,6 +320,9 @@ static grib_context default_grib_context = {
#endif
};
/* Hopefully big enough. Note: GRIB_DEFINITION_PATH can contain SEVERAL colon-separated sub-paths */
#define DEF_PATH_MAXLEN 8192
grib_context* grib_context_get_default()
{
GRIB_PTHREAD_ONCE(&once,&init);
@ -399,6 +402,27 @@ grib_context* grib_context_get_default()
}
#endif
/* GRIB-779: Special case for ECMWF testing. Not for external use! */
/* Append the new path to our existing path */
{
const char* test_defs = getenv("_ECCODES_ECMWF_TEST_DEFINITION_PATH");
const char* test_samp = getenv("_ECCODES_ECMWF_TEST_SAMPLES_PATH");
if (test_defs) {
char buffer[DEF_PATH_MAXLEN];
strcpy(buffer, default_grib_context.grib_definition_files_path);
strcat(buffer, ":");
strcat(buffer, strdup(test_defs));
default_grib_context.grib_definition_files_path = strdup(buffer);
}
if (test_samp) {
char buffer[DEF_PATH_MAXLEN];
strcpy(buffer, default_grib_context.grib_samples_path);
strcat(buffer, ":");
strcat(buffer, strdup(test_samp));
default_grib_context.grib_samples_path = strdup(buffer);
}
}
grib_context_log(&default_grib_context, GRIB_LOG_DEBUG, "Definitions path: %s",
default_grib_context.grib_definition_files_path);
grib_context_log(&default_grib_context, GRIB_LOG_DEBUG, "Samples path: %s",
@ -469,9 +493,6 @@ grib_context* grib_context_new(grib_context* parent)
return c;
}
/* Hopefully big enough. Note: ECCODES_DEFINITION_PATH can contain SEVERAL colon-separated sub-paths */
#define DEF_PATH_MAXLEN 8192
/* GRIB-235: Resolve path to expand symbolic links etc */
static char* resolve_path(grib_context* c, char* path)
{