diff --git a/definitions/grib2/products_11.def b/definitions/grib2/products_11.def index 6084a0b37..bad30182a 100644 --- a/definitions/grib2/products_11.def +++ b/definitions/grib2/products_11.def @@ -1,5 +1,7 @@ # (C) Copyright 2005- ECMWF. -# Copernicus regional reanalysis (CARRA/CERRA) -constant marsExpver = 'test'; +# Copernicus regional reanalysis test (CARRA/CERRA) +if (!defined(marsExpver)) { + constant marsExpver = 'test'; +} include "grib2/products_crra.def" diff --git a/tests/grib_uerra.sh b/tests/grib_uerra.sh index cdd7beb87..15f9523e6 100755 --- a/tests/grib_uerra.sh +++ b/tests/grib_uerra.sh @@ -85,11 +85,18 @@ status=$? set -e [ $status -ne 0 ] -# crraLocalVersion=2 has a coded key which can be set +# ECC-1532 +# crraLocalVersion=2 has a coded key for experimentVersionNumber ${tools_dir}/grib_set -s \ productionStatusOfProcessedData=10,grib2LocalSectionPresent=1,crraLocalVersion=2,marsExpver=coco \ $grib2_sample $temp1 grib_check_key_equals $temp1 'marsExpver,mars.expver' 'coco coco' +${tools_dir}/grib_set -s \ + productionStatusOfProcessedData=11,grib2LocalSectionPresent=1,crraLocalVersion=2,experimentVersionNumber=0078 \ +$grib2_sample $temp1 +grib_check_key_equals $temp1 'marsExpver,mars.expver' '0078 0078' + + # Clean up rm -f $temp1 $temp2 $tempSample