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

ECC-1071: Performance: GRIB1: Calculating number of points for Reduced Gaussian grids

This commit is contained in:
Shahram Najm 2020-02-11 13:59:13 +00:00
parent 7236f84e3c
commit deac4b3488
1 changed files with 2 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/grib_accessor_class_number_of_points_gaussian.c
View File

@ -338,7 +338,6 @@ static int unpack_long_new(grib_accessor* a, long* val, size_t* len)
int is_global = 0; int is_global = 0;
long ni = 0, nj = 0, plpresent = 0, order = 0; long ni = 0, nj = 0, plpresent = 0, order = 0;
size_t plsize = 0; size_t plsize = 0;
double* lats = {0,};
double lat_first, lat_last, lon_first, lon_last; double lat_first, lat_last, lon_first, lon_last;
long* pl = NULL; long* pl = NULL;
long* plsave = NULL; long* plsave = NULL;
@ -370,7 +369,6 @@ static int unpack_long_new(grib_accessor* a, long* val, size_t* len)
if (plpresent) { if (plpresent) {
long max_pl = 0; long max_pl = 0;
float d = 0;
int j = 0; int j = 0;
double lon_first_row = 0, lon_last_row = 0; double lon_first_row = 0, lon_last_row = 0;
@ -386,10 +384,6 @@ static int unpack_long_new(grib_accessor* a, long* val, size_t* len)
if ((ret = grib_get_double_internal(h, self->lon_last, &lon_last)) != GRIB_SUCCESS) if ((ret = grib_get_double_internal(h, self->lon_last, &lon_last)) != GRIB_SUCCESS)
return ret; return ret;
lats = (double*)grib_context_malloc(a->context, sizeof(double) * order * 2);
if ((ret = grib_get_gaussian_latitudes(order, lats)) != GRIB_SUCCESS)
return ret;
if ((ret = grib_get_size(h, self->pl, &plsize)) != GRIB_SUCCESS) if ((ret = grib_get_size(h, self->pl, &plsize)) != GRIB_SUCCESS)
return ret; return ret;
@ -410,14 +404,12 @@ static int unpack_long_new(grib_accessor* a, long* val, size_t* len)
max_pl = pl[j]; max_pl = pl[j];
} }
d = fabs(lats[0] - lats[1]);
is_global = 0; /* ECC-445 */ is_global = 0; /* ECC-445 */
correctWestEast(max_pl, angular_precision, &lon_first, &lon_last); correctWestEast(max_pl, angular_precision, &lon_first, &lon_last);
if (!is_global) { if (!is_global) {
/*sub area*/ /*sub area*/
(void)d;
*val = 0; *val = 0;
for (j = 0; j < nj; j++) { for (j = 0; j < nj; j++) {
row_count = 0; row_count = 0;
@ -440,8 +432,6 @@ static int unpack_long_new(grib_accessor* a, long* val, size_t* len)
/*regular*/ /*regular*/
*val = ni * nj; *val = ni * nj;
} }
if (lats)
grib_context_free(c, lats);
if (plsave) if (plsave)
grib_context_free(c, plsave); grib_context_free(c, plsave);
@ -455,7 +445,6 @@ static int unpack_long_with_legacy_support(grib_accessor* a, long* val, size_t*
int is_global = 0; int is_global = 0;
long ni = 0, nj = 0, plpresent = 0, order = 0; long ni = 0, nj = 0, plpresent = 0, order = 0;
size_t plsize = 0; size_t plsize = 0;
double* lats = {0,};
double lat_first, lat_last, lon_first, lon_last; double lat_first, lat_last, lon_first, lon_last;
long* pl = NULL; long* pl = NULL;
long* plsave = NULL; long* plsave = NULL;
@ -487,8 +476,7 @@ static int unpack_long_with_legacy_support(grib_accessor* a, long* val, size_t*
} }
if (plpresent) { if (plpresent) {
long max_pl = 0; long max_pl = 0;
float d = 0;
int j = 0; int j = 0;
double lon_first_row = 0, lon_last_row = 0; double lon_first_row = 0, lon_last_row = 0;
@ -504,10 +492,6 @@ static int unpack_long_with_legacy_support(grib_accessor* a, long* val, size_t*
if ((ret = grib_get_double_internal(h, self->lon_last, &lon_last)) != GRIB_SUCCESS) if ((ret = grib_get_double_internal(h, self->lon_last, &lon_last)) != GRIB_SUCCESS)
return ret; return ret;
lats = (double*)grib_context_malloc(a->context, sizeof(double) * order * 2);
if ((ret = grib_get_gaussian_latitudes(order, lats)) != GRIB_SUCCESS)
return ret;
if ((ret = grib_get_size(h, self->pl, &plsize)) != GRIB_SUCCESS) if ((ret = grib_get_size(h, self->pl, &plsize)) != GRIB_SUCCESS)
return ret; return ret;
@ -529,14 +513,12 @@ static int unpack_long_with_legacy_support(grib_accessor* a, long* val, size_t*
} }
/*is_global=is_gaussian_global(lat_first,lat_last,lon_first,lon_last,max_pl,lats,angular_precision);*/ /*is_global=is_gaussian_global(lat_first,lat_last,lon_first,lon_last,max_pl,lats,angular_precision);*/
d = fabs(lats[0] - lats[1]);
is_global = 0; /* ECC-445 */ is_global = 0; /* ECC-445 */
correctWestEast(max_pl, angular_precision, &lon_first, &lon_last); correctWestEast(max_pl, angular_precision, &lon_first, &lon_last);
if (!is_global) { if (!is_global) {
/*sub area*/ /*sub area*/
(void)d;
#if EFDEBUG #if EFDEBUG
printf("-------- subarea fabs(lat_first-lats[0])=%g d=%g\n", fabs(lat_first - lats[0]), d); printf("-------- subarea fabs(lat_first-lats[0])=%g d=%g\n", fabs(lat_first - lats[0]), d);
printf("-------- subarea fabs(lat_last+lats[0])=%g d=%g\n", fabs(lat_last + lats[0]), d); printf("-------- subarea fabs(lat_last+lats[0])=%g d=%g\n", fabs(lat_last + lats[0]), d);
@ -584,8 +566,7 @@ static int unpack_long_with_legacy_support(grib_accessor* a, long* val, size_t*
for (i = 0; i < plsize; i++) for (i = 0; i < plsize; i++)
printf(" DEBUG: pl[%d]=%ld\n", i, pl[i]); printf(" DEBUG: pl[%d]=%ld\n", i, pl[i]);
#endif #endif
if (lats)
grib_context_free(c, lats);
if (plsave) if (plsave)
grib_context_free(c, plsave); grib_context_free(c, plsave);