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

Put the common code to compute BUFR key rank into grib_utils.c

This commit is contained in:
Shahram Najm 2016-08-15 16:48:52 +01:00
parent 61b216683b
commit 904705e319
6 changed files with 70 additions and 175 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/grib_api_prototypes.h
View File

@ -1393,6 +1393,7 @@ char get_dir_separator_char(void);
const char *extract_filename(const char *filepath);
int is_gaussian_global(double lat1, double lat2, double lon1, double lon2, long num_points_equator, const double *latitudes, double angular_precision);
char *codes_getenv(const char *name);
int compute_key_rank(grib_handle* h, grib_string_list* keys, const char* key);
/* compile.c */
void grib_compile_flags(grib_compiler *c, long flags);

46
src/grib_dumper_class_filter.c
View File

@ -108,38 +108,6 @@ struct string_count {
string_count* next;
};
static int get_key_rank(grib_handle* h, grib_string_list* keys, const char* key)
{
grib_string_list* next=keys;
grib_string_list* prev=keys;
int ret=0;
size_t size=0;
grib_context* c=h->context;
while (next && next->value && grib_inline_strcmp(next->value,key)) {
prev=next;
next=next->next;
}
if (!next) {
prev->next=(grib_string_list*)grib_context_malloc_clear(c,sizeof(grib_string_list));
next=prev->next;
}
if (!next->value) {
next->value=strdup(key);
next->count=0;
}
next->count++;
ret=next->count;
if (ret==1) {
char* s=grib_context_malloc_clear(c,strlen(key)+5);
sprintf(s,"#2#%s",key);
if (grib_get_size(h,s,&size)==GRIB_NOT_FOUND) ret=0;
}
return ret;
}
static int depth=0;
static void init_class (grib_dumper_class* c){}
@ -203,7 +171,7 @@ static void dump_values(grib_dumper* d, grib_accessor* a)
if (size>1) {
int icount=0;
if ((r=get_key_rank(h,self->keys,a->name))!=0)
if ((r=compute_key_rank(h,self->keys,a->name))!=0)
fprintf(self->dumper.out,"set #%d#%s=",r,a->name);
else
fprintf(self->dumper.out,"set %s=",a->name);
@ -222,7 +190,7 @@ static void dump_values(grib_dumper* d, grib_accessor* a)
fprintf(self->dumper.out,"};\n");
grib_context_free(c,values);
} else {
r=get_key_rank(h,self->keys,a->name);
r=compute_key_rank(h,self->keys,a->name);
if( !grib_is_missing_double(a,value) ) {
if (r!=0)
@ -271,7 +239,7 @@ static void dump_long(grib_dumper* d, grib_accessor* a, const char* comment)
if (size>1) {
icount=0;
if ((r=get_key_rank(h,self->keys,a->name))!=0)
if ((r=compute_key_rank(h,self->keys,a->name))!=0)
fprintf(self->dumper.out,"set #%d#%s=",r,a->name);
else
fprintf(self->dumper.out,"set %s=",a->name);
@ -290,7 +258,7 @@ static void dump_long(grib_dumper* d, grib_accessor* a, const char* comment)
fprintf(self->dumper.out,"};\n");
grib_context_free(a->context,values);
} else {
r=get_key_rank(h,self->keys,a->name);
r=compute_key_rank(h,self->keys,a->name);
if( !grib_is_missing_long(a,value) ) {
if (r!=0)
fprintf(self->dumper.out,"set #%d#%s=",r,a->name);
@ -326,7 +294,7 @@ static void dump_double(grib_dumper* d, grib_accessor* a, const char* comment)
self->begin=0;
self->empty=0;
r=get_key_rank(h,self->keys,a->name);
r=compute_key_rank(h,self->keys,a->name);
if( !grib_is_missing_double(a,value) ) {
if (r!=0)
fprintf(self->dumper.out,"set #%d#%s=",r,a->name);
@ -368,7 +336,7 @@ static void dump_string_array(grib_dumper* d, grib_accessor* a, const char* comm
if (self->isLeaf==0) {
depth+=2;
if ((r=get_key_rank(h,self->keys,a->name))!=0)
if ((r=compute_key_rank(h,self->keys,a->name))!=0)
fprintf(self->dumper.out,"set #%d#%s=",r,a->name);
else
fprintf(self->dumper.out,"set %s=",a->name);
@ -433,7 +401,7 @@ static void dump_string(grib_dumper* d, grib_accessor* a, const char* comment)
err = grib_unpack_string(a,value,&size);
p=value;
r=get_key_rank(h,self->keys,a->name);
r=compute_key_rank(h,self->keys,a->name);
if (grib_is_missing_string(a,(unsigned char *)value,size))
return;

58
src/grib_dumper_class_fortran.c
View File

@ -109,44 +109,6 @@ struct string_count {
string_count* next;
};
static int get_key_rank(grib_handle* h,grib_string_list* keys, const char* key)
{
grib_string_list* next=keys;
grib_string_list* prev=keys;
int ret=0;
size_t size=0;
grib_context* c=h->context;
while (next && next->value && grib_inline_strcmp(next->value,key)) {
prev=next;
next=next->next;
}
if (!next) {
prev->next=(grib_string_list*)grib_context_malloc_clear(c,sizeof(grib_string_list));
next=prev->next;
}
if (!next->value) {
next->value=strdup(key);
next->count=0;
}
next->count++;
ret=next->count;
if (ret==1) {
/* If the count is 1 it could mean two things: */
/* This is the first instance of the key and there is another one */
/* This is the first and only instance of the key */
/* So we check if there is a second one of this key, */
/* If not, then rank is zero i.e. this is the only instance */
char* s=grib_context_malloc_clear(c,strlen(key)+5);
sprintf(s,"#2#%s",key);
if (grib_get_size(h,s,&size)==GRIB_NOT_FOUND) ret=0;
grib_context_free(c, s);
}
return ret;
}
static int depth=0;
static void init_class (grib_dumper_class* c){}
@ -245,12 +207,12 @@ static void dump_values(grib_dumper* d, grib_accessor* a)
fprintf(self->dumper.out,"/)\n");
grib_context_free(c,values);
if ((r=get_key_rank(h,self->keys,a->name))!=0)
if ((r=compute_key_rank(h,self->keys,a->name))!=0)
fprintf(self->dumper.out," call codes_set(ibufr,'#%d#%s',rvalues)\n",r,a->name);
else
fprintf(self->dumper.out," call codes_set(ibufr,'%s',rvalues)\n",a->name);
} else {
r=get_key_rank(h,self->keys,a->name);
r=compute_key_rank(h,self->keys,a->name);
if( !grib_is_missing_double(a,value) ) {
sval=dval_to_string(c,value);
@ -335,7 +297,7 @@ static void dump_values_attribute(grib_dumper* d, grib_accessor* a, const char*
fprintf(self->dumper.out," call codes_set(ibufr,'%s->%s' &\n,rvalues)\n",prefix,a->name);
} else {
/* int r=get_key_rank(h,self->keys,a->name); */
/* int r=compute_key_rank(h,self->keys,a->name); */
if( !grib_is_missing_double(a,value) ) {
sval=dval_to_string(c,value);
@ -383,7 +345,7 @@ static void dump_long(grib_dumper* d,grib_accessor* a, const char* comment)
char* prefix;
int dofree=0;
r=get_key_rank(h,self->keys,a->name);
r=compute_key_rank(h,self->keys,a->name);
if (r!=0) {
prefix=grib_context_malloc_clear(c,sizeof(char)*(strlen(a->name)+10));
dofree=1;
@ -424,13 +386,13 @@ static void dump_long(grib_dumper* d,grib_accessor* a, const char* comment)
fprintf(self->dumper.out,"/)\n");
grib_context_free(a->context,values);
if ((r=get_key_rank(h,self->keys,a->name))!=0)
if ((r=compute_key_rank(h,self->keys,a->name))!=0)
fprintf(self->dumper.out," call codes_set(ibufr,'#%d#%s',ivalues)\n",r,a->name);
else
fprintf(self->dumper.out," call codes_set(ibufr,'%s',ivalues)\n",a->name);
} else {
r=get_key_rank(h,self->keys,a->name);
r=compute_key_rank(h,self->keys,a->name);
if( !grib_is_missing_long(a,value) ) {
if (r!=0)
fprintf(self->dumper.out," call codes_set(ibufr,'#%d#%s',",r,a->name);
@ -505,7 +467,7 @@ static void dump_long_attribute(grib_dumper* d, grib_accessor* a, const char* pr
fprintf(self->dumper.out," call codes_set(ibufr,'%s->%s' &\n,ivalues)\n",prefix,a->name);
} else {
/* int r=get_key_rank(h,self->keys,a->name); */
/* int r=compute_key_rank(h,self->keys,a->name); */
if( !grib_is_missing_long(a,value) ) {
fprintf(self->dumper.out," call codes_set(ibufr,'%s->%s'&\n,",prefix,a->name);
fprintf(self->dumper.out,"%ld)\n",value);
@ -545,7 +507,7 @@ static void dump_double(grib_dumper* d, grib_accessor* a, const char* comment)
self->empty=0;
r=get_key_rank(h,self->keys,a->name);
r=compute_key_rank(h,self->keys,a->name);
if( !grib_is_missing_double(a,value) ) {
sval=dval_to_string(c,value);
if (r!=0)
@ -616,7 +578,7 @@ static void dump_string_array(grib_dumper* d, grib_accessor* a, const char* comm
fprintf(self->dumper.out," \"%s\" /)\n",values[i]);
if (self->isLeaf==0) {
if ((r=get_key_rank(h,self->keys,a->name))!=0)
if ((r=compute_key_rank(h,self->keys,a->name))!=0)
fprintf(self->dumper.out," call codes_set_string_array(ibufr,'#%d#%s',svalues)\n",r,a->name);
else
fprintf(self->dumper.out," call codes_set_string_array(ibufr,'%s',svalues)\n",a->name);
@ -668,7 +630,7 @@ static void dump_string(grib_dumper* d, grib_accessor* a, const char* comment)
err = grib_unpack_string(a,value,&size);
p=value;
r=get_key_rank(h,self->keys,a->name);
r=compute_key_rank(h,self->keys,a->name);
if (grib_is_missing_string(a,(unsigned char *)value,size))
return;

58
src/grib_dumper_class_python.c
View File

@ -109,44 +109,6 @@ struct string_count {
string_count* next;
};
static int get_key_rank(grib_handle* h,grib_string_list* keys, const char* key)
{
grib_string_list* next=keys;
grib_string_list* prev=keys;
int ret=0;
size_t size=0;
grib_context* c=h->context;
while (next && next->value && grib_inline_strcmp(next->value,key)) {
prev=next;
next=next->next;
}
if (!next) {
prev->next=(grib_string_list*)grib_context_malloc_clear(c,sizeof(grib_string_list));
next=prev->next;
}
if (!next->value) {
next->value=strdup(key);
next->count=0;
}
next->count++;
ret=next->count;
if (ret==1) {
/* If the count is 1 it could mean two things: */
/* This is the first instance of the key and there is another one */
/* This is the first and only instance of the key */
/* So we check if there is a second one of this key, */
/* If not, then rank is zero i.e. this is the only instance */
char* s=grib_context_malloc_clear(c,strlen(key)+5);
sprintf(s,"#2#%s",key);
if (grib_get_size(h,s,&size)==GRIB_NOT_FOUND) ret=0;
grib_context_free(c, s);
}
return ret;
}
static int depth=0;
static void init_class (grib_dumper_class* c){}
@ -236,12 +198,12 @@ static void dump_values(grib_dumper* d,grib_accessor* a)
fprintf(self->dumper.out,",)\n");
grib_context_free(c,values);
if ((r=get_key_rank(h,self->keys,a->name))!=0)
if ((r=compute_key_rank(h,self->keys,a->name))!=0)
fprintf(self->dumper.out," codes_set_array(ibufr, '#%d#%s', rvalues)\n",r,a->name);
else
fprintf(self->dumper.out," codes_set_array(ibufr, '%s', rvalues)\n",a->name);
} else {
r=get_key_rank(h,self->keys,a->name);
r=compute_key_rank(h,self->keys,a->name);
if( !grib_is_missing_double(a,value) ) {
sval=dval_to_string(c,value);
@ -323,7 +285,7 @@ static void dump_values_attribute(grib_dumper* d,grib_accessor* a, const char* p
fprintf(self->dumper.out," codes_set_array(ibufr, '%s->%s' \n, rvalues)\n",prefix,a->name);
} else {
/* int r=get_key_rank(h,self->keys,a->name); */
/* int r=compute_key_rank(h,self->keys,a->name); */
if( !grib_is_missing_double(a,value) ) {
sval=dval_to_string(c,value);
@ -370,7 +332,7 @@ static void dump_long(grib_dumper* d, grib_accessor* a, const char* comment)
char* prefix;
int dofree=0;
r=get_key_rank(h,self->keys,a->name);
r=compute_key_rank(h,self->keys,a->name);
if (r!=0) {
prefix=grib_context_malloc_clear(c,sizeof(char)*(strlen(a->name)+10));
dofree=1;
@ -409,13 +371,13 @@ static void dump_long(grib_dumper* d, grib_accessor* a, const char* comment)
fprintf(self->dumper.out,",)\n");
grib_context_free(a->context,values);
if ((r=get_key_rank(h,self->keys,a->name))!=0)
if ((r=compute_key_rank(h,self->keys,a->name))!=0)
fprintf(self->dumper.out," codes_set_array(ibufr, '#%d#%s', ivalues)\n",r,a->name);
else
fprintf(self->dumper.out," codes_set_array(ibufr, '%s', ivalues)\n",a->name);
} else {
r=get_key_rank(h,self->keys,a->name);
r=compute_key_rank(h,self->keys,a->name);
if( !grib_is_missing_long(a,value) ) {
if (r!=0)
fprintf(self->dumper.out," codes_set(ibufr, '#%d#%s', ",r,a->name);
@ -488,7 +450,7 @@ static void dump_long_attribute(grib_dumper* d, grib_accessor* a, const char* pr
fprintf(self->dumper.out," codes_set_array(ibufr, '%s->%s' \n,ivalues)\n",prefix,a->name);
} else {
/* int r=get_key_rank(h,self->keys,a->name); */
/* int r=compute_key_rank(h,self->keys,a->name); */
if( !grib_is_missing_long(a,value) ) {
fprintf(self->dumper.out," codes_set(ibufr, '%s->%s'\n,",prefix,a->name);
fprintf(self->dumper.out,"%ld)\n",value);
@ -528,7 +490,7 @@ static void dump_double(grib_dumper* d,grib_accessor* a,const char* comment)
self->empty=0;
r=get_key_rank(h,self->keys,a->name);
r=compute_key_rank(h,self->keys,a->name);
if( !grib_is_missing_double(a,value) ) {
sval=dval_to_string(c,value);
if (r!=0)
@ -596,7 +558,7 @@ static void dump_string_array(grib_dumper* d,grib_accessor* a,const char* commen
fprintf(self->dumper.out," \"%s\", )\n",values[i]);
if (self->isLeaf==0) {
if ((r=get_key_rank(h,self->keys,a->name))!=0)
if ((r=compute_key_rank(h,self->keys,a->name))!=0)
fprintf(self->dumper.out," codes_set_string_array(ibufr, '#%d#%s', svalues)\n",r,a->name);
else
fprintf(self->dumper.out," codes_set_string_array(ibufr, '%s', svalues)\n",a->name);
@ -648,7 +610,7 @@ static void dump_string(grib_dumper* d,grib_accessor* a,const char* comment)
err = grib_unpack_string(a,value,&size);
p=value;
r=get_key_rank(h,self->keys,a->name);
r=compute_key_rank(h,self->keys,a->name);
if (grib_is_missing_string(a,(unsigned char *)value,size))
return;

41
src/grib_util.c
View File

@ -1676,3 +1676,44 @@ char* codes_getenv(const char* name)
}
return result;
}
/* Return the rank of the key using list of keys (For BUFR keys) */
/* The argument 'keys' is an input as well as output from each call */
int compute_key_rank(grib_handle* h, grib_string_list* keys, const char* key)
{
grib_string_list* next=keys;
grib_string_list* prev=keys;
int theRank=0;
size_t size=0;
grib_context* c=h->context;
Assert(h->product_kind == PRODUCT_BUFR);
while (next && next->value && strcmp(next->value,key)) {
prev=next;
next=next->next;
}
if (!next) {
prev->next=(grib_string_list*)grib_context_malloc_clear(c,sizeof(grib_string_list));
next=prev->next;
}
if (!next->value) {
next->value=strdup(key);
next->count=0;
}
next->count++;
theRank=next->count;
if (theRank==1) {
/* If the count is 1 it could mean two things: */
/* This is the first instance of the key and there is another one */
/* This is the first and only instance of the key */
/* So we check if there is a second one of this key, */
/* If not, then rank is zero i.e. this is the only instance */
char* s=grib_context_malloc_clear(c,strlen(key)+5);
sprintf(s,"#2#%s",key);
if (grib_get_size(h,s,&size)==GRIB_NOT_FOUND) theRank=0;
grib_context_free(c, s);
}
return theRank;
}

41
tools/bufr_compare.c
View File

@ -94,45 +94,6 @@ static void release_keys_list()
}
}
/* Return the rank of the key using global list of keys */
static int get_key_rank(grib_handle* h, grib_string_list* keys, const char* key)
{
grib_string_list* next=keys;
grib_string_list* prev=keys;
int ret=0;
size_t size=0;
grib_context* c=h->context;
while (next && next->value && grib_inline_strcmp(next->value,key)) {
prev=next;
next=next->next;
}
if (!next) {
prev->next=(grib_string_list*)grib_context_malloc_clear(c,sizeof(grib_string_list));
next=prev->next;
}
if (!next->value) {
next->value=strdup(key);
next->count=0;
}
next->count++;
ret=next->count;
if (ret==1) {
/* If the count is 1 it could mean two things: */
/* This is the first instance of the key and there is another one */
/* This is the first and only instance of the key */
/* So we check if there is a second one of this key, */
/* If not, then rank is zero i.e. this is the only instance */
char* s=grib_context_malloc_clear(c,strlen(key)+5);
sprintf(s,"#2#%s",key);
if (grib_get_size(h,s,&size)==GRIB_NOT_FOUND) ret=0;
grib_context_free(c, s);
}
return ret;
}
GRIB_INLINE static double compare_double_absolute(double *a,double *b,double *err)
{
double ret=0;
@ -1132,7 +1093,7 @@ static int compare_all_dump_keys(grib_handle* handle1, grib_handle* handle2, gri
if (xa==NULL || ( xa->flags & GRIB_ACCESSOR_FLAG_DUMP )==0 ) continue;
/* Get full name of key, e.g. '#2#windSpeed' or 'blockNumber' */
rank = get_key_rank(handle1, keys_list, xa->name);
rank = compute_key_rank(handle1, keys_list, xa->name);
if (rank != 0) {
prefix=grib_context_malloc_clear(context,sizeof(char)*(strlen(xa->name)+10));
dofree = 1;