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 2018-04-27 12:55:36 +01:00
parent b3194458fb 9a6d266bbf
commit 807bb2cfb1
4 changed files with 35 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
definitions/mars/grib.efas.go.def
View File

@ -1,4 +1,6 @@
# EFAS Gridded observations
alias mars.step = startStep;
alias mars.date = dateOfForecast;
alias mars.time = timeOfForecast;

1
tests/CMakeLists.txt
View File

@ -53,6 +53,7 @@ list( APPEND tests_no_data_reqd
julian
bufr_ecc-359
bufr_ecc-517
bufr_subTypes
grib_efas
)
# These tests do require data downloads

30
tests/bufr_subTypes.sh Executable file
View File

@ -0,0 +1,30 @@
#!/bin/sh
# 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.sh
label="bufr_subTypes"
fBufr3Input=$ECCODES_SAMPLES_PATH/BUFR3_local.tmpl
fBufr4Input=$ECCODES_SAMPLES_PATH/BUFR4_local.tmpl
fBufrOutput=${label}".bufr.tmp"
inputs="$fBufr3Input $fBufr4Input"
for fin in $inputs; do
${tools_dir}/bufr_set -s oldSubtype=2,newSubtype=300 $fin $fBufrOutput
res=`${tools_dir}/bufr_get -p rdbSubtype,oldSubtype,newSubtype $fBufrOutput`
[ "$res" = "2 2 300" ]
${tools_dir}/bufr_set -s oldSubtype=255,newSubtype=300 $fin $fBufrOutput
res=`${tools_dir}/bufr_get -p rdbSubtype,oldSubtype,newSubtype $fBufrOutput`
[ "$res" = "300 255 300" ]
done
rm -f $fBufrOutput

4
tests/grib_efas.sh
View File

@ -66,7 +66,7 @@ grib_check_key_equals $temp1 anoffset 25
grib_check_key_equals $temp1 anoffsetFirst,anoffsetLast,anoffsetFrequency "MISSING MISSING MISSING"
# ECC-663: MARS step
types="an fu"
types="an fu go"
for t in $types; do
${tools_dir}/grib_set -s setLocalDefinition=1,localDefinitionNumber=41,type=$t,stepType=accum,stepRange=12-36,paramId=260268 \
$sample $temp1
@ -74,7 +74,7 @@ for t in $types; do
#${tools_dir}/grib_dump -Da $temp1 | grep mars.step
done
types="go fc pf cf"
types="fc pf cf"
for t in $types; do
${tools_dir}/grib_set -s setLocalDefinition=1,localDefinitionNumber=41,type=$t,stepType=accum,stepRange=12-36,paramId=260268 \
$sample $temp1