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

GRIB-323: grib_find_nearest: distance to same grid point should be 0

This commit is contained in:
Shahram Najm 2014-06-27 13:23:04 +01:00
parent 41f5b34b4d
commit 50a9c1cadf
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/grib_nearest.c
View File

@ -83,7 +83,6 @@ int grib_nearest_delete(grib_nearest *i)
return 0; return 0;
} }
void grib_binary_search(double xx[], const unsigned long n, double x, void grib_binary_search(double xx[], const unsigned long n, double x,
int *ju,int *jl) int *ju,int *jl)
{ {
@ -101,13 +100,18 @@ void grib_binary_search(double xx[], const unsigned long n, double x,
#define RADIAN(x) ((x) * acos(0.0) / 90.0) #define RADIAN(x) ((x) * acos(0.0) / 90.0)
double grib_nearest_distance(double radius,double lon1, double lat1, double lon2, double lat2){ double grib_nearest_distance(double radius,double lon1, double lat1, double lon2, double lat2)
{
double rlat1=RADIAN(lat1); double rlat1=RADIAN(lat1);
double rlat2=RADIAN(lat2); double rlat2=RADIAN(lat2);
double rlon1=lon1; double rlon1=lon1;
double rlon2=lon2; double rlon2=lon2;
double a; double a;
if (lat1 == lat2 && lon1 == lon2) {
return 0.0; /* the two points are identical */
}
if (rlon1 >=360) rlon1-=360.0; if (rlon1 >=360) rlon1-=360.0;
rlon1=RADIAN(rlon1); rlon1=RADIAN(rlon1);
if (rlon2 >=360) rlon2-=360.0; if (rlon2 >=360) rlon2-=360.0;