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

ECC-1806: Additional entries for stepType

This commit is contained in:
shahramn 2024-04-19 22:18:09 +01:00
parent ce791332a5
commit b81ab6324a
3 changed files with 33 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
definitions/grib1/localConcepts/ecmf/stepTypeForConversion.def
View File

@ -198,3 +198,17 @@
"accum"={gribTablesVersionNo=162;indicatorOfParameter=112;centre=98;} "accum"={gribTablesVersionNo=162;indicatorOfParameter=112;centre=98;}
# vtpha # vtpha
"accum"={gribTablesVersionNo=162;indicatorOfParameter=113;centre=98;} "accum"={gribTablesVersionNo=162;indicatorOfParameter=113;centre=98;}
# mvv
"avg"={gribTablesVersionNo=130;indicatorOfParameter=232;centre=98;}
# msshfl
"avg"={gribTablesVersionNo=172; indicatorOfParameter=146;centre=98;}
# mslhfl
"avg"={gribTablesVersionNo=172;indicatorOfParameter=147;centre=98;}
"avg"={gribTablesVersionNo=128;indicatorOfParameter=55;centre=98;}
"avg"={gribTablesVersionNo=128;indicatorOfParameter=56;centre=98;}
"avg"={gribTablesVersionNo=172;indicatorOfParameter=169;centre=98;}
"avg"={gribTablesVersionNo=172;indicatorOfParameter=175;centre=98;}
"avg"={gribTablesVersionNo=172;indicatorOfParameter=176;centre=98;}
"avg"={gribTablesVersionNo=172;indicatorOfParameter=177;centre=98;}
"avg"={gribTablesVersionNo=172;indicatorOfParameter=178;centre=98;}
"avg"={gribTablesVersionNo=172;indicatorOfParameter=179;centre=98;}

28
definitions/grib1/section.1.def
View File

@ -328,18 +328,18 @@ meta md5Product md5(offsetSection1,section1Length,gridDefinition,section1Flags,d
# ECC-1806 # ECC-1806
concept_nofail paramIdForConversion(zero) { concept_nofail paramIdForConversion(zero) {
228004 = { gribTablesVersionNo=128; indicatorOfParameter=55; centre=98; } # 55 -> 228004 228004 = { gribTablesVersionNo=128; indicatorOfParameter=55; centre=98; } # 55 -> 228004
235168 = { gribTablesVersionNo=128; indicatorOfParameter=56; centre=98; } # 56 -> 235168 235168 = { gribTablesVersionNo=128; indicatorOfParameter=56; centre=98; } # 56 -> 235168
235135 = { gribTablesVersionNo=130; indicatorOfParameter=232; centre=98; } # 130232 -> 235135 235135 = { gribTablesVersionNo=130; indicatorOfParameter=232; centre=98; } # 130232 -> 235135
262104 = { gribTablesVersionNo=151; indicatorOfParameter=163; centre=98; } # 151163 -> 262104 262104 = { gribTablesVersionNo=151; indicatorOfParameter=163; centre=98; } # 151163 -> 262104
262124 = { gribTablesVersionNo=151; indicatorOfParameter=145; centre=98; } # 151145 -> 262124 262124 = { gribTablesVersionNo=151; indicatorOfParameter=145; centre=98; } # 151145 -> 262124
235033 = { gribTablesVersionNo=172; indicatorOfParameter=146; centre=98; } # 172146 -> 235033 235033 = { gribTablesVersionNo=172; indicatorOfParameter=146; centre=98; } # 172146 -> 235033
235034 = { gribTablesVersionNo=172; indicatorOfParameter=147; centre=98; } # 172147 -> 235034 235034 = { gribTablesVersionNo=172; indicatorOfParameter=147; centre=98; } # 172147 -> 235034
235035 = { gribTablesVersionNo=172; indicatorOfParameter=169; centre=98; } # 172169 -> 235035 235035 = { gribTablesVersionNo=172; indicatorOfParameter=169; centre=98; } # 172169 -> 235035
235036 = { gribTablesVersionNo=172; indicatorOfParameter=175; centre=98; } # 172175 -> 235036 235036 = { gribTablesVersionNo=172; indicatorOfParameter=175; centre=98; } # 172175 -> 235036
235037 = { gribTablesVersionNo=172; indicatorOfParameter=176; centre=98; } # 172176 -> 235037 235037 = { gribTablesVersionNo=172; indicatorOfParameter=176; centre=98; } # 172176 -> 235037
235038 = { gribTablesVersionNo=172; indicatorOfParameter=177; centre=98; } # 172177 -> 235038 235038 = { gribTablesVersionNo=172; indicatorOfParameter=177; centre=98; } # 172177 -> 235038
235039 = { gribTablesVersionNo=172; indicatorOfParameter=178; centre=98; } # 172178 -> 235039 235039 = { gribTablesVersionNo=172; indicatorOfParameter=178; centre=98; } # 172178 -> 235039
235040 = { gribTablesVersionNo=172; indicatorOfParameter=179; centre=98; } # 172179 -> 235040 235040 = { gribTablesVersionNo=172; indicatorOfParameter=179; centre=98; } # 172179 -> 235040
262000 = { gribTablesVersionNo=174; indicatorOfParameter=98; centre=98; } # 174098 -> 262000 262000 = { gribTablesVersionNo=174; indicatorOfParameter=98; centre=98; } # 174098 -> 262000
} : long_type; } : long_type;

17
tests/grib_ecc-1806.sh
View File

@ -17,8 +17,8 @@ tempGrib1=temp.$label.1.grib
tempGrib2=temp.$label.2.grib tempGrib2=temp.$label.2.grib
tempLog=temp.$label.log tempLog=temp.$label.log
sample_grib1=$ECCODES_SAMPLES_PATH/GRIB1.tmpl sampleGrib1=$ECCODES_SAMPLES_PATH/GRIB1.tmpl
sample_grib2=$ECCODES_SAMPLES_PATH/GRIB2.tmpl sampleGrib2=$ECCODES_SAMPLES_PATH/GRIB2.tmpl
test_conversion() test_conversion()
{ {
@ -26,20 +26,13 @@ test_conversion()
param2=$2 # new paramId in GRIB2 param2=$2 # new paramId in GRIB2
short=$3 # new shortName short=$3 # new shortName
${tools_dir}/grib_set -s paramId=$param1 $sample_grib1 $tempGrib1 ${tools_dir}/grib_set -s paramId=$param1 $sampleGrib1 $tempGrib1
${tools_dir}/grib_set -s edition=2 $tempGrib1 $tempGrib2
set +e
${tools_dir}/grib_set -s edition=2 $tempGrib1 $tempGrib2 2>$REDIRECT
status=$?
set -e
if [ $status -ne 0 ]; then
${tools_dir}/grib_set -s stepType=avg,edition=2 $tempGrib1 $tempGrib2
fi
grib_check_key_equals $tempGrib2 paramId,shortName "$param2 $short" grib_check_key_equals $tempGrib2 paramId,shortName "$param2 $short"
# Check the old paramId has been removed from GRIB2 # Check the old paramId has been removed from GRIB2
set +e set +e
${tools_dir}/grib_set -s paramId=$param1 $sample_grib2 $tempGrib2 >$tempLog 2>&1 ${tools_dir}/grib_set -s paramId=$param1 $sampleGrib2 $tempGrib2 >$tempLog 2>&1
status=$? status=$?
set -e set -e
[ $status -ne 0 ] [ $status -ne 0 ]