Clean up of test scripts

This commit is contained in:
Shahram Najm 2013-11-13 17:20:59 +00:00
parent 27209d52cc
commit 61677656b2
6 changed files with 21 additions and 27 deletions

View File

@ -52,9 +52,9 @@ set values={1,2,3,4,5,6,7,1111,1111,8,9,10};
write ; write ;
EOF EOF
${tools_dir}grib_filter -o out.grib1 bitmap.rules $grib1 ${tools_dir}grib_filter -o out.grib1 bitmap.rules $grib1
${tools_dir}grib_filter -o out.grib2 bitmap.rules $grib2 ${tools_dir}grib_filter -o out.grib2 bitmap.rules $grib2
exit 0 #exit 0
${tools_dir}grib_get_data -m missing out.grib1 > out.grib1.data ${tools_dir}grib_get_data -m missing out.grib1 > out.grib1.data
${tools_dir}grib_get_data -m missing out.grib2 > out.grib2.data ${tools_dir}grib_get_data -m missing out.grib2 > out.grib2.data
@ -63,4 +63,3 @@ diff out.grib1.data out.grib2.data
rm -f out.grib1.data out.grib2.data out.grib1 out.grib2 bitmap.rules rm -f out.grib1.data out.grib2.data out.grib1 out.grib2 bitmap.rules
rm -f $grib2 rm -f $grib2

View File

@ -8,7 +8,6 @@
# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction. # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
# #
. ./include.sh . ./include.sh
REDIRECT=/dev/null REDIRECT=/dev/null
@ -28,22 +27,16 @@ then
exit 1 exit 1
fi fi
rm -f ${data_dir}/out.grib2 rm -f ${data_dir}/out.grib2 rules
exit 0
if [ ! -f "${data_dir}/lfpw.grib1" ]
then
echo no data to convert
exit 0
fi
tmpdata=grib_api.grib
rm -f $tmpdata || true
${tools_dir}grib_convert ${data_dir}/mf.rules ${data_dir}/lfpw.grib1 $tmpdata 2> $REDIRECT > $REDIRECT
${tools_dir}grib_compare -f ${data_dir}/lfpw.grib2 $tmpdata
rm -f $tmpdata || true
#if [ ! -f "${data_dir}/lfpw.grib1" ]
#then
# echo no data to convert
# exit 0
#fi
#tmpdata=grib_api.grib
#rm -f $tmpdata || true
#${tools_dir}grib_convert ${data_dir}/mf.rules ${data_dir}/lfpw.grib1 $tmpdata 2> $REDIRECT > $REDIRECT
#${tools_dir}grib_compare -f ${data_dir}/lfpw.grib2 $tmpdata
#rm -f $tmpdata rules || true

View File

@ -27,5 +27,4 @@ ${test_dir}/read_index ${infile} > index.out
diff index.out ${data_dir}/index.ok diff index.out ${data_dir}/index.ok
rm -f index.out rm -f index.out out.gribidx

View File

@ -50,4 +50,4 @@ do
done done
done done
rm -f $$_f locx.grib1 locy.grib1 rm -f $$_f locx.grib1 locy.grib1 loc.grib1

View File

@ -8,11 +8,13 @@
# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction. # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
# #
. ./include.sh . ./include.sh
files="regular_latlon_surface.grib2 regular_latlon_surface.grib1" files="regular_latlon_surface.grib2 regular_latlon_surface.grib1"
# Create the grib2 file from grib1
${tools_dir}grib_set -s editionNumber=2 ${data_dir}/regular_latlon_surface.grib1 ${data_dir}/regular_latlon_surface.grib2
for file in $files for file in $files
do do
@ -37,4 +39,5 @@ diff statistics.out ${data_dir}/statistics.out.good
done done
rm -f statistics.out statistics.filter || true
rm -f ${data_dir}/regular_latlon_surface.grib2

View File

@ -79,4 +79,4 @@ hourEnd=$1; dayEnd=$2
[ "$dayEnd" = "6" ] [ "$dayEnd" = "6" ]
rm -f $grib2File.p8tmp ${grib2File}.tmp | true rm -f $grib2File.p8tmp ${grib2File}.tmp | true
rm -f $grib2File rm -f $grib2File x.grib