Commit 9b293789 authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

added test/Read_grib.test

parent b8643cb4
...@@ -649,6 +649,7 @@ test/Gridarea.test.in -text ...@@ -649,6 +649,7 @@ test/Gridarea.test.in -text
test/Makefile.am -text test/Makefile.am -text
test/Makefile.in -text test/Makefile.in -text
test/README -text test/README -text
test/Read_grib.test.in -text
test/Read_netcdf.test.in -text test/Read_netcdf.test.in -text
test/Remap.test.in -text test/Remap.test.in -text
test/Select.test.in -text test/Select.test.in -text
......
...@@ -20765,7 +20765,9 @@ fi ...@@ -20765,7 +20765,9 @@ fi
done done
   
   
ac_config_files="$ac_config_files test/Read_netcdf.test test/Cat.test test/Gridarea.test test/Genweights.test test/Remap.test" ac_config_files="$ac_config_files test/Read_grib.test test/Read_netcdf.test"
ac_config_files="$ac_config_files test/Cat.test test/Gridarea.test test/Genweights.test test/Remap.test"
   
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/Select.test test/Spectral.test test/Timstat.test test/Vertint.test"
   
...@@ -21920,6 +21922,7 @@ do ...@@ -21920,6 +21922,7 @@ do
"src/config.h") CONFIG_HEADERS="$CONFIG_HEADERS src/config.h" ;; "src/config.h") CONFIG_HEADERS="$CONFIG_HEADERS src/config.h" ;;
"depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
"libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
"test/Read_grib.test") CONFIG_FILES="$CONFIG_FILES test/Read_grib.test" ;;
"test/Read_netcdf.test") CONFIG_FILES="$CONFIG_FILES test/Read_netcdf.test" ;; "test/Read_netcdf.test") CONFIG_FILES="$CONFIG_FILES test/Read_netcdf.test" ;;
"test/Cat.test") CONFIG_FILES="$CONFIG_FILES test/Cat.test" ;; "test/Cat.test") CONFIG_FILES="$CONFIG_FILES test/Cat.test" ;;
"test/Gridarea.test") CONFIG_FILES="$CONFIG_FILES test/Gridarea.test" ;; "test/Gridarea.test") CONFIG_FILES="$CONFIG_FILES test/Gridarea.test" ;;
...@@ -23422,6 +23425,7 @@ compiler_lib_search_path=$lt_compiler_lib_search_path_CXX ...@@ -23422,6 +23425,7 @@ compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
_LT_EOF _LT_EOF
   
;; ;;
"test/Read_grib.test":F) chmod a+x "$ac_file" ;;
"test/Read_netcdf.test":F) chmod a+x "$ac_file" ;; "test/Read_netcdf.test":F) chmod a+x "$ac_file" ;;
"test/Cat.test":F) chmod a+x "$ac_file" ;; "test/Cat.test":F) chmod a+x "$ac_file" ;;
"test/Gridarea.test":F) chmod a+x "$ac_file" ;; "test/Gridarea.test":F) chmod a+x "$ac_file" ;;
......
...@@ -214,7 +214,8 @@ AC_DEFINE_UNQUOTED(COMPILER, ["$COMPILER"], [Compiler]) ...@@ -214,7 +214,8 @@ AC_DEFINE_UNQUOTED(COMPILER, ["$COMPILER"], [Compiler])
AC_REQUIRE_AUX_FILE([tap-driver.sh]) AC_REQUIRE_AUX_FILE([tap-driver.sh])
AC_PROG_AWK AC_PROG_AWK
AC_CONFIG_FILES([test/Read_netcdf.test test/Cat.test test/Gridarea.test test/Genweights.test test/Remap.test],[chmod a+x "$ac_file"]) AC_CONFIG_FILES([test/Read_grib.test test/Read_netcdf.test],[chmod a+x "$ac_file"])
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/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([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_CONFIG_FILES([Makefile src/Makefile contrib/Makefile test/Makefile test/data/Makefile cdo.spec cdo.settings])
......
...@@ -5,7 +5,7 @@ export ...@@ -5,7 +5,7 @@ export
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 = Read_netcdf.test Cat.test Gridarea.test Detrend.test Genweights.test Remap.test \ TESTS = Read_grib.test Read_netcdf.test Cat.test Gridarea.test Detrend.test Genweights.test Remap.test \
Select.test Spectral.test Timstat.test Vertint.test Select.test Spectral.test Timstat.test Vertint.test
# $(top_srcdir)/test/test_Remap.sh \ # $(top_srcdir)/test/test_Remap.sh \
......
...@@ -79,7 +79,7 @@ build_triplet = @build@ ...@@ -79,7 +79,7 @@ build_triplet = @build@
host_triplet = @host@ host_triplet = @host@
subdir = test subdir = test
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/config/mkinstalldirs \ $(top_srcdir)/config/mkinstalldirs $(srcdir)/Read_grib.test.in \
$(srcdir)/Read_netcdf.test.in $(srcdir)/Cat.test.in \ $(srcdir)/Read_netcdf.test.in $(srcdir)/Cat.test.in \
$(srcdir)/Gridarea.test.in $(srcdir)/Genweights.test.in \ $(srcdir)/Gridarea.test.in $(srcdir)/Genweights.test.in \
$(srcdir)/Remap.test.in $(srcdir)/Select.test.in \ $(srcdir)/Remap.test.in $(srcdir)/Select.test.in \
...@@ -95,9 +95,9 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ...@@ -95,9 +95,9 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4) $(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/src/config.h CONFIG_HEADER = $(top_builddir)/src/config.h
CONFIG_CLEAN_FILES = Read_netcdf.test Cat.test Gridarea.test \ CONFIG_CLEAN_FILES = Read_grib.test Read_netcdf.test Cat.test \
Genweights.test Remap.test Select.test Spectral.test \ Gridarea.test Genweights.test Remap.test Select.test \
Timstat.test Vertint.test Detrend.test Spectral.test Timstat.test Vertint.test Detrend.test
CONFIG_CLEAN_VPATH_FILES = CONFIG_CLEAN_VPATH_FILES =
AM_V_P = $(am__v_P_@AM_V@) AM_V_P = $(am__v_P_@AM_V@)
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
...@@ -495,7 +495,7 @@ CLEANFILES = `ls *.pyc` ...@@ -495,7 +495,7 @@ CLEANFILES = `ls *.pyc`
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 = Read_netcdf.test Cat.test Gridarea.test Detrend.test Genweights.test Remap.test \ TESTS = Read_grib.test Read_netcdf.test Cat.test Gridarea.test Detrend.test Genweights.test Remap.test \
Select.test Spectral.test Timstat.test Vertint.test Select.test Spectral.test Timstat.test Vertint.test
...@@ -545,6 +545,8 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) ...@@ -545,6 +545,8 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps): $(am__aclocal_m4_deps):
Read_grib.test: $(top_builddir)/config.status $(srcdir)/Read_grib.test.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
Read_netcdf.test: $(top_builddir)/config.status $(srcdir)/Read_netcdf.test.in Read_netcdf.test: $(top_builddir)/config.status $(srcdir)/Read_netcdf.test.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
Cat.test: $(top_builddir)/config.status $(srcdir)/Cat.test.in Cat.test: $(top_builddir)/config.status $(srcdir)/Cat.test.in
......
#! @SHELL@
echo 1..4 # Number of tests to be executed.
#
test -n "$CDO" || CDO=cdo
test -n "$DATAPATH" || DATAPATH=./data
#
CDOOUT=cout
CDOERR=cerr
#
NTEST=1
#
for OPERATOR in sinfo info; do
for FILE in testfile01 testfile02; do
RSTAT=0
IFILE=$DATAPATH/grib_${FILE}.grb
OFILE=grib_${FILE}_${OPERATOR}
RFILE=$DATAPATH/${OFILE}_ref
CDOTEST="$OPERATOR $FILE"
CDOCOMMAND="$CDO $OPERATOR $IFILE"
if [ "@ENABLE_GRIB@" = yes ] ; then
echo "Running test: $NTEST"
echo "$CDOCOMMAND"
$CDOCOMMAND > $OFILE
test $? -eq 0 || let RSTAT+=1
diff $OFILE $RFILE > $CDOOUT 2> $CDOERR
test $? -eq 0 || let RSTAT+=1
test -s $CDOERR && let RSTAT+=1
cat $CDOOUT $CDOERR
test $RSTAT -eq 0 && echo "ok $NTEST - $CDOTEST"
test $RSTAT -eq 0 || echo "not ok $NTEST - $CDOTEST"
else
test $RSTAT -eq 0 && echo "ok $NTEST - $CDOTEST # SKIP GRIB not enabled"
fi
let NTEST+=1
rm -f $OFILE
done
done
#
rm -f $CDOOUT $CDOERR
#
exit 0
#! @SHELL@ #! @SHELL@
echo 1..2 # Number of tests to be executed. echo 1..4 # Number of tests to be executed.
# #
test -n "$CDO" || CDO=cdo test -n "$CDO" || CDO=cdo
test -n "$DATAPATH" || DATAPATH=./data test -n "$DATAPATH" || DATAPATH=./data
...@@ -9,8 +9,8 @@ CDOERR=cerr ...@@ -9,8 +9,8 @@ CDOERR=cerr
# #
NTEST=1 NTEST=1
# #
for OPERATOR in "sinfon" "infon"; do for OPERATOR in sinfon infon; do
for FILE in "testfile01"; do for FILE in testfile01 testfile02; do
RSTAT=0 RSTAT=0
IFILE=$DATAPATH/netcdf_${FILE}.nc IFILE=$DATAPATH/netcdf_${FILE}.nc
OFILE=netcdf_${FILE}_${OPERATOR} OFILE=netcdf_${FILE}_${OPERATOR}
......
INPUTDATA = ts_mm_5years hl_l19.grb t21_geosp_tsurf.grb bathy4.grb pl_data.grb detrend_data \ INPUTDATA = ts_mm_5years hl_l19.grb t21_geosp_tsurf.grb bathy4.grb pl_data.grb detrend_data \
netcdf_testfile01.nc grib_testfile01.grb grib_testfile02.grb netcdf_testfile01.nc netcdf_testfile02.nc
NETCDF_REF = netcdf_testfile01_sinfon_ref netcdf_testfile01_infon_ref GRIB_REF = grib_testfile01_sinfo_ref grib_testfile01_info_ref grib_testfile02_sinfo_ref grib_testfile02_info_ref
NETCDF_REF = netcdf_testfile01_sinfon_ref netcdf_testfile01_infon_ref netcdf_testfile02_sinfon_ref netcdf_testfile02_infon_ref
TIMSTAT_REF = timmin_ref timmax_ref timsum_ref timavg_ref timmean_ref timstd_ref timstd1_ref timvar_ref timvar1_ref TIMSTAT_REF = timmin_ref timmax_ref timsum_ref timavg_ref timmean_ref timstd_ref timstd1_ref timvar_ref timvar1_ref
SPECTRAL_REF = sp2gp_ref sp2gpl_ref gp2sp_ref gp2spl_ref SPECTRAL_REF = sp2gp_ref sp2gpl_ref gp2sp_ref gp2spl_ref
VERTINT_REF = ml2pl_ref VERTINT_REF = ml2pl_ref
...@@ -10,4 +11,4 @@ REMAP_REF = n16_bic_ref n16_bil_ref n16_con_ref n16_ycon_ref n16_laf_ref n16_ ...@@ -10,4 +11,4 @@ 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 SELECT_REF = select1_ref select2_ref select3_ref select4_ref select5_ref
DETREND_REF = detrend_ref DETREND_REF = detrend_ref
EXTRA_DIST = $(INPUTDATA) $(NETCDF_REF) $(TIMSTAT_REF) $(SPECTRAL_REF) $(VERTINT_REF) $(REMAP_REF) $(SELECT_REF) $(DETREND_REF) EXTRA_DIST = $(INPUTDATA) $(GRIB_REF) $(NETCDF_REF) $(TIMSTAT_REF) $(SPECTRAL_REF) $(VERTINT_REF) $(REMAP_REF) $(SELECT_REF) $(DETREND_REF)
...@@ -282,9 +282,10 @@ top_build_prefix = @top_build_prefix@ ...@@ -282,9 +282,10 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
INPUTDATA = ts_mm_5years hl_l19.grb t21_geosp_tsurf.grb bathy4.grb pl_data.grb detrend_data \ INPUTDATA = ts_mm_5years hl_l19.grb t21_geosp_tsurf.grb bathy4.grb pl_data.grb detrend_data \
netcdf_testfile01.nc grib_testfile01.grb grib_testfile02.grb netcdf_testfile01.nc netcdf_testfile02.nc
NETCDF_REF = netcdf_testfile01_sinfon_ref netcdf_testfile01_infon_ref GRIB_REF = grib_testfile01_sinfo_ref grib_testfile01_info_ref grib_testfile02_sinfo_ref grib_testfile02_info_ref
NETCDF_REF = netcdf_testfile01_sinfon_ref netcdf_testfile01_infon_ref netcdf_testfile02_sinfon_ref netcdf_testfile02_infon_ref
TIMSTAT_REF = timmin_ref timmax_ref timsum_ref timavg_ref timmean_ref timstd_ref timstd1_ref timvar_ref timvar1_ref TIMSTAT_REF = timmin_ref timmax_ref timsum_ref timavg_ref timmean_ref timstd_ref timstd1_ref timvar_ref timvar1_ref
SPECTRAL_REF = sp2gp_ref sp2gpl_ref gp2sp_ref gp2spl_ref SPECTRAL_REF = sp2gp_ref sp2gpl_ref gp2sp_ref gp2spl_ref
VERTINT_REF = ml2pl_ref VERTINT_REF = ml2pl_ref
...@@ -293,7 +294,7 @@ REMAP_REF = n16_bic_ref n16_bil_ref n16_con_ref n16_ycon_ref n16_laf_ref n16_nn_ ...@@ -293,7 +294,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 SELECT_REF = select1_ref select2_ref select3_ref select4_ref select5_ref
DETREND_REF = detrend_ref DETREND_REF = detrend_ref
EXTRA_DIST = $(INPUTDATA) $(NETCDF_REF) $(TIMSTAT_REF) $(SPECTRAL_REF) $(VERTINT_REF) $(REMAP_REF) $(SELECT_REF) $(DETREND_REF) EXTRA_DIST = $(INPUTDATA) $(GRIB_REF) $(NETCDF_REF) $(TIMSTAT_REF) $(SPECTRAL_REF) $(VERTINT_REF) $(REMAP_REF) $(SELECT_REF) $(DETREND_REF)
all: all-am all: all-am
.SUFFIXES: .SUFFIXES:
......
Supports Markdown
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