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

GRIB-941: GRIB2 angles are not rounded

This commit is contained in:
Shahram Najm 2016-03-07 17:52:07 +00:00
parent cddc02537e
commit 299a2606fc
2 changed files with 169 additions and 173 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/grib_accessor_class_g2grid.c
View File

@ -166,7 +166,6 @@ static void init(grib_accessor* a,const long l, grib_arguments* c)
a->flags |= a->flags |=
GRIB_ACCESSOR_FLAG_EDITION_SPECIFIC | GRIB_ACCESSOR_FLAG_EDITION_SPECIFIC |
GRIB_ACCESSOR_FLAG_READ_ONLY ; GRIB_ACCESSOR_FLAG_READ_ONLY ;
} }
static int value_count(grib_accessor* a,long* count) static int value_count(grib_accessor* a,long* count)
@ -175,7 +174,6 @@ static int value_count(grib_accessor* a,long* count)
return 0; return 0;
} }
static int unpack_double(grib_accessor* a, double* val, size_t *len) static int unpack_double(grib_accessor* a, double* val, size_t *len)
{ {
grib_accessor_g2grid* self = (grib_accessor_g2grid*)a; grib_accessor_g2grid* self = (grib_accessor_g2grid*)a;
@ -202,8 +200,6 @@ static int unpack_double(grib_accessor* a, double* val, size_t *len)
if(sub_division == GRIB_MISSING_LONG || sub_division == 0) if(sub_division == GRIB_MISSING_LONG || sub_division == 0)
sub_division = 1000000; sub_division = 1000000;
if(basic_angle == 0) if(basic_angle == 0)
basic_angle = 1; basic_angle = 1;
@ -237,8 +233,6 @@ static int unpack_double(grib_accessor* a, double* val, size_t *len)
else else
val[i] = (double)v[i] / (double)sub_division * (double)basic_angle; val[i] = (double)v[i] / (double)sub_division * (double)basic_angle;
return GRIB_SUCCESS; return GRIB_SUCCESS;
} }
@ -254,7 +248,6 @@ static long lcm(long a,long b)
return a*b/gcd(a,b); return a*b/gcd(a,b);
} }
static int is_ok(const double* val,long v[6],double basic_angle,double sub_division) static int is_ok(const double* val,long v[6],double basic_angle,double sub_division)
{ {
int i; int i;
@ -268,6 +261,7 @@ static int is_ok(const double* val,long v[6],double basic_angle,double sub_divis
{ {
double d = (val[i] * sub_division) / basic_angle; double d = (val[i] * sub_division) / basic_angle;
double e; double e;
d = round(d); /* GRIB-941 */
v[i] = d; v[i] = d;
e = (v[i] * basic_angle) / sub_division ; e = (v[i] * basic_angle) / sub_division ;
@ -278,9 +272,7 @@ static int is_ok(const double* val,long v[6],double basic_angle,double sub_divis
ok = 0; ok = 0;
} }
} }
} }
return ok; return ok;
} }
@ -296,7 +288,6 @@ static int trial(const double* val,long v[6],long* basic_angle,long* sub_divisio
if(val[4] == 0) return 0; if(val[4] == 0) return 0;
if(val[5] == 0) return 0; if(val[5] == 0) return 0;
ni = (long)(0.5+fabs((val[0] - val[2])/val[4])) + 1; ni = (long)(0.5+fabs((val[0] - val[2])/val[4])) + 1;
nj = (long)(0.5+fabs((val[1] - val[3])/val[5])) + 1; nj = (long)(0.5+fabs((val[1] - val[3])/val[5])) + 1;
@ -314,7 +305,6 @@ static int trial(const double* val,long v[6],long* basic_angle,long* sub_divisio
Assert(*sub_division >= 0); Assert(*sub_division >= 0);
return is_ok(val,v,*basic_angle,*sub_division); return is_ok(val,v,*basic_angle,*sub_division);
} }
static int pack_double(grib_accessor* a, const double* val, size_t *len) static int pack_double(grib_accessor* a, const double* val, size_t *len)
@ -386,9 +376,5 @@ static int pack_double(grib_accessor* a, const double* val, size_t *len)
if((ret = grib_set_long_internal(grib_handle_of_accessor(a), self->j_increment,v[n++])) != GRIB_SUCCESS) if((ret = grib_set_long_internal(grib_handle_of_accessor(a), self->j_increment,v[n++])) != GRIB_SUCCESS)
return ret; return ret;
return GRIB_SUCCESS; return GRIB_SUCCESS;
} }

10
tests/set.sh
View File

@ -58,4 +58,14 @@ ${tools_dir}grib_set -p levtype $infile $outfile 2> $REDIRECT > $REDIRECT
[ $? -ne 0 ] [ $? -ne 0 ]
# GRIB-941: encoding of grib2 angles
angleInDegrees=130.9989
angleInMicroDegrees=130998900
files="GRIB2.tmpl regular_gg_pl_grib2.tmpl reduced_gg_pl_320_grib2.tmpl polar_stereographic_pl_grib2.tmpl"
for f in $files; do
f=$ECCODES_SAMPLES_PATH/$f
${tools_dir}grib_set -s longitudeOfFirstGridPointInDegrees=$angleInDegrees $f $outfile
grib_check_key_equals $outfile longitudeOfFirstGridPoint $angleInMicroDegrees
done
rm -f $outfile || true rm -f $outfile || true