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

ECC-521: grib_get_data for Lambert Conformal: incorrect if adjacent rows scan in the opposite direction

This commit is contained in:
Shahram Najm 2017-08-14 17:25:56 +01:00
parent 81bd4e4353
commit f918b2e86a
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/grib_iterator_class_lambert_conformal.c
View File

@ -146,7 +146,7 @@ static int transform_data(grib_handle* h, double* data,
/* Already +i and +j. No need to change */
return GRIB_SUCCESS;
}
#if 0
if ( !iScansNegatively && !jScansPositively && !jPointsAreConsecutive && !alternativeRowScanning &&
nx > 0 && ny > 0)
{
@ -165,7 +165,7 @@ static int transform_data(grib_handle* h, double* data,
grib_context_free(h->context, data2);
return GRIB_SUCCESS;
}
#endif
if (nx < 1 || ny < 1) {
grib_context_log(h->context,GRIB_LOG_ERROR, "Invalid values for Nx and/or Ny");
return GRIB_GEOCALCULUS_PROBLEM;
@ -334,16 +334,11 @@ static int init(grib_iterator* iter,grib_handle* h,grib_arguments* args)
iter->e = -1;
if (alternativeRowScanning || jPointsAreConsecutive) {
/* TODO: Test this thoroughly for all scanning modes.
* For now we transform the data array only for the specific
* cases of alternativeRowScanning or jPointsAreConsecutive
*/
err = transform_data(h, iter->data,
iScansNegatively, jScansPositively, jPointsAreConsecutive, alternativeRowScanning,
iter->nv, nx, ny);
if (err) return err;
}
err = transform_data(h, iter->data,
iScansNegatively, jScansPositively, jPointsAreConsecutive, alternativeRowScanning,
iter->nv, nx, ny);
if (err) return err;
return err;
}