Commit e5db08fa authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

Remap.test: added CDOTEST.

parent ad4e743a
......@@ -13,10 +13,7 @@ else
fi
#
ABSLIMMAX=0.0001
STATS="after"
FORMAT=""
NTEST=1
######################################################
......@@ -34,8 +31,6 @@ test $? -eq 0 || let RSTAT+=1
#
$CDO diff,abslim=$ABSLIMMAX $OFILE $RFILE
test $? -eq 0 || let RSTAT+=1
#
test $RSTAT -eq 0 && echo "ok $NTEST - $CDOTEST"
test $RSTAT -eq 0 || echo "not ok $NTEST - $CDOTEST"
......@@ -70,15 +65,13 @@ test $? -eq 0 || let RSTAT+=1
#
$CDO diff,abslim=$ABSLIMMAX $OFILE $RFILE
test $? -eq 0 || let RSTAT+=1
#
test $RSTAT -eq 0 && echo "ok $NTEST - $CDOTEST"
test $RSTAT -eq 0 || echo "not ok $NTEST - $CDOTEST"
#
let NTEST+=1
rm -f $OFILE
#
######################################################
SELECT=atm
IFILE=$CDOTESTDATA/$AFTERTESTFILE
......@@ -130,15 +123,13 @@ test $? -eq 0 || let RSTAT+=1
#
$CDO diff,abslim=$ABSLIMMAX $OFILE $RFILE
test $? -eq 0 || let RSTAT+=1
#
test $RSTAT -eq 0 && echo "ok $NTEST - $CDOTEST"
test $RSTAT -eq 0 || echo "not ok $NTEST - $CDOTEST"
#
let NTEST+=1
rm -f $OFILE
#
######################################################
fi
#
......
......@@ -4,8 +4,6 @@ echo 1..4 # Number of tests to be executed.
test -n "$CDO" || CDO="@abs_top_builddir@/src/cdo $CDO_DEBUG"
test -n "$DATAPATH" || DATAPATH="@abs_top_srcdir@/test/data/"
#
FORMAT="-f srv -b 32"
STATS="add sub mul div"
#
......@@ -62,8 +60,6 @@ for STAT in $STATS; do
$CDO diff $OFILE $OFILE3
test $? -eq 0 || let RSTAT+=1
rm -f $OFILE $OFILE2 $OFILE3 $CFILE
fi
done
......@@ -73,7 +69,5 @@ for STAT in $STATS; do
let NTEST+=1
done
#
#
exit 0
......@@ -6,7 +6,6 @@ test -n "$CDO" || CDO="@abs_top_builddir@/src/cdo $CDO_DEBUG"
test -n "$DATAPATH" || DATAPATH="@abs_top_srcdir@/test/data/"
#
STATS="cat"
FORMAT="-f srv -b 32"
RSTAT=0
#
......@@ -28,7 +27,5 @@ TESTCOMMAND="$CDO diff $OFILE $RFILE"
runTest "1" "$CDOTEST" "$CDODOMMAND" "$TESTCOMMAND"
#
rm -f $OFILE $RFILE
#
#
exit 0
......@@ -4,9 +4,6 @@ echo 1..4 # Number of tests to be executed.
test -n "$CDO" || CDO="@abs_top_builddir@/src/cdo $CDO_DEBUG"
test -n "$DATAPATH" || DATAPATH="@abs_top_srcdir@/test/data/"
#
FORMAT="-f srv -b 32"
declare -a SHOW
declare -a STATS
......@@ -15,7 +12,7 @@ STATS=("chcode,-1,101" "chname,topo,newname" "chunit,m,km" "chlevel,0,101")
EXPECTED_RESULTS=("101" "newname" "km" "101")
IFILE="-topo"
CDOCALL="$CDO $FORMAT"
#
RSTAT=0
for i in {0..3};
do
......@@ -34,4 +31,3 @@ do
fi
fi
done
......@@ -54,7 +54,6 @@ for GRIDTYPE in $GRIDTYPES; do
else
test $RSTAT -eq 0 && echo "ok $NTEST - $CDOTEST # SKIP netCDF not enabled"
fi
fi
let NTEST+=1
done
......
......@@ -4,8 +4,6 @@ echo 1..6 # Number of tests to be executed.
test -n "$CDO" || CDO="@abs_top_builddir@/src/cdo $CDO_DEBUG"
test -n "$DATAPATH" || DATAPATH="@abs_top_srcdir@/test/data/"
#
FORMAT="-f srv -b 32"
STATS="eqc nec lec ltc gec gtc"
CONST=300
......@@ -37,7 +35,5 @@ for STAT in $STATS; do
fi
let NTEST+=1
done
#
#
exit 0
......@@ -5,7 +5,6 @@ test -n "$CDO" || CDO="@abs_top_builddir@/src/cdo $CDO_DEBUG"
test -n "$DATAPATH" || DATAPATH="@abs_top_srcdir@/test/data/"
#
STATS="copy"
#
FILES="datar.nc datag.nc datac.nc datau.nc testfile01c.nc"
#
......@@ -17,7 +16,6 @@ for OPERATOR in $STATS; do
for FILE in $FILES; do
RSTAT=0
IFILE=$DATAPATH/${FILE}
OFILE=${OPERATOR}_${FILE}
......@@ -44,7 +42,5 @@ for OPERATOR in $STATS; do
rm -f $OFILE
done
done
#
#
exit 0
......@@ -4,8 +4,6 @@ echo 1..10 # Number of tests to be executed.
test -n "$CDO" || CDO="@abs_top_builddir@/src/cdo $CDO_DEBUG"
test -n "$DATAPATH" || DATAPATH="@abs_top_srcdir@/test/data/"
#
PCTLS="1 20 25 33 50 66 75 80 99 100"
#
IFILE=$DATAPATH/ts_mm_5years
......@@ -41,8 +39,6 @@ for PCTL in $PCTLS; do
let NTEST+=1
done
#
#
rm -f $IFILES
#
exit 0
......@@ -5,8 +5,6 @@ echo 1..10 # Number of tests to be executed.
test -n "$CDO" || CDO="@abs_top_builddir@/src/cdo $CDO_DEBUG"
test -n "$DATAPATH" || DATAPATH="@abs_top_srcdir@/test/data/"
#
FORMAT="-f srv -b 32"
#
PCTLS="1 20 25 33 50 66 75 80 99 100"
......
......@@ -5,8 +5,6 @@ echo 1..10 # Number of tests to be executed.
test -n "$CDO" || CDO="@abs_top_builddir@/src/cdo $CDO_DEBUG"
test -n "$DATAPATH" || DATAPATH="@abs_top_srcdir@/test/data/"
#
FORMAT="-f srv -b 32"
#
TYPE="fld"
......@@ -18,14 +16,12 @@ NTEST=1
#
for STAT in $STATS; do
if [ -z "$1" ] || [ $NTEST == $1 ]; then
RSTAT=0
RFILE=$DATAPATH/${TYPE}${STAT}_ref
OFILE=${TYPE}${STAT}_res
CDOTEST="${TYPE}$STAT"
CDOCOMMAND="$CDO $FORMAT ${TYPE}${STAT} $IFILE $OFILE"
TESTCOMMAND="$CDO diff $OFILE $RFILE"
runTest "$NTEST" "$CDOTEST" "$CDOCOMMAND" "$TESTCOMMAND"
......
......@@ -4,8 +4,6 @@ echo 1..7 # Number of tests to be executed.
test -n "$CDO" || CDO="@abs_top_builddir@/src/cdo $CDO_DEBUG"
test -n "$DATAPATH" || DATAPATH="@abs_top_srcdir@/test/data/"
#
REFVAL="12.5663706"
GRIDS="global_5 global_2 global_1 global_.5 n32 n80 n160"
RSTAT=0;
......@@ -38,7 +36,6 @@ for GRID in $GRIDS; do
let NTEST+=1
done
#
unset PLANET_RADIUS
#
exit 0
......@@ -4,8 +4,6 @@ echo 1..10 # Number of tests to be executed.
test -n "$CDO" || CDO="@abs_top_builddir@/src/cdo $CDO_DEBUG"
test -n "$DATAPATH" || DATAPATH="@abs_top_srcdir@/test/data/"
#
FORMAT="-f srv -b 32"
#
OPERTYPES="gridbox"
......@@ -22,7 +20,6 @@ for TYPE in $OPERTYPES; do
RFILE=$DATAPATH/fld${STAT}_ref
OFILE=${TYPE}${STAT}_res
CDOTEST="${TYPE}$STAT"
CDOCOMMAND="$CDO $FORMAT ${TYPE}${STAT},64,32 $IFILE $OFILE"
......@@ -43,7 +40,5 @@ for TYPE in $OPERTYPES; do
let NTEST+=1
done
done
#
#
exit 0
......@@ -4,8 +4,6 @@ echo 1..2 # Number of tests to be executed.
test -n "$CDO" || CDO="@abs_top_builddir@/src/cdo $CDO_DEBUG"
test -n "$DATAPATH" || DATAPATH="@abs_top_srcdir@/test/data/"
#
FORMAT="-f srv -b 32"
ABSLIMMAX=0.001
#
......@@ -54,7 +52,5 @@ testfunc
#
OPERATOR="${STATS[1]},${ARGS[1]}"
testfunc
#
#
exit 0
......@@ -4,8 +4,6 @@ echo 1..2 # Number of tests to be executed.
test -n "$CDO" || CDO="@abs_top_builddir@/src/cdo $CDO_DEBUG"
test -n "$DATAPATH" || DATAPATH="@abs_top_srcdir@/test/data/"
#
FORMAT="-f srv -b 32"
#
IFILE1=$DATAPATH/mergetime_y2
......@@ -43,7 +41,5 @@ for X in 1 2; do
fi
let NTEST+=1
done
#
#
exit 0
......@@ -5,8 +5,6 @@ echo 1..10 # Number of tests to be executed.
test -n "$CDO" || CDO="@abs_top_builddir@/src/cdo $CDO_DEBUG"
test -n "$DATAPATH" || DATAPATH="@abs_top_srcdir@/test/data/"
#
FORMAT="-f srv -b 32"
#
STATS="mermin mermax merrange mersum meravg mermean merstd merstd1 mervar mervar1"
......@@ -30,7 +28,5 @@ for STAT in $STATS; do
fi
let NTEST+=1
done
#
#
exit 0
......@@ -7,8 +7,7 @@ test -n "$DATAPATH" || DATAPATH="@abs_top_srcdir@/test/data/"
#
IFILE1=$DATAPATH/ts_1d_1year
IFILE2=$DATAPATH/ts_mm_1991
#
FORMAT="-f srv -b 32"
STATS="monadd monsub monmul mondiv"
#
......@@ -31,7 +30,5 @@ for STAT in $STATS; do
let NTEST+=1
fi
done
#
#
exit 0
......@@ -39,8 +39,6 @@ for TYPE in $OPERTYPES; do
$CDO diff,abslim=0.004 $OFILE $RFILE
test $? -eq 0 || let RSTAT+=1
done
test $RSTAT -eq 0 && echo "ok $NTEST - $CDOTEST"
......@@ -50,7 +48,5 @@ for TYPE in $OPERTYPES; do
let NTEST+=1
done
done
#
#
exit 0
......@@ -6,7 +6,6 @@ test -n "$DATAPATH" || DATAPATH="@abs_top_srcdir@/test/data/"
#
HAS_NETCDF=`${CDO} --config has-nc`
#
STATS="sinfon infon"
#
NTEST=1
......@@ -43,7 +42,5 @@ for OPERATOR in $STATS; do
let NTEST+=1
done
done
#
#
exit 0
......@@ -11,8 +11,7 @@ test -n "$DATAPATH" || DATAPATH="@abs_top_srcdir@/test/data/"
ABSLIMMAX=0.001
ABSLIMDIS=0.2
ABSLIMSCON=0.25
#
FORMAT="-f srv -b 32"
GRIDS="n16 n32"
#
......@@ -39,6 +38,8 @@ for GRIDTYPE in regular curvilinear unstructured; do
OFILE=${GRID}_${RMOD:5}_$$
RFILE=$DATAPATH/${GRID}_${RMOD:5}_ref
CDOTEST="${RMOD} $GRID $GRIDTYPE"
if [ "${HAS_THREADS}" = no -a "$GRIDTYPE" != "regular" ]; then
test $RSTAT -eq 0 && echo "ok $NTEST - $CDOTEST # SKIP POSIX threads not enabled"
else
......@@ -79,7 +80,5 @@ for GRIDTYPE in regular curvilinear unstructured; do
done
done
done
#
#
exit 0
......@@ -6,8 +6,7 @@ test -n "$DATAPATH" || DATAPATH="@abs_top_srcdir@/test/data/"
#
ABSLIMMAX=0.0001
ABSLIMDIS=0.001
#
FORMAT="-f srv -b 32"
GRID=$DATAPATH/spain.grid
#
......@@ -53,7 +52,5 @@ for RMOD in $STATS; do
fi
let NTEST+=1
done
#
#
exit 0
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment