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

Merge branch 'release/2.0.0' into develop

This commit is contained in:
Shahram Najm 2016-10-05 18:47:48 +01:00
parent abfaabbe1f 3d10d553bb
commit 342cb381e2
20 changed files with 275 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION.cmake
View File

@ -1 +1 @@
set( ${PROJECT_NAME}_VERSION_STR "2.1.0" )
set( ${PROJECT_NAME}_VERSION_STR "2.0.0" )

8
definitions/bufr/boot.def
View File

@ -24,7 +24,7 @@ transient extractSubsetList={-1} : hidden;
transient extractSubsetIntervalStart=-1 : hidden;
transient extractSubsetIntervalEnd=-1 : hidden;
meta doExtractSubsets bufr_extract_subsets(numericValues,pack,numberOfSubsets,extractSubset,extractSubsetIntervalStart,extractSubsetIntervalEnd,extractSubsetList) : hidden;
meta doExtractSubsets bufr_extract_subsets(numericValues,pack,numberOfSubsets,extractSubset,extractSubsetIntervalStart,extractSubsetIntervalEnd,extractSubsetList)=0 : hidden;
transient extractAreaWestLongitude=1.1 : hidden;
transient extractAreaEastLongitude=1.1 : hidden;
@ -61,7 +61,11 @@ transient extractDateTimeMinuteRank=1 : hidden;
transient extractDateTimeSecondRank=1 : hidden;
transient extractedDateTimeNumberOfSubsets=0 : hidden;
meta doExtractDateTime bufr_extract_datetime_subsets(doExtractSubsets,numberOfSubsets,extractSubsetList) : hidden;
meta doExtractDateTime bufr_extract_datetime_subsets(doExtractSubsets,numberOfSubsets,extractSubsetList)=0 : hidden;
transient simpleThinningStart=1 : hidden;
transient simpleThinningMissingRadius=0 : hidden;
meta simpleThinningSkip bufr_simple_thinning(doExtractSubsets,numberOfSubsets,extractSubsetList,simpleThinningStart,simpleThinningMissingRadius)=0 : hidden;
template boot_edition "bufr/boot_edition_[ed:l].def";

1
src/CMakeLists.txt
View File

@ -247,6 +247,7 @@ list( APPEND grib_api_srcs
grib_accessor_class_unsigned.c
grib_accessor_class_unsigned_bits.c
grib_accessor_class_raw.c
grib_accessor_class_bufr_simple_thinning.c
grib_accessor_class_bufr_extract_subsets.c
grib_accessor_class_bufr_extract_area_subsets.c
grib_accessor_class_bufr_extract_datetime_subsets.c

1
src/Makefile.am
View File

@ -265,6 +265,7 @@ libeccodes_la_prototypes= \
grib_accessor_class_unsigned_bits.c \
grib_accessor_class_raw.c \
grib_accessor_class_bufr_extract_subsets.c \
grib_accessor_class_bufr_simple_thinning.c \
grib_accessor_class_spd.c \
grib_accessor_class_sum.c \
grib_accessor_class_to_integer.c \

1
src/grib_accessor_class.h
View File

@ -21,6 +21,7 @@ extern grib_accessor_class* grib_accessor_class_bufr_extract_datetime_subsets;
extern grib_accessor_class* grib_accessor_class_bufr_extract_subsets;
extern grib_accessor_class* grib_accessor_class_bufr_group;
extern grib_accessor_class* grib_accessor_class_bufr_has_delayed_replication;
extern grib_accessor_class* grib_accessor_class_bufr_simple_thinning;
extern grib_accessor_class* grib_accessor_class_bufr_string_values;
extern grib_accessor_class* grib_accessor_class_bufrdc_expanded_descriptors;
extern grib_accessor_class* grib_accessor_class_bytes;

224
src/grib_accessor_class_bufr_simple_thinning.c Normal file
View File

@ -0,0 +1,224 @@
/*
* Copyright 2005-2016 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.
*/
#include "grib_api_internal.h"
/*
This is used by make_class.pl
START_CLASS_DEF
CLASS = accessor
SUPER = grib_accessor_class_gen
IMPLEMENTS = init; get_native_type
IMPLEMENTS = pack_long;
MEMBERS = const char* doExtractSubsets
MEMBERS = const char* numberOfSubsets
MEMBERS = const char* extractSubsetList
MEMBERS = const char* simpleThinningStart
MEMBERS = const char* simpleThinningMissingRadius
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 get_native_type(grib_accessor*);
static int pack_long(grib_accessor*, const 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_bufr_simple_thinning {
grib_accessor att;
/* Members defined in gen */
/* Members defined in bufr_simple_thinning */
const char* doExtractSubsets;
const char* numberOfSubsets;
const char* extractSubsetList;
const char* simpleThinningStart;
const char* simpleThinningMissingRadius;
} grib_accessor_bufr_simple_thinning;
extern grib_accessor_class* grib_accessor_class_gen;
static grib_accessor_class _grib_accessor_class_bufr_simple_thinning = {
&grib_accessor_class_gen, /* super */
"bufr_simple_thinning", /* name */
sizeof(grib_accessor_bufr_simple_thinning), /* 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 */
&get_native_type, /* get native type */
0, /* get sub_section */
0, /* grib_pack procedures long */
0, /* grib_pack procedures long */
&pack_long, /* grib_pack procedures long */
0, /* 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 */
0, /* clone accessor */
};
grib_accessor_class* grib_accessor_class_bufr_simple_thinning = &_grib_accessor_class_bufr_simple_thinning;
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->sub_section = (*(c->super))->sub_section;
c->pack_missing = (*(c->super))->pack_missing;
c->is_missing = (*(c->super))->is_missing;
c->unpack_long = (*(c->super))->unpack_long;
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;
c->make_clone = (*(c->super))->make_clone;
}
/* END_CLASS_IMP */
static void init(grib_accessor* a, const long len , grib_arguments* arg )
{
int n=0;
grib_accessor_bufr_simple_thinning *self =(grib_accessor_bufr_simple_thinning*)a;
a->length=0;
self->doExtractSubsets = grib_arguments_get_name(grib_handle_of_accessor(a),arg,n++);
self->numberOfSubsets = grib_arguments_get_name(grib_handle_of_accessor(a),arg,n++);
self->extractSubsetList = grib_arguments_get_name(grib_handle_of_accessor(a),arg,n++);
self->simpleThinningStart = grib_arguments_get_name(grib_handle_of_accessor(a),arg,n++);
self->simpleThinningMissingRadius = grib_arguments_get_name(grib_handle_of_accessor(a),arg,n++);
a->flags |= GRIB_ACCESSOR_FLAG_FUNCTION;
}
static int get_native_type(grib_accessor* a)
{
return GRIB_TYPE_LONG;
}
static int apply_thinning(grib_accessor* a,long skip) {
grib_accessor_bufr_simple_thinning *self =(grib_accessor_bufr_simple_thinning*)a;
int ret=0;
grib_handle* h=grib_handle_of_accessor(a);
grib_context* c=h->context;
long compressed=0,nsubsets;
long numberOfSubsets,i;
grib_iarray* subsets;
long *subsets_ar=0;
long start=0,radius=0;
ret=grib_get_long(h,"compressedData",&compressed);
if (ret) return ret;
if (compressed) {
long numberOfSubsets=0;
ret=grib_get_long(h,self->numberOfSubsets,&numberOfSubsets);
if (ret) return ret;
ret=grib_get_long(h,self->simpleThinningStart,&start);
if (ret) return ret;
ret=grib_get_long(h,self->simpleThinningMissingRadius,&radius);
if (ret) return ret;
subsets=grib_iarray_new(c,numberOfSubsets / skip + 1 ,10);
for (i=0;i<numberOfSubsets;i+=skip+1) {
grib_iarray_push(subsets,i+1);
}
nsubsets=grib_iarray_used_size(subsets);
if (nsubsets!=0) {
subsets_ar=grib_iarray_get_array(subsets);
ret=grib_set_long_array(h,self->extractSubsetList,subsets_ar,nsubsets);
if (ret) return ret;
ret=grib_set_long(h,"unpack",1);
if (ret) return ret;
ret=grib_set_long(h,self->doExtractSubsets,1);
if (ret) return ret;
}
} else {
return GRIB_NOT_IMPLEMENTED;
}
return ret;
}
static int pack_long(grib_accessor* a, const long* val, size_t *len)
{
int err=0;
grib_accessor_bufr_simple_thinning *self =(grib_accessor_bufr_simple_thinning*)a;
if (*len==0) return GRIB_SUCCESS;
err=apply_thinning(a,*val);
if (err) return err;
err=grib_set_long(a->parent->h,self->doExtractSubsets,1);
if (err) return err;
return err;
}

1
src/grib_accessor_factory.h
View File

@ -21,6 +21,7 @@
{ "bufr_extract_subsets", &grib_accessor_class_bufr_extract_subsets, },
{ "bufr_group", &grib_accessor_class_bufr_group, },
{ "bufr_has_delayed_replication", &grib_accessor_class_bufr_has_delayed_replication, },
{ "bufr_simple_thinning", &grib_accessor_class_bufr_simple_thinning, },
{ "bufr_string_values", &grib_accessor_class_bufr_string_values, },
{ "bufrdc_expanded_descriptors", &grib_accessor_class_bufrdc_expanded_descriptors, },
{ "bytes", &grib_accessor_class_bytes, },

1
src/grib_accessor_factory_hash_list
View File

@ -23,6 +23,7 @@ bufr_extract_subsets, &grib_accessor_class_bufr_extract_subsets
bufr_group, &grib_accessor_class_bufr_group
bufr_group_number, &grib_accessor_class_bufr_group_number
bufr_has_delayed_replication, &grib_accessor_class_bufr_has_delayed_replication
bufr_simple_thinning, &grib_accessor_class_bufr_simple_thinning
bufr_string_values, &grib_accessor_class_bufr_string_values
bufr_subset_number, &grib_accessor_class_bufr_subset_number
bufr_uncompressed_data, &grib_accessor_class_bufr_uncompressed_data

2
src/grib_dumper_class.h
View File

@ -7,11 +7,11 @@ extern grib_dumper_class* grib_dumper_class_bufr_encode_C;
extern grib_dumper_class* grib_dumper_class_bufr_encode_filter;
extern grib_dumper_class* grib_dumper_class_bufr_encode_fortran;
extern grib_dumper_class* grib_dumper_class_bufr_encode_python;
extern grib_dumper_class* grib_dumper_class_grib_encode_C;
extern grib_dumper_class* grib_dumper_class_compare;
extern grib_dumper_class* grib_dumper_class_debug;
extern grib_dumper_class* grib_dumper_class_default;
extern grib_dumper_class* grib_dumper_class_file;
extern grib_dumper_class* grib_dumper_class_grib_encode_C;
extern grib_dumper_class* grib_dumper_class_json;
extern grib_dumper_class* grib_dumper_class_keys;
extern grib_dumper_class* grib_dumper_class_serialize;

6
src/grib_dumper_class_bufr_decode_C.c
View File

@ -59,7 +59,7 @@ static void footer (grib_dumper*,grib_handle*);
typedef struct grib_dumper_bufr_decode_C {
grib_dumper dumper;
/* Members defined in C */
/* Members defined in bufr_decode_C */
long section_offset;
long empty;
long end;
@ -71,8 +71,8 @@ typedef struct grib_dumper_bufr_decode_C {
static grib_dumper_class _grib_dumper_class_bufr_decode_C = {
0, /* super */
"bufr_decode_C", /* name */
sizeof(grib_dumper_bufr_decode_C), /* size */
"bufr_decode_C", /* name */
sizeof(grib_dumper_bufr_decode_C), /* size */
0, /* inited */
&init_class, /* init_class */
&init, /* init */

4
src/grib_dumper_class_bufr_decode_filter.c
View File

@ -57,7 +57,7 @@ static void dump_section (grib_dumper* d, grib_accessor* a,grib_block_of_acce
typedef struct grib_dumper_bufr_decode_filter {
grib_dumper dumper;
/* Members defined in filter */
/* Members defined in bufr_decode_filter */
long section_offset;
long begin;
long empty;
@ -70,7 +70,7 @@ typedef struct grib_dumper_bufr_decode_filter {
static grib_dumper_class _grib_dumper_class_bufr_decode_filter = {
0, /* super */
"bufr_decode_filter", /* name */
"bufr_decode_filter", /* name */
sizeof(grib_dumper_bufr_decode_filter), /* size */
0, /* inited */
&init_class, /* init_class */

6
src/grib_dumper_class_bufr_decode_fortran.c
View File

@ -59,7 +59,7 @@ static void footer (grib_dumper*,grib_handle*);
typedef struct grib_dumper_bufr_decode_fortran {
grib_dumper dumper;
/* Members defined in fortran */
/* Members defined in bufr_decode_fortran */
long section_offset;
long empty;
long end;
@ -71,8 +71,8 @@ typedef struct grib_dumper_bufr_decode_fortran {
static grib_dumper_class _grib_dumper_class_bufr_decode_fortran = {
0, /* super */
"bufr_decode_fortran", /* name */
sizeof(grib_dumper_bufr_decode_fortran), /* size */
"bufr_decode_fortran", /* name */
sizeof(grib_dumper_bufr_decode_fortran), /* size */
0, /* inited */
&init_class, /* init_class */
&init, /* init */

4
src/grib_dumper_class_bufr_decode_python.c
View File

@ -59,7 +59,7 @@ static void footer (grib_dumper*,grib_handle*);
typedef struct grib_dumper_bufr_decode_python {
grib_dumper dumper;
/* Members defined in python */
/* Members defined in bufr_decode_python */
long section_offset;
long empty;
long end;
@ -71,7 +71,7 @@ typedef struct grib_dumper_bufr_decode_python {
static grib_dumper_class _grib_dumper_class_bufr_decode_python = {
0, /* super */
"bufr_decode_python", /* name */
"bufr_decode_python", /* name */
sizeof(grib_dumper_bufr_decode_python), /* size */
0, /* inited */
&init_class, /* init_class */

6
src/grib_dumper_class_bufr_encode_C.c
View File

@ -59,7 +59,7 @@ static void footer (grib_dumper*,grib_handle*);
typedef struct grib_dumper_bufr_encode_C {
grib_dumper dumper;
/* Members defined in C */
/* Members defined in bufr_encode_C */
long section_offset;
long empty;
long end;
@ -71,8 +71,8 @@ typedef struct grib_dumper_bufr_encode_C {
static grib_dumper_class _grib_dumper_class_bufr_encode_C = {
0, /* super */
"bufr_encode_C", /* name */
sizeof(grib_dumper_bufr_encode_C), /* size */
"bufr_encode_C", /* name */
sizeof(grib_dumper_bufr_encode_C), /* size */
0, /* inited */
&init_class, /* init_class */
&init, /* init */

4
src/grib_dumper_class_bufr_encode_filter.c
View File

@ -57,7 +57,7 @@ static void dump_section (grib_dumper* d, grib_accessor* a,grib_block_of_acce
typedef struct grib_dumper_bufr_encode_filter {
grib_dumper dumper;
/* Members defined in filter */
/* Members defined in bufr_encode_filter */
long section_offset;
long begin;
long empty;
@ -70,7 +70,7 @@ typedef struct grib_dumper_bufr_encode_filter {
static grib_dumper_class _grib_dumper_class_bufr_encode_filter = {
0, /* super */
"bufr_encode_filter", /* name */
"bufr_encode_filter", /* name */
sizeof(grib_dumper_bufr_encode_filter), /* size */
0, /* inited */
&init_class, /* init_class */

6
src/grib_dumper_class_bufr_encode_fortran.c
View File

@ -59,7 +59,7 @@ static void footer (grib_dumper*,grib_handle*);
typedef struct grib_dumper_bufr_encode_fortran {
grib_dumper dumper;
/* Members defined in fortran */
/* Members defined in bufr_encode_fortran */
long section_offset;
long empty;
long end;
@ -71,8 +71,8 @@ typedef struct grib_dumper_bufr_encode_fortran {
static grib_dumper_class _grib_dumper_class_bufr_encode_fortran = {
0, /* super */
"bufr_encode_fortran", /* name */
sizeof(grib_dumper_bufr_encode_fortran), /* size */
"bufr_encode_fortran", /* name */
sizeof(grib_dumper_bufr_encode_fortran), /* size */
0, /* inited */
&init_class, /* init_class */
&init, /* init */

4
src/grib_dumper_class_bufr_encode_python.c
View File

@ -59,7 +59,7 @@ static void footer (grib_dumper*,grib_handle*);
typedef struct grib_dumper_bufr_encode_python {
grib_dumper dumper;
/* Members defined in python */
/* Members defined in bufr_encode_python */
long section_offset;
long empty;
long end;
@ -71,7 +71,7 @@ typedef struct grib_dumper_bufr_encode_python {
static grib_dumper_class _grib_dumper_class_bufr_encode_python = {
0, /* super */
"bufr_encode_python", /* name */
"bufr_encode_python", /* name */
sizeof(grib_dumper_bufr_encode_python), /* size */
0, /* inited */
&init_class, /* init_class */

4
src/grib_dumper_class_grib_encode_C.c
View File

@ -53,14 +53,14 @@ static void footer (grib_dumper*,grib_handle*);
typedef struct grib_dumper_grib_encode_C {
grib_dumper dumper;
/* Members defined in c_code */
/* Members defined in grib_encode_C */
int cr;
} grib_dumper_grib_encode_C;
static grib_dumper_class _grib_dumper_class_grib_encode_C = {
0, /* super */
"grib_encode_C", /* name */
"grib_encode_C", /* name */
sizeof(grib_dumper_grib_encode_C), /* size */
0, /* inited */
&init_class, /* init_class */

16
src/grib_dumper_factory.h
View File

@ -1,17 +1,31 @@
/* This file is automatically generated by ./make_class.pl, do not edit */
{ "bufr_decode_C", &grib_dumper_class_bufr_decode_C, },
{ "bufr_decode_C", &grib_dumper_class_bufr_decode_C, },
{ "bufr_decode_filter", &grib_dumper_class_bufr_decode_filter, },
{ "bufr_decode_filter", &grib_dumper_class_bufr_decode_filter, },
{ "bufr_decode_fortran", &grib_dumper_class_bufr_decode_fortran, },
{ "bufr_decode_python", &grib_dumper_class_bufr_decode_python, },
{ "bufr_decode_python", &grib_dumper_class_bufr_decode_python, },
{ "bufr_encode_C", &grib_dumper_class_bufr_encode_C, },
{ "bufr_encode_C", &grib_dumper_class_bufr_encode_C, },
{ "bufr_encode_filter", &grib_dumper_class_bufr_encode_filter, },
{ "bufr_encode_filter", &grib_dumper_class_bufr_encode_filter, },
{ "bufr_encode_fortran", &grib_dumper_class_bufr_encode_fortran, },
{ "bufr_encode_python", &grib_dumper_class_bufr_encode_python, },
{ "grib_encode_C", &grib_dumper_class_grib_encode_C, },
{ "bufr_encode_python", &grib_dumper_class_bufr_encode_python, },
{ "debug", &grib_dumper_class_debug, },
{ "debug", &grib_dumper_class_debug, },
{ "default", &grib_dumper_class_default, },
{ "default", &grib_dumper_class_default, },
{ "grib_encode_C", &grib_dumper_class_grib_encode_C, },
{ "grib_encode_C", &grib_dumper_class_grib_encode_C, },
{ "json", &grib_dumper_class_json, },
{ "json", &grib_dumper_class_json, },
{ "keys", &grib_dumper_class_keys, },
{ "keys", &grib_dumper_class_keys, },
{ "serialize", &grib_dumper_class_serialize, },
{ "serialize", &grib_dumper_class_serialize, },
{ "wmo", &grib_dumper_class_wmo, },
{ "wmo", &grib_dumper_class_wmo, },
{ "xml", &grib_dumper_class_xml, },
{ "xml", &grib_dumper_class_xml, },

2
version.sh
View File

@ -14,7 +14,7 @@ PACKAGE_NAME='eccodes'
# Package version
ECCODES_MAJOR_VERSION=2
ECCODES_MINOR_VERSION=1
ECCODES_MINOR_VERSION=0
ECCODES_REVISION_VERSION=0
ECCODES_CURRENT=1