Skip to content

Commit b81ab63

Browse files
shahramnshahramn
committed
ECC-1806: Additional entries for stepType
1 parent ce79133 commit b81ab63

File tree

3 files changed

+33
-26
lines changed

3 files changed

+33
-26
lines changed

‎definitions/grib1/localConcepts/ecmf/stepTypeForConversion.def

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,3 +198,17 @@
198198
"accum"={gribTablesVersionNo=162;indicatorOfParameter=112;centre=98;}
199199
# vtpha
200200
"accum"={gribTablesVersionNo=162;indicatorOfParameter=113;centre=98;}
201+
# mvv
202+
"avg"={gribTablesVersionNo=130;indicatorOfParameter=232;centre=98;}
203+
# msshfl
204+
"avg"={gribTablesVersionNo=172; indicatorOfParameter=146;centre=98;}
205+
# mslhfl
206+
"avg"={gribTablesVersionNo=172;indicatorOfParameter=147;centre=98;}
207+
"avg"={gribTablesVersionNo=128;indicatorOfParameter=55;centre=98;}
208+
"avg"={gribTablesVersionNo=128;indicatorOfParameter=56;centre=98;}
209+
"avg"={gribTablesVersionNo=172;indicatorOfParameter=169;centre=98;}
210+
"avg"={gribTablesVersionNo=172;indicatorOfParameter=175;centre=98;}
211+
"avg"={gribTablesVersionNo=172;indicatorOfParameter=176;centre=98;}
212+
"avg"={gribTablesVersionNo=172;indicatorOfParameter=177;centre=98;}
213+
"avg"={gribTablesVersionNo=172;indicatorOfParameter=178;centre=98;}
214+
"avg"={gribTablesVersionNo=172;indicatorOfParameter=179;centre=98;}

‎definitions/grib1/section.1.def

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -328,18 +328,18 @@ meta md5Product md5(offsetSection1,section1Length,gridDefinition,section1Flags,d
328328

329329
# ECC-1806
330330
concept_nofail paramIdForConversion(zero) {
331-
228004 = { gribTablesVersionNo=128; indicatorOfParameter=55; centre=98; } # 55 -> 228004
332-
235168 = { gribTablesVersionNo=128; indicatorOfParameter=56; centre=98; } # 56 -> 235168
333-
235135 = { gribTablesVersionNo=130; indicatorOfParameter=232; centre=98; } # 130232 -> 235135
334-
262104 = { gribTablesVersionNo=151; indicatorOfParameter=163; centre=98; } # 151163 -> 262104
335-
262124 = { gribTablesVersionNo=151; indicatorOfParameter=145; centre=98; } # 151145 -> 262124
336-
235033 = { gribTablesVersionNo=172; indicatorOfParameter=146; centre=98; } # 172146 -> 235033
337-
235034 = { gribTablesVersionNo=172; indicatorOfParameter=147; centre=98; } # 172147 -> 235034
338-
235035 = { gribTablesVersionNo=172; indicatorOfParameter=169; centre=98; } # 172169 -> 235035
339-
235036 = { gribTablesVersionNo=172; indicatorOfParameter=175; centre=98; } # 172175 -> 235036
340-
235037 = { gribTablesVersionNo=172; indicatorOfParameter=176; centre=98; } # 172176 -> 235037
341-
235038 = { gribTablesVersionNo=172; indicatorOfParameter=177; centre=98; } # 172177 -> 235038
342-
235039 = { gribTablesVersionNo=172; indicatorOfParameter=178; centre=98; } # 172178 -> 235039
343-
235040 = { gribTablesVersionNo=172; indicatorOfParameter=179; centre=98; } # 172179 -> 235040
344-
262000 = { gribTablesVersionNo=174; indicatorOfParameter=98; centre=98; } # 174098 -> 262000
331+
228004 = { gribTablesVersionNo=128; indicatorOfParameter=55; centre=98; } # 55 -> 228004
332+
235168 = { gribTablesVersionNo=128; indicatorOfParameter=56; centre=98; } # 56 -> 235168
333+
235135 = { gribTablesVersionNo=130; indicatorOfParameter=232; centre=98; } # 130232 -> 235135
334+
262104 = { gribTablesVersionNo=151; indicatorOfParameter=163; centre=98; } # 151163 -> 262104
335+
262124 = { gribTablesVersionNo=151; indicatorOfParameter=145; centre=98; } # 151145 -> 262124
336+
235033 = { gribTablesVersionNo=172; indicatorOfParameter=146; centre=98; } # 172146 -> 235033
337+
235034 = { gribTablesVersionNo=172; indicatorOfParameter=147; centre=98; } # 172147 -> 235034
338+
235035 = { gribTablesVersionNo=172; indicatorOfParameter=169; centre=98; } # 172169 -> 235035
339+
235036 = { gribTablesVersionNo=172; indicatorOfParameter=175; centre=98; } # 172175 -> 235036
340+
235037 = { gribTablesVersionNo=172; indicatorOfParameter=176; centre=98; } # 172176 -> 235037
341+
235038 = { gribTablesVersionNo=172; indicatorOfParameter=177; centre=98; } # 172177 -> 235038
342+
235039 = { gribTablesVersionNo=172; indicatorOfParameter=178; centre=98; } # 172178 -> 235039
343+
235040 = { gribTablesVersionNo=172; indicatorOfParameter=179; centre=98; } # 172179 -> 235040
344+
262000 = { gribTablesVersionNo=174; indicatorOfParameter=98; centre=98; } # 174098 -> 262000
345345
} : long_type;

‎tests/grib_ecc-1806.sh

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,29 +17,22 @@ tempGrib1=temp.$label.1.grib
1717
tempGrib2=temp.$label.2.grib
1818
tempLog=temp.$label.log
1919

20-
sample_grib1=$ECCODES_SAMPLES_PATH/GRIB1.tmpl
21-
sample_grib2=$ECCODES_SAMPLES_PATH/GRIB2.tmpl
20+
sampleGrib1=$ECCODES_SAMPLES_PATH/GRIB1.tmpl
21+
sampleGrib2=$ECCODES_SAMPLES_PATH/GRIB2.tmpl
2222

2323
test_conversion()
2424
{
2525
param1=$1 # old paramId in GRIB1
2626
param2=$2 # new paramId in GRIB2
2727
short=$3 # new shortName
2828

29-
${tools_dir}/grib_set -s paramId=$param1 $sample_grib1 $tempGrib1
30-
31-
set +e
32-
${tools_dir}/grib_set -s edition=2 $tempGrib1 $tempGrib2 2>$REDIRECT
33-
status=$?
34-
set -e
35-
if [ $status -ne 0 ]; then
36-
${tools_dir}/grib_set -s stepType=avg,edition=2 $tempGrib1 $tempGrib2
37-
fi
29+
${tools_dir}/grib_set -s paramId=$param1 $sampleGrib1 $tempGrib1
30+
${tools_dir}/grib_set -s edition=2 $tempGrib1 $tempGrib2
3831
grib_check_key_equals $tempGrib2 paramId,shortName "$param2 $short"
3932

4033
# Check the old paramId has been removed from GRIB2
4134
set +e
42-
${tools_dir}/grib_set -s paramId=$param1 $sample_grib2 $tempGrib2 >$tempLog 2>&1
35+
${tools_dir}/grib_set -s paramId=$param1 $sampleGrib2 $tempGrib2 >$tempLog 2>&1
4336
status=$?
4437
set -e
4538
[ $status -ne 0 ]

0 commit comments

Comments
 (0)