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

ECC-1847: Fix case when input has typeOfLevel=unknown

This commit is contained in:
shahramn 2024-06-22 15:02:57 +01:00
parent 19d71254f7
commit 97dd1741aa
2 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
definitions/grib2/typeOfLevelConcept.def
View File

@ -97,3 +97,4 @@
'road' = {typeOfFirstFixedSurface=187; typeOfSecondFixedSurface=255;} 'road' = {typeOfFirstFixedSurface=187; typeOfSecondFixedSurface=255;}
'roadLayer' = {typeOfFirstFixedSurface=187; typeOfSecondFixedSurface=187;} 'roadLayer' = {typeOfFirstFixedSurface=187; typeOfSecondFixedSurface=187;}
'urbanCanyon' = {typeOfFirstFixedSurface=187; typeOfSecondFixedSurface=185;} 'urbanCanyon' = {typeOfFirstFixedSurface=187; typeOfSecondFixedSurface=185;}
'unknown' = {dummy=0;}

27
tests/grib_typeOfLevel.sh
View File

@ -11,8 +11,9 @@
. ./include.ctest.sh . ./include.ctest.sh
label="grib_typeOfLevel_test" label="grib_typeOfLevel_test"
temp=temp.$label.txt tempText=temp.$label.txt
tempGrib=temp.$label.grib tempGribA=temp.$label.A.grib
tempGribB=temp.$label.B.grib
if [ ! -d "$ECCODES_DEFINITION_PATH" ]; then if [ ! -d "$ECCODES_DEFINITION_PATH" ]; then
echo "Test $0 disabled. No definitions directory" echo "Test $0 disabled. No definitions directory"
@ -23,32 +24,40 @@ sample_g1=$ECCODES_SAMPLES_PATH/GRIB1.tmpl
sample_g2=$ECCODES_SAMPLES_PATH/GRIB2.tmpl sample_g2=$ECCODES_SAMPLES_PATH/GRIB2.tmpl
# Make sure all typeOfLevel values are unique # Make sure all typeOfLevel values are unique
# --------------------------------------------
def_file="$ECCODES_DEFINITION_PATH/grib2/typeOfLevelConcept.def" def_file="$ECCODES_DEFINITION_PATH/grib2/typeOfLevelConcept.def"
rm -f $temp rm -f $tempText
# uniq -d outputs a single copy of each line that is repeated in the input # uniq -d outputs a single copy of each line that is repeated in the input
grep "^'" $def_file | awk -F= '{print $1}' | tr -d "' " | sort | uniq -d > $temp grep "^'" $def_file | awk -F= '{print $1}' | tr -d "' " | sort | uniq -d > $tempText
if [ -s "$temp" ]; then if [ -s "$tempText" ]; then
# File exists and has a size greater than zero # File exists and has a size greater than zero
echo "ERROR: Duplicates found in $def_file" >&2 echo "ERROR: Duplicates found in $def_file" >&2
cat $temp cat $tempText
exit 1 exit 1
else else
echo "No duplicates in $def_file" echo "No duplicates in $def_file"
fi fi
# ECC-1847: Setting invalid value for 'typeOfLevel' does not fail # ECC-1847: Setting invalid value for 'typeOfLevel' does not fail
# ----------------------------------------------------------------
for sample in $sample_g1 $sample_g2; do for sample in $sample_g1 $sample_g2; do
set +e set +e
${tools_dir}/grib_set -s typeOfLevel=rubbish $sample $tempGrib 2>$temp ${tools_dir}/grib_set -s typeOfLevel=rubbish $sample $tempGribA 2>$tempText
status=$? status=$?
set -e set -e
[ $status -ne 0 ] [ $status -ne 0 ]
grep -q "Concept no match" $temp grep -q "Concept no match" $tempText
done done
# Change of PDT with typeOfLevel=unknown
${tools_dir}/grib_set -s productDefinitionTemplateNumber=0,typeOfFirstFixedSurface=0 $sample_g2 $tempGribA
grib_check_key_equals $tempGribA typeOfLevel 'unknown'
${tools_dir}/grib_set -s productDefinitionTemplateNumber=1 $tempGribA $tempGribB
grib_check_key_equals $tempGribB typeOfLevel,productDefinitionTemplateNumber 'unknown 1'
# Clean up # Clean up
rm -f $temp $tempGrib rm -f $tempText $tempGribA $tempGribB