Added Timpctl.test.in.

configure

@@ -25832,7 +25832,7 @@ ac_config_files="$ac_config_files test/Cat.test test/Gridarea.test test/Genweigh
 ac_config_files="$ac_config_files test/EOF.test 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 test/Runpctl.test test/Multiyearstat.test test/Ydrunstat.test"
+ac_config_files="$ac_config_files test/Timstat.test test/Timselstat.test test/Seasstat.test test/Timpctl.test test/Runstat.test test/Runpctl.test test/Multiyearstat.test test/Ydrunstat.test"
 ac_config_files="$ac_config_files test/Gridboxstat.test test/Vertstat.test test/Fldstat.test test/Fldpctl.test test/Ensstat.test test/Enspctl.test"
@@ -27106,6 +27106,7 @@ do
     "test/Timstat.test") CONFIG_FILES="$CONFIG_FILES test/Timstat.test" ;;
     "test/Timselstat.test") CONFIG_FILES="$CONFIG_FILES test/Timselstat.test" ;;
     "test/Seasstat.test") CONFIG_FILES="$CONFIG_FILES test/Seasstat.test" ;;
+    "test/Timpctl.test") CONFIG_FILES="$CONFIG_FILES test/Timpctl.test" ;;
     "test/Runstat.test") CONFIG_FILES="$CONFIG_FILES test/Runstat.test" ;;
     "test/Runpctl.test") CONFIG_FILES="$CONFIG_FILES test/Runpctl.test" ;;
     "test/Multiyearstat.test") CONFIG_FILES="$CONFIG_FILES test/Multiyearstat.test" ;;
@@ -28799,6 +28800,7 @@ _LT_EOF
     "test/Timstat.test":F) chmod a+x "$ac_file" ;;
     "test/Timselstat.test":F) chmod a+x "$ac_file" ;;
     "test/Seasstat.test":F) chmod a+x "$ac_file" ;;
+    "test/Timpctl.test":F) chmod a+x "$ac_file" ;;
     "test/Runstat.test":F) chmod a+x "$ac_file" ;;
     "test/Runpctl.test":F) chmod a+x "$ac_file" ;;
     "test/Multiyearstat.test":F) chmod a+x "$ac_file" ;;

configure.ac

@@ -295,7 +295,7 @@ AC_CONFIG_FILES([test/File.test test/Read_grib.test test/Read_netcdf.test test/C
 AC_CONFIG_FILES([test/Comp.test test/Compc.test],[chmod a+x "$ac_file"])
 AC_CONFIG_FILES([test/Cat.test test/Gridarea.test test/Genweights.test test/Remap.test test/Remap2.test test/Remapeta.test],[chmod a+x "$ac_file"])
 AC_CONFIG_FILES([test/EOF.test 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 test/Runpctl.test test/Multiyearstat.test test/Ydrunstat.test],[chmod a+x "$ac_file"])
+AC_CONFIG_FILES([test/Timstat.test test/Timselstat.test test/Seasstat.test test/Timpctl.test test/Runstat.test test/Runpctl.test test/Multiyearstat.test test/Ydrunstat.test],[chmod a+x "$ac_file"])
 AC_CONFIG_FILES([test/Gridboxstat.test test/Vertstat.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 test/Mergetime.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"])

test/Makefile.am

@@ -18,7 +18,7 @@ TESTS = threads.test tsformat.test wildcard.test File.test Comp.test Compc.test
         Detrend.test Genweights.test Remap.test Remap2.test Remapeta.test Select.test Spectral.test \
         Ensstat.test Enspctl.test Gridboxstat.test \
         Vertstat.test Fldstat.test Fldpctl.test Merstat.test Zonstat.test \
-        Timstat.test Timselstat.test Seasstat.test \
+        Timstat.test Timselstat.test Seasstat.test Timpctl.test \
         Runstat.test Runpctl.test Multiyearstat.test Ydrunstat.test \
         Mergetime.test EOF.test \
         Vertint.test Afterburner.test Arithc.test Arith.test Expr.test \

test/Makefile.in

@@ -90,20 +90,20 @@ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(srcdir)/Select.test.in $(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)/Runpctl.test.in \
-	$(srcdir)/Multiyearstat.test.in $(srcdir)/Ydrunstat.test.in \
-	$(srcdir)/Gridboxstat.test.in $(srcdir)/Vertstat.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)/Mergetime.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)/Setmiss.test.in \
-	$(srcdir)/Smooth.test.in $(srcdir)/MapReduce.test.in \
-	$(srcdir)/Ninfo.test.in README
+	$(srcdir)/Timpctl.test.in $(srcdir)/Runstat.test.in \
+	$(srcdir)/Runpctl.test.in $(srcdir)/Multiyearstat.test.in \
+	$(srcdir)/Ydrunstat.test.in $(srcdir)/Gridboxstat.test.in \
+	$(srcdir)/Vertstat.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)/Mergetime.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)/Setmiss.test.in $(srcdir)/Smooth.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_cfortran_flags.m4 \
 	$(top_srcdir)/m4/acx_check_cfortran.m4 \
@@ -122,14 +122,14 @@ CONFIG_CLEAN_FILES = File.test Read_grib.test Read_netcdf.test \
 	Copy_netcdf.test Comp.test Compc.test Cat.test Gridarea.test \
 	Genweights.test Remap.test Remap2.test Remapeta.test EOF.test \
 	Select.test Spectral.test Vertint.test Timstat.test \
-	Timselstat.test Seasstat.test Runstat.test Runpctl.test \
-	Multiyearstat.test Ydrunstat.test Gridboxstat.test \
-	Vertstat.test Fldstat.test Fldpctl.test Ensstat.test \
-	Enspctl.test Merstat.test Zonstat.test Mergetime.test \
-	Afterburner.test Detrend.test Arithc.test Arith.test Expr.test \
-	Gradsdes.test Collgrid.test threads.test tsformat.test \
-	wildcard.test Setmiss.test Smooth.test MapReduce.test \
-	Ninfo.test
+	Timselstat.test Seasstat.test Timpctl.test Runstat.test \
+	Runpctl.test Multiyearstat.test Ydrunstat.test \
+	Gridboxstat.test Vertstat.test Fldstat.test Fldpctl.test \
+	Ensstat.test Enspctl.test Merstat.test Zonstat.test \
+	Mergetime.test Afterburner.test Detrend.test Arithc.test \
+	Arith.test Expr.test Gradsdes.test Collgrid.test threads.test \
+	tsformat.test wildcard.test Setmiss.test Smooth.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@)
@@ -551,7 +551,7 @@ TESTS = threads.test tsformat.test wildcard.test File.test Comp.test Compc.test
         Detrend.test Genweights.test Remap.test Remap2.test Remapeta.test Select.test Spectral.test \
         Ensstat.test Enspctl.test Gridboxstat.test \
         Vertstat.test Fldstat.test Fldpctl.test Merstat.test Zonstat.test \
-        Timstat.test Timselstat.test Seasstat.test \
+        Timstat.test Timselstat.test Seasstat.test Timpctl.test \
         Runstat.test Runpctl.test Multiyearstat.test Ydrunstat.test \
         Mergetime.test EOF.test \
         Vertint.test Afterburner.test Arithc.test Arith.test Expr.test \
@@ -642,6 +642,8 @@ Timselstat.test: $(top_builddir)/config.status $(srcdir)/Timselstat.test.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 Seasstat.test: $(top_builddir)/config.status $(srcdir)/Seasstat.test.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+Timpctl.test: $(top_builddir)/config.status $(srcdir)/Timpctl.test.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 Runstat.test: $(top_builddir)/config.status $(srcdir)/Runstat.test.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 Runpctl.test: $(top_builddir)/config.status $(srcdir)/Runpctl.test.in

test/Timpctl.test.in

+#! @BASH@
+echo 1..5 # 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"
+#
+TYPES="seas tim year mon day"
+PCTL=50
+
+NTEST=1
+
+rm -rf TimpctlDebugOutput
+mkdir TimpctlDebugOutput
+
+#
+for TYPE in $TYPES; do
+  if [ $TYPE = day ] ; then
+    IFILE=$DATAPATH/ts_6h_1mon
+  elif [ $TYPE = mon ] ; then
+    IFILE=$DATAPATH/ts_1d_1year
+  else
+    IFILE=$DATAPATH/ts_mm_5years
+  fi
+#
+  RSTAT=0
+  RFILE=$DATAPATH/${TYPE}pctl${PCTL}_ref
+  OFILE=${TYPE}pctl${PCTL}_res
+
+  CDOTEST="${TYPE}pctl"
+
+  DEBUG_OUT="--seperateDebugFromLog TimpctlDebugOutput/Timpctl_${TYPE}.debug"
+  CDOCOMMAND="$CDO $DEBUG_OUT $FORMAT ${TYPE}pctl,${PCTL} $IFILE $DATAPATH/${TYPE}min_ref $DATAPATH/${TYPE}max_ref $OFILE"
+
+  echo "Running test: $NTEST"
+  echo "$CDOCOMMAND"
+
+  $CDOCOMMAND
+  test $? -eq 0 || let RSTAT+=1
+
+  $CDO $DEBUG_OUT 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

test/data/Makefile.am

@@ -11,8 +11,9 @@ YDRUNSTAT    = ydrunmin_ref ydrunmax_ref ydrunsum_ref ydrunavg_ref ydrunmean_ref
 YMONSTAT     = ymonmin_ref ymonmax_ref ymonsum_ref ymonavg_ref ymonmean_ref ymonstd_ref ymonstd1_ref ymonvar_ref ymonvar1_ref ymonrange_ref ymonskew_ref ymonkurt_ref
 YSEASSTAT    = yseasmin_ref yseasmax_ref yseassum_ref yseasavg_ref yseasmean_ref yseasstd_ref yseasstd1_ref yseasvar_ref yseasvar1_ref yseasrange_ref
 SEASSTAT     = seasmin_ref seasmax_ref seassum_ref seasavg_ref seasmean_ref seasstd_ref seasstd1_ref seasvar_ref seasvar1_ref seasrange_ref
+TIMPCTL      = seaspctl50_ref timpctl50_ref yearpctl50_ref monpctl50_ref daypctl50_ref
 RUNSTAT      = runmin_ref runmax_ref runsum_ref runavg_ref runmean_ref runstd_ref runstd1_ref runvar_ref runvar1_ref runrange_ref
-RUNPSTAT     = runpctl1_ref runpctl20_ref runpctl25_ref runpctl33_ref runpctl50_ref runpctl66_ref runpctl75_ref runpctl80_ref runpctl99_ref runpctl100_ref
+RUNPCTL      = runpctl1_ref runpctl20_ref runpctl25_ref runpctl33_ref runpctl50_ref runpctl66_ref runpctl75_ref runpctl80_ref runpctl99_ref runpctl100_ref
 TIMSTAT      = timmin_ref timmax_ref timsum_ref timavg_ref timmean_ref timstd_ref timstd1_ref timvar_ref timvar1_ref timrange_ref
 YEARSTAT     = yearmin_ref yearmax_ref yearsum_ref yearavg_ref yearmean_ref yearstd_ref yearstd1_ref yearvar_ref yearvar1_ref yearrange_ref
 MONSTAT      = monmin_ref monmax_ref monsum_ref monavg_ref monmean_ref monstd_ref monstd1_ref monvar_ref monvar1_ref monrange_ref
@@ -47,7 +48,7 @@ REMAPETA     = remapeta1.nc remapeta2.nc remapeta_ref VCT.L62
 SMOOTH       = smooth1_ref smooth2_ref smooth3_ref
 SETMISS      = setmisstoc_ref setmisstonn_ref setmisstodis_ref
 
-EXTRA_DIST = $(INPUTDATA) $(FILE) $(GRIB) $(NETCDF) $(EOF) $(COMP) $(YDRUNSTAT) $(YMONSTAT) $(YSEASSTAT) $(SEASSTAT) \
-             $(RUNSTAT) $(RUNPSTAT) $(TIMSTAT) $(YEARSTAT) $(MONSTAT) $(DAYSTAT) $(VERTSTAT) $(FLDSTAT) $(FLDPSTAT) \
+EXTRA_DIST = $(INPUTDATA) $(FILE) $(GRIB) $(NETCDF) $(EOF) $(COMP) $(YDRUNSTAT) $(YMONSTAT) $(YSEASSTAT) $(SEASSTAT) $(TIMPCTL) \
+             $(RUNSTAT) $(RUNPCTL) $(TIMSTAT) $(YEARSTAT) $(MONSTAT) $(DAYSTAT) $(VERTSTAT) $(FLDSTAT) $(FLDPSTAT) \
              $(MERSTAT) $(ZONSTAT) $(ENSPSTAT) $(SPECTRAL) $(VERTINT) $(REMAP) $(REMAP2) $(SELECT) $(DETREND) \
              $(THREAD) $(EXPR) $(GRADSDES) $(ARITH) $(MAPREDUCE) $(MERGETIME) $(REMAPETA) $(SMOOTH) $(SETMISS)

test/data/Makefile.in

@@ -309,8 +309,9 @@ YDRUNSTAT = ydrunmin_ref ydrunmax_ref ydrunsum_ref ydrunavg_ref ydrunmean_ref yd
 YMONSTAT = ymonmin_ref ymonmax_ref ymonsum_ref ymonavg_ref ymonmean_ref ymonstd_ref ymonstd1_ref ymonvar_ref ymonvar1_ref ymonrange_ref ymonskew_ref ymonkurt_ref
 YSEASSTAT = yseasmin_ref yseasmax_ref yseassum_ref yseasavg_ref yseasmean_ref yseasstd_ref yseasstd1_ref yseasvar_ref yseasvar1_ref yseasrange_ref
 SEASSTAT = seasmin_ref seasmax_ref seassum_ref seasavg_ref seasmean_ref seasstd_ref seasstd1_ref seasvar_ref seasvar1_ref seasrange_ref
+TIMPCTL = seaspctl50_ref timpctl50_ref yearpctl50_ref monpctl50_ref daypctl50_ref
 RUNSTAT = runmin_ref runmax_ref runsum_ref runavg_ref runmean_ref runstd_ref runstd1_ref runvar_ref runvar1_ref runrange_ref
-RUNPSTAT = runpctl1_ref runpctl20_ref runpctl25_ref runpctl33_ref runpctl50_ref runpctl66_ref runpctl75_ref runpctl80_ref runpctl99_ref runpctl100_ref
+RUNPCTL = runpctl1_ref runpctl20_ref runpctl25_ref runpctl33_ref runpctl50_ref runpctl66_ref runpctl75_ref runpctl80_ref runpctl99_ref runpctl100_ref
 TIMSTAT = timmin_ref timmax_ref timsum_ref timavg_ref timmean_ref timstd_ref timstd1_ref timvar_ref timvar1_ref timrange_ref
 YEARSTAT = yearmin_ref yearmax_ref yearsum_ref yearavg_ref yearmean_ref yearstd_ref yearstd1_ref yearvar_ref yearvar1_ref yearrange_ref
 MONSTAT = monmin_ref monmax_ref monsum_ref monavg_ref monmean_ref monstd_ref monstd1_ref monvar_ref monvar1_ref monrange_ref
@@ -346,8 +347,8 @@ MERGETIME = mergetime_ref mergetime_y1 mergetime_y2 mergetime_y12
 REMAPETA = remapeta1.nc remapeta2.nc remapeta_ref VCT.L62
 SMOOTH = smooth1_ref smooth2_ref smooth3_ref
 SETMISS = setmisstoc_ref setmisstonn_ref setmisstodis_ref
-EXTRA_DIST = $(INPUTDATA) $(FILE) $(GRIB) $(NETCDF) $(EOF) $(COMP) $(YDRUNSTAT) $(YMONSTAT) $(YSEASSTAT) $(SEASSTAT) \
-             $(RUNSTAT) $(RUNPSTAT) $(TIMSTAT) $(YEARSTAT) $(MONSTAT) $(DAYSTAT) $(VERTSTAT) $(FLDSTAT) $(FLDPSTAT) \
+EXTRA_DIST = $(INPUTDATA) $(FILE) $(GRIB) $(NETCDF) $(EOF) $(COMP) $(YDRUNSTAT) $(YMONSTAT) $(YSEASSTAT) $(SEASSTAT) $(TIMPCTL) \
+             $(RUNSTAT) $(RUNPCTL) $(TIMSTAT) $(YEARSTAT) $(MONSTAT) $(DAYSTAT) $(VERTSTAT) $(FLDSTAT) $(FLDPSTAT) \
              $(MERSTAT) $(ZONSTAT) $(ENSPSTAT) $(SPECTRAL) $(VERTINT) $(REMAP) $(REMAP2) $(SELECT) $(DETREND) \
              $(THREAD) $(EXPR) $(GRADSDES) $(ARITH) $(MAPREDUCE) $(MERGETIME) $(REMAPETA) $(SMOOTH) $(SETMISS)
 

test/data/gen_refdata.sh

@@ -5,6 +5,38 @@ CDO=cdo
 FORMAT="-f srv -b F32"
 ########################################################################
 #
+# Timpctl Yearpctl Monstat Daypctl
+#
+PCTLS="50"
+#
+IFILE=ts_mm_5years
+for PCTL in $PCTLS; do
+  $CDO $FORMAT seaspctl,${PCTL} $IFILE seasmin_ref seasmax_ref seaspctl${PCTL}_ref
+done
+#
+IFILE=ts_mm_5years
+for PCTL in $PCTLS; do
+  $CDO $FORMAT timpctl,$PCTL $IFILE timmin_ref timmax_ref timpctl${PCTL}_ref
+done
+#
+IFILE=ts_mm_5years
+for PCTL in $PCTLS; do
+  $CDO $FORMAT yearpctl,$PCTL $IFILE yearmin_ref yearmax_ref yearpctl${PCTL}_ref
+done
+#
+IFILE=ts_1d_1year
+for PCTL in $PCTLS; do
+  $CDO $FORMAT monpctl,$PCTL $IFILE monmin_ref monmax_ref monpctl${PCTL}_ref
+done
+#
+IFILE=ts_6h_1mon
+for PCTL in $PCTLS; do
+  $CDO $FORMAT daypctl,$PCTL $IFILE daymin_ref daymax_ref daypctl${PCTL}_ref
+done
+exit
+#
+########################################################################
+#
 # runpctl
 #
 IFILE=ts_mm_5years