Commit 6a939995 authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

Added test/Yeararith.test.

parent 805bbe8d
Pipeline #2804 passed with stages
in 14 minutes and 19 seconds
...@@ -333,6 +333,7 @@ AC_CONFIG_FILES([ ...@@ -333,6 +333,7 @@ AC_CONFIG_FILES([
test/Vertint.test test/Vertint.test
test/Vertstat.test test/Vertstat.test
test/Wind.test test/Wind.test
test/Yeararith.test
test/Ydrunstat.test test/Ydrunstat.test
test/Yearmonstat.test test/Yearmonstat.test
test/Ymonarith.test test/Ymonarith.test
......
...@@ -10,7 +10,6 @@ AM_COLOR_TESTS=always ...@@ -10,7 +10,6 @@ AM_COLOR_TESTS=always
TEST_LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \ TEST_LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \
$(top_srcdir)/config/tap-driver.sh $(top_srcdir)/config/tap-driver.sh
# tests which should pass # tests which should pass
TESTS =\ TESTS =\
threads.test \ threads.test \
...@@ -71,6 +70,7 @@ TESTS =\ ...@@ -71,6 +70,7 @@ TESTS =\
Vertint.test \ Vertint.test \
Vertstat.test \ Vertstat.test \
Wind.test \ Wind.test \
Yeararith.test \
Ydrunstat.test \ Ydrunstat.test \
Yearmonstat.test \ Yearmonstat.test \
Ymonarith.test \ Ymonarith.test \
...@@ -79,14 +79,6 @@ TESTS =\ ...@@ -79,14 +79,6 @@ TESTS =\
# tests which should fail # tests which should fail
XFAIL_TESTS = XFAIL_TESTS =
# $(top_srcdir)/test/test_Remap.sh \
# $(top_srcdir)/test/test_info.py
# $(top_srcdir)/test/test_diff.py
# $(top_srcdir)/test/test_Arith.py
# $(top_srcdir)/test/test_Arithc.py
# $(top_srcdir)/test/test_Selvar.py
# $(top_srcdir)/test/test_intgridbil.py
#EXTRA_DIST = $(TESTS) $(top_srcdir)/test/testStreams.py #EXTRA_DIST = $(TESTS) $(top_srcdir)/test/testStreams.py
CDO = $(top_builddir)/src/cdo CDO = $(top_builddir)/src/cdo
......
#! @BASH@
#
echo 1..4 # Number of tests to be executed.
#
. ./cdoTestFunctions.test
#
test -n "$CDO" || CDO="@abs_top_builddir@/src/cdo $CDO_DEBUG"
test -n "$DATAPATH" || DATAPATH="@abs_top_srcdir@/test/data/"
#
IFILE1=$DATAPATH/ts_mm_5years
IFILE2=$DATAPATH/ts_ym_5years
#
FORMAT="-f srv -b 32"
STATS="yearadd yearsub yearmul yeardiv"
#
NTEST=1
#
for STAT in $STATS; do
if [ -z "$1" ] || [ $NTEST == $1 ]; then
RFILE=$DATAPATH/${STAT}_ref
OFILE=${STAT}_res
CDOTEST="$STAT"
CDOCOMMAND="$CDO $FORMAT ${STAT} $IFILE1 $IFILE2 $OFILE"
TESTCOMMAND="$CDO diff $OFILE $RFILE"
runTest
rm -f $OFILE
let NTEST+=1
fi
done
#
exit 0
INPUTDATA = ts_mm_5years ts_mm_1year ts_mm_1991 ts_6h_1mon ts_1d_1year ts_mm_5years_m ts_mm_1year_m ts_mm_1991_m ts_6h_1mon_m ts_1d_1year_m \ INPUTDATA = ts_ym_5years ts_mm_5years ts_mm_1year ts_mm_1991 ts_6h_1mon ts_1d_1year ts_mm_5years_m ts_mm_1year_m ts_mm_1991_m ts_6h_1mon_m ts_1d_1year_m \
hl_l19.grb ap_l47.nc t31_dv.grb t21_geosp_tsurf.grb t21_geosp_tsurf_sea.grb bathy4.grb pl_data pl_data.grb detrend_data \ hl_l19.grb ap_l47.nc t31_dv.grb t21_geosp_tsurf.grb t21_geosp_tsurf_sea.grb bathy4.grb pl_data pl_data.grb detrend_data \
grib_testfile01.grb grib_testfile02.grb grib_testfile03.grb netcdf_testfile01.nc netcdf_testfile02.nc netcdf_testfile03.nc testfile01c.nc \ grib_testfile01.grb grib_testfile02.grb grib_testfile03.grb netcdf_testfile01.nc netcdf_testfile02.nc netcdf_testfile03.nc testfile01c.nc \
datar.nc datac.nc datau.nc datag.nc arith1.srv expr1.srv arithmask.srv psl_DJF_anom.grb tsurf_spain.grb spain.grid \ datar.nc datac.nc datau.nc datag.nc arith1.srv expr1.srv arithmask.srv psl_DJF_anom.grb tsurf_spain.grb spain.grid \
...@@ -75,6 +75,7 @@ THREAD = thread1_ref tsformat1_ref ...@@ -75,6 +75,7 @@ THREAD = thread1_ref tsformat1_ref
GRADSDES = pl_data.ctl pl_data.gmp GRADSDES = pl_data.ctl pl_data.gmp
ARITH = arithadd_ref arithsub_ref arithmul_ref arithdiv_ref ARITH = arithadd_ref arithsub_ref arithmul_ref arithdiv_ref
MONARITH = monadd_ref monsub_ref monmul_ref mondiv_ref MONARITH = monadd_ref monsub_ref monmul_ref mondiv_ref
YEARARITH = yearadd_ref yearsub_ref yearmul_ref yeardiv_ref
YMONARITH = ymonadd_ref ymonsub_ref ymonmul_ref ymondiv_ref YMONARITH = ymonadd_ref ymonsub_ref ymonmul_ref ymondiv_ref
MAPREDUCE = r18x9_grid icon_cell_grid griddes.r18x9 griddes.icon_cell MAPREDUCE = r18x9_grid icon_cell_grid griddes.r18x9 griddes.icon_cell
MERGETIME = mergetime_ref mergetime_y1 mergetime_y2 mergetime_y12 MERGETIME = mergetime_ref mergetime_y1 mergetime_y2 mergetime_y12
...@@ -89,4 +90,4 @@ EXTRA_DIST = $(INPUTDATA) $(FILE) $(GRIB) $(NETCDF) $(EOF) $(COMP) $(YDRUNSTAT) ...@@ -89,4 +90,4 @@ EXTRA_DIST = $(INPUTDATA) $(FILE) $(GRIB) $(NETCDF) $(EOF) $(COMP) $(YDRUNSTAT)
$(ISOSURFACE) \ $(ISOSURFACE) \
$(TIMSTAT) $(YEARSTAT) $(MONSTAT) $(DAYSTAT) $(TIMMSTAT) $(YEARMSTAT) $(MONMSTAT) $(DAYMSTAT) \ $(TIMSTAT) $(YEARSTAT) $(MONSTAT) $(DAYSTAT) $(TIMMSTAT) $(YEARMSTAT) $(MONMSTAT) $(DAYMSTAT) \
$(MERSTAT) $(ZONSTAT) $(ENSSTAT) $(ENSMSTAT) $(ENSPCTL) $(SPECTRAL) $(WIND) $(INTTIME) $(VERTINT) $(REMAPGRID) $(REMAP) $(REMAP2) $(REMAP3) $(SELECT) $(DETREND) \ $(MERSTAT) $(ZONSTAT) $(ENSSTAT) $(ENSMSTAT) $(ENSPCTL) $(SPECTRAL) $(WIND) $(INTTIME) $(VERTINT) $(REMAPGRID) $(REMAP) $(REMAP2) $(REMAP3) $(SELECT) $(DETREND) \
$(THREAD) $(EXPR) $(GRADSDES) $(ARITH) $(MONARITH) $(YMONARITH) $(MAPREDUCE) $(MERGETIME) $(REMAPETA) $(SMOOTH) $(SETMISS) $(FILTER) $(THREAD) $(EXPR) $(GRADSDES) $(ARITH) $(MONARITH) $(YEARARITH) $(YMONARITH) $(MAPREDUCE) $(MERGETIME) $(REMAPETA) $(SMOOTH) $(SETMISS) $(FILTER)
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