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

ECC-924: Fixes applied by Philipe Marguinaud (new sample)

This commit is contained in:
Shahram Najm 2019-05-15 12:44:41 +01:00
parent 214d12c55c
commit 4a8bd2acb6
3 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
definitions/grib2/template.7.53.def
View File

@ -41,6 +41,7 @@ meta codedValues data_g2bifourier_packing(
biFourierSubTruncationType, biFourierSubTruncationType,
biFourierPackingModeForAxes, biFourierPackingModeForAxes,
biFourierMakeTemplate, biFourierMakeTemplate,
totalNumberOfValuesInUnpackedSubset,
numberOfValues numberOfValues
): read_only; ): read_only;

BIN
samples/lambert_bf_grib2.tmpl
View File

Binary file not shown.

6
src/grib_accessor_class_data_g2bifourier_packing.c
View File

@ -41,6 +41,7 @@
MEMBERS= const char* biFourierSubTruncationType MEMBERS= const char* biFourierSubTruncationType
MEMBERS= const char* biFourierDoNotPackAxes MEMBERS= const char* biFourierDoNotPackAxes
MEMBERS= const char* biFourierMakeTemplate MEMBERS= const char* biFourierMakeTemplate
MEMBERS= const char* totalNumberOfValuesInUnpackedSubset
MEMBERS=const char* numberOfValues MEMBERS=const char* numberOfValues
END_CLASS_DEF END_CLASS_DEF
@ -94,6 +95,7 @@ typedef struct grib_accessor_data_g2bifourier_packing {
const char* biFourierSubTruncationType; const char* biFourierSubTruncationType;
const char* biFourierDoNotPackAxes; const char* biFourierDoNotPackAxes;
const char* biFourierMakeTemplate; const char* biFourierMakeTemplate;
const char* totalNumberOfValuesInUnpackedSubset;
const char* numberOfValues; const char* numberOfValues;
} grib_accessor_data_g2bifourier_packing; } grib_accessor_data_g2bifourier_packing;
@ -191,6 +193,7 @@ static void init(grib_accessor* a,const long v, grib_arguments* args)
self->biFourierSubTruncationType = grib_arguments_get_name(gh,args,self->carg++); self->biFourierSubTruncationType = grib_arguments_get_name(gh,args,self->carg++);
self->biFourierDoNotPackAxes = grib_arguments_get_name(gh,args,self->carg++); self->biFourierDoNotPackAxes = grib_arguments_get_name(gh,args,self->carg++);
self->biFourierMakeTemplate = grib_arguments_get_name(gh,args,self->carg++); self->biFourierMakeTemplate = grib_arguments_get_name(gh,args,self->carg++);
self->totalNumberOfValuesInUnpackedSubset = grib_arguments_get_name(gh,args,self->carg++);
/*self->numberOfValues = grib_arguments_get_name(gh,args,self->carg++);*/ /*self->numberOfValues = grib_arguments_get_name(gh,args,self->carg++);*/
a->flags |= GRIB_ACCESSOR_FLAG_DATA; a->flags |= GRIB_ACCESSOR_FLAG_DATA;
@ -931,6 +934,9 @@ static int pack_double(grib_accessor* a, const double* val, size_t *len)
grib_buffer_replace (a, buf, buflen, 1, 1); grib_buffer_replace (a, buf, buflen, 1, 1);
if ((ret = grib_set_long_internal (gh, self->totalNumberOfValuesInUnpackedSubset, bt->n_vals_sub)) != GRIB_SUCCESS)
goto cleanup;
if ((ret = grib_set_long_internal (gh, self->number_of_values, bt->n_vals_bif)) != GRIB_SUCCESS) if ((ret = grib_set_long_internal (gh, self->number_of_values, bt->n_vals_bif)) != GRIB_SUCCESS)
goto cleanup; goto cleanup;