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

implemented uncompressed decoding

This commit is contained in:
Enrico Fucile 2014-08-10 20:20:57 +01:00
parent 527f05f2c7
commit 3d94d6dd8d
7 changed files with 338 additions and 189 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
definitions/bufr/section.4.def
View File

@ -17,12 +17,15 @@ meta selectGroupNumber bufr_group_number();
transient subsetNumber=0; transient subsetNumber=0;
if (compressedData) { if (compressedData) {
meta numericValues bufr_data_array(offsetSection4,offsetBeforeData,offsetEndSection4,section4Length, meta numericValues bufr_data_array(offsetSection4,offsetBeforeData,offsetEndSection4,section4Length,
numberOfDataSubsets,subsetNumber, numberOfDataSubsets,subsetNumber,
expandedDescriptors,type,reference,scale,width, expandedDescriptors,type,unit,reference,scale,width,
stringValues,elementsFXY,compressedData) ; stringValues,elementsFXY,compressedData) ;
} else { } else {
assert(0); meta numericValues bufr_data_array(offsetSection4,offsetBeforeData,offsetEndSection4,section4Length,
numberOfDataSubsets,subsetNumber,
expandedDescriptors,type,unit,reference,scale,width,
stringValues,elementsFXY,compressedData) ;
} }
meta unpack unpack_bufr_values(numericValues); meta unpack unpack_bufr_values(numericValues);

2
src/grib_accessor_class_bufr_data.c
View File

@ -692,7 +692,7 @@ static int decode_elements(grib_accessor* a) {
if (width) {Assert(0);} if (width) {Assert(0);}
if(bitmapIndex[self->bitmapNumber[i]]==-1) if(bitmapIndex[self->bitmapNumber[i]]==-1)
bitmapIndex[self->bitmapNumber[i]]=grib_iarray_get_used_size(bitmap); bitmapIndex[self->bitmapNumber[i]]=grib_iarray_used_size(bitmap);
grib_iarray_push(index,i); grib_iarray_push(index,i);
grib_iarray_push(groupNumberIndex,groupNumber); grib_iarray_push(groupNumberIndex,groupNumber);
groupNumberSection[groupNumber]=section; groupNumberSection[groupNumber]=section;

490
src/grib_accessor_class_bufr_data_array.c
View File

@ -33,6 +33,7 @@
MEMBERS= const char* subsetNumberName MEMBERS= const char* subsetNumberName
MEMBERS= const char* expandedDescriptorsName MEMBERS= const char* expandedDescriptorsName
MEMBERS= const char* typeName MEMBERS= const char* typeName
MEMBERS= const char* unitsName
MEMBERS= const char* referenceName MEMBERS= const char* referenceName
MEMBERS= const char* scaleName MEMBERS= const char* scaleName
MEMBERS= const char* widthName MEMBERS= const char* widthName
@ -40,7 +41,7 @@
MEMBERS= const char* elementsFXYName MEMBERS= const char* elementsFXYName
MEMBERS= const char* compressedDataName MEMBERS= const char* compressedDataName
MEMBERS= long* expandedDescriptors MEMBERS= long* expandedDescriptors
MEMBERS= char** type MEMBERS= int* type
MEMBERS= long* reference MEMBERS= long* reference
MEMBERS= double* factor MEMBERS= double* factor
MEMBERS= long* width MEMBERS= long* width
@ -94,6 +95,7 @@ typedef struct grib_accessor_bufr_data_array {
const char* subsetNumberName; const char* subsetNumberName;
const char* expandedDescriptorsName; const char* expandedDescriptorsName;
const char* typeName; const char* typeName;
const char* unitsName;
const char* referenceName; const char* referenceName;
const char* scaleName; const char* scaleName;
const char* widthName; const char* widthName;
@ -101,7 +103,7 @@ typedef struct grib_accessor_bufr_data_array {
const char* elementsFXYName; const char* elementsFXYName;
const char* compressedDataName; const char* compressedDataName;
long* expandedDescriptors; long* expandedDescriptors;
char** type; int* type;
long* reference; long* reference;
double* factor; double* factor;
long* width; long* width;
@ -216,6 +218,7 @@ static void init(grib_accessor* a,const long v, grib_arguments* params)
self->subsetNumberName = grib_arguments_get_name(a->parent->h,params,n++); self->subsetNumberName = grib_arguments_get_name(a->parent->h,params,n++);
self->expandedDescriptorsName = grib_arguments_get_name(a->parent->h,params,n++); self->expandedDescriptorsName = grib_arguments_get_name(a->parent->h,params,n++);
self->typeName = grib_arguments_get_name(a->parent->h,params,n++); self->typeName = grib_arguments_get_name(a->parent->h,params,n++);
self->unitsName = grib_arguments_get_name(a->parent->h,params,n++);
self->referenceName = grib_arguments_get_name(a->parent->h,params,n++); self->referenceName = grib_arguments_get_name(a->parent->h,params,n++);
self->scaleName = grib_arguments_get_name(a->parent->h,params,n++); self->scaleName = grib_arguments_get_name(a->parent->h,params,n++);
self->widthName = grib_arguments_get_name(a->parent->h,params,n++); self->widthName = grib_arguments_get_name(a->parent->h,params,n++);
@ -234,10 +237,6 @@ static void init(grib_accessor* a,const long v, grib_arguments* params)
} }
static void self_clear(grib_context* c,grib_accessor_bufr_data_array* self) { static void self_clear(grib_context* c,grib_accessor_bufr_data_array* self) {
int i=0;
for (i=0;i<self->numberOfDescriptors;i++) {
grib_context_free(c,self->type[i]);
}
grib_context_free(c,self->expandedDescriptors); grib_context_free(c,self->expandedDescriptors);
grib_context_free(c,self->type); grib_context_free(c,self->type);
grib_context_free(c,self->reference); grib_context_free(c,self->reference);
@ -295,6 +294,8 @@ static int get_descriptors(grib_accessor* a) {
long* scale=0; long* scale=0;
double* factor=0; double* factor=0;
int i=0; int i=0;
char** ctype=0;
char** cunits=0;
grib_accessor_bufr_data_array *self =(grib_accessor_bufr_data_array*)a; grib_accessor_bufr_data_array *self =(grib_accessor_bufr_data_array*)a;
grib_accessor* expandedDescriptors=0; grib_accessor* expandedDescriptors=0;
grib_handle* h=a->parent->h; grib_handle* h=a->parent->h;
@ -323,9 +324,31 @@ static int get_descriptors(grib_accessor* a) {
!= GRIB_SUCCESS) != GRIB_SUCCESS)
return err; return err;
self->type=grib_context_malloc_clear(c,self->numberOfDescriptors*sizeof(int));
size=self->numberOfDescriptors; size=self->numberOfDescriptors;
self->type=(char**)grib_context_malloc_clear(c,size*sizeof(char*)); ctype=(char**)grib_context_malloc_clear(c,size*sizeof(char*));
err=grib_get_string_array(h,self->typeName,self->type,&size); err=grib_get_string_array(h,self->typeName,ctype,&size);
size=self->numberOfDescriptors;
cunits=(char**)grib_context_malloc_clear(c,size*sizeof(char*));
err=grib_get_string_array(h,self->unitsName,cunits,&size);
for (i=0;i<self->numberOfDescriptors;i++) {
if (*(ctype[i]) =='s') {
self->type[i]=BUFR_TYPE_STRING;
} else {
if (strstr(cunits[i],"TABLE") ) {
if (strstr(cunits[i],"FLAG")) {
self->type[i]=BUFR_TYPE_FLAGTABLE;
} else {
self->type[i]=BUFR_TYPE_CODETABLE;
}
} else {
self->type[i]=BUFR_TYPE_DOUBLE;
}
}
}
grib_context_free(c,ctype);
grib_context_free(c,cunits);
size=self->numberOfDescriptors; size=self->numberOfDescriptors;
self->reference=grib_context_malloc_clear(c,size*sizeof(long)); self->reference=grib_context_malloc_clear(c,size*sizeof(long));
@ -391,21 +414,28 @@ static grib_darray* decode_double_array(grib_context* c,unsigned char* data,long
int extraWidth,int extraScale,double referenceFactor,int associatedFieldWidth,int localDescriptorWidth) { int extraWidth,int extraScale,double referenceFactor,int associatedFieldWidth,int localDescriptorWidth) {
grib_darray* ret=NULL; grib_darray* ret=NULL;
int j; int j;
long lval; unsigned long lval;
long localReference; long localReference;
int width,modifiedWidth,modifiedReference; int width,modifiedWidth,modifiedReference;
double modifiedFactor,dval; double modifiedFactor,dval;
modifiedReference= self->reference[i]*referenceFactor;
modifiedFactor= extraScale ? self->factor[i]*grib_power(-extraScale,10) : self->factor[i];
if (localDescriptorWidth) { if (self->type[i]==BUFR_TYPE_CODETABLE || self->type[i]==BUFR_TYPE_FLAGTABLE) {
modifiedWidth=localDescriptorWidth; modifiedReference= self->reference[i];
modifiedFactor= self->factor[i];
modifiedWidth= self->width[i];
} else { } else {
modifiedWidth= self->width[i]+extraWidth; modifiedReference= self->reference[i]*referenceFactor;
modifiedFactor= extraScale ? self->factor[i]*grib_power(-extraScale,10) : self->factor[i];
if (localDescriptorWidth) {
modifiedWidth=localDescriptorWidth;
} else {
modifiedWidth= self->width[i]+extraWidth;
}
} }
lval=grib_decode_unsigned_long(data,pos,modifiedWidth); lval=grib_decode_unsigned_long(data,pos,modifiedWidth);
localReference=lval+modifiedReference; localReference=(long)lval+modifiedReference;
width=grib_decode_unsigned_long(data,pos,6); width=grib_decode_unsigned_long(data,pos,6);
ret=grib_darray_new(c,100,100); ret=grib_darray_new(c,100,100);
if (width) { if (width) {
@ -414,7 +444,7 @@ static grib_darray* decode_double_array(grib_context* c,unsigned char* data,long
if (grib_is_all_bits_one(lval,width) && canBeMissing) { if (grib_is_all_bits_one(lval,width) && canBeMissing) {
dval=GRIB_MISSING_DOUBLE; dval=GRIB_MISSING_DOUBLE;
} else { } else {
dval=(lval+localReference)*modifiedFactor; dval=((long)lval+localReference)*modifiedFactor;
} }
grib_darray_push(c,ret,dval); grib_darray_push(c,ret,dval);
} }
@ -426,41 +456,57 @@ static grib_darray* decode_double_array(grib_context* c,unsigned char* data,long
} }
grib_darray_push(c,ret,dval); grib_darray_push(c,ret,dval);
} }
/*
switch (width) {
case 0:
if (!grib_is_all_bits_one(lval,modifiedWidth) || self->expandedDescriptors[i]==31031) {
dval=localReference*modifiedFactor;
} else dval=GRIB_MISSING_DOUBLE;
grib_darray_push(c,ret,dval);
break;
case 1:
for (j=0;j<self->numberOfDataSubsets;j++) {
lval=grib_decode_unsigned_long(data,pos,width);
if (self->expandedDescriptors[i]!=31031 && lval==1) {
dval=GRIB_MISSING_DOUBLE;
} else {
dval=localReference*modifiedFactor;
}
grib_darray_push(c,ret,dval);
}
break;
default :
for (j=0;j<self->numberOfDataSubsets;j++) {
lval=grib_decode_unsigned_long(data,pos,width);
if (!grib_is_all_bits_one(lval,modifiedWidth)) {
dval=(lval+localReference)*modifiedFactor;
} else {
dval=GRIB_MISSING_DOUBLE;
}
grib_darray_push(c,ret,dval);
}
}
*/
return ret; return ret;
} }
static char* decode_string_value(grib_context* c,unsigned char* data,long* pos, int i,
grib_accessor_bufr_data_array* self,
int extraWidth,int extraScale,double referenceFactor,int associatedFieldWidth,int localDescriptorWidth) {
char* sval=0;
int modifiedWidth,modifiedReference;
double modifiedFactor;
modifiedWidth= extraWidth ? self->width[i]+extraWidth : self->width[i];
modifiedReference= referenceFactor ? self->reference[i]*referenceFactor : self->reference[i];
modifiedFactor= extraScale ? self->factor[i]*grib_power(-extraScale,10) : self->factor[i];
sval=grib_context_malloc_clear(c,modifiedWidth/8+1);
grib_decode_string(data,pos,modifiedWidth/8,sval);
return sval;
}
static double decode_double_value(grib_context* c,unsigned char* data,long* pos,int i,
grib_accessor_bufr_data_array* self,int canBeMissing,
int extraWidth,int extraScale,double referenceFactor,int associatedFieldWidth,int localDescriptorWidth) {
unsigned long lval;
int modifiedWidth,modifiedReference;
double modifiedFactor,dval;
if (self->type[i]==BUFR_TYPE_CODETABLE || self->type[i]==BUFR_TYPE_FLAGTABLE) {
modifiedReference= self->reference[i];
modifiedFactor= self->factor[i];
modifiedWidth= self->width[i];
} else {
modifiedReference= self->reference[i]*referenceFactor;
modifiedFactor= extraScale ? self->factor[i]*grib_power(-extraScale,10) : self->factor[i];
if (localDescriptorWidth) {
modifiedWidth=localDescriptorWidth;
} else {
modifiedWidth= self->width[i]+extraWidth;
}
}
lval=grib_decode_unsigned_long(data,pos,modifiedWidth);
if (grib_is_all_bits_one(lval,modifiedWidth) && canBeMissing) {
dval=GRIB_MISSING_DOUBLE;
} else {
dval=((long)lval+modifiedReference)*modifiedFactor;
}
return dval;
}
static int can_be_missing(int F,int X,int Y) { static int can_be_missing(int F,int X,int Y) {
int ret=1; int ret=1;
if (F==0 && X==31 && Y==31) ret=0; if (F==0 && X==31 && Y==31) ret=0;
@ -480,8 +526,12 @@ static int decode_elements(grib_accessor* a) {
grib_sarray* sval=0; grib_sarray* sval=0;
grib_darray* dval; grib_darray* dval;
grib_iarray* elementsFXY=0; grib_iarray* elementsFXY=0;
long localReference=0,width,pos=0; long localReference=0,width=0;
long pos=0;
int index,sval_size,ii; int index,sval_size,ii;
int iss,end,elementIndex;
double cdval;
char* csval;
grib_vdarray* dvalues = NULL; grib_vdarray* dvalues = NULL;
grib_vsarray* svalues = NULL; grib_vsarray* svalues = NULL;
@ -517,131 +567,175 @@ static int decode_elements(grib_accessor* a) {
if (self->elementsFXY) grib_viarray_delete(c,self->elementsFXY); if (self->elementsFXY) grib_viarray_delete(c,self->elementsFXY);
self->elementsFXY=grib_viarray_new(c,100,100); self->elementsFXY=grib_viarray_new(c,100,100);
elementsFXY=grib_iarray_new(c,100,100);
for (i=0;i<self->numberOfDescriptors;i++) {
canBeMissing=can_be_missing(F[i],X[i],Y[i]);
switch(F[i]) {
case 0:
/* Table B element */
grib_iarray_push(elementsFXY,self->expandedDescriptors[i]);
if (*(self->type[i])=='s') {
/* string */
sval=decode_string_array(c,data,&pos,i,self,extraWidth,extraScale,referenceFactor,associatedFieldWidth,localDescriptorWidth);
grib_vsarray_push(c,svalues,sval);
index=grib_vsarray_used_size(svalues)-1;
sval_size=grib_sarray_used_size(sval);
dval=grib_darray_new(c,sval_size,10);
for (ii=0;ii<sval_size;ii++) {
double x=index*1000+strlen(sval->v[ii]);
grib_darray_push(c,dval,x);
}
grib_vdarray_push(c,dvalues,dval);
} else { end= self->compressedData ? 1 : self->numberOfDataSubsets;
/* numeric */
dval=decode_double_array(c,data,&pos,i,self,canBeMissing,extraWidth,extraScale,referenceFactor,associatedFieldWidth,localDescriptorWidth); for (iss=0;iss<end;iss++) {
grib_vdarray_push(c,dvalues,dval); elementsFXY=grib_iarray_new(c,100,100);
} if (!self->compressedData) {
break; dval=grib_darray_new(c,100,100);
case 1: sval=grib_sarray_new(c,10,10);
/* Delayed replication */ }
numberOfElementsToRepeat=X[i]; for (i=0;i<self->numberOfDescriptors;i++) {
nn=numberOfElementsToRepeat; canBeMissing=can_be_missing(F[i],X[i],Y[i]);
i++; elementIndex=grib_iarray_used_size(elementsFXY);
localReference=grib_decode_unsigned_long(data,&pos,self->width[i])+self->reference[i]; switch(F[i]) {
width=grib_decode_unsigned_long(data,&pos,6); case 0:
if (width) { /* Table B element */
/* delayed replication number is not constant. NOT IMPLEMENTED */ grib_iarray_push(elementsFXY,self->expandedDescriptors[i]);
Assert(0); if (self->type[i]==BUFR_TYPE_STRING) {
} else { /* string */
numberOfRepetitions=localReference*self->factor[i]; if (self->compressedData) {
startRepetition=i; sval=decode_string_array(c,data,&pos,i,self,extraWidth,extraScale,referenceFactor,associatedFieldWidth,localDescriptorWidth);
} grib_vsarray_push(c,svalues,sval);
continue; index=grib_vsarray_used_size(svalues)-1;
case 2: sval_size=grib_sarray_used_size(sval);
/* Operator */ dval=grib_darray_new(c,sval_size,10);
associatedFieldWidth=0; for (ii=0;ii<sval_size;ii++) {
localDescriptorWidth=0; double x=index*1000+strlen(sval->v[ii]);
switch(X[i]) { grib_darray_push(c,dval,x);
case 1: }
extraWidth = Y[i] ? Y[i]-128 : 0; grib_vdarray_push(c,dvalues,dval);
break;
case 2:
extraScale = Y[i] ? Y[i]-128 : 0;
break;
/* case 4: */
/* associated field*/
/* associatedFieldWidth=Y[i]; */
/* break; */
case 6:
/*signify data width*/
localDescriptorWidth=Y[i];
break;
case 7:
if (Y) {
extraScale = Y[i];
referenceFactor=grib_power(Y[i],10);
extraWidth=((10*Y[i])+2)/3;
} else { } else {
extraWidth=0; csval=decode_string_value(c,data,&pos,i,self,extraWidth,extraScale,referenceFactor,associatedFieldWidth,localDescriptorWidth);
extraScale=0; grib_sarray_push(c,sval,csval);
referenceFactor=1; index=grib_sarray_used_size(sval);
sval_size=grib_sarray_used_size(sval);
cdval=index*1000+strlen(csval);
grib_darray_push(c,dval,cdval);
} }
break; } else {
case 22: /* numeric or codetable or flagtable */
case 23: if (self->compressedData) {
case 24: dval=decode_double_array(c,data,&pos,i,self,canBeMissing,extraWidth,extraScale,referenceFactor,associatedFieldWidth,localDescriptorWidth);
case 25: grib_vdarray_push(c,dvalues,dval);
case 26: } else {
case 27: cdval=decode_double_value(c,data,&pos,i,self,canBeMissing,extraWidth,extraScale,referenceFactor,associatedFieldWidth,localDescriptorWidth);
case 29: grib_darray_push(c,dval,cdval);
case 30: }
case 31: }
case 32: break;
case 33: case 1:
case 34: /* Delayed replication */
case 35: numberOfElementsToRepeat=X[i];
case 36: nn=numberOfElementsToRepeat;
case 37: i++;
case 38: if (self->compressedData) {
case 39: localReference=grib_decode_unsigned_long(data,&pos,self->width[i])+self->reference[i];
case 40: width=grib_decode_unsigned_long(data,&pos,6);
case 41: if (width) {
case 42: /* delayed replication number is not constant. NOT IMPLEMENTED */
grib_iarray_push(elementsFXY,self->expandedDescriptors[i]); Assert(0);
} else {
numberOfRepetitions=localReference*self->factor[i];
startRepetition=i;
}
} else {
numberOfRepetitions=grib_decode_unsigned_long(data,&pos,self->width[i])+self->reference[i]*self->factor[i];
startRepetition=i;
}
grib_iarray_push(elementsFXY,self->expandedDescriptors[i]);
if (self->compressedData) {
dval=grib_darray_new(c,1,100); dval=grib_darray_new(c,1,100);
grib_darray_push(c,dval,0); grib_darray_push(c,dval,(double)numberOfRepetitions);
grib_vdarray_push(c,dvalues,dval); grib_vdarray_push(c,dvalues,dval);
break; } else {
default : grib_darray_push(c,dval,(double)numberOfRepetitions);
grib_context_log(c,GRIB_LOG_ERROR,"unsupported operator %d\n",X[i]); }
return GRIB_INTERNAL_ERROR; continue;
} case 2:
break; /* Operator */
default: associatedFieldWidth=0;
err=GRIB_INTERNAL_ERROR; localDescriptorWidth=0;
return err; switch(X[i]) {
} case 1:
extraWidth = Y[i] ? Y[i]-128 : 0;
/* delayed repetition check */ break;
if (numberOfRepetitions) { case 2:
if (nn>1) { extraScale = Y[i] ? Y[i]-128 : 0;
nn--; break;
} else { /* case 4: */
nn=numberOfElementsToRepeat; /* associated field*/
numberOfRepetitions--; /* associatedFieldWidth=Y[i]; */
if (numberOfRepetitions) i=startRepetition; /* break; */
case 6:
/*signify data width*/
localDescriptorWidth=Y[i];
break;
case 7:
if (Y) {
extraScale = Y[i];
referenceFactor=grib_power(Y[i],10);
extraWidth=((10*Y[i])+2)/3;
} else {
extraWidth=0;
extraScale=0;
referenceFactor=1;
}
break;
case 22:
case 23:
case 24:
case 25:
case 26:
case 27:
case 29:
case 30:
case 31:
case 32:
case 33:
case 34:
case 35:
case 36:
case 37:
case 38:
case 39:
case 40:
case 41:
case 42:
grib_iarray_push(elementsFXY,self->expandedDescriptors[i]);
if (self->compressedData) {
dval=grib_darray_new(c,1,100);
grib_darray_push(c,dval,0);
grib_vdarray_push(c,dvalues,dval);
} else {
grib_darray_push(c,dval,0);
}
break;
default :
grib_context_log(c,GRIB_LOG_ERROR,"unsupported operator %d\n",X[i]);
return GRIB_INTERNAL_ERROR;
}
break;
default:
err=GRIB_INTERNAL_ERROR;
return err;
} }
}
/* delayed repetition check */
if (numberOfRepetitions) {
if (nn>1) {
nn--;
} else {
nn=numberOfElementsToRepeat;
numberOfRepetitions--;
if (numberOfRepetitions) i=startRepetition;
}
}
}
grib_viarray_push(c,self->elementsFXY,elementsFXY);
if (!self->compressedData) {
grib_vdarray_push(c,dvalues,dval);
grib_vsarray_push(c,svalues,sval);
}
} }
grib_viarray_push(c,self->elementsFXY,elementsFXY);
if (self->numericValues) { if (self->numericValues) {
grib_vdarray_delete_content(c,dvalues); grib_vdarray_delete_content(c,self->numericValues);
grib_vdarray_delete(c,dvalues); grib_vdarray_delete(c,self->numericValues);
grib_vsarray_delete_content(c,svalues); grib_vsarray_delete_content(c,self->stringValues);
grib_vsarray_delete(c,svalues); grib_vsarray_delete(c,self->stringValues);
} }
self->numericValues=dvalues; self->numericValues=dvalues;
self->stringValues=svalues; self->stringValues=svalues;
@ -660,22 +754,36 @@ static void dump(grib_accessor* a, grib_dumper* dumper)
static int value_count(grib_accessor* a,long* count) static int value_count(grib_accessor* a,long* count)
{ {
int err=0,l; int err=0,l;
long numberOfSubsets=0,subsetNumber=0; long i,subsetNumber=0;
grib_accessor_bufr_data_array *self =(grib_accessor_bufr_data_array*)a; grib_accessor_bufr_data_array *self =(grib_accessor_bufr_data_array*)a;
grib_context* c=a->parent->h->context;
err=decode_elements(a); err=decode_elements(a);
if (err) return err; if (err) return err;
err=grib_get_long(a->parent->h,self->subsetNumberName,&subsetNumber); err=grib_get_long(a->parent->h,self->subsetNumberName,&subsetNumber);
if (err) return err; if (err) return err;
if (subsetNumber>self->numberOfDataSubsets) {
err=GRIB_INVALID_KEY_VALUE;
grib_context_log(c,GRIB_LOG_ERROR,"%s=%ld is too big, %s=%ld",self->subsetNumberName,self->numberOfDataSubsetsName);
return err;
}
l=grib_vdarray_used_size(self->numericValues); if (self->compressedData) {
l=grib_vdarray_used_size(self->numericValues);
*count=l; *count=l;
if (subsetNumber<=0) { if (subsetNumber<=0) {
err=grib_get_long(a->parent->h,self->numberOfDataSubsetsName,&numberOfSubsets); *count *= self->numberOfDataSubsets;
if (err) return err; }
*count *= numberOfSubsets; } else {
if (subsetNumber>0) {
*count=grib_iarray_used_size(self->elementsFXY->v[subsetNumber-1]);
} else {
*count=0;
for (i=0;i<self->numberOfDataSubsets;i++)
*count+=grib_iarray_used_size(self->elementsFXY->v[i]);
}
} }
return err; return err;
@ -684,9 +792,10 @@ static int value_count(grib_accessor* a,long* count)
static int unpack_double(grib_accessor* a, double* val, size_t *len) { static int unpack_double(grib_accessor* a, double* val, size_t *len) {
int err=0,i,k,ii; int err=0,i,k,ii;
long n=0; long n=0;
size_t l=0; size_t l=0,elementsInSubset;
long numberOfSubsets=0; long numberOfSubsets=0;
grib_accessor_bufr_data_array *self =(grib_accessor_bufr_data_array*)a; grib_accessor_bufr_data_array *self =(grib_accessor_bufr_data_array*)a;
grib_context* c=a->parent->h->context;
err=decode_elements(a); err=decode_elements(a);
if (err) return err; if (err) return err;
@ -695,19 +804,38 @@ static int unpack_double(grib_accessor* a, double* val, size_t *len) {
l=grib_vdarray_used_size(self->numericValues); l=grib_vdarray_used_size(self->numericValues);
err=grib_get_long(a->parent->h,self->subsetNumberName,&n); err=grib_get_long(a->parent->h,self->subsetNumberName,&n);
if (err) return err; if (err) return err;
err=grib_get_long(a->parent->h,self->numberOfDataSubsetsName,&numberOfSubsets);
if (err) return err;
if (n>numberOfSubsets) {
err=GRIB_INVALID_KEY_VALUE;
grib_context_log(c,GRIB_LOG_ERROR,"%s=%ld is too big, %s=%ld",self->subsetNumberName,self->numberOfDataSubsetsName);
return err;
}
if (n>0) { if (self->compressedData) {
for (i=0;i<l;i++) { if (n>0) {
val[i]=self->numericValues->v[i]->n > 1 ? self->numericValues->v[i]->v[n-1] : self->numericValues->v[i]->v[0]; for (i=0;i<l;i++) {
val[i]=self->numericValues->v[i]->n > 1 ? self->numericValues->v[i]->v[n-1] : self->numericValues->v[i]->v[0];
}
} else {
ii=0;
for (k=0;k<numberOfSubsets;k++) {
for (i=0;i<l;i++) {
val[ii++]=self->numericValues->v[i]->n > 1 ? self->numericValues->v[i]->v[k] : self->numericValues->v[i]->v[0];
}
}
} }
} else { } else {
err=grib_get_long(a->parent->h,self->numberOfDataSubsetsName,&numberOfSubsets); if (n>0) {
if (err) return err; elementsInSubset=grib_iarray_used_size(self->elementsFXY->v[n]);
for (i=0;i<elementsInSubset;i++) val[i]=self->numericValues->v[n-1]->v[i];
ii=0; } else {
for (k=0;k<numberOfSubsets;k++) { ii=0;
for (i=0;i<l;i++) { for (k=0;k<numberOfSubsets;k++) {
val[ii++]=self->numericValues->v[i]->n > 1 ? self->numericValues->v[i]->v[k] : self->numericValues->v[i]->v[0]; elementsInSubset=grib_iarray_used_size(self->elementsFXY->v[k]);
for (i=0;i<elementsInSubset;i++) {
val[ii++]=self->numericValues->v[k]->v[i];
}
} }
} }
} }

2
src/grib_accessor_class_expanded_descriptors.c
View File

@ -174,7 +174,7 @@ size_t __expand(grib_accessor* a,grib_iarray* unexpanded,grib_iarray* expanded,
grib_context* c=a->parent->h->context; grib_context* c=a->parent->h->context;
long us; long us;
if (grib_iarray_get_used_size(unexpanded)==0) return 0; if (grib_iarray_used_size(unexpanded)==0) return 0;
us=grib_iarray_get(unexpanded,0); us=grib_iarray_get(unexpanded,0);

6
src/grib_api_internal.h
View File

@ -200,6 +200,12 @@ double rint(double x);
#define MAX_SMART_TABLE_COLUMNS 20 #define MAX_SMART_TABLE_COLUMNS 20
#define MAX_CODETABLE_ENTRIES 65536 #define MAX_CODETABLE_ENTRIES 65536
/* types of BUFR table B elements */
#define BUFR_TYPE_STRING 1
#define BUFR_TYPE_DOUBLE 2
#define BUFR_TYPE_CODETABLE 3
#define BUFR_TYPE_FLAGTABLE 4
/* ACCESSOR COMPARE FLAGS */ /* ACCESSOR COMPARE FLAGS */
#define GRIB_COMPARE_NAMES (1<<0) #define GRIB_COMPARE_NAMES (1<<0)
#define GRIB_COMPARE_TYPES (1<<1) #define GRIB_COMPARE_TYPES (1<<1)

16
src/grib_api_prototypes.h
View File

@ -177,7 +177,7 @@ void grib_iarray_set(grib_iarray *a, size_t i, long v);
void grib_iarray_delete(grib_iarray *v); void grib_iarray_delete(grib_iarray *v);
void grib_iarray_delete_array(grib_iarray *v); void grib_iarray_delete_array(grib_iarray *v);
long *grib_iarray_get_array(grib_iarray *v); long *grib_iarray_get_array(grib_iarray *v);
size_t grib_iarray_get_used_size(grib_iarray *v); size_t grib_iarray_used_size(grib_iarray *v);
/* grib_vdarray.c */ /* grib_vdarray.c */
grib_vdarray *grib_vdarray_new(grib_context *c, size_t size, size_t incsize); grib_vdarray *grib_vdarray_new(grib_context *c, size_t size, size_t incsize);
@ -620,8 +620,8 @@ int grib_index_select_double(grib_index *index, const char *skey, double value);
int grib_index_select_string(grib_index *index, const char *skey, char *value); int grib_index_select_string(grib_index *index, const char *skey, char *value);
grib_handle *grib_index_get_handle(grib_field *field, int *err); grib_handle *grib_index_get_handle(grib_field *field, int *err);
grib_handle *codes_index_get_handle(grib_field *field, int message_type, int *err); grib_handle *codes_index_get_handle(grib_field *field, int message_type, int *err);
int grib_index_dump_file(FILE *fout, const char *filename);
void grib_index_dump(FILE *fout, grib_index *index); void grib_index_dump(FILE *fout, grib_index *index);
int grib_index_dump_file(FILE* fout, const char* filename);
char *grib_get_field_file(grib_index *index, off_t *offset); char *grib_get_field_file(grib_index *index, off_t *offset);
grib_handle *grib_handle_new_from_index(grib_index *index, int *err); grib_handle *grib_handle_new_from_index(grib_index *index, int *err);
grib_handle *codes_new_from_index(grib_index *index, int message_type, int *err); grib_handle *codes_new_from_index(grib_index *index, int message_type, int *err);
@ -697,6 +697,14 @@ void grib_timer_print(grib_timer *t);
void grib_timer_partial_rate(grib_timer *t, double start, long total); void grib_timer_partial_rate(grib_timer *t, double start, long total);
void grib_print_all_timers(void); void grib_print_all_timers(void);
void grib_reset_all_timers(void); void grib_reset_all_timers(void);
grib_timer *grib_get_timer(grib_context *c, const char *name, const char *statname, int elapsed);
int grib_timer_start(grib_timer *t);
int grib_timer_stop(grib_timer *t, long total);
double grib_timer_value(grib_timer *t);
void grib_timer_print(grib_timer *t);
void grib_timer_partial_rate(grib_timer *t, double start, long total);
void grib_print_all_timers(void);
void grib_reset_all_timers(void);
/* grib_ibmfloat.c */ /* grib_ibmfloat.c */
unsigned long grib_ibm_to_long(double x); unsigned long grib_ibm_to_long(double x);
@ -715,6 +723,10 @@ double grib_ieeefloat_error(double x);
double grib_long_to_ieee(unsigned long x); double grib_long_to_ieee(unsigned long x);
unsigned long grib_ieee_nearest_smaller_to_long(double x); unsigned long grib_ieee_nearest_smaller_to_long(double x);
int grib_nearest_smaller_ieee_float(double a, double *ret); int grib_nearest_smaller_ieee_float(double a, double *ret);
double grib_ieeefloat_error(double x);
double grib_long_to_ieee(unsigned long x);
int grib_nearest_smaller_ieee_float(double a, double *x);
unsigned long grib_ieee_to_long(double x);
unsigned long grib_ieee64_to_long(double x); unsigned long grib_ieee64_to_long(double x);
double grib_long_to_ieee64(unsigned long x); double grib_long_to_ieee64(unsigned long x);
int grib_ieee_decode_array(grib_context *c, unsigned char *buf, size_t nvals, int bytes, double *val); int grib_ieee_decode_array(grib_context *c, unsigned char *buf, size_t nvals, int bytes, double *val);

2
src/grib_iarray.c
View File

@ -199,5 +199,5 @@ long* grib_iarray_get_array(grib_iarray* v) {
return vv; return vv;
} }
size_t grib_iarray_get_used_size(grib_iarray* v) {return v->n;} size_t grib_iarray_used_size(grib_iarray* v) {return v->n;}