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

GRIB-744: Create computed key to indicate if gaussian grid is octahedral

This commit is contained in:
Shahram Najm 2015-04-20 16:08:04 +01:00
parent 3bf3b0c89f
commit 440a14eb08
8 changed files with 220 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
definitions/grib1/grid_definition_gaussian.def
View File

@ -89,4 +89,4 @@ meta longitudes longitudes(values,0);
meta distinctLatitudes latitudes(values,1);
meta distinctLongitudes longitudes(values,1);
meta octahedral octahedral_gaussian(N, Ni, PLPresent, pl) = 0 : no_copy,dump;

4
definitions/grib2/template.3.gaussian.def
View File

@ -71,7 +71,7 @@ if(missing(Ni) && PLPresent == 1){
Ni,Nj,iScansNegatively,
latitudeFirstInDegrees, latitudeLastInDegrees,
N,jScansPositively);
nearest regular(values,radius,Ni ,Nj);
nearest regular(values,radius,Ni,Nj);
}
meta latLonValues latlonvalues(values);
alias latitudeLongitudeValues=latLonValues;
@ -80,6 +80,8 @@ meta longitudes longitudes(values,0);
meta distinctLatitudes latitudes(values,1);
meta distinctLongitudes longitudes(values,1);
meta octahedral octahedral_gaussian(N, Ni, PLPresent, pl) = 0 : no_copy,dump;
# Useful for sub-areas
# meta numberOfExpectedPoints number_of_points_gaussian(Ni,Nj,PLPresent,pl,
# N,

1
src/CMakeLists.txt
View File

@ -136,6 +136,7 @@ list( APPEND grib_api_srcs
grib_accessor_class_label.c
grib_accessor_class_long.c
grib_accessor_class_lookup.c
grib_accessor_class_octahedral_gaussian.c
grib_accessor_class_octect_number.c
grib_accessor_class_headers_only.c
grib_accessor_class_padding.c

1
src/Makefile.am
View File

@ -143,6 +143,7 @@ libeccodes_la_prototypes= \
grib_accessor_class_latitudes.c \
grib_accessor_class_longitudes.c \
grib_accessor_class_missing.c \
grib_accessor_class_octahedral_gaussian.c \
grib_accessor_class_offset_file.c \
grib_accessor_class_scale.c \
grib_accessor_class_from_scale_factor_scaled_value.c \

1
src/grib_accessor_class.h
View File

@ -150,6 +150,7 @@ extern grib_accessor_class* grib_accessor_class_number_of_points;
extern grib_accessor_class* grib_accessor_class_number_of_points_gaussian;
extern grib_accessor_class* grib_accessor_class_number_of_values;
extern grib_accessor_class* grib_accessor_class_number_of_values_data_raw_packing;
extern grib_accessor_class* grib_accessor_class_octahedral_gaussian;
extern grib_accessor_class* grib_accessor_class_octect_number;
extern grib_accessor_class* grib_accessor_class_offset_file;
extern grib_accessor_class* grib_accessor_class_offset_values;

211
src/grib_accessor_class_octahedral_gaussian.c Normal file
View File

@ -0,0 +1,211 @@
/*
* Copyright 2005-2015 ECMWF.
*
* This software is licensed under the terms of the Apache Licence Version 2.0
* which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
*
* In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
* virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
*/
/*************************************************
* Enrico Fucile
***********************************************/
#include "grib_api_internal.h"
#include <math.h>
/*
This is used by make_class.pl
START_CLASS_DEF
CLASS = accessor
SUPER = grib_accessor_class_long
IMPLEMENTS = unpack_long
IMPLEMENTS = init
IMPLEMENTS = pack_long
MEMBERS=const char* N
MEMBERS=const char* Ni
MEMBERS=const char* plpresent
MEMBERS=const char* pl
END_CLASS_DEF
*/
/* START_CLASS_IMP */
/*
Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
Instead edit values between START_CLASS_DEF and END_CLASS_DEF
or edit "accessor.class" and rerun ./make_class.pl
*/
static int pack_long(grib_accessor*, const long* val,size_t *len);
static int unpack_long(grib_accessor*, long* val,size_t *len);
static void init(grib_accessor*,const long, grib_arguments* );
static void init_class(grib_accessor_class*);
typedef struct grib_accessor_octahedral_gaussian {
grib_accessor att;
/* Members defined in gen */
/* Members defined in long */
/* Members defined in octahedral_gaussian */
const char* N;
const char* Ni;
const char* plpresent;
const char* pl;
} grib_accessor_octahedral_gaussian;
extern grib_accessor_class* grib_accessor_class_long;
static grib_accessor_class _grib_accessor_class_octahedral_gaussian = {
&grib_accessor_class_long, /* super */
"octahedral_gaussian", /* name */
sizeof(grib_accessor_octahedral_gaussian), /* size */
0, /* inited */
&init_class, /* init_class */
&init, /* init */
0, /* post_init */
0, /* free mem */
0, /* describes himself */
0, /* get length of section */
0, /* get length of string */
0, /* get number of values */
0, /* get number of bytes */
0, /* get offset to bytes */
0, /* get native type */
0, /* get sub_section */
0, /* grib_pack procedures long */
0, /* grib_pack procedures long */
&pack_long, /* grib_pack procedures long */
&unpack_long, /* grib_unpack procedures long */
0, /* grib_pack procedures double */
0, /* grib_unpack procedures double */
0, /* grib_pack procedures string */
0, /* grib_unpack procedures string */
0, /* grib_pack array procedures string */
0, /* grib_unpack array procedures string */
0, /* grib_pack procedures bytes */
0, /* grib_unpack procedures bytes */
0, /* pack_expression */
0, /* notify_change */
0, /* update_size */
0, /* preferred_size */
0, /* resize */
0, /* nearest_smaller_value */
0, /* next accessor */
0, /* compare vs. another accessor */
0, /* unpack only ith value */
0, /* unpack a subarray */
0, /* clear */
};
grib_accessor_class* grib_accessor_class_octahedral_gaussian = &_grib_accessor_class_octahedral_gaussian;
static void init_class(grib_accessor_class* c)
{
c->dump = (*(c->super))->dump;
c->next_offset = (*(c->super))->next_offset;
c->string_length = (*(c->super))->string_length;
c->value_count = (*(c->super))->value_count;
c->byte_count = (*(c->super))->byte_count;
c->byte_offset = (*(c->super))->byte_offset;
c->get_native_type = (*(c->super))->get_native_type;
c->sub_section = (*(c->super))->sub_section;
c->pack_missing = (*(c->super))->pack_missing;
c->is_missing = (*(c->super))->is_missing;
c->pack_double = (*(c->super))->pack_double;
c->unpack_double = (*(c->super))->unpack_double;
c->pack_string = (*(c->super))->pack_string;
c->unpack_string = (*(c->super))->unpack_string;
c->pack_string_array = (*(c->super))->pack_string_array;
c->unpack_string_array = (*(c->super))->unpack_string_array;
c->pack_bytes = (*(c->super))->pack_bytes;
c->unpack_bytes = (*(c->super))->unpack_bytes;
c->pack_expression = (*(c->super))->pack_expression;
c->notify_change = (*(c->super))->notify_change;
c->update_size = (*(c->super))->update_size;
c->preferred_size = (*(c->super))->preferred_size;
c->resize = (*(c->super))->resize;
c->nearest_smaller_value = (*(c->super))->nearest_smaller_value;
c->next = (*(c->super))->next;
c->compare = (*(c->super))->compare;
c->unpack_double_element = (*(c->super))->unpack_double_element;
c->unpack_double_subarray = (*(c->super))->unpack_double_subarray;
c->clear = (*(c->super))->clear;
}
/* END_CLASS_IMP */
static void init(grib_accessor* a,const long l, grib_arguments* c)
{
grib_accessor_octahedral_gaussian* self = (grib_accessor_octahedral_gaussian*)a;
int n = 0;
self->N = grib_arguments_get_name(a->parent->h,c,n++);
self->Ni = grib_arguments_get_name(a->parent->h,c,n++);
self->plpresent = grib_arguments_get_name(a->parent->h,c,n++);
self->pl = grib_arguments_get_name(a->parent->h,c,n++);
}
static int unpack_long(grib_accessor* a, long* val, size_t *len)
{
grib_accessor_octahedral_gaussian* self = (grib_accessor_octahedral_gaussian*)a;
int ret = GRIB_SUCCESS;
long N,Ni;
long plpresent=0;
long max_pl=0; /* max. element of pl array */
grib_context* c=a->parent->h->context;
if((ret = grib_get_long_internal(a->parent->h, self->N,&N)) != GRIB_SUCCESS)
return ret;
if((ret = grib_get_long_internal(a->parent->h, self->Ni,&Ni)) != GRIB_SUCCESS)
return ret;
/* If Ni is not missing, then this is a plain gaussian grid and not reduced. */
/* So it cannot be an octahedral grid */
if (Ni != GRIB_MISSING_LONG) {
*val=0;
return GRIB_SUCCESS;
}
if((ret = grib_get_long_internal(a->parent->h, self->plpresent,&plpresent)) != GRIB_SUCCESS)
return ret;
/* GRIB-704: Work out the maximum element in pl array, if present */
if (plpresent) {
size_t plsize=0, i=0;
long* pl=NULL; /* pl array */
if((ret = grib_get_size(a->parent->h,self->pl,&plsize)) != GRIB_SUCCESS)
return ret;
Assert(plsize);
pl=(long*)grib_context_malloc_clear(c,sizeof(long)*plsize);
grib_get_long_array_internal(a->parent->h,self->pl,pl, &plsize);
max_pl = pl[0];
for (i=1; i<plsize; i++) {
if (pl[i] > max_pl) max_pl = pl[i];
}
grib_context_free(c, pl);
}
/* An octahedral gaussian grid is a reduced gaussian grid with max_pl not equal to 4*N */
if ( plpresent && (max_pl != 4*N) )
{
/* octahedral grid */
*val=1;
} else {
/* plain reduced gaussian */
*val=0;
}
return ret;
}
static int pack_long(grib_accessor* a, const long* val, size_t *len)
{
return GRIB_NOT_IMPLEMENTED;
}

1
src/grib_accessor_factory.h
View File

@ -149,6 +149,7 @@
{ "number_of_points_gaussian", &grib_accessor_class_number_of_points_gaussian, },
{ "number_of_values", &grib_accessor_class_number_of_values, },
{ "number_of_values_data_raw_packing", &grib_accessor_class_number_of_values_data_raw_packing, },
{ "octahedral_gaussian", &grib_accessor_class_octahedral_gaussian, },
{ "octect_number", &grib_accessor_class_octect_number, },
{ "offset_file", &grib_accessor_class_offset_file, },
{ "offset_values", &grib_accessor_class_offset_values, },

1
src/grib_accessor_factory_hash_list
View File

@ -158,6 +158,7 @@ number_of_points, &grib_accessor_class_number_of_points
number_of_points_gaussian, &grib_accessor_class_number_of_points_gaussian
number_of_values, &grib_accessor_class_number_of_values
number_of_values_data_raw_packing, &grib_accessor_class_number_of_values_data_raw_packing
octahedral_gaussian, &grib_accessor_class_octahedral_gaussian
octect_number, &grib_accessor_class_octect_number
offset_file, &grib_accessor_class_offset_file
offset_values, &grib_accessor_class_offset_values