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-25 15:45:10 +01:00
parent 25208f0fab 9a5b979cdc
commit 2659e22a00
7 changed files with 7 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9233,12 +9233,6 @@
parameterCategory = 228 ;
parameterNumber = 255 ;
}
#Flood alert levels
'flal' = {
discipline = 192 ;
parameterCategory = 240 ;
parameterNumber = 10 ;
}
#Stream function gradient
'strfgrd' = {
discipline = 192 ;

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

@ -9233,12 +9233,6 @@
parameterCategory = 228 ;
parameterNumber = 255 ;
}
#Flood alert levels
'Flood alert levels' = {
discipline = 192 ;
parameterCategory = 240 ;
parameterNumber = 10 ;
}
#Stream function gradient
'Stream function gradient' = {
discipline = 192 ;

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

@ -9233,12 +9233,6 @@
parameterCategory = 228 ;
parameterNumber = 255 ;
}
#Flood alert levels
'240010' = {
discipline = 192 ;
parameterCategory = 240 ;
parameterNumber = 10 ;
}
#Stream function gradient
'129001' = {
discipline = 192 ;

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

@ -9233,12 +9233,6 @@
parameterCategory = 228 ;
parameterNumber = 255 ;
}
#Flood alert levels
'flal' = {
discipline = 192 ;
parameterCategory = 240 ;
parameterNumber = 10 ;
}
#Stream function gradient
'strfgrd' = {
discipline = 192 ;

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

@ -9233,12 +9233,6 @@
parameterCategory = 228 ;
parameterNumber = 255 ;
}
#Flood alert levels
'Integer' = {
discipline = 192 ;
parameterCategory = 240 ;
parameterNumber = 10 ;
}
#Stream function gradient
'm**2 s**-1' = {
discipline = 192 ;

1
definitions/grib2/template.3.110.def
View File

@ -41,3 +41,4 @@ unsigned[4] Dy : dump ;
unsigned[1] projectionCenterFlag : dump ;
include "grib2/template.3.scanning_mode.def";

13
src/grib_accessor_class_bufr_data_array.c
View File

@ -406,6 +406,7 @@ static int get_descriptors(grib_accessor* a)
self->canBeMissing[i]=grib_bufr_descriptor_can_be_missing(self->expanded->v[i]);
ret=grib_get_long(h,self->numberOfSubsetsName,&(self->numberOfSubsets));
if (ret != GRIB_SUCCESS) return ret;
ret=grib_get_long(h,self->compressedDataName,&(self->compressedData));
return ret;
@ -745,7 +746,7 @@ static double decode_double_value(grib_context* c,unsigned char* data,long* pos,
static int decode_element(grib_context* c,grib_accessor_bufr_data_array* self,int subsetIndex,
grib_buffer* b,unsigned char* data,long *pos,int i,bufr_descriptor* descriptor,long elementIndex,
grib_darray* dval,grib_sarray* sval)
grib_darray* dval,grib_sarray* sval)
{
grib_accessor* a=(grib_accessor*)self;
grib_darray* dar=0;
@ -862,7 +863,7 @@ static int encode_new_bitmap(grib_context* c,grib_buffer* buff,long *pos,int idx
static int encode_new_element(grib_context* c,grib_accessor_bufr_data_array* self,int subsetIndex,
grib_buffer* buff,unsigned char* data,long *pos,int i,bufr_descriptor* descriptor,
long elementIndex,grib_darray* dval,grib_sarray* sval)
long elementIndex,grib_darray* dval,grib_sarray* sval)
{
int ii;
char* csval=0;
@ -964,7 +965,7 @@ static int encode_new_replication(grib_context* c,grib_accessor_bufr_data_array*
static int encode_element(grib_context* c,grib_accessor_bufr_data_array* self,int subsetIndex,
grib_buffer* buff,unsigned char* data,long *pos,int i,bufr_descriptor* descriptor,
long elementIndex,grib_darray* dval,grib_sarray* sval)
long elementIndex,grib_darray* dval,grib_sarray* sval)
{
int idx,j;
int err=0;
@ -1673,12 +1674,11 @@ static int create_keys(grib_accessor* a,long onlySubset,long startSubset,long en
/*int forceGroupClosure=0;*/
creatorGroup.op = "bufr_group";
creatorGroup.name="groupNumber";
creatorGroup.name = "groupNumber";
creatorGroup.name_space = "";
creatorGroup.flags = GRIB_ACCESSOR_FLAG_DUMP;
creatorGroup.flags = GRIB_ACCESSOR_FLAG_DUMP;
creatorGroup.set = 0;
if (self->dataAccessors) {
grib_accessors_list_delete(c,self->dataAccessors);
/* grib_empty_section ( c,self->dataKeys ); */
@ -2027,7 +2027,6 @@ static int process_elements(grib_accessor* a,int flag,long onlySubset,long start
self->elementsDescriptorsIndex=grib_viarray_new(c,100,100);
}
numberOfDescriptors=grib_bufr_descriptors_array_used_size(self->expanded);
set_subset_start_end(self,&onlySubset,&startSubset,&endSubset,&start,&end);