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 2016-04-22 14:22:00 +01:00
parent bce9c1efc5 f51d62bd10
commit 6f42cda9a4
11 changed files with 10 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
data/grib_data_files.txt
View File

@ -66,7 +66,6 @@ second_ord_rbr.grib1
simple_bitmap.grib
simple.grib
small_ensemble.grib1
spectral_compex.grib1
spectral_complex.grib1
spherical_model_level.grib1
spherical_model_level.grib2

18
definitions/grib2/localConcepts/ecmf/cfVarName.def
View File

@ -9239,24 +9239,6 @@
parameterCategory = 240 ;
parameterNumber = 10 ;
}
#Maximum discharge in 15 day forecast
'mxcq15d' = {
discipline = 192 ;
parameterCategory = 240 ;
parameterNumber = 19 ;
}
#Maximum rain in 24 hours over the 15 day forecast
'mxtp24h15d' = {
discipline = 192 ;
parameterCategory = 240 ;
parameterNumber = 23 ;
}
#Accumulated precipitation over the 15 day forecast
'acctp15d' = {
discipline = 192 ;
parameterCategory = 240 ;
parameterNumber = 27 ;
}
#Stream function gradient
'strfgrd' = {
discipline = 192 ;

18
definitions/grib2/localConcepts/ecmf/name.def
View File

@ -9239,24 +9239,6 @@
parameterCategory = 240 ;
parameterNumber = 10 ;
}
#Maximum discharge in 15 day forecast
'Maximum discharge in 15 day forecast' = {
discipline = 192 ;
parameterCategory = 240 ;
parameterNumber = 19 ;
}
#Maximum rain in 24 hours over the 15 day forecast
'Maximum rain in 24 hours over the 15 day forecast' = {
discipline = 192 ;
parameterCategory = 240 ;
parameterNumber = 23 ;
}
#Accumulated precipitation over the 15 day forecast
'Accumulated precipitation over the 15 day forecast' = {
discipline = 192 ;
parameterCategory = 240 ;
parameterNumber = 27 ;
}
#Stream function gradient
'Stream function gradient' = {
discipline = 192 ;

18
definitions/grib2/localConcepts/ecmf/paramId.def
View File

@ -9239,24 +9239,6 @@
parameterCategory = 240 ;
parameterNumber = 10 ;
}
#Maximum discharge in 15 day forecast
'240019' = {
discipline = 192 ;
parameterCategory = 240 ;
parameterNumber = 19 ;
}
#Maximum rain in 24 hours over the 15 day forecast
'240023' = {
discipline = 192 ;
parameterCategory = 240 ;
parameterNumber = 23 ;
}
#Accumulated precipitation over the 15 day forecast
'240027' = {
discipline = 192 ;
parameterCategory = 240 ;
parameterNumber = 27 ;
}
#Stream function gradient
'129001' = {
discipline = 192 ;

18
definitions/grib2/localConcepts/ecmf/shortName.def
View File

@ -9239,24 +9239,6 @@
parameterCategory = 240 ;
parameterNumber = 10 ;
}
#Maximum discharge in 15 day forecast
'mxcq15d' = {
discipline = 192 ;
parameterCategory = 240 ;
parameterNumber = 19 ;
}
#Maximum rain in 24 hours over the 15 day forecast
'mxtp24h15d' = {
discipline = 192 ;
parameterCategory = 240 ;
parameterNumber = 23 ;
}
#Accumulated precipitation over the 15 day forecast
'acctp15d' = {
discipline = 192 ;
parameterCategory = 240 ;
parameterNumber = 27 ;
}
#Stream function gradient
'strfgrd' = {
discipline = 192 ;

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

@ -9239,24 +9239,6 @@
parameterCategory = 240 ;
parameterNumber = 10 ;
}
#Maximum discharge in 15 day forecast
'm**3 s**-1' = {
discipline = 192 ;
parameterCategory = 240 ;
parameterNumber = 19 ;
}
#Maximum rain in 24 hours over the 15 day forecast
'm' = {
discipline = 192 ;
parameterCategory = 240 ;
parameterNumber = 23 ;
}
#Accumulated precipitation over the 15 day forecast
'm' = {
discipline = 192 ;
parameterCategory = 240 ;
parameterNumber = 27 ;
}
#Stream function gradient
'm**2 s**-1' = {
discipline = 192 ;

1
src/grib_accessor_class_bufr_data_array.c
View File

@ -2129,7 +2129,6 @@ static int process_elements(grib_accessor* a,int flag,long onlySubset,long start
case 25:
/*difference statistical values marker operator*/
if (descriptors[i]->Y==255) {
double reference;
index=get_next_bitmap_descriptor_index(self,elementsDescriptorsIndex,dval);
bd=grib_bufr_descriptor_clone(self->expanded->v[index]);
bd->reference=-grib_power(bd->width,2);

1
tests/bitsPerValue.sh
View File

@ -60,7 +60,6 @@ regular_latlon_surface.grib1
regular_latlon_surface_constant.grib1
second_ord_rbr.grib1
small_ensemble.grib1
spectral_compex.grib1
spectral_complex.grib1
spherical_model_level.grib1
spherical_pressure_level.grib1

1
tests/concept.sh
View File

@ -33,7 +33,6 @@ regular_latlon_surface.grib1
regular_latlon_surface_constant.grib1
second_ord_rbr.grib1
small_ensemble.grib1
spectral_compex.grib1
spectral_complex.grib1
spherical_model_level.grib1
spherical_pressure_level.grib1

1
tests/debug.sh
View File

@ -34,7 +34,6 @@ regular_latlon_surface.grib1
regular_latlon_surface_constant.grib1
second_ord_rbr.grib1
small_ensemble.grib1
spectral_compex.grib1
spectral_complex.grib1
spherical_model_level.grib1
spherical_pressure_level.grib1

11
tools/grib_compare.c
View File

@ -789,9 +789,11 @@ static int compare_values(grib_runtime_options* options,grib_handle* h1,grib_han
err1=grib_get_double(h1,"packingError",&packingError1);
err2=grib_get_double(h2,"packingError",&packingError2);
if (packingCompare && !err1 && !err2) {
/* packingError specified by user and message supports it */
/* GRIB-972: Not all GRIBs have packingError key! */
value_tolerance = packingError1 > packingError2 ? packingError1 : packingError2;
compare_double= &compare_double_absolute;
compareAbsolute=1;
}
} else if (!grib_inline_strcmp(name,"unpackedValues") ) {
packingError1=0;
@ -799,9 +801,11 @@ static int compare_values(grib_runtime_options* options,grib_handle* h1,grib_han
err1=grib_get_double(h1,"unpackedError",&packingError1);
err2=grib_get_double(h2,"unpackedError",&packingError2);
if (packingCompare && !err1 && !err2) {
/* packingError specified by user and message supports it */
/* GRIB-972: Not all GRIBs have unpackedError key! */
value_tolerance = packingError1 > packingError2 ? packingError1 : packingError2;
compare_double= &compare_double_absolute;
compareAbsolute=1;
}
} else if ( !grib_inline_rstrcmp(name,"InDegrees")) {
packingError1=0.0005;
@ -866,7 +870,12 @@ static int compare_values(grib_runtime_options* options,grib_handle* h1,grib_han
if (*dval2 > 360 ) dnew2 -= 360.0 ;
}
value_tolerance*=tolerance_factor;
if (verbose) printf(" (%d values) tolerance=%g\n",(int)len1,value_tolerance);
if (verbose) {
printf(" (%d values) tolerance=%g \t",(int)len1,value_tolerance);
if (compare_double == &compare_double_absolute) printf("using compare_double_absolute");
if (compare_double == &compare_double_relative) printf("using compare_double_relative");
printf("\n");
}
for(i = 0; i < len1; i++) {
if((diff=compare_double(pv1++, pv2++, value_tolerance))!=0) {
countdiff++;