Detrend: added test

.gitattributes

@@ -644,6 +644,8 @@ test/bm_Remap.sh -text
 test/data/Makefile.am -text
 test/data/Makefile.in -text
 test/data/bathy4.grb -text
+test/data/detrend_data -text
+test/data/detrend_ref -text
 test/data/gen_refdata.sh -text
 test/data/gp2sp_ref -text
 test/data/gp2spl_ref -text

ChangeLog

@@ -6,6 +6,7 @@
 2014-06-19  Uwe Schulzweida
 
 	* Filter: disable zero-padding
+	* Detrend: added test
 	* added option --use_fftw: used in module filter
 
 2014-06-18  Uwe Schulzweida

configure

@@ -20522,6 +20522,8 @@ ac_config_files="$ac_config_files test/Cat.test test/Gridarea.test test/Genweigh
 ac_config_files="$ac_config_files test/Select.test test/Spectral.test test/Timstat.test test/Vertint.test"
+ac_config_files="$ac_config_files test/Detrend.test"
+
 ac_config_files="$ac_config_files Makefile src/Makefile contrib/Makefile test/Makefile test/data/Makefile cdo.spec cdo.settings"
 cat >confcache <<\_ACEOF
@@ -21667,6 +21669,7 @@ do
     "test/Spectral.test") CONFIG_FILES="$CONFIG_FILES test/Spectral.test" ;;
     "test/Timstat.test") CONFIG_FILES="$CONFIG_FILES test/Timstat.test" ;;
     "test/Vertint.test") CONFIG_FILES="$CONFIG_FILES test/Vertint.test" ;;
+    "test/Detrend.test") CONFIG_FILES="$CONFIG_FILES test/Detrend.test" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
     "contrib/Makefile") CONFIG_FILES="$CONFIG_FILES contrib/Makefile" ;;
@@ -23167,6 +23170,7 @@ _LT_EOF
     "test/Spectral.test":F) chmod a+x "$ac_file" ;;
     "test/Timstat.test":F) chmod a+x "$ac_file" ;;
     "test/Vertint.test":F) chmod a+x "$ac_file" ;;
+    "test/Detrend.test":F) chmod a+x "$ac_file" ;;
   esac
 done # for ac_tag

configure.ac

@@ -140,6 +140,7 @@ AC_PROG_AWK
 
 AC_CONFIG_FILES([test/Cat.test test/Gridarea.test test/Genweights.test test/Remap.test],[chmod a+x "$ac_file"])
 AC_CONFIG_FILES([test/Select.test test/Spectral.test test/Timstat.test test/Vertint.test],[chmod a+x "$ac_file"])
+AC_CONFIG_FILES([test/Detrend.test],[chmod a+x "$ac_file"])
 AC_CONFIG_FILES([Makefile src/Makefile contrib/Makefile test/Makefile test/data/Makefile cdo.spec cdo.settings])
 AC_OUTPUT
 

test/Makefile.am

@@ -5,7 +5,7 @@ export
 TEST_LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \
                   $(top_srcdir)/config/tap-driver.sh
 
-TESTS = Cat.test Gridarea.test Genweights.test Remap.test \
+TESTS = Cat.test Gridarea.test Detrend.test Genweights.test Remap.test \
         Select.test Spectral.test Timstat.test Vertint.test
 
 #        $(top_srcdir)/test/test_Remap.sh \

test/Makefile.in

@@ -83,7 +83,7 @@ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(srcdir)/Gridarea.test.in $(srcdir)/Genweights.test.in \
 	$(srcdir)/Remap.test.in $(srcdir)/Select.test.in \
 	$(srcdir)/Spectral.test.in $(srcdir)/Timstat.test.in \
-	$(srcdir)/Vertint.test.in README
+	$(srcdir)/Vertint.test.in $(srcdir)/Detrend.test.in README
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_options.m4 \
 	$(top_srcdir)/m4/ax_pthread.m4 $(top_srcdir)/m4/libtool.m4 \
@@ -95,7 +95,8 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/src/config.h
 CONFIG_CLEAN_FILES = Cat.test Gridarea.test Genweights.test Remap.test \
-	Select.test Spectral.test Timstat.test Vertint.test
+	Select.test Spectral.test Timstat.test Vertint.test \
+	Detrend.test
 CONFIG_CLEAN_VPATH_FILES =
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
@@ -493,7 +494,7 @@ CLEANFILES = `ls *.pyc`
 TEST_LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \
                   $(top_srcdir)/config/tap-driver.sh
 
-TESTS = Cat.test Gridarea.test Genweights.test Remap.test \
+TESTS = Cat.test Gridarea.test Detrend.test Genweights.test Remap.test \
         Select.test Spectral.test Timstat.test Vertint.test
 
 
@@ -559,6 +560,8 @@ Timstat.test: $(top_builddir)/config.status $(srcdir)/Timstat.test.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 Vertint.test: $(top_builddir)/config.status $(srcdir)/Vertint.test.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+Detrend.test: $(top_builddir)/config.status $(srcdir)/Detrend.test.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 
 mostlyclean-libtool:
 	-rm -f *.lo

test/data/gen_refdata.sh

@@ -88,3 +88,12 @@ $CDO select,code=130 $IFILE $OFILE
 OFILE=select5_ref
 $CDO select,level=90000 $IFILE $OFILE
 ########################################################################
+#
+# Detrend
+#
+OFILE=detrend_data
+$CDO $FORMAT -sqr -for,1,100 $OFILE
+IFILE=$OFILE
+OFILE=detrend_ref
+$CDO detrend $IFILE $OFILE
+########################################################################