mirror of https://github.com/ecmwf/eccodes.git
GRIB-941: GRIB2 angles are not rounded
This commit is contained in:
Shahram Najm
parent
cddc02537e
commit
299a2606fc
|
|
@ -151,244 +151,230 @@ static void init_class(grib_accessor_class* c)
|
|||
|
||||
static void init(grib_accessor* a,const long l, grib_arguments* c)
|
||||
{
|
||||
grib_accessor_g2grid* self = (grib_accessor_g2grid*)a;
|
||||
int n = 0;
|
||||
grib_accessor_g2grid* self = (grib_accessor_g2grid*)a;
|
||||
int n = 0;
|
||||
|
||||
self->latitude_first = grib_arguments_get_name(grib_handle_of_accessor(a),c,n++);
|
||||
self->longitude_first = grib_arguments_get_name(grib_handle_of_accessor(a),c,n++);
|
||||
self->latitude_last = grib_arguments_get_name(grib_handle_of_accessor(a),c,n++);
|
||||
self->longitude_last = grib_arguments_get_name(grib_handle_of_accessor(a),c,n++);
|
||||
self->i_increment = grib_arguments_get_name(grib_handle_of_accessor(a),c,n++);
|
||||
self->j_increment = grib_arguments_get_name(grib_handle_of_accessor(a),c,n++);
|
||||
self->basic_angle = grib_arguments_get_name(grib_handle_of_accessor(a),c,n++);
|
||||
self->sub_division = grib_arguments_get_name(grib_handle_of_accessor(a),c,n++);
|
||||
|
||||
a->flags |=
|
||||
GRIB_ACCESSOR_FLAG_EDITION_SPECIFIC |
|
||||
GRIB_ACCESSOR_FLAG_READ_ONLY ;
|
||||
self->latitude_first = grib_arguments_get_name(grib_handle_of_accessor(a),c,n++);
|
||||
self->longitude_first = grib_arguments_get_name(grib_handle_of_accessor(a),c,n++);
|
||||
self->latitude_last = grib_arguments_get_name(grib_handle_of_accessor(a),c,n++);
|
||||
self->longitude_last = grib_arguments_get_name(grib_handle_of_accessor(a),c,n++);
|
||||
self->i_increment = grib_arguments_get_name(grib_handle_of_accessor(a),c,n++);
|
||||
self->j_increment = grib_arguments_get_name(grib_handle_of_accessor(a),c,n++);
|
||||
self->basic_angle = grib_arguments_get_name(grib_handle_of_accessor(a),c,n++);
|
||||
self->sub_division = grib_arguments_get_name(grib_handle_of_accessor(a),c,n++);
|
||||
|
||||
a->flags |=
|
||||
GRIB_ACCESSOR_FLAG_EDITION_SPECIFIC |
|
||||
GRIB_ACCESSOR_FLAG_READ_ONLY ;
|
||||
}
|
||||
|
||||
static int value_count(grib_accessor* a,long* count)
|
||||
{
|
||||
*count=6;
|
||||
return 0;
|
||||
*count=6;
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
static int unpack_double(grib_accessor* a, double* val, size_t *len)
|
||||
{
|
||||
grib_accessor_g2grid* self = (grib_accessor_g2grid*)a;
|
||||
int ret = 0;
|
||||
grib_accessor_g2grid* self = (grib_accessor_g2grid*)a;
|
||||
int ret = 0;
|
||||
|
||||
long basic_angle = 0;
|
||||
long sub_division = 0;
|
||||
int n = 0;
|
||||
long v[6];
|
||||
int i;
|
||||
long basic_angle = 0;
|
||||
long sub_division = 0;
|
||||
int n = 0;
|
||||
long v[6];
|
||||
int i;
|
||||
|
||||
if(*len < 6){
|
||||
ret = GRIB_ARRAY_TOO_SMALL;
|
||||
return ret;
|
||||
}
|
||||
if(*len < 6){
|
||||
ret = GRIB_ARRAY_TOO_SMALL;
|
||||
return ret;
|
||||
}
|
||||
|
||||
if((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->basic_angle,&basic_angle)) != GRIB_SUCCESS)
|
||||
return ret;
|
||||
|
||||
if((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->sub_division,&sub_division)) != GRIB_SUCCESS)
|
||||
return ret;
|
||||
|
||||
|
||||
if(sub_division == GRIB_MISSING_LONG || sub_division == 0)
|
||||
sub_division = 1000000;
|
||||
|
||||
|
||||
|
||||
if(basic_angle == 0)
|
||||
basic_angle = 1;
|
||||
|
||||
n = 0;
|
||||
if((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->latitude_first,&v[n++])) != GRIB_SUCCESS)
|
||||
return ret;
|
||||
|
||||
if((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->longitude_first,&v[n++])) != GRIB_SUCCESS)
|
||||
return ret;
|
||||
|
||||
if((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->latitude_last,&v[n++])) != GRIB_SUCCESS)
|
||||
return ret;
|
||||
|
||||
if((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->longitude_last,&v[n++])) != GRIB_SUCCESS)
|
||||
return ret;
|
||||
|
||||
if(!self->i_increment) v[n++] = GRIB_MISSING_LONG;
|
||||
else
|
||||
if((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->i_increment,&v[n++])) != GRIB_SUCCESS)
|
||||
return ret;
|
||||
|
||||
if(!self->j_increment) v[n++] = GRIB_MISSING_LONG;
|
||||
else
|
||||
if(self->j_increment)
|
||||
if((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->j_increment,&v[n++])) != GRIB_SUCCESS)
|
||||
if((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->basic_angle,&basic_angle)) != GRIB_SUCCESS)
|
||||
return ret;
|
||||
|
||||
for(i = 0 ; i < n ; i++)
|
||||
if(v[i] == GRIB_MISSING_LONG)
|
||||
val[i] = GRIB_MISSING_DOUBLE;
|
||||
if((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->sub_division,&sub_division)) != GRIB_SUCCESS)
|
||||
return ret;
|
||||
|
||||
|
||||
if(sub_division == GRIB_MISSING_LONG || sub_division == 0)
|
||||
sub_division = 1000000;
|
||||
|
||||
if(basic_angle == 0)
|
||||
basic_angle = 1;
|
||||
|
||||
n = 0;
|
||||
if((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->latitude_first,&v[n++])) != GRIB_SUCCESS)
|
||||
return ret;
|
||||
|
||||
if((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->longitude_first,&v[n++])) != GRIB_SUCCESS)
|
||||
return ret;
|
||||
|
||||
if((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->latitude_last,&v[n++])) != GRIB_SUCCESS)
|
||||
return ret;
|
||||
|
||||
if((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->longitude_last,&v[n++])) != GRIB_SUCCESS)
|
||||
return ret;
|
||||
|
||||
if(!self->i_increment) v[n++] = GRIB_MISSING_LONG;
|
||||
else
|
||||
val[i] = (double)v[i] / (double)sub_division * (double)basic_angle;
|
||||
if((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->i_increment,&v[n++])) != GRIB_SUCCESS)
|
||||
return ret;
|
||||
|
||||
if(!self->j_increment) v[n++] = GRIB_MISSING_LONG;
|
||||
else
|
||||
if(self->j_increment)
|
||||
if((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->j_increment,&v[n++])) != GRIB_SUCCESS)
|
||||
return ret;
|
||||
|
||||
for(i = 0 ; i < n ; i++)
|
||||
if(v[i] == GRIB_MISSING_LONG)
|
||||
val[i] = GRIB_MISSING_DOUBLE;
|
||||
else
|
||||
val[i] = (double)v[i] / (double)sub_division * (double)basic_angle;
|
||||
|
||||
return GRIB_SUCCESS;
|
||||
return GRIB_SUCCESS;
|
||||
}
|
||||
|
||||
static long gcd(long a,long b)
|
||||
{
|
||||
if(b>a) return gcd(b,a);
|
||||
if(b == 0) return a;
|
||||
return gcd(b,a%b);
|
||||
if(b>a) return gcd(b,a);
|
||||
if(b == 0) return a;
|
||||
return gcd(b,a%b);
|
||||
}
|
||||
|
||||
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)
|
||||
{
|
||||
int i;
|
||||
int ok = 1;
|
||||
int i;
|
||||
int ok = 1;
|
||||
|
||||
for(i = 0; i < 6 ; i++)
|
||||
{
|
||||
if(val[i] == GRIB_MISSING_DOUBLE)
|
||||
v[i] = GRIB_MISSING_LONG;
|
||||
else
|
||||
for(i = 0; i < 6 ; i++)
|
||||
{
|
||||
double d = (val[i] * sub_division) / basic_angle;
|
||||
double e;
|
||||
v[i] = d;
|
||||
e = (v[i] * basic_angle) / sub_division ;
|
||||
if(val[i] == GRIB_MISSING_DOUBLE)
|
||||
v[i] = GRIB_MISSING_LONG;
|
||||
else
|
||||
{
|
||||
double d = (val[i] * sub_division) / basic_angle;
|
||||
double e;
|
||||
d = round(d); /* GRIB-941 */
|
||||
v[i] = d;
|
||||
e = (v[i] * basic_angle) / sub_division ;
|
||||
|
||||
/* if(fabs(e - val[i]) >= 1e-6) */
|
||||
if(fabs(e - val[i]) > 0)
|
||||
{
|
||||
/* printf("e=%g val=%g diff=%g\n",e,val[i],e-val[i]); */
|
||||
ok = 0;
|
||||
}
|
||||
/* if(fabs(e - val[i]) >= 1e-6) */
|
||||
if(fabs(e - val[i]) > 0)
|
||||
{
|
||||
/* printf("e=%g val=%g diff=%g\n",e,val[i],e-val[i]); */
|
||||
ok = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
return ok;
|
||||
return ok;
|
||||
}
|
||||
|
||||
static int trial(const double* val,long v[6],long* basic_angle,long* sub_division)
|
||||
{
|
||||
int i = 0;
|
||||
long ni, nj;
|
||||
int i = 0;
|
||||
long ni, nj;
|
||||
|
||||
for(i = 0; i < 6 ; i++)
|
||||
if(val[i] == GRIB_MISSING_DOUBLE)
|
||||
return 0;
|
||||
for(i = 0; i < 6 ; i++)
|
||||
if(val[i] == GRIB_MISSING_DOUBLE)
|
||||
return 0;
|
||||
|
||||
if(val[4] == 0) return 0;
|
||||
if(val[5] == 0) return 0;
|
||||
if(val[4] == 0) return 0;
|
||||
if(val[5] == 0) return 0;
|
||||
|
||||
ni = (long)(0.5+fabs((val[0] - val[2])/val[4])) + 1;
|
||||
nj = (long)(0.5+fabs((val[1] - val[3])/val[5])) + 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;
|
||||
|
||||
*basic_angle = 360;
|
||||
*sub_division = lcm(ni,nj);
|
||||
*basic_angle = 360;
|
||||
*sub_division = lcm(ni,nj);
|
||||
|
||||
#if 0
|
||||
printf("ni = %ld, nj = %ld , basic_angle=%ld sub_division = %ld\n",
|
||||
ni,nj,
|
||||
*basic_angle,*sub_division);
|
||||
printf("ni = %ld, nj = %ld , basic_angle=%ld sub_division = %ld\n",
|
||||
ni,nj,
|
||||
*basic_angle,*sub_division);
|
||||
#endif
|
||||
if(*sub_division < 0)
|
||||
return 0;
|
||||
if(*sub_division < 0)
|
||||
return 0;
|
||||
|
||||
Assert(*sub_division >= 0);
|
||||
|
||||
return is_ok(val,v,*basic_angle,*sub_division);
|
||||
Assert(*sub_division >= 0);
|
||||
|
||||
return is_ok(val,v,*basic_angle,*sub_division);
|
||||
}
|
||||
|
||||
static int pack_double(grib_accessor* a, const double* val, size_t *len)
|
||||
{
|
||||
grib_accessor_g2grid* self = (grib_accessor_g2grid*)a;
|
||||
int ret;
|
||||
long v[6];
|
||||
int n;
|
||||
long basic_angle;
|
||||
long sub_division;
|
||||
grib_accessor_g2grid* self = (grib_accessor_g2grid*)a;
|
||||
int ret;
|
||||
long v[6];
|
||||
int n;
|
||||
long basic_angle;
|
||||
long sub_division;
|
||||
|
||||
if(*len < 6){
|
||||
ret = GRIB_ARRAY_TOO_SMALL;
|
||||
return ret;
|
||||
}
|
||||
if(*len < 6){
|
||||
ret = GRIB_ARRAY_TOO_SMALL;
|
||||
return ret;
|
||||
}
|
||||
|
||||
/* printf("pack_double %g %g %g %g %g %g\n",val[0],val[1],val[2],val[3],val[4],val[5]);*/
|
||||
/* printf("pack_double %g %g %g %g %g %g\n",val[0],val[1],val[2],val[3],val[4],val[5]);*/
|
||||
|
||||
if(is_ok(val,v,1,1000000))
|
||||
{
|
||||
basic_angle = 1;
|
||||
sub_division = 1000000;
|
||||
}
|
||||
else if(trial(val,v,&basic_angle,&sub_division))
|
||||
{
|
||||
if(is_ok(val,v,1,1000000))
|
||||
{
|
||||
basic_angle = 1;
|
||||
sub_division = 1000000;
|
||||
}
|
||||
else if(trial(val,v,&basic_angle,&sub_division))
|
||||
{
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
basic_angle = 1;
|
||||
sub_division = 1000000;
|
||||
}
|
||||
else
|
||||
{
|
||||
basic_angle = 1;
|
||||
sub_division = 1000000;
|
||||
|
||||
if(!is_ok(val,v,basic_angle,sub_division))
|
||||
grib_context_log(a->context,GRIB_LOG_DEBUG,"Grid cannot be coded with any loss of precision");
|
||||
}
|
||||
if(!is_ok(val,v,basic_angle,sub_division))
|
||||
grib_context_log(a->context,GRIB_LOG_DEBUG,"Grid cannot be coded with any loss of precision");
|
||||
}
|
||||
|
||||
if(basic_angle == 1 && sub_division == 1000000)
|
||||
{
|
||||
basic_angle = 0;
|
||||
sub_division = GRIB_MISSING_LONG;
|
||||
}
|
||||
if(basic_angle == 1 && sub_division == 1000000)
|
||||
{
|
||||
basic_angle = 0;
|
||||
sub_division = GRIB_MISSING_LONG;
|
||||
}
|
||||
|
||||
if((ret = grib_set_long_internal(grib_handle_of_accessor(a), self->basic_angle,basic_angle)) != GRIB_SUCCESS)
|
||||
return ret;
|
||||
if((ret = grib_set_long_internal(grib_handle_of_accessor(a), self->basic_angle,basic_angle)) != GRIB_SUCCESS)
|
||||
return ret;
|
||||
|
||||
if((ret = grib_set_long_internal(grib_handle_of_accessor(a), self->sub_division,sub_division)) != GRIB_SUCCESS)
|
||||
return ret;
|
||||
if((ret = grib_set_long_internal(grib_handle_of_accessor(a), self->sub_division,sub_division)) != GRIB_SUCCESS)
|
||||
return ret;
|
||||
|
||||
n = 0;
|
||||
if((ret = grib_set_long_internal(grib_handle_of_accessor(a), self->latitude_first,v[n++])) != GRIB_SUCCESS)
|
||||
return ret;
|
||||
n = 0;
|
||||
if((ret = grib_set_long_internal(grib_handle_of_accessor(a), self->latitude_first,v[n++])) != GRIB_SUCCESS)
|
||||
return ret;
|
||||
|
||||
if((ret = grib_set_long_internal(grib_handle_of_accessor(a), self->longitude_first,v[n++])) != GRIB_SUCCESS)
|
||||
return ret;
|
||||
if((ret = grib_set_long_internal(grib_handle_of_accessor(a), self->longitude_first,v[n++])) != GRIB_SUCCESS)
|
||||
return ret;
|
||||
|
||||
if((ret = grib_set_long_internal(grib_handle_of_accessor(a), self->latitude_last,v[n++])) != GRIB_SUCCESS)
|
||||
return ret;
|
||||
if((ret = grib_set_long_internal(grib_handle_of_accessor(a), self->latitude_last,v[n++])) != GRIB_SUCCESS)
|
||||
return ret;
|
||||
|
||||
if((ret = grib_set_long_internal(grib_handle_of_accessor(a), self->longitude_last,v[n++])) != GRIB_SUCCESS)
|
||||
return ret;
|
||||
if((ret = grib_set_long_internal(grib_handle_of_accessor(a), self->longitude_last,v[n++])) != GRIB_SUCCESS)
|
||||
return ret;
|
||||
|
||||
if(!self->i_increment) n++;
|
||||
else
|
||||
if((ret = grib_set_long_internal(grib_handle_of_accessor(a), self->i_increment,v[n++])) != GRIB_SUCCESS)
|
||||
return ret;
|
||||
if(!self->i_increment) n++;
|
||||
else
|
||||
if((ret = grib_set_long_internal(grib_handle_of_accessor(a), self->i_increment,v[n++])) != GRIB_SUCCESS)
|
||||
return ret;
|
||||
|
||||
if(!self->j_increment) n++;
|
||||
else
|
||||
if((ret = grib_set_long_internal(grib_handle_of_accessor(a), self->j_increment,v[n++])) != GRIB_SUCCESS)
|
||||
return ret;
|
||||
if(!self->j_increment) n++;
|
||||
else
|
||||
if((ret = grib_set_long_internal(grib_handle_of_accessor(a), self->j_increment,v[n++])) != GRIB_SUCCESS)
|
||||
return ret;
|
||||
|
||||
|
||||
return GRIB_SUCCESS;
|
||||
return GRIB_SUCCESS;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
10
tests/set.sh
10
tests/set.sh
|
|
@ -58,4 +58,14 @@ ${tools_dir}grib_set -p levtype $infile $outfile 2> $REDIRECT > $REDIRECT
|
|||
|
||||
[ $? -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
|
||||
|
|
|
|||
Loading…
Reference in New Issue