added test/data/tsformat1_ref

.gitattributes

@@ -846,6 +846,7 @@ test/data/timsum_ref -text
 test/data/timvar1_ref -text
 test/data/timvar_ref -text
 test/data/ts_mm_5years -text
+test/data/tsformat1_ref -text
 test/data/uvdata.grb -text
 test/data/ymonavg_ref -text
 test/data/ymonmax_ref -text

test/data/Makefile.am

@@ -17,7 +17,7 @@ REMAP_REF    = n16_bic_ref n16_bil_ref n16_con_ref n16_ycon_ref n16_laf_ref n16_
 SELECT_REF   = select1_ref select2_ref select3_ref select4_ref select5_ref
 DETREND_REF  = detrend_ref
 EXPR_REF     = expr1_ref aexpr1_ref expr2_ref aexpr2_ref
-THREAD_REF   = thread1_ref
+THREAD_REF   = thread1_ref tsformat1_ref
 GRADSDES_REF = pl_data.ctl pl_data.gmp
 
 EXTRA_DIST = $(INPUTDATA) $(FILE_REF) $(GRIB_REF) $(NETCDF_REF) $(YMONSTAT_REF) $(TIMSTAT_REF) $(FLDSTAT_REF) $(FLDPSTAT_REF) $(ENSPSTAT_REF) $(SPECTRAL_REF) $(VERTINT_REF) $(REMAP_REF) $(SELECT_REF) $(DETREND_REF) $(THREAD_REF) $(EXPR_REF) $(GRADSDES_REF)

test/data/Makefile.in

@@ -305,7 +305,7 @@ REMAP_REF = n16_bic_ref n16_bil_ref n16_con_ref n16_ycon_ref n16_laf_ref n16_nn_
 SELECT_REF = select1_ref select2_ref select3_ref select4_ref select5_ref
 DETREND_REF = detrend_ref
 EXPR_REF = expr1_ref aexpr1_ref expr2_ref aexpr2_ref
-THREAD_REF = thread1_ref
+THREAD_REF = thread1_ref tsformat1_ref
 GRADSDES_REF = pl_data.ctl pl_data.gmp
 EXTRA_DIST = $(INPUTDATA) $(FILE_REF) $(GRIB_REF) $(NETCDF_REF) $(YMONSTAT_REF) $(TIMSTAT_REF) $(FLDSTAT_REF) $(FLDPSTAT_REF) $(ENSPSTAT_REF) $(SPECTRAL_REF) $(VERTINT_REF) $(REMAP_REF) $(SELECT_REF) $(DETREND_REF) $(THREAD_REF) $(EXPR_REF) $(GRADSDES_REF)
 all: all-am

test/tsformat.test.in

 #! @SHELL@
-echo 1..1 # Number of tests to be executed.
+echo 1..8 # Number of tests to be executed.
 #
 test -n "$CDO"      || CDO=cdo
 test -n "$DATAPATH" || DATAPATH=./data
@@ -8,7 +8,7 @@ CDOOUT=cout$$
 CDOERR=cerr$$
 OFORMAT="-f srv -b 32"
 FORMATS="srv ext ieg grb grb2 nc nc2 nc4"
-FORMATS="nc4"
+#FORMATS="nc4"
 #
 IFILE=$DATAPATH/pl_data
 NTEST=1
@@ -41,10 +41,10 @@ function testfunc()
 {
   RSTAT=0
 
-  CDOTEST="chaining set $NTEST"
+  CDOTEST="chaining set $INSET with $FILEFORMAT"
   echo "Running test: $NTEST - $CDOTEST"
 
-  RFILE=$DATAPATH/thread${NTEST}_ref
+  RFILE=$DATAPATH/tsformat${INSET}_ref
   OFILE=thread${NTEST}_res
 
   CDOCOMMAND="$CDO $INSTR ${IFILE}(${FORMAT}) $OFILE"
@@ -53,7 +53,7 @@ function testfunc()
 
   if [ "${ENABLE_TEST}" = yes ] ; then
     if [ "@ENABLE_THREADS@" = yes ] ; then
-      $CDO -f $FORMAT copy ${IFILE} ifile$$
+      $CDO -f $FORMAT setgrid,r12x6 ${IFILE} ifile$$
       CDOCOMMAND="$CDO $INSTR ifile$$ $OFILE"
       
       $CDOCOMMAND
@@ -81,8 +81,9 @@ function testfunc()
 #
 for FORMAT in $FORMATS; do
   fileformat
-#  INSTR="-fldmean -timmean -select,code=129,130,152"
-  INSTR="-fldmean -timmean -select,code=130"
+#  INSTR="-fldmin -timmean -select,code=129,130,152"
+  INSTR="-fldmin -timmean -select,code=130"
+  INSET=1
   testfunc
 done
 #