Skip to content

GitLab

Commit 8b4d4d29 authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

Added Setmiss.test.

parent 69db11cb
Hide whitespace changes
Inline Side-by-side
configure
View file @ 8b4d4d29
......@@ -25842,7 +25842,7 @@ ac_config_files="$ac_config_files test/Afterburner.test test/Detrend.test test/A
 
ac_config_files="$ac_config_files test/Gradsdes.test test/Collgrid.test test/threads.test test/tsformat.test test/wildcard.test"
 
ac_config_files="$ac_config_files test/Smooth.test test/MapReduce.test test/Ninfo.test"
ac_config_files="$ac_config_files test/Setmiss.test test/Smooth.test test/MapReduce.test test/Ninfo.test"
 
ac_config_files="$ac_config_files Makefile src/lib/ncl/Makefile src/Makefile contrib/Makefile test/Makefile test/data/Makefile test/bandit_tests/Makefile cdo.spec cdo.settings"
 
......@@ -27128,6 +27128,7 @@ do
"test/threads.test") CONFIG_FILES="$CONFIG_FILES test/threads.test" ;;
"test/tsformat.test") CONFIG_FILES="$CONFIG_FILES test/tsformat.test" ;;
"test/wildcard.test") CONFIG_FILES="$CONFIG_FILES test/wildcard.test" ;;
"test/Setmiss.test") CONFIG_FILES="$CONFIG_FILES test/Setmiss.test" ;;
"test/Smooth.test") CONFIG_FILES="$CONFIG_FILES test/Smooth.test" ;;
"test/MapReduce.test") CONFIG_FILES="$CONFIG_FILES test/MapReduce.test" ;;
"test/Ninfo.test") CONFIG_FILES="$CONFIG_FILES test/Ninfo.test" ;;
......@@ -28819,6 +28820,7 @@ _LT_EOF
"test/threads.test":F) chmod a+x "$ac_file" ;;
"test/tsformat.test":F) chmod a+x "$ac_file" ;;
"test/wildcard.test":F) chmod a+x "$ac_file" ;;
"test/Setmiss.test":F) chmod a+x "$ac_file" ;;
"test/Smooth.test":F) chmod a+x "$ac_file" ;;
"test/MapReduce.test":F) chmod a+x "$ac_file" ;;
"test/Ninfo.test":F) chmod a+x "$ac_file" ;;
......
configure.ac
View file @ 8b4d4d29
......@@ -300,7 +300,7 @@ AC_CONFIG_FILES([test/Gridboxstat.test test/Vertstat.test test/Fldstat.test test
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"])
AC_CONFIG_FILES([test/Gradsdes.test test/Collgrid.test test/threads.test test/tsformat.test test/wildcard.test],[chmod a+x "$ac_file"])
AC_CONFIG_FILES([test/Smooth.test test/MapReduce.test test/Ninfo.test],[chmod a+x "$ac_file"])
AC_CONFIG_FILES([test/Setmiss.test test/Smooth.test test/MapReduce.test test/Ninfo.test],[chmod a+x "$ac_file"])
AC_CONFIG_FILES([Makefile src/lib/ncl/Makefile src/Makefile contrib/Makefile test/Makefile test/data/Makefile test/bandit_tests/Makefile cdo.spec cdo.settings])
AC_OUTPUT
......
test/Makefile.am
View file @ 8b4d4d29
......@@ -22,7 +22,7 @@ TESTS = threads.test tsformat.test wildcard.test File.test Comp.test Compc.test
Runstat.test Multiyearstat.test Ydrunstat.test \
Mergetime.test EOF.test \
Vertint.test Afterburner.test Arithc.test Arith.test Expr.test \
Gradsdes.test Collgrid.test Smooth.test MapReduce.test Ninfo.test
Gradsdes.test Collgrid.test Setmiss.test Smooth.test MapReduce.test Ninfo.test
# tests which should fail
XFAIL_TESTS =
......
test/Makefile.in
View file @ 8b4d4d29
......@@ -101,8 +101,8 @@ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(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)/Smooth.test.in $(srcdir)/MapReduce.test.in \
$(srcdir)/Ninfo.test.in README
$(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 \
......@@ -126,8 +126,8 @@ CONFIG_CLEAN_FILES = File.test Read_grib.test Read_netcdf.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 Smooth.test \
MapReduce.test Ninfo.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@)
......@@ -553,7 +553,7 @@ TESTS = threads.test tsformat.test wildcard.test File.test Comp.test Compc.test
Runstat.test Multiyearstat.test Ydrunstat.test \
Mergetime.test EOF.test \
Vertint.test Afterburner.test Arithc.test Arith.test Expr.test \
Gradsdes.test Collgrid.test Smooth.test MapReduce.test Ninfo.test
Gradsdes.test Collgrid.test Setmiss.test Smooth.test MapReduce.test Ninfo.test
# $(top_srcdir)/test/test_Remap.sh \
......@@ -684,6 +684,8 @@ tsformat.test: $(top_builddir)/config.status $(srcdir)/tsformat.test.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
wildcard.test: $(top_builddir)/config.status $(srcdir)/wildcard.test.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
Setmiss.test: $(top_builddir)/config.status $(srcdir)/Setmiss.test.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
Smooth.test: $(top_builddir)/config.status $(srcdir)/Smooth.test.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
MapReduce.test: $(top_builddir)/config.status $(srcdir)/MapReduce.test.in
......
test/Setmiss.test.in 0 → 100644
View file @ 8b4d4d29
#! @BASH@
echo 1..3 # 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"
ABSLIMMAX=0.001
#
IFILE=$DATAPATH/t21_geosp_tsurf_sea.grb
NTEST=1
#
rm -f Setmiss.debug
DEBUG_OUT="--seperateDebugFromLog Expr.debug"
#
function testfunc()
{
RSTAT=0
CDOTEST="setmiss${SETMISS}"
echo "Running test: $NTEST - $CDOTEST"
RFILE=$DATAPATH/setmiss${SETMISS}_ref
OFILE=setmiss${SETMISS}_res
OPT=""
if [ "$SETMISS" = "toc" ] ; then OPT=",0" ; fi
CDOCOMMAND="$CDO $DEBUG_OUT $FORMAT setmiss${SETMISS}${OPT} $IFILE $OFILE"
echo "$CDOCOMMAND"
$CDOCOMMAND
test $? -eq 0 || let RSTAT+=1
$CDO $DEBUG_OUT diff,$ABSLIMMAX $RFILE $OFILE > $CDOOUT 2> $CDOERR
test $? -eq 0 || let RSTAT+=1
test -s $CDOOUT && let RSTAT+=1
cat $CDOOUT $CDOERR
rm -f $OFILE $FINSTR
test $RSTAT -eq 0 && echo "ok $NTEST - $CDOTEST"
test $RSTAT -eq 0 || echo "not ok $NTEST - $CDOTEST"
let NTEST+=1
}
#
SETMISS=toc
testfunc
#
SETMISS=tonn
testfunc
#
SETMISS=todis
testfunc
#
rm -f $CDOOUT $CDOERR
#
exit 0
test/data/Makefile.am
View file @ 8b4d4d29
......@@ -44,8 +44,9 @@ MAPREDUCE = r18x9_grid icon_cell_grid griddes.r18x9 griddes.icon_cell
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) $(TIMSTAT) $(YEARSTAT) $(MONSTAT) $(DAYSTAT) $(VERTSTAT) $(FLDSTAT) $(FLDPSTAT) \
$(MERSTAT) $(ZONSTAT) $(ENSPSTAT) $(SPECTRAL) $(VERTINT) $(REMAP) $(REMAP2) $(SELECT) $(DETREND) \
$(THREAD) $(EXPR) $(GRADSDES) $(ARITH) $(MAPREDUCE) $(MERGETIME) $(REMAPETA) $(SMOOTH)
$(THREAD) $(EXPR) $(GRADSDES) $(ARITH) $(MAPREDUCE) $(MERGETIME) $(REMAPETA) $(SMOOTH) $(SETMISS)
test/data/Makefile.in
View file @ 8b4d4d29
......@@ -296,36 +296,36 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
INPUTDATA = ts_mm_5years ts_6h_1mon ts_1d_1year hl_l19.grb t21_geosp_tsurf.grb bathy4.grb pl_data pl_data.grb detrend_data \
INPUTDATA = ts_mm_5years ts_6h_1mon ts_1d_1year hl_l19.grb t21_geosp_tsurf.grb t21_geosp_tsurf_sea.grb bathy4.grb pl_data pl_data.grb detrend_data \
grib_testfile01.grb grib_testfile02.grb grib_testfile03.grb netcdf_testfile01.nc netcdf_testfile02.nc testfile01c.nc \
datar.nc datac.nc datau.nc datag.nc arith1.srv expr1.srv arithmask.srv psl_DJF_anom.grb tsurf_spain.grb spain.grid
FILE_REF = file_F32_srv_ref
GRIB_REF = grib_testfile01_sinfo_ref grib_testfile01_info_ref grib_testfile02_sinfo_ref grib_testfile02_info_ref grib_testfile03_sinfo_ref grib_testfile03_info_ref
NETCDF_REF = netcdf_testfile01_sinfon_ref netcdf_testfile01_infon_ref netcdf_testfile02_sinfon_ref netcdf_testfile02_infon_ref
COMP_REF = comp_eqc_ref comp_gec_ref comp_gtc_ref comp_lec_ref comp_ltc_ref comp_nec_ref comptest.srv
EOF_REF = eval_ref eof_ref pcoeff00000
YDRUNSTAT_REF = ydrunmin_ref ydrunmax_ref ydrunsum_ref ydrunavg_ref ydrunmean_ref ydrunstd_ref ydrunstd1_ref ydrunvar_ref ydrunvar1_ref
YMONSTAT_REF = ymonmin_ref ymonmax_ref ymonsum_ref ymonavg_ref ymonmean_ref ymonstd_ref ymonstd1_ref ymonvar_ref ymonvar1_ref ymonrange_ref
YSEASSTAT_REF = yseasmin_ref yseasmax_ref yseassum_ref yseasavg_ref yseasmean_ref yseasstd_ref yseasstd1_ref yseasvar_ref yseasvar1_ref yseasrange_ref
SEASSTAT_REF = seasmin_ref seasmax_ref seassum_ref seasavg_ref seasmean_ref seasstd_ref seasstd1_ref seasvar_ref seasvar1_ref seasrange_ref
RUNSTAT_REF = runmin_ref runmax_ref runsum_ref runavg_ref runmean_ref runstd_ref runstd1_ref runvar_ref runvar1_ref runrange_ref
TIMSTAT_REF = timmin_ref timmax_ref timsum_ref timavg_ref timmean_ref timstd_ref timstd1_ref timvar_ref timvar1_ref timrange_ref
YEARSTAT_REF = yearmin_ref yearmax_ref yearsum_ref yearavg_ref yearmean_ref yearstd_ref yearstd1_ref yearvar_ref yearvar1_ref yearrange_ref
MONSTAT_REF = monmin_ref monmax_ref monsum_ref monavg_ref monmean_ref monstd_ref monstd1_ref monvar_ref monvar1_ref monrange_ref
DAYSTAT_REF = daymin_ref daymax_ref daysum_ref dayavg_ref daymean_ref daystd_ref daystd1_ref dayvar_ref dayvar1_ref dayrange_ref
VERTSTAT_REF = vertmin_ref vertmax_ref vertsum_ref vertavg_ref vertmean_ref vertstd_ref vertstd1_ref vertvar_ref vertvar1_ref vertint_ref vertrange_ref
FLDSTAT_REF = fldmin_ref fldmax_ref fldsum_ref fldavg_ref fldmean_ref fldstd_ref fldstd1_ref fldvar_ref fldvar1_ref fldrange_ref
FLDPSTAT_REF = fldpctl1_ref fldpctl20_ref fldpctl25_ref fldpctl33_ref fldpctl50_ref fldpctl66_ref fldpctl75_ref fldpctl80_ref fldpctl99_ref fldpctl100_ref
MERSTAT_REF = mermin_ref mermax_ref mersum_ref meravg_ref mermean_ref merstd_ref merstd1_ref mervar_ref mervar1_ref merrange_ref
ZONSTAT_REF = zonmin_ref zonmax_ref zonsum_ref zonavg_ref zonmean_ref zonstd_ref zonstd1_ref zonvar_ref zonvar1_ref zonrange_ref
ENSPSTAT_REF = enspctl1_ref enspctl20_ref enspctl25_ref enspctl33_ref enspctl50_ref enspctl66_ref enspctl75_ref enspctl80_ref enspctl99_ref enspctl100_ref
SPECTRAL_REF = sp2gp_ref sp2gpl_ref gp2sp_ref gp2spl_ref
VERTINT_REF = ml2pl_ref
REMAP_REF = n16_bic_ref n16_bil_ref n16_con_ref n16_con2_ref n16_ycon_ref n16_laf_ref n16_nn_ref n16_dis_ref \
FILE = file_F32_srv_ref
GRIB = grib_testfile01_sinfo_ref grib_testfile01_info_ref grib_testfile02_sinfo_ref grib_testfile02_info_ref grib_testfile03_sinfo_ref grib_testfile03_info_ref
NETCDF = netcdf_testfile01_sinfon_ref netcdf_testfile01_infon_ref netcdf_testfile02_sinfon_ref netcdf_testfile02_infon_ref
COMP = comp_eqc_ref comp_gec_ref comp_gtc_ref comp_lec_ref comp_ltc_ref comp_nec_ref comptest.srv
EOF = eval_ref eof_ref pcoeff00000
YDRUNSTAT = ydrunmin_ref ydrunmax_ref ydrunsum_ref ydrunavg_ref ydrunmean_ref ydrunstd_ref ydrunstd1_ref ydrunvar_ref ydrunvar1_ref
YMONSTAT = ymonmin_ref ymonmax_ref ymonsum_ref ymonavg_ref ymonmean_ref ymonstd_ref ymonstd1_ref ymonvar_ref ymonvar1_ref ymonrange_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
RUNSTAT = runmin_ref runmax_ref runsum_ref runavg_ref runmean_ref runstd_ref runstd1_ref runvar_ref runvar1_ref runrange_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
DAYSTAT = daymin_ref daymax_ref daysum_ref dayavg_ref daymean_ref daystd_ref daystd1_ref dayvar_ref dayvar1_ref dayrange_ref
VERTSTAT = vertmin_ref vertmax_ref vertsum_ref vertavg_ref vertmean_ref vertstd_ref vertstd1_ref vertvar_ref vertvar1_ref vertint_ref vertrange_ref
FLDSTAT = fldmin_ref fldmax_ref fldsum_ref fldavg_ref fldmean_ref fldstd_ref fldstd1_ref fldvar_ref fldvar1_ref fldrange_ref
FLDPSTAT = fldpctl1_ref fldpctl20_ref fldpctl25_ref fldpctl33_ref fldpctl50_ref fldpctl66_ref fldpctl75_ref fldpctl80_ref fldpctl99_ref fldpctl100_ref
MERSTAT = mermin_ref mermax_ref mersum_ref meravg_ref mermean_ref merstd_ref merstd1_ref mervar_ref mervar1_ref merrange_ref
ZONSTAT = zonmin_ref zonmax_ref zonsum_ref zonavg_ref zonmean_ref zonstd_ref zonstd1_ref zonvar_ref zonvar1_ref zonrange_ref
ENSPSTAT = enspctl1_ref enspctl20_ref enspctl25_ref enspctl33_ref enspctl50_ref enspctl66_ref enspctl75_ref enspctl80_ref enspctl99_ref enspctl100_ref
SPECTRAL = sp2gp_ref sp2gpl_ref gp2sp_ref gp2spl_ref
VERTINT = ml2pl_ref
REMAP = n16_bic_ref n16_bil_ref n16_con_ref n16_con2_ref n16_ycon_ref n16_laf_ref n16_nn_ref n16_dis_ref \
n32_bic_ref n32_bil_ref n32_con_ref n32_con2_ref n32_ycon_ref n32_laf_ref n32_nn_ref n32_dis_ref
REMAP2_REF = tsurf_spain_bic_def_ref tsurf_spain_bic_off_ref tsurf_spain_bic_on_ref \
REMAP2 = tsurf_spain_bic_def_ref tsurf_spain_bic_off_ref tsurf_spain_bic_on_ref \
tsurf_spain_bil_def_ref tsurf_spain_bil_off_ref tsurf_spain_bil_on_ref \
tsurf_spain_dis_def_ref tsurf_spain_dis_off_ref tsurf_spain_dis_on_ref \
tsurf_spain_nn_def_ref tsurf_spain_nn_off_ref tsurf_spain_nn_on_ref \
......@@ -334,19 +334,21 @@ REMAP2_REF = tsurf_spain_bic_def_ref tsurf_spain_bic_off_ref tsurf_spain_bic
tsurf_spain_con_def_ref tsurf_spain_con_off_ref tsurf_spain_con_on_ref \
tsurf_spain_con2_def_ref tsurf_spain_con2_off_ref tsurf_spain_con2_on_ref
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 tsformat1_ref
GRADSDES_REF = pl_data.ctl pl_data.gmp
ARITH_REF = arithadd_ref arithsub_ref arithmul_ref arithdiv_ref
SELECT = select1_ref select2_ref select3_ref select4_ref select5_ref
DETREND = detrend_ref
EXPR = expr1_ref aexpr1_ref expr2_ref aexpr2_ref
THREAD = thread1_ref tsformat1_ref
GRADSDES = pl_data.ctl pl_data.gmp
ARITH = arithadd_ref arithsub_ref arithmul_ref arithdiv_ref
MAPREDUCE = r18x9_grid icon_cell_grid griddes.r18x9 griddes.icon_cell
MERGETIME = mergetime_ref mergetime_y1 mergetime_y2 mergetime_y12
REMAPETA = remapeta1.nc remapeta2.nc remapeta_ref VCT.L62
EXTRA_DIST = $(INPUTDATA) $(FILE_REF) $(GRIB_REF) $(NETCDF_REF) $(EOF_REF) $(COMP_REF) $(YDRUNSTAT_REF) $(YMONSTAT_REF) $(YSEASSTAT_REF) $(SEASSTAT_REF) \
$(RUNSTAT_REF) $(TIMSTAT_REF) $(YEARSTAT_REF) $(MONSTAT_REF) $(DAYSTAT_REF) $(VERTSTAT_REF) $(FLDSTAT_REF) $(FLDPSTAT_REF) \
$(MERSTAT_REF) $(ZONSTAT_REF) $(ENSPSTAT_REF) $(SPECTRAL_REF) $(VERTINT_REF) $(REMAP_REF) $(REMAP2_REF) $(SELECT_REF) $(DETREND_REF) \
$(THREAD_REF) $(EXPR_REF) $(GRADSDES_REF) $(ARITH_REF) $(MAPREDUCE) $(MERGETIME) $(REMAPETA)
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) $(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)
all: all-am
......
test/data/gen_refdata.sh
View file @ 8b4d4d29
......@@ -5,6 +5,16 @@ CDO=cdo
FORMAT="-f srv -b F32"
########################################################################
#
# setmiss
#
IFILE=t21_geosp_tsurf_sea.grb
#
$CDO $FORMAT setmisstoc,0 $IFILE setmisstoc_ref
$CDO $FORMAT setmisstonn $IFILE setmisstonn_ref
$CDO $FORMAT setmisstodis $IFILE setmisstodis_ref
exit
########################################################################
#
# smooth
#
IFILE=t21_geosp_tsurf_sea.grb
......
Markdown is supported
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

Imprint | Privacy Policy