Commit 1fef9d25 authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

Added test for Gridboxstat.

parent 163b053d
......@@ -21060,9 +21060,9 @@ ac_config_files="$ac_config_files test/Cat.test test/Gridarea.test test/Genweigh
 
ac_config_files="$ac_config_files test/Select.test test/Spectral.test test/Vertint.test"
 
ac_config_files="$ac_config_files test/Timstat.test test/Timselstat.test test/Seasstat.test test/Runstat.test"
ac_config_files="$ac_config_files test/Timstat.test test/Timselstat.test test/Seasstat.test test/Runstat.test test/Ymonstat.test"
 
ac_config_files="$ac_config_files test/Ymonstat.test test/Fldstat.test test/Fldpctl.test test/Ensstat.test test/Enspctl.test"
ac_config_files="$ac_config_files test/Gridboxstat.test test/Fldstat.test test/Fldpctl.test test/Ensstat.test test/Enspctl.test"
 
ac_config_files="$ac_config_files test/Merstat.test test/Zonstat.test"
 
......@@ -22237,6 +22237,7 @@ do
"test/Seasstat.test") CONFIG_FILES="$CONFIG_FILES test/Seasstat.test" ;;
"test/Runstat.test") CONFIG_FILES="$CONFIG_FILES test/Runstat.test" ;;
"test/Ymonstat.test") CONFIG_FILES="$CONFIG_FILES test/Ymonstat.test" ;;
"test/Gridboxstat.test") CONFIG_FILES="$CONFIG_FILES test/Gridboxstat.test" ;;
"test/Fldstat.test") CONFIG_FILES="$CONFIG_FILES test/Fldstat.test" ;;
"test/Fldpctl.test") CONFIG_FILES="$CONFIG_FILES test/Fldpctl.test" ;;
"test/Ensstat.test") CONFIG_FILES="$CONFIG_FILES test/Ensstat.test" ;;
......@@ -23763,6 +23764,7 @@ _LT_EOF
"test/Seasstat.test":F) chmod a+x "$ac_file" ;;
"test/Runstat.test":F) chmod a+x "$ac_file" ;;
"test/Ymonstat.test":F) chmod a+x "$ac_file" ;;
"test/Gridboxstat.test":F) chmod a+x "$ac_file" ;;
"test/Fldstat.test":F) chmod a+x "$ac_file" ;;
"test/Fldpctl.test":F) chmod a+x "$ac_file" ;;
"test/Ensstat.test":F) chmod a+x "$ac_file" ;;
......
......@@ -250,8 +250,8 @@ AC_PROG_AWK
AC_CONFIG_FILES([test/File.test test/Read_grib.test test/Read_netcdf.test test/Copy_netcdf.test],[chmod a+x "$ac_file"])
AC_CONFIG_FILES([test/Cat.test test/Gridarea.test test/Genweights.test test/Remap.test],[chmod a+x "$ac_file"])
AC_CONFIG_FILES([test/Select.test test/Spectral.test test/Vertint.test],[chmod a+x "$ac_file"])
AC_CONFIG_FILES([test/Timstat.test test/Timselstat.test test/Seasstat.test test/Runstat.test],[chmod a+x "$ac_file"])
AC_CONFIG_FILES([test/Ymonstat.test test/Fldstat.test test/Fldpctl.test test/Ensstat.test test/Enspctl.test],[chmod a+x "$ac_file"])
AC_CONFIG_FILES([test/Timstat.test test/Timselstat.test test/Seasstat.test test/Runstat.test test/Ymonstat.test],[chmod a+x "$ac_file"])
AC_CONFIG_FILES([test/Gridboxstat.test test/Fldstat.test test/Fldpctl.test test/Ensstat.test test/Enspctl.test],[chmod a+x "$ac_file"])
AC_CONFIG_FILES([test/Merstat.test test/Zonstat.test],[chmod a+x "$ac_file"])
AC_CONFIG_FILES([test/Afterburner.test test/Detrend.test test/Arithc.test test/Arith.test test/Expr.test],[chmod a+x "$ac_file"])
AC_CONFIG_FILES([test/Gradsdes.test test/Collgrid.test test/threads.test test/tsformat.test test/wildcard.test],[chmod a+x "$ac_file"])
......
#! @SHELL@
echo 1..9 # Number of tests to be executed.
#
test -n "$CDO" || CDO=cdo
test -n "$DATAPATH" || DATAPATH=./data
#
CDOOUT=cout$$
CDOERR=cerr$$
FORMAT="-f srv -b 32"
#
TYPE=gridbox
STATS="min max sum avg mean std std1 var var1"
#
IFILE=$DATAPATH/t21_geosp_tsurf.grb
#
NTEST=1
#
for STAT in $STATS; do
RSTAT=0
RFILE=$DATAPATH/fld${STAT}_ref
OFILE=${TYPE}${STAT}_res
CDOTEST="${TYPE}$STAT"
CDOCOMMAND="$CDO $FORMAT ${TYPE}${STAT},64,32 $IFILE $OFILE"
echo "Running test: $NTEST"
echo "$CDOCOMMAND"
$CDOCOMMAND
test $? -eq 0 || let RSTAT+=1
$CDO diff $OFILE $RFILE > $CDOOUT 2> $CDOERR
test $? -eq 0 || let RSTAT+=1
test -s $CDOOUT && let RSTAT+=1
cat $CDOOUT $CDOERR
test $RSTAT -eq 0 && echo "ok $NTEST - $CDOTEST"
test $RSTAT -eq 0 || echo "not ok $NTEST - $CDOTEST"
let NTEST+=1
rm -f $OFILE
done
#
rm -f $CDOOUT $CDOERR
#
exit 0
......@@ -13,7 +13,8 @@ TEST_LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \
# tests which should pass
TESTS = threads.test tsformat.test wildcard.test File.test Read_grib.test Read_netcdf.test Copy_netcdf.test Cat.test Gridarea.test \
Detrend.test Genweights.test Remap.test Select.test Spectral.test \
Ensstat.test Enspctl.test Fldstat.test Fldpctl.test Merstat.test Zonstat.test Timstat.test Timselstat.test Seasstat.test \
Ensstat.test Enspctl.test Gridboxstat.test Fldstat.test Fldpctl.test Merstat.test Zonstat.test \
Timstat.test Timselstat.test Seasstat.test \
Runstat.test Ymonstat.test \
Vertint.test Afterburner.test Arithc.test Arith.test Expr.test \
Gradsdes.test Collgrid.test MapReduce.test Ninfo.test
......
......@@ -88,16 +88,16 @@ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(srcdir)/Spectral.test.in $(srcdir)/Vertint.test.in \
$(srcdir)/Timstat.test.in $(srcdir)/Timselstat.test.in \
$(srcdir)/Seasstat.test.in $(srcdir)/Runstat.test.in \
$(srcdir)/Ymonstat.test.in $(srcdir)/Fldstat.test.in \
$(srcdir)/Fldpctl.test.in $(srcdir)/Ensstat.test.in \
$(srcdir)/Enspctl.test.in $(srcdir)/Merstat.test.in \
$(srcdir)/Zonstat.test.in $(srcdir)/Afterburner.test.in \
$(srcdir)/Detrend.test.in $(srcdir)/Arithc.test.in \
$(srcdir)/Arith.test.in $(srcdir)/Expr.test.in \
$(srcdir)/Gradsdes.test.in $(srcdir)/Collgrid.test.in \
$(srcdir)/threads.test.in $(srcdir)/tsformat.test.in \
$(srcdir)/wildcard.test.in $(srcdir)/MapReduce.test.in \
$(srcdir)/Ninfo.test.in README
$(srcdir)/Ymonstat.test.in $(srcdir)/Gridboxstat.test.in \
$(srcdir)/Fldstat.test.in $(srcdir)/Fldpctl.test.in \
$(srcdir)/Ensstat.test.in $(srcdir)/Enspctl.test.in \
$(srcdir)/Merstat.test.in $(srcdir)/Zonstat.test.in \
$(srcdir)/Afterburner.test.in $(srcdir)/Detrend.test.in \
$(srcdir)/Arithc.test.in $(srcdir)/Arith.test.in \
$(srcdir)/Expr.test.in $(srcdir)/Gradsdes.test.in \
$(srcdir)/Collgrid.test.in $(srcdir)/threads.test.in \
$(srcdir)/tsformat.test.in $(srcdir)/wildcard.test.in \
$(srcdir)/MapReduce.test.in $(srcdir)/Ninfo.test.in README
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/acx_options.m4 \
$(top_srcdir)/m4/ax_pthread.m4 $(top_srcdir)/m4/libtool.m4 \
......@@ -112,11 +112,11 @@ CONFIG_CLEAN_FILES = File.test Read_grib.test Read_netcdf.test \
Copy_netcdf.test Cat.test Gridarea.test Genweights.test \
Remap.test Select.test Spectral.test Vertint.test Timstat.test \
Timselstat.test Seasstat.test Runstat.test Ymonstat.test \
Fldstat.test Fldpctl.test Ensstat.test Enspctl.test \
Merstat.test Zonstat.test Afterburner.test Detrend.test \
Arithc.test Arith.test Expr.test Gradsdes.test Collgrid.test \
threads.test tsformat.test wildcard.test MapReduce.test \
Ninfo.test
Gridboxstat.test Fldstat.test Fldpctl.test Ensstat.test \
Enspctl.test Merstat.test Zonstat.test Afterburner.test \
Detrend.test Arithc.test Arith.test Expr.test Gradsdes.test \
Collgrid.test threads.test tsformat.test wildcard.test \
MapReduce.test Ninfo.test
CONFIG_CLEAN_VPATH_FILES =
AM_V_P = $(am__v_P_@AM_V@)
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
......@@ -527,7 +527,8 @@ TEST_LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \
# tests which should pass
TESTS = threads.test tsformat.test wildcard.test File.test Read_grib.test Read_netcdf.test Copy_netcdf.test Cat.test Gridarea.test \
Detrend.test Genweights.test Remap.test Select.test Spectral.test \
Ensstat.test Enspctl.test Fldstat.test Fldpctl.test Merstat.test Zonstat.test Timstat.test Timselstat.test Seasstat.test \
Ensstat.test Enspctl.test Gridboxstat.test Fldstat.test Fldpctl.test Merstat.test Zonstat.test \
Timstat.test Timselstat.test Seasstat.test \
Runstat.test Ymonstat.test \
Vertint.test Afterburner.test Arithc.test Arith.test Expr.test \
Gradsdes.test Collgrid.test MapReduce.test Ninfo.test
......@@ -611,6 +612,8 @@ Runstat.test: $(top_builddir)/config.status $(srcdir)/Runstat.test.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
Ymonstat.test: $(top_builddir)/config.status $(srcdir)/Ymonstat.test.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
Gridboxstat.test: $(top_builddir)/config.status $(srcdir)/Gridboxstat.test.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
Fldstat.test: $(top_builddir)/config.status $(srcdir)/Fldstat.test.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
Fldpctl.test: $(top_builddir)/config.status $(srcdir)/Fldpctl.test.in
......
Supports Markdown
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