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

ECC-465: Key 'deleteLocalDefinition' works for GRIB edition 1 only

This commit is contained in:
Shahram Najm 2017-04-20 17:38:38 +01:00
parent 663a2f1e9c
commit 871628c31e
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
definitions/grib2/sections.def
View File

@ -19,11 +19,13 @@
transient grib2LocalSectionPresent=0;
alias section2Used=zero;
alias setLocalDefinition=grib2LocalSectionPresent;
transient deleteLocalDefinition=0;
if( sectionNumber == 2 or grib2LocalSectionPresent>0 ){
if( (sectionNumber == 2 or grib2LocalSectionPresent>0) and deleteLocalDefinition == 0 ){
position sectionPosition;
template section_2 "grib2/section.2.def";
}
}
alias localUsePresent=section2Used;
lookup[1] sectionNumber(4) ;

15
tests/grib_local.sh
View File

@ -65,8 +65,21 @@ diff local.log local.good.log
rm -f local.log loc.grib1 loc.grib2 loc1.grib1 loc1.grib2 eps.grib1 eps.grib2
# Delete Local Definition
# -----------------------
sample_g1=$ECCODES_SAMPLES_PATH/reduced_gg_pl_640_grib1.tmpl
sample_g2=$ECCODES_SAMPLES_PATH/reduced_gg_pl_640_grib2.tmpl
temp=temp.grib_local.grib
grib_check_key_equals $sample_g1 localUsePresent 1
${tools_dir}/grib_set -s deleteLocalDefinition=1 $sample_g1 $temp
grib_check_key_equals $temp localUsePresent 0
grib_check_key_equals $sample_g2 "localUsePresent,section2Used" "1 1"
${tools_dir}/grib_set -s deleteLocalDefinition=1 $sample_g2 $temp
grib_check_key_equals $temp "localUsePresent,section2Used" "0 0"
# Local Definition 5
# ----------------------
# -----------------------
sample_g1=$ECCODES_SAMPLES_PATH/GRIB1.tmpl
temp=temp.grib_local.grib
${tools_dir}/grib_set -s setLocalDefinition=1,localDefinitionNumber=5 $sample_g1 $temp.1