Added test/Ydayarith.test.in

configure.ac

@@ -264,6 +264,7 @@ AC_CONFIG_FILES([
                 test/Ydrunpctl.test
                 test/Ydrunstat.test
                 test/Yearmonstat.test
+                test/Ydayarith.test
                 test/Ymonarith.test
                 test/Zonstat.test
                 test/X_arith.test

test/Makefile.am

@@ -86,6 +86,7 @@ TESTS =\
 		Ydrunpctl.test     \
 		Ydrunstat.test     \
 		Yearmonstat.test   \
+		Ydayarith.test     \
 		Ymonarith.test     \
 		Zonstat.test
 

test/Ydayarith.test.in

+#! @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_1d_5years
+IFILE2=$DATAPATH/ts_1d_1year
+#
+FORMAT="-f srv -b 32"
+OPERATORS="ydayadd ydaysub ydaymul ydaydiv"
+#
+NTEST=1
+#
+for OPERATOR in $OPERATORS; do
+    if [ -z "$1" ] || [ $NTEST == $1 ]; then
+        RFILE=$DATAPATH/${OPERATOR}_ref
+        OFILE=${OPERATOR}_res
+
+        CDOTEST="$OPERATOR"
+        CDOCOMMAND="$CDO  $FORMAT ${OPERATOR} -del29feb $IFILE1 $IFILE2 $OFILE"
+        TESTCOMMAND="$CDO  diff $OFILE $RFILE"
+
+        runTest
+        rm -f $OFILE
+    fi
+    let NTEST+=1
+done
+#
+exit 0

test/data/Makefile.am

@@ -92,6 +92,7 @@ GRADSDES     = pl_data.ctl pl_data.gmp
 ARITH        = arithadd_ref arithsub_ref arithmul_ref arithdiv_ref arith2.srv arith2mean.srv arith2add_ref arith2sub_ref arith2mul_ref arith2div_ref
 MONARITH     = monadd_ref monsub_ref monmul_ref mondiv_ref
 YEARARITH    = yearadd_ref yearsub_ref yearmul_ref yeardiv_ref
+YDAYARITH    = ydayadd_ref ydaysub_ref ydaymul_ref ydaydiv_ref
 YMONARITH    = ymonadd_ref ymonsub_ref ymonmul_ref ymondiv_ref
 MAPREDUCE    = r18x9_grid icon_cell_grid griddes.r18x9 griddes.icon_cell
 MERGETIME    = mergetime_ref mergetime_y1 mergetime_y2 mergetime_y12
@@ -109,4 +110,4 @@ EXTRA_DIST = $(INPUTDATA) $(FILE) $(GRIB) $(NETCDF) $(EOF) $(COMP) $(YDRUNSTAT)
              $(ISOSURFACE) $(ECA) $(ETCCDI) $(MATH)\
              $(TIMSTAT) $(YEARSTAT) $(MONSTAT) $(DAYSTAT) $(TIMMSTAT) $(YEARMSTAT) $(MONMSTAT) $(DAYMSTAT) \
              $(MERSTAT) $(ZONSTAT) $(ENSSTAT) $(ENSMSTAT) $(ENSPCTL) $(SPECTRAL) $(WIND) $(INTTIME) $(VERTINT) $(REMAPGRID) $(REMAPSTAT) $(REMAP) $(REMAP2) $(REMAP3) $(REMAP4) $(SELECT) $(DETREND) \
-             $(THREAD) $(EXPR) $(GRADSDES) $(ARITH) $(MONARITH) $(YEARARITH) $(YMONARITH) $(MAPREDUCE) $(MERGETIME) $(REMAPETA) $(SMOOTH) $(SETMISS) $(FILTER)
+             $(THREAD) $(EXPR) $(GRADSDES) $(ARITH) $(MONARITH) $(YEARARITH) $(YDAYARITH) $(YMONARITH) $(MAPREDUCE) $(MERGETIME) $(REMAPETA) $(SMOOTH) $(SETMISS) $(FILTER)

test/data/gen_refdata.sh

@@ -6,6 +6,39 @@ FORMAT="-f srv -b F32"
 #
 ########################################################################
 #
+# Ydayarith
+#
+IFILE1=ts_1d_5years
+IFILE2=ts_1d_1year
+OPS="add sub mul div"
+for OP in $OPS; do
+  $CDO $FORMAT yday$OP -del29feb $IFILE1 $IFILE2 yday${OP}_ref
+done
+exit
+########################################################################
+#
+# Ymonarith
+#
+IFILE1=ts_mm_5years
+IFILE2=ts_mm_1year
+OPS="add sub mul div"
+for OP in $OPS; do
+  $CDO $FORMAT ymon$OP $IFILE1 $IFILE2 ymon${OP}_ref
+done
+exit
+########################################################################
+#
+# Monarith
+#
+IFILE1=ts_1d_1year
+IFILE2=ts_mm_1991
+OPS="add sub mul div"
+for OP in $OPS; do
+  $CDO $FORMAT mon$OP $IFILE1 $IFILE2 mon${OP}_ref
+done
+exit
+########################################################################
+#
 # Remap rotated grid
 #
 CDO=/Users/m214003/cdt/work/cdo/build/gnu/src/cdo
@@ -280,28 +313,6 @@ exit
 #
 ########################################################################
 #
-# Monarith
-#
-IFILE1=ts_1d_1year
-IFILE2=ts_mm_1991
-OPS="add sub mul div"
-for OP in $OPS; do
-  $CDO $FORMAT mon$OP $IFILE1 $IFILE2 mon${OP}_ref
-done
-exit
-########################################################################
-#
-# Ymonarith
-#
-IFILE1=ts_mm_5years
-IFILE2=ts_mm_1year
-OPS="add sub mul div"
-for OP in $OPS; do
-  $CDO $FORMAT ymon$OP $IFILE1 $IFILE2 ymon${OP}_ref
-done
-exit
-########################################################################
-#
 # Varsstat
 #
 STATS="min max sum avg mean std std1 var var1 range"