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

Merge branch 'develop' of ssh://software.ecmwf.int:7999/eccodes/eccodes into develop

This commit is contained in:
Shahram Najm 2016-09-23 15:10:40 +01:00
parent 2333add502 8243217204
commit d7006c98d5
7 changed files with 592 additions and 629 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
definitions/boot.def
View File

@ -11,13 +11,13 @@ constant definitionFilesVersion="2.0.0.0" : hidden;
constant internalVersion=30 : hidden;
meta checkInternalVersion check_internal_version(internalVersion) : hidden;
UseEcmfConventions = getenv("ECCODES_USE_ECMF_CONVENTIONS","1");
UseEcmfConventions = getenv("ECCODES_USE_ECMF_CONVENTIONS","1") :hidden ;
constant defaultTypeOfLevel="unknown" : hidden;
# GRIBEX special boustrophedonic mode. See GRIB-472
# If the environment variable is not defined, the key will be 0
GRIBEX_boustrophedonic = getenv("ECCODES_GRIBEX_BOUSTROPHEDONIC","0");
GRIBEX_boustrophedonic = getenv("ECCODES_GRIBEX_BOUSTROPHEDONIC","0") :hidden;
constant zero=0 : hidden;
@ -45,8 +45,8 @@ transient truncateDegrees=0 : hidden;
transient dummy = 1 :hidden;
constant unknown="unknown" : hidden;
constant oneConstant=1 : hidden;
constant thousand=1000;
constant hundred=100;
constant thousand=1000 :hidden;
constant hundred=100 :hidden;
constant oneMillionConstant=1000000 : hidden;
constant grib1divider = 1000 : hidden;
meta offset offset_file() : hidden;

76
definitions/bufr/boot.def
View File

@ -8,60 +8,60 @@
#
lookup[1] ed (7,editionNumber);
transient missingValue=999999;
transient missingValue=999999 : hidden;
#negative value=not used
transient inputDelayedDescriptorReplicationFactor={-1};
transient inputDelayedDescriptorReplicationFactor={-1} : hidden;
#negative value=not used
transient inputExtendedDelayedDescriptorReplicationFactor={-1};
transient inputExtendedDelayedDescriptorReplicationFactor={-1} : hidden;
#negative value=not used
transient inputShortDelayedDescriptorReplicationFactor={-1};
transient inputShortDelayedDescriptorReplicationFactor={-1} : hidden;
transient inputDataPresentIndicator={-1};
transient inputDataPresentIndicator={-1} : hidden;
transient extractSubset=-1;
transient extractSubsetList={-1};
transient extractSubsetIntervalStart=-1;
transient extractSubsetIntervalEnd=-1;
transient extractSubset=-1 : hidden;
transient extractSubsetList={-1} : hidden;
transient extractSubsetIntervalStart=-1 : hidden;
transient extractSubsetIntervalEnd=-1 : hidden;
meta doExtractSubsets bufr_extract_subsets(numericValues,pack,numberOfSubsets,extractSubset,extractSubsetIntervalStart,extractSubsetIntervalEnd,extractSubsetList);
meta doExtractSubsets bufr_extract_subsets(numericValues,pack,numberOfSubsets,extractSubset,extractSubsetIntervalStart,extractSubsetIntervalEnd,extractSubsetList) : hidden;
transient extractAreaWestLongitude=1.1;
transient extractAreaEastLongitude=1.1;
transient extractAreaNorthLatitude=1.1;
transient extractAreaSouthLatitude=1.1;
transient extractAreaLatitudeRank=1;
transient extractAreaLongitudeRank=1;
transient extractedAreaNumberOfSubsets=0;
transient extractAreaWestLongitude=1.1 : hidden;
transient extractAreaEastLongitude=1.1 : hidden;
transient extractAreaNorthLatitude=1.1 : hidden;
transient extractAreaSouthLatitude=1.1 : hidden;
transient extractAreaLatitudeRank=1 : hidden;
transient extractAreaLongitudeRank=1 : hidden;
transient extractedAreaNumberOfSubsets=0 : hidden;
meta doExtractArea bufr_extract_area_subsets(
doExtractSubsets,numberOfSubsets,extractSubsetList,extractAreaWestLongitude,extractAreaEastLongitude,
extractAreaNorthLatitude,extractAreaSouthLatitude,extractAreaLongitudeRank,extractAreaLatitudeRank,
extractedAreaNumberOfSubsets)=0;
extractedAreaNumberOfSubsets)=0 : hidden;
transient extractDateTimeYearStart=2016;
transient extractDateTimeMonthStart=1;
transient extractDateTimeDayStart=1;
transient extractDateTimeHourStart=1;
transient extractDateTimeMinuteStart=1;
transient extractDateTimeSecondStart=1;
transient extractDateTimeYearStart=2016 : hidden;
transient extractDateTimeMonthStart=1 : hidden;
transient extractDateTimeDayStart=1 : hidden;
transient extractDateTimeHourStart=1 : hidden;
transient extractDateTimeMinuteStart=1 : hidden;
transient extractDateTimeSecondStart=1 : hidden;
transient extractDateTimeYearEnd=2016;
transient extractDateTimeMonthEnd=1;
transient extractDateTimeDayEnd=1;
transient extractDateTimeHourEnd=1;
transient extractDateTimeMinuteEnd=1;
transient extractDateTimeSecondEnd=1;
transient extractDateTimeYearEnd=2016 : hidden;
transient extractDateTimeMonthEnd=1 : hidden;
transient extractDateTimeDayEnd=1 : hidden;
transient extractDateTimeHourEnd=1 : hidden;
transient extractDateTimeMinuteEnd=1 : hidden;
transient extractDateTimeSecondEnd=1 : hidden;
transient extractDateTimeYearRank=1;
transient extractDateTimeMonthRank=1;
transient extractDateTimeDayRank=1;
transient extractDateTimeHourRank=1;
transient extractDateTimeMinuteRank=1;
transient extractDateTimeSecondRank=1;
transient extractedDateTimeNumberOfSubsets=0;
transient extractDateTimeYearRank=1 : hidden;
transient extractDateTimeMonthRank=1 : hidden;
transient extractDateTimeDayRank=1 : hidden;
transient extractDateTimeHourRank=1 : hidden;
transient extractDateTimeMinuteRank=1 : hidden;
transient extractDateTimeSecondRank=1 : hidden;
transient extractedDateTimeNumberOfSubsets=0 : hidden;
meta doExtractDateTime bufr_extract_datetime_subsets(doExtractSubsets,numberOfSubsets,extractSubsetList);
meta doExtractDateTime bufr_extract_datetime_subsets(doExtractSubsets,numberOfSubsets,extractSubsetList) : hidden;
template boot_edition "bufr/boot_edition_[ed:l].def";

2
definitions/parameters_version.def
View File

@ -1 +1 @@
transient parametersVersion=1;
transient parametersVersion=1 :hidden;

3
src/action_class_transient_darray.c
View File

@ -86,7 +86,7 @@ static void init_class(grib_action_class* c)
}
/* END_CLASS_IMP */
grib_action* grib_action_create_transient_darray( grib_context* context, const char* name, grib_darray* darray)
grib_action* grib_action_create_transient_darray( grib_context* context, const char* name, grib_darray* darray,int flags)
{
grib_action_transient_darray* a = NULL;
grib_action_class* c = grib_action_class_transient_darray;
@ -96,6 +96,7 @@ grib_action* grib_action_create_transient_darray( grib_context* context, const c
act->cclass = c;
a = (grib_action_transient_darray*)act;
act->context = context;
act->flags = flags;
a->darray = darray;
a->name = grib_context_strdup_persistent(context,name);

2
src/grib_api_prototypes.h
View File

@ -104,7 +104,7 @@ grib_action *grib_action_create_variable(grib_context *context, const char *name
grib_action *grib_action_create_modify(grib_context *context, const char *name, long flags);
/* action_class_transient_darray.c */
grib_action *grib_action_create_transient_darray(grib_context *context, const char *name, grib_darray *darray);
grib_action *grib_action_create_transient_darray(grib_context *context, const char *name, grib_darray *darray,int flags);
/* grib_accessor.c */
void grib_accessor_dump(grib_accessor *a, grib_dumper *f);

1126
src/grib_yacc.c
View File

File diff suppressed because it is too large Load Diff

4
src/griby.y
View File

@ -484,8 +484,8 @@ simple : UNSIGNED '[' INTEGER ']' IDENT default flags
| TRANS IDENT '=' argument flags
{ $$ = grib_action_create_variable(grib_parser_context,$2,"transient",0,$4,$4,$5,NULL); free($2); }
| TRANS IDENT '=' '{' dvalues '}'
{ $$ = grib_action_create_transient_darray(grib_parser_context,$2,$5); free($2); }
| TRANS IDENT '=' '{' dvalues '}' flags
{ $$ = grib_action_create_transient_darray(grib_parser_context,$2,$5,$7); free($2); }
| FLOAT IDENT default flags
{ $$ = grib_action_create_gen(grib_parser_context,$2,"ieeefloat",4,NULL,$3,$4,NULL,NULL); free($2); }