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

ECC-341: fix bug with constant lat/lon values

This commit is contained in:
Shahram Najm 2018-01-11 18:18:53 +00:00
parent 50e6d0e0d0
commit fc8653b26f
1 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/grib_accessor_class_bufr_extract_area_subsets.c
View File

@ -172,6 +172,12 @@ static int get_native_type(grib_accessor* a)
return GRIB_TYPE_LONG;
}
/* Copy first element of array into all others */
static void fill_in(double a[], long length)
{
long i;
for (i=1; i<length; ++i) a[i] = a[0];
}
static int select_area(grib_accessor* a)
{
int ret=0;
@ -211,6 +217,7 @@ static int select_area(grib_accessor* a)
sprintf(latstr,"#%ld#latitude",latRank);
}
/* Latitudes */
n=numberOfSubsets;
lat=(double*)grib_context_malloc_clear(c,sizeof(double)*numberOfSubsets);
if (compressed) {
@ -220,14 +227,23 @@ static int select_area(grib_accessor* a)
/* n can be 1 if all latitudes are the same */
return GRIB_INTERNAL_ERROR;
}
if (n == 1) {
fill_in(lat, numberOfSubsets);
}
} else {
size_t values_len=0;
for(i=0; i<numberOfSubsets; ++i) {
sprintf(latstr,"#%ld#latitude", i+1);
ret = grib_get_size(h, latstr, &values_len); if (ret) return ret;
if (values_len>1)
return GRIB_NOT_IMPLEMENTED;
ret=grib_get_double(h,latstr,&(lat[i]));
if (ret) return ret;
}
}
/* Longitudes */
n=numberOfSubsets;
lon=(double*)grib_context_malloc_clear(c,sizeof(double)*numberOfSubsets);
if (compressed) {
ret=grib_get_double_array(h,lonstr,lon,&n);
@ -236,9 +252,16 @@ static int select_area(grib_accessor* a)
/* n can be 1 if all longitudes are the same */
return GRIB_INTERNAL_ERROR;
}
if (n == 1) {
fill_in(lon, numberOfSubsets);
}
} else {
size_t values_len=0;
for(i=0; i<numberOfSubsets; ++i) {
sprintf(lonstr,"#%ld#longitude", i+1);
ret = grib_get_size(h, lonstr, &values_len); if (ret) return ret;
if (values_len>1)
return GRIB_NOT_IMPLEMENTED;
ret=grib_get_double(h,lonstr,&(lon[i]));
if (ret) return ret;
}