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

ECC-1526: Performance: Unnecessary decoding during nearest neighbour computation

This commit is contained in:
Shahram Najm 2023-02-08 17:25:44 +00:00
parent 3710b22999
commit a34af79897
3 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/grib_nearest_class_latlon_reduced.cc
View File

@ -182,7 +182,6 @@ static int find_global(grib_nearest* nearest, grib_handle* h,
* This is for performance: if the grid has not changed, we only do this once * This is for performance: if the grid has not changed, we only do this once
* and reuse for other messages */ * and reuse for other messages */
if (!nearest->h || (flags & GRIB_NEAREST_SAME_GRID) == 0) { if (!nearest->h || (flags & GRIB_NEAREST_SAME_GRID) == 0) {
double dummy = 0;
double olat = 1.e10; double olat = 1.e10;
long n = 0; long n = 0;
@ -211,12 +210,12 @@ static int find_global(grib_nearest* nearest, grib_handle* h,
if (!self->lons) if (!self->lons)
return GRIB_OUT_OF_MEMORY; return GRIB_OUT_OF_MEMORY;
iter = grib_iterator_new(h, 0, &ret); iter = grib_iterator_new(h, GRIB_GEOITERATOR_NO_VALUES, &ret);
if (ret) { if (ret) {
grib_context_log(h->context, GRIB_LOG_ERROR, "unable to create iterator"); grib_context_log(h->context, GRIB_LOG_ERROR, "unable to create iterator");
return ret; return ret;
} }
while (grib_iterator_next(iter, &lat, &lon, &dummy)) { while (grib_iterator_next(iter, &lat, &lon, NULL)) {
if (olat != lat) { if (olat != lat) {
self->lats[ilat++] = lat; self->lats[ilat++] = lat;
olat = lat; olat = lat;

5
src/grib_nearest_class_reduced.cc
View File

@ -215,7 +215,6 @@ static int find_global(grib_nearest* nearest, grib_handle* h,
* This is for performance: if the grid has not changed, we only do this once * This is for performance: if the grid has not changed, we only do this once
* and reuse for other messages */ * and reuse for other messages */
if (!nearest->h || (flags & GRIB_NEAREST_SAME_GRID) == 0) { if (!nearest->h || (flags & GRIB_NEAREST_SAME_GRID) == 0) {
double dummy = 0;
double olat = 1.e10; double olat = 1.e10;
long n = 0; long n = 0;
@ -244,12 +243,12 @@ static int find_global(grib_nearest* nearest, grib_handle* h,
if (!self->lons) if (!self->lons)
return GRIB_OUT_OF_MEMORY; return GRIB_OUT_OF_MEMORY;
iter = grib_iterator_new(h, 0, &ret); iter = grib_iterator_new(h, GRIB_GEOITERATOR_NO_VALUES, &ret);
if (ret != GRIB_SUCCESS) { if (ret != GRIB_SUCCESS) {
grib_context_log(h->context, GRIB_LOG_ERROR, "grib_nearest_reduced: Unable to create lat/lon iterator"); grib_context_log(h->context, GRIB_LOG_ERROR, "grib_nearest_reduced: Unable to create lat/lon iterator");
return ret; return ret;
} }
while (grib_iterator_next(iter, &lat, &lon, &dummy)) { while (grib_iterator_next(iter, &lat, &lon, NULL)) {
if (olat != lat) { if (olat != lat) {
self->lats[ilat++] = lat; self->lats[ilat++] = lat;
olat = lat; olat = lat;

5
src/grib_nearest_class_regular.cc
View File

@ -253,7 +253,6 @@ static int find(grib_nearest* nearest, grib_handle* h,
* This is for performance: if the grid has not changed, we only do this once * This is for performance: if the grid has not changed, we only do this once
* and reuse for other messages */ * and reuse for other messages */
if (!nearest->h || (flags & GRIB_NEAREST_SAME_GRID) == 0) { if (!nearest->h || (flags & GRIB_NEAREST_SAME_GRID) == 0) {
double dummy = 0;
double olat = 1.e10, olon = 1.e10; double olat = 1.e10, olon = 1.e10;
int ilat = 0, ilon = 0; int ilat = 0, ilon = 0;
long n = 0; long n = 0;
@ -316,12 +315,12 @@ static int find(grib_nearest* nearest, grib_handle* h,
if (!self->lons) if (!self->lons)
return GRIB_OUT_OF_MEMORY; return GRIB_OUT_OF_MEMORY;
iter = grib_iterator_new(h, 0, &ret); iter = grib_iterator_new(h, GRIB_GEOITERATOR_NO_VALUES, &ret);
if (ret != GRIB_SUCCESS) { if (ret != GRIB_SUCCESS) {
grib_context_log(h->context, GRIB_LOG_ERROR, "grib_nearest_regular: Unable to create lat/lon iterator"); grib_context_log(h->context, GRIB_LOG_ERROR, "grib_nearest_regular: Unable to create lat/lon iterator");
return ret; return ret;
} }
while (grib_iterator_next(iter, &lat, &lon, &dummy)) { while (grib_iterator_next(iter, &lat, &lon, NULL)) {
if (ilat < self->lats_count && olat != lat) { if (ilat < self->lats_count && olat != lat) {
/* Assert(ilat < self->lats_count); */ /* Assert(ilat < self->lats_count); */
self->lats[ilat++] = lat; self->lats[ilat++] = lat;