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

Merge feature/ECC-744-Grib2Local

This commit is contained in:
Shahram Najm 2019-01-11 17:56:49 +00:00
parent 582a2d5bdd 52de69a7dc
commit 2c691a7750
15 changed files with 827 additions and 525 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
definitions/grib2/section.1.def
View File

@ -39,11 +39,11 @@ when (tablesVersion!=255) {
set masterDir="grib2/tables/4";
}
codetable[1] localTablesVersion 'grib2/tables/[tablesVersion]/1.1.table' ;
codetable[1] localTablesVersion 'grib2/tables/local/[centreForLocal]/1.1.table' ;
alias versionNumberOfGribLocalTables=localTablesVersion;
transient localDir="";
if (localTablesVersion != 0) {
if (localTablesVersion != 0 and localTablesVersion != 255) {
transient localDir="grib2/tables/local/[centre]/[localTablesVersion]";
}
@ -110,7 +110,8 @@ concept stepType {
"sum" = {selectStepTemplateInterval=1; stepTypeInternal="sum";}
}
#meta is_chemical g2_chemical(productDefinitionTemplateNumber, stepType);
meta is_chemical g2_chemical(productDefinitionTemplateNumber, stepType);
meta is_aerosol g2_aerosol(productDefinitionTemplateNumber, stepType);
transient setCalendarId = 0 ;
transient deleteCalendarId = 0 ;

6
definitions/grib2/tables/local/ecmf/1.1.table Normal file
View File

@ -0,0 +1,6 @@
# Code Table 1.1 GRIB Local Tables Version Number
0 0 Local tables not used
# . Only table entries and templates from the current Master table are valid.
# 1-254 Number of local tables version used
1 1 ECMWF local tables version 1
255 255 Missing

4
definitions/grib2/tables/local/ecmf/1/4.230.table Normal file
View File

@ -0,0 +1,4 @@
# Code table 4.230 - Atmospheric chemical constituent type for ECMWF
63000 63000 Some chemical

1
src/CMakeLists.txt
View File

@ -231,6 +231,7 @@ list( APPEND grib_api_srcs
grib_accessor_class_select_step_template.c
grib_accessor_class_local_definition.c
grib_accessor_class_g2_eps.c
grib_accessor_class_g2_aerosol.c
grib_accessor_class_g2_chemical.c
grib_accessor_class_g2_mars_labeling.c
grib_accessor_class_md5.c

1
src/Makefile.am
View File

@ -247,6 +247,7 @@ libeccodes_la_prototypes= \
grib_accessor_class_select_step_template.c \
grib_accessor_class_local_definition.c \
grib_accessor_class_g2_eps.c \
grib_accessor_class_g2_aerosol.c \
grib_accessor_class_g2_chemical.c \
grib_accessor_class_g2_mars_labeling.c \
grib_accessor_class_transient_darray.c \

1
src/grib_accessor_class.h
View File

@ -97,6 +97,7 @@ extern grib_accessor_class* grib_accessor_class_g1p1p2;
extern grib_accessor_class* grib_accessor_class_g1param;
extern grib_accessor_class* grib_accessor_class_g1step_range;
extern grib_accessor_class* grib_accessor_class_g1verificationdate;
extern grib_accessor_class* grib_accessor_class_g2_aerosol;
extern grib_accessor_class* grib_accessor_class_g2_chemical;
extern grib_accessor_class* grib_accessor_class_g2_eps;
extern grib_accessor_class* grib_accessor_class_g2_mars_labeling;

213
src/grib_accessor_class_g2_aerosol.c Normal file
View File

@ -0,0 +1,213 @@
/*
* Copyright 2005-2018 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_unsigned
IMPLEMENTS = unpack_long;pack_long; value_count
IMPLEMENTS = init
MEMBERS=const char* productDefinitionTemplateNumber
MEMBERS=const char* stepType
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 int value_count(grib_accessor*,long*);
static void init(grib_accessor*,const long, grib_arguments* );
static void init_class(grib_accessor_class*);
typedef struct grib_accessor_g2_aerosol {
grib_accessor att;
/* Members defined in gen */
/* Members defined in long */
/* Members defined in unsigned */
long nbytes;
grib_arguments* arg;
/* Members defined in g2_aerosol */
const char* productDefinitionTemplateNumber;
const char* stepType;
} grib_accessor_g2_aerosol;
extern grib_accessor_class* grib_accessor_class_unsigned;
static grib_accessor_class _grib_accessor_class_g2_aerosol = {
&grib_accessor_class_unsigned, /* super */
"g2_aerosol", /* name */
sizeof(grib_accessor_g2_aerosol), /* 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 */
&value_count, /* 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 */
0, /* clone accessor */
};
grib_accessor_class* grib_accessor_class_g2_aerosol = &_grib_accessor_class_g2_aerosol;
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->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;
c->make_clone = (*(c->super))->make_clone;
}
/* END_CLASS_IMP */
static void init(grib_accessor* a,const long l, grib_arguments* c)
{
grib_accessor_g2_aerosol* self = (grib_accessor_g2_aerosol*)a;
int n = 0;
self->productDefinitionTemplateNumber = grib_arguments_get_name(grib_handle_of_accessor(a),c,n++);
self->stepType = grib_arguments_get_name(grib_handle_of_accessor(a),c,n++);
}
static int unpack_long(grib_accessor* a, long* val, size_t *len)
{
grib_accessor_g2_aerosol* self = (grib_accessor_g2_aerosol*)a;
long productDefinitionTemplateNumber=0;
grib_get_long(grib_handle_of_accessor(a), self->productDefinitionTemplateNumber,&productDefinitionTemplateNumber);
*val=is_productDefinitionTemplateNumber_Aerosol(productDefinitionTemplateNumber);
return GRIB_SUCCESS;
}
static int pack_long(grib_accessor* a, const long* val, size_t *len)
{
grib_accessor_g2_aerosol* self = (grib_accessor_g2_aerosol*)a;
long productDefinitionTemplateNumber=-1;
long productDefinitionTemplateNumberNew=-1;
/*long type=-1;
long stream=-1;*/
long eps=-1;
char stepType[15]={0,};
size_t slen=15;
/*int aerosol = *val;*/
int isInstant=0;
/*long derivedForecast=-1;*/
int ret = 0;
if (grib_get_long(grib_handle_of_accessor(a), self->productDefinitionTemplateNumber,&productDefinitionTemplateNumber)!=GRIB_SUCCESS)
return GRIB_SUCCESS;
/*
grib_get_long(grib_handle_of_accessor(a), self->type,&type);
grib_get_long(grib_handle_of_accessor(a), self->stream,&stream);
*/
ret = grib_get_string(grib_handle_of_accessor(a), self->stepType, stepType, &slen);
Assert(ret == GRIB_SUCCESS);
eps = is_productDefinitionTemplateNumber_EPS(productDefinitionTemplateNumber);
if (!strcmp(stepType,"instant")) isInstant=1;
if ( eps == 1 ) {
if (isInstant) {
productDefinitionTemplateNumberNew=45;
} else {
productDefinitionTemplateNumberNew=47;
}
} else {
if (isInstant) {
productDefinitionTemplateNumberNew=48;/*44 is deprecated*/
} else {
productDefinitionTemplateNumberNew=46;
}
}
if (productDefinitionTemplateNumber != productDefinitionTemplateNumberNew) {
grib_set_long(grib_handle_of_accessor(a), self->productDefinitionTemplateNumber,productDefinitionTemplateNumberNew);
/*if (derivedForecast>=0) grib_set_long(grib_handle_of_accessor(a), self->derivedForecast,derivedForecast);*/
}
return 0;
}
static int value_count(grib_accessor* a,long* count)
{
*count=1;
return 0;
}

44
src/grib_accessor_class_g2_eps.c
View File

@ -179,6 +179,8 @@ static int pack_long(grib_accessor* a, const long* val, size_t *len)
long productDefinitionTemplateNumberNew=-1;
long type=-1;
long stream=-1;
long chemical=-1;
long aerosol=-1;
char stepType[15]={0,};
size_t slen=15;
int eps=*val;
@ -192,7 +194,13 @@ static int pack_long(grib_accessor* a, const long* val, size_t *len)
grib_get_long(grib_handle_of_accessor(a), self->stream,&stream);
grib_get_string(grib_handle_of_accessor(a), self->stepType,stepType,&slen);
if (!strcmp(stepType,"instant")) isInstant=1;
/*TODO chemicals*/
grib_get_long(grib_handle_of_accessor(a), "is_chemical",&chemical);
grib_get_long(grib_handle_of_accessor(a), "is_aerosol",&aerosol);
if (chemical && aerosol) {
grib_context_log(a->context,GRIB_LOG_ERROR,"Parameter cannot be both chemical and aerosol!");
return GRIB_ENCODING_ERROR;
}
/* eps or stream=(enda or elda or ewla) */
if ( eps || stream==1030 || stream==1249 || stream==1250 ) {
if (isInstant) {
@ -226,6 +234,40 @@ static int pack_long(grib_accessor* a, const long* val, size_t *len)
}
}
/* Adjust for chemical species */
if (chemical==1) {
if ( eps == 1 ) {
if (isInstant) {
productDefinitionTemplateNumberNew=41;
} else {
productDefinitionTemplateNumberNew=43;
}
} else {
if (isInstant) {
productDefinitionTemplateNumberNew=40;
} else {
productDefinitionTemplateNumberNew=42;
}
}
}
/* Adjust for aerosols */
if (aerosol==1) {
if ( eps == 1 ) {
if (isInstant) {
productDefinitionTemplateNumberNew=45;
} else {
productDefinitionTemplateNumberNew=47;
}
} else {
if (isInstant) {
productDefinitionTemplateNumberNew=48;/*44 is deprecated*/
} else {
productDefinitionTemplateNumberNew=46;
}
}
}
if (productDefinitionTemplateNumber != productDefinitionTemplateNumberNew) {
grib_set_long(grib_handle_of_accessor(a), self->productDefinitionTemplateNumber,productDefinitionTemplateNumberNew);
if (derivedForecast>=0)

46
src/grib_accessor_class_local_definition.c
View File

@ -187,6 +187,8 @@ static int pack_long(grib_accessor* a, const long* val, size_t *len)
long stream=-1;
long the_class=-1;
long eps=-1;
long chemical=-1;
long aerosol=-1;
char stepType[15]={0,};
size_t slen=15;
int localDefinitionNumber=*val;
@ -196,7 +198,7 @@ static int pack_long(grib_accessor* a, const long* val, size_t *len)
long editionNumber = 0;
if (grib_get_long(grib_handle_of_accessor(a), "editionNumber", &editionNumber)==GRIB_SUCCESS) {
Assert(editionNumber == 2);
Assert(editionNumber != 1);
}
if (grib_get_long(grib_handle_of_accessor(a), self->productDefinitionTemplateNumber,&productDefinitionTemplateNumber)!=GRIB_SUCCESS)
@ -209,10 +211,16 @@ static int pack_long(grib_accessor* a, const long* val, size_t *len)
grib_get_string(grib_handle_of_accessor(a), self->stepType,stepType,&slen);
if (!strcmp(stepType,"instant")) isInstant=1;
grib_get_long(grib_handle_of_accessor(a), self->grib2LocalSectionNumber,&grib2LocalSectionNumber);
grib_get_long(grib_handle_of_accessor(a), "is_chemical",&chemical);
grib_get_long(grib_handle_of_accessor(a), "is_aerosol",&aerosol);
if (chemical && aerosol) {
grib_context_log(a->context,GRIB_LOG_ERROR,"Parameter cannot be both chemical and aerosol!");
return GRIB_ENCODING_ERROR;
}
if (is_productDefinitionTemplateNumber_EPS(productDefinitionTemplateNumber))
eps=1;
/*TODO chemicals*/
switch (localDefinitionNumber) {
case 0:
case 300:
@ -307,6 +315,40 @@ static int pack_long(grib_accessor* a, const long* val, size_t *len)
break;
}
/* Adjust for chemical species */
if (chemical==1) {
if ( eps == 1 ) {
if (isInstant) {
productDefinitionTemplateNumberNew=41;
} else {
productDefinitionTemplateNumberNew=43;
}
} else {
if (isInstant) {
productDefinitionTemplateNumberNew=40;
} else {
productDefinitionTemplateNumberNew=42;
}
}
}
/* Adjust for aerosols */
if (aerosol==1) {
if ( eps == 1 ) {
if (isInstant) {
productDefinitionTemplateNumberNew=45;
} else {
productDefinitionTemplateNumberNew=47;
}
} else {
if (isInstant) {
productDefinitionTemplateNumberNew=48;/*44 is deprecated*/
} else {
productDefinitionTemplateNumberNew=46;
}
}
}
if (productDefinitionTemplateNumber != productDefinitionTemplateNumberNew) {
if (tooEarly)
grib_set_long(grib_handle_of_accessor(a), self->productDefinitionTemplateNumberInternal,productDefinitionTemplateNumberNew);

6
src/grib_accessor_class_select_step_template.c
View File

@ -160,7 +160,7 @@ static int pack_long(grib_accessor* a, const long* val, size_t* len)
grib_accessor_select_step_template* self = (grib_accessor_select_step_template*)a;
long productDefinitionTemplateNumber=0;
long productDefinitionTemplateNumberNew=0;
/*TODO chemicals*/
grib_get_long(grib_handle_of_accessor(a), self->productDefinitionTemplateNumber,&productDefinitionTemplateNumber);
if (self->instant) {
@ -194,7 +194,7 @@ static int pack_long(grib_accessor* a, const long* val, size_t* len)
productDefinitionTemplateNumberNew=41;
break;
case 46: /* non-EPS aerosol */
productDefinitionTemplateNumberNew=44;
productDefinitionTemplateNumberNew=48;/*44 is deprecated*/
break;
case 47: /* EPS aerosol */
productDefinitionTemplateNumberNew=45;
@ -250,7 +250,7 @@ static int pack_long(grib_accessor* a, const long* val, size_t* len)
case 41: /* EPS chemical */
productDefinitionTemplateNumberNew=43;
break;
case 44: /* non-EPS aerosol */
case 48: /* non-EPS aerosol. Note template 44 is deprecated */
productDefinitionTemplateNumberNew=46;
break;
case 45: /* EPS aerosol */

1001
src/grib_accessor_classes_hash.c
View File

File diff suppressed because it is too large Load Diff

1
src/grib_accessor_factory.h
View File

@ -97,6 +97,7 @@
{ "g1param", &grib_accessor_class_g1param, },
{ "g1step_range", &grib_accessor_class_g1step_range, },
{ "g1verificationdate", &grib_accessor_class_g1verificationdate, },
{ "g2_aerosol", &grib_accessor_class_g2_aerosol, },
{ "g2_chemical", &grib_accessor_class_g2_chemical, },
{ "g2_eps", &grib_accessor_class_g2_eps, },
{ "g2_mars_labeling", &grib_accessor_class_g2_mars_labeling, },

1
src/grib_accessor_factory_hash_list
View File

@ -98,6 +98,7 @@ g1p1p2, &grib_accessor_class_g1p1p2
g1param, &grib_accessor_class_g1param
g1step_range, &grib_accessor_class_g1step_range
g1verificationdate, &grib_accessor_class_g1verificationdate
g2_aerosol, &grib_accessor_class_g2_aerosol
g2_chemical, &grib_accessor_class_g2_chemical
g2_eps, &grib_accessor_class_g2_eps
g2_mars_labeling, &grib_accessor_class_g2_mars_labeling

3
src/grib_api_prototypes.h
View File

@ -691,6 +691,8 @@ bufr_descriptors_array *grib_accessor_class_expanded_descriptors_get_expanded(gr
/* grib_accessor_class_g2_eps.c */
/* grib_accessor_class_g2_aerosol.c */
/* grib_accessor_class_g2_chemical.c */
/* grib_accessor_class_g2_mars_labeling.c */
@ -1456,6 +1458,7 @@ int grib_moments(grib_handle *h, double east, double north, double west, double
int parse_keyval_string(const char *grib_tool, char *arg, int values_required, int default_type, grib_values values[], int *count);
int is_productDefinitionTemplateNumber_EPS(long productDefinitionTemplateNumber);
int is_productDefinitionTemplateNumber_Chemical(long productDefinitionTemplateNumber);
int is_productDefinitionTemplateNumber_Chemical_Dist(long productDefinitionTemplateNumber);
int is_productDefinitionTemplateNumber_Aerosol(long productDefinitionTemplateNumber);
int is_index_file(const char *filename);
char get_dir_separator_char(void);

17
src/grib_util.c
View File

@ -1815,7 +1815,7 @@ int parse_keyval_string(const char* grib_tool, char* arg, int values_required, i
return GRIB_SUCCESS;
}
/* Return 1 if the productDefinitionTemplateNumber (grib edition 2) is related to EPS */
/* Return 1 if the productDefinitionTemplateNumber (GRIB2) is related to EPS */
int is_productDefinitionTemplateNumber_EPS(long productDefinitionTemplateNumber)
{
return (
@ -1826,7 +1826,7 @@ int is_productDefinitionTemplateNumber_EPS(long productDefinitionTemplateNumber)
);
}
/* Return 1 if the productDefinitionTemplateNumber (grib edition 2) is related to atmospheric chemical constituents */
/* Return 1 if the productDefinitionTemplateNumber (GRIB2) is related to atmospheric chemical constituents */
int is_productDefinitionTemplateNumber_Chemical(long productDefinitionTemplateNumber)
{
return (
@ -1836,7 +1836,18 @@ int is_productDefinitionTemplateNumber_Chemical(long productDefinitionTemplateNu
productDefinitionTemplateNumber == 43);
}
/* Return 1 if the productDefinitionTemplateNumber (grib edition 2) is related to aerosols */
/* Return 1 if the productDefinitionTemplateNumber (GRIB2) is related to
* atmospheric chemical constituents based on a distribution function */
int is_productDefinitionTemplateNumber_Chemical_Dist(long productDefinitionTemplateNumber)
{
return (
productDefinitionTemplateNumber == 57 ||
productDefinitionTemplateNumber == 58 ||
productDefinitionTemplateNumber == 67 ||
productDefinitionTemplateNumber == 68);
}
/* Return 1 if the productDefinitionTemplateNumber (GRIB2) is related to aerosols */
int is_productDefinitionTemplateNumber_Aerosol(long productDefinitionTemplateNumber)
{
return (