Skip to content
Snippets Groups Projects
Commit 8d424511 authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

cleanup tests

parent c452f9d3
No related branches found
No related tags found
1 merge request!4Runner for levante
Hide whitespace changes
Inline Side-by-side
Showing
with 59 additions and 35 deletions
cdoTestsStatus.py
+ 7
− 0
View file @ 8d424511
......@@ -107,6 +107,13 @@ def scanFilesForOperator():
dict[file].append(x)
else:
dict[file] = temp
if "OPERATORS=" in l:
temp = l[l.find("\"") + 1 : -2].replace("\"","").split(" ")
if file in dict:
for x in temp:
dict[file].append(x)
else:
dict[file] = temp
f.close()
......
libcdi @ 7271ca99
Compare a2bea14d...7271ca99
Subproject commit a2bea14d36582cdcf4d92c0fcc748ad332c14dc6
Subproject commit 7271ca9934b1bc8dd8cd0be94fa4a92a471e95f5
test/Arithc.test.in
+ 13
− 12
View file @ 8d424511
......@@ -6,14 +6,14 @@ 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"
OPERATORS="addc subc mulc divc"
#
IFILE=$DATAPATH/pl_data
NTEST=1
#
for STAT in $STATS; do
for OPERATOR in $OPERATORS; do
RSTAT=0
OFILE=stat${STAT}_res
OFILE=stat${OPERATOR}_res
for VAR in -777 -1 0 1 777; do
if [ -z "$1" ] || [ $NTEST == $1 ]; then
......@@ -25,9 +25,10 @@ for STAT in $STATS; do
# stat var const
CDOTEST="$STAT"
CDOCOMMAND="$CDO $FORMAT ${STAT} $IFILE $CFILE $OFILE"
XOPERATOR=`echo ${OPERATOR} | cut -c 1-3`
CDOCOMMAND="$CDO $FORMAT ${XOPERATOR} $IFILE $CFILE $OFILE"
CDOTEST="$OPERATOR"
echo "Running test: $NTEST - $CDOTEST"
echo "$CDOCOMMAND"
......@@ -36,8 +37,8 @@ for STAT in $STATS; do
# stat,const var
OFILE2=stat${STAT}c_res
CDOCOMMAND="$CDO $FORMAT ${STAT}c,$VAL $IFILE $OFILE2"
OFILE2=stat${OPERATOR}_res
CDOCOMMAND="$CDO $FORMAT ${OPERATOR},$VAL $IFILE $OFILE2"
$CDOCOMMAND
test $? -eq 0 || let RSTAT+=1
......@@ -48,11 +49,11 @@ for STAT in $STATS; do
# expr,instr var
OP=""
if [ "$STAT" = add ] ; then OP='+' ; fi
if [ "$STAT" = sub ] ; then OP='-' ; fi
if [ "$STAT" = mul ] ; then OP='*' ; fi
if [ "$STAT" = div ] ; then OP='/' ; fi
OFILE3=arithc_expr${STAT}_res
if [ "$OPERATOR" = addc ] ; then OP='+' ; fi
if [ "$OPERATOR" = subc ] ; then OP='-' ; fi
if [ "$OPERATOR" = mulc ] ; then OP='*' ; fi
if [ "$OPERATOR" = divc ] ; then OP='/' ; fi
OFILE3=arithc_expr${OPERATOR}_res
INSTR="var130=var130${OP}${VAL};var152=var152${OP}${VAL};var129=var129${OP}${VAL};"
echo $INSTR
CDOCOMMAND="$CDO $FORMAT expr,$INSTR $IFILE $OFILE3"
......
test/Cat.test.in
+ 4
− 3
View file @ 8d424511
......@@ -7,9 +7,10 @@ echo 1..1 # 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/"
#
STATS="cat"
OPERATORS="cat"
FORMAT="-f srv -b 32"
#
OPERATOR=$OPERATORS
IFILE=$DATAPATH/t21_geosp_tsurf.grb
#
RFILE=catdata_ref
......@@ -22,8 +23,8 @@ cat $IFILE >> ${RFILE}
rm -f ${OFILE}
#
NTEST=1
CDOTEST="cat"
CDOCOMMAND="$CDO $STATS $IFILE ${OFILE}"
CDOTEST=$OPERATOR
CDOCOMMAND="$CDO $OPERATOR $IFILE ${OFILE}"
TESTCOMMAND="$CDO diff $OFILE $RFILE"
#
runTest
......
test/Collgrid.test.in
+ 2
− 1
View file @ 8d424511
......@@ -5,7 +5,8 @@ echo 1..9 # 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/"
#
OPERATOR="collgrid"
OPERATORS="collgrid"
OPERATOR=$OPERATORS
#
GRIDTYPES="regular generic curvilinear"
DISTS="4,3 12,1 1,6"
......
test/EOF.test.in
+ 4
− 4
View file @ 8d424511
......@@ -11,7 +11,7 @@ export CDO_FILE_SUFFIX=NULL
export CDO_WEIGHT_MODE=off
#
FORMAT="-f srv -b 32"
STATS="eof eof3d"
OPERATORS="eof eof3d"
#
NTEST=1
IFILE=$DATAPATH/psl_DJF_anom.grb
......@@ -20,14 +20,14 @@ RFILE2=$DATAPATH/eof_ref
OFILE1=eval_res
OFILE2=eof_res
#
for STAT in $STATS; do
for OPERATOR in $OPERATORS; do
for MODE in jacobi danielson_lanczos; do
if [ "${HAS_THREADS}" = yes ] ; then
RSTAT=0
export CDO_SVD_MODE=$MODE
CDOTEST="${STAT} - $MODE"
CDOCOMMAND="$CDO $FORMAT ${STAT},1 $IFILE $OFILE1 $OFILE2"
CDOTEST="${OPERATOR} - $MODE"
CDOCOMMAND="$CDO $FORMAT ${OPERATOR},1 $IFILE $OFILE1 $OFILE2"
echo "$CDOCOMMAND"
$CDOCOMMAND
......
test/EOFcoeff.test.in
+ 4
− 4
View file @ 8d424511
......@@ -11,21 +11,21 @@ export CDO_FILE_SUFFIX=NULL
export CDO_WEIGHT_MODE=off
#
FORMAT="-f srv -b 32"
STATS="eofcoeff eofcoeff3d"
OPERATORS="eofcoeff eofcoeff3d"
#
NTEST=1
IFILE=$DATAPATH/psl_DJF_anom.grb
RFILE=$DATAPATH/pcoeff00000
OFILE=res_pcoeff
#
for STAT in $STATS; do
for OPERATOR in $OPERATORS; do
for MODE in jacobi danielson_lanczos; do
if [ "${HAS_THREADS}" = yes ] ; then
RSTAT=0
export CDO_SVD_MODE=$MODE
CDOTEST="${STAT} - $MODE"
CDOCOMMAND="$CDO $FORMAT ${STAT} $DATAPATH/eof_ref $IFILE $OFILE"
CDOTEST="${OPERATOR} - $MODE"
CDOCOMMAND="$CDO $FORMAT ${OPERATOR} $DATAPATH/eof_ref $IFILE $OFILE"
echo "$CDOCOMMAND"
$CDOCOMMAND
......
test/Ensstat.test.in
+ 2
− 1
View file @ 8d424511
......@@ -7,11 +7,12 @@ echo 1..26 # 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/"
#
TYPE="ens"
OPERTYPES="ens"
STATS="min max range sum avg mean std std1 var var1 skew kurt median"
#
export CDO_FILE_SUFFIX=NULL
#
TYPE=$OPERTYPES
NTEST=1
#
for RUN in 1 2; do
......
test/Seasstat.test.in
+ 4
− 1
View file @ 8d424511
......@@ -6,10 +6,13 @@ test -n "$DATAPATH" || DATAPATH="@abs_top_srcdir@/test/data/"
#
HAS_NETCDF=`${CDO} --config has-nc`
#
TYPE="seas"
OPERTYPES="seas"
STATS="min max range sum avg mean std std1 var var1"
TYPE=$OPERTYPES
#
FMS="srv grb"
if [ "${HAS_NETCDF}" = yes ] ; then FMS="$FMS nc"; fi
#
NTEST=1
#
for RUN in 1 2; do
......
test/Smooth.test.in
+ 4
− 1
View file @ 8d424511
......@@ -5,6 +5,9 @@ echo 1..3 # 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/"
#
OPERATORS="smooth"
OPERATOR=$OPERATORS
#
FORMAT="-f srv -b 32"
ABSLIMMAX=0.001
#
......@@ -19,7 +22,7 @@ function testfunc()
CDOTEST="parameter set $NTEST"
echo "Running test: $NTEST - $CDOTEST"
RFILE=$DATAPATH/smooth${NTEST}_ref
RFILE=$DATAPATH/${OPERAROR}${NTEST}_ref
OFILE=smooth${NTEST}_res
CDOCOMMAND="$CDO $FORMAT $SMOOTHOPT $IFILE $OFILE"
......
test/Spectral.test.in
+ 2
− 0
View file @ 8d424511
......@@ -7,6 +7,8 @@ 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/"
#
OPERATORS="gp2sp sp2gp gp2spl sp2gpl"
#
FORMAT=""
NTEST=1
# operator infile abslim
......
test/Timpctl.test.in
+ 4
− 4
View file @ 8d424511
......@@ -9,14 +9,14 @@ test -n "$DATAPATH" || DATAPATH="@abs_top_srcdir@/test/data/"
#
FORMAT="-f srv -b 32"
#
STATS="pctl"
OPERTYPES="seas tim year mon day yseas ymon yday"
STATS="pctl"
PCTL=50
#
NTEST=1
#
for STAT in $OPERTYPES; do
OPERATOR="$STAT$STATS"
for TYPE in $OPERTYPES; do
OPERATOR="$TYPE$STATS"
if [ -z "$1" ] || [ $NTEST == $1 ]; then
if [ $OPERATOR = daypctl ] ; then
IFILE=$DATAPATH/ts_6h_1mon
......@@ -30,7 +30,7 @@ for STAT in $OPERTYPES; do
OFILE=${OPERATOR}${PCTL}_res
CDOTEST="${OPERATOR}"
CDOCOMMAND="$CDO $FORMAT ${OPERATOR},${PCTL} $IFILE $DATAPATH/${STAT}min_ref $DATAPATH/${STAT}max_ref $OFILE"
CDOCOMMAND="$CDO $FORMAT ${OPERATOR},${PCTL} $IFILE $DATAPATH/${TYPE}min_ref $DATAPATH/${TYPE}max_ref $OFILE"
TESTCOMMAND="$CDO diff,abslim=0.004 $OFILE $RFILE"
runTest
......
test/Timselpctl.test.in
+ 8
− 3
View file @ 8d424511
......@@ -9,9 +9,14 @@ test -n "$DATAPATH" || DATAPATH="@abs_top_srcdir@/test/data/"
#
FORMAT="-f srv -b 32"
#
TYPE="timsel"
OPERTYPES="timsel"
STATS="pctl"
PCTL=50
#
TYPE=$OPERTYPES;
STAT=$STATS
OPERATOR=${TYPE}${STAT}
#
NTEST=1
#
IFILE=$DATAPATH/ts_mm_5years
......@@ -27,8 +32,8 @@ for NSETS in 12 60; do
RFILE=$DATAPATH/${TYPE}${NSETS}pctl${PCTL}_ref
OFILE=${TYPE}${NSETS}pctl${PCTL}_res
CDOTEST="${TYPE}pctl nsets=${NSETS}"
CDOCOMMAND="$CDO $FORMAT ${TYPE}pctl,${PCTL},${NSETS} $IFILE $DATAPATH/${RTYPE}min_ref $DATAPATH/${RTYPE}max_ref $OFILE"
CDOTEST="${OPERATOR} nsets=${NSETS}"
CDOCOMMAND="$CDO $FORMAT ${OPERATOR},${PCTL},${NSETS} $IFILE $DATAPATH/${RTYPE}min_ref $DATAPATH/${RTYPE}max_ref $OFILE"
TESTCOMMAND="$CDO diff,abslim=0.004 $OFILE $RFILE"
runTest
......
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

Imprint | Privacy Policy