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

added test/test_Timstat.sh

parent ef900e0d
......@@ -592,6 +592,18 @@ test/.checklib_pyunittest -text
test/Makefile.am -text
test/Makefile.in -text
test/README -text
test/data/Makefile.am -text
test/data/gen_refdata.sh -text
test/data/timavg_ref -text
test/data/timmax_ref -text
test/data/timmean_ref -text
test/data/timmin_ref -text
test/data/timstd1_ref -text
test/data/timstd_ref -text
test/data/timsum_ref -text
test/data/timvar1_ref -text
test/data/timvar_ref -text
test/data/ts_mm_5years -text
test/testStreams.py -text
test/test_Arith.py -text
test/test_Arithc.py -text
......
# Process this file with automake to produce Makefile.in
SUBDIRS = libcdi src contrib test
SUBDIRS = libcdi src contrib test/data test
#
EXTRA_DIST=config/default OPERATORS doc/cdo.pdf doc/cdo_refcard.pdf cdo.spec README
#
......
......@@ -298,7 +298,7 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
# Process this file with automake to produce Makefile.in
SUBDIRS = libcdi src contrib test
SUBDIRS = libcdi src contrib test/data test
#
EXTRA_DIST = config/default OPERATORS doc/cdo.pdf doc/cdo_refcard.pdf cdo.spec README
#
......
......@@ -19468,7 +19468,7 @@ cat >>confdefs.h <<_ACEOF
_ACEOF
 
 
ac_config_files="$ac_config_files Makefile src/Makefile contrib/Makefile test/Makefile cdo.spec cdo.settings"
ac_config_files="$ac_config_files Makefile src/Makefile contrib/Makefile test/Makefile test/data/Makefile cdo.spec cdo.settings"
 
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
......@@ -20586,6 +20586,7 @@ do
"src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
"contrib/Makefile") CONFIG_FILES="$CONFIG_FILES contrib/Makefile" ;;
"test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;;
"test/data/Makefile") CONFIG_FILES="$CONFIG_FILES test/data/Makefile" ;;
"cdo.spec") CONFIG_FILES="$CONFIG_FILES cdo.spec" ;;
"cdo.settings") CONFIG_FILES="$CONFIG_FILES cdo.settings" ;;
 
......
......@@ -124,7 +124,7 @@ AC_SUBST([AR])
COMPILER="$CC $CFLAGS"
AC_DEFINE_UNQUOTED(COMPILER, ["$COMPILER"], [Compiler])
AC_OUTPUT(Makefile src/Makefile contrib/Makefile test/Makefile cdo.spec cdo.settings)
AC_OUTPUT(Makefile src/Makefile contrib/Makefile test/Makefile test/data/Makefile cdo.spec cdo.settings)
# ----------------------------------------------------------------------
# Show configuration
......
......@@ -202,9 +202,9 @@ void *Diff(void *argument)
tsID++;
}
fprintf(stdout, " %d of %d records differ\n", ndrec, ngrec);
fprintf(stderr, " %d of %d records differ\n", ndrec, ngrec);
if ( ndrec != nd2rec )
fprintf(stdout, " %d of %d records differ more than 0.001\n", nd2rec, ngrec);
fprintf(stderr, " %d of %d records differ more than 0.001\n", nd2rec, ngrec);
/* fprintf(stdout, " %d of %d records differ more then one thousandth\n", nprec, ngrec); */
if ( nrecs == 0 && nrecs2 > 0 )
cdoWarning("stream2 has more time steps than stream1!");
......
......@@ -15,6 +15,8 @@ EXTRA_DIST = $(TESTS) $(top_srcdir)/test/testStreams.py
CDO = $(top_builddir)/src/cdo
DATAPATH = $(top_srcdir)/test/data
PYTHONPATH = $(top_srcdir)/contrib/python:$(top_srcdir)/test
listTests:
......
......@@ -262,6 +262,7 @@ TESTS = $(top_srcdir)/test/test_info.py \
# $(top_srcdir)/test/test_intgridbil.py
EXTRA_DIST = $(TESTS) $(top_srcdir)/test/testStreams.py
CDO = $(top_builddir)/src/cdo
DATAPATH = $(top_srcdir)/test/data
PYTHONPATH = $(top_srcdir)/contrib/python:$(top_srcdir)/test
AUTOMAKE_OPTIONS = color-tests
all: all-am
......
INPUTDATA = ts_mm_5years
TIMSTAT_REF = timmin_ref timmax_ref timsum_ref timavg_ref timmean_ref timstd_ref timstd1_ref timvar_ref timvar1_ref
EXTRA_DIST = $(INPUTDATA) $(TIMSTAT_REF)
#!/bin/sh
#
CDO=cdo
#
FORMAT="-f srv -b 32"
#
IFILE=EH5_AMIP_1_TSURF_6H_1991-1995.grb
OFILE=ts_6h_5years
$CDO $FORMAT remapnn,lon=55_lat=10 $IFILE $OFILE
#
IFILE=$OFILE
OFILE=ts_1d_5years
$CDO $FORMAT daymean $IFILE $OFILE
#
IFILE=$OFILE
OFILE=ts_mm_5years
$CDO $FORMAT monmean $IFILE $OFILE
#
STATS="min max sum avg mean std std1 var var1"
IFILE=$OFILE
for STAT in $STATS; do
$CDO $FORMAT tim$STAT $IFILE tim${STAT}_ref
done
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