Skip to content

GitLab

Commit f1f6be2f authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

Added test/Ydrunstat.test.in.

parent 2ed91023
Show whitespace changes
Inline Side-by-side
configure
View file @ f1f6be2f
......@@ -22201,7 +22201,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/Multiyearstat.test"
ac_config_files="$ac_config_files test/Timstat.test test/Timselstat.test test/Seasstat.test test/Runstat.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"
 
......@@ -23386,6 +23386,7 @@ do
"test/Seasstat.test") CONFIG_FILES="$CONFIG_FILES test/Seasstat.test" ;;
"test/Runstat.test") CONFIG_FILES="$CONFIG_FILES test/Runstat.test" ;;
"test/Multiyearstat.test") CONFIG_FILES="$CONFIG_FILES test/Multiyearstat.test" ;;
"test/Ydrunstat.test") CONFIG_FILES="$CONFIG_FILES test/Ydrunstat.test" ;;
"test/Gridboxstat.test") CONFIG_FILES="$CONFIG_FILES test/Gridboxstat.test" ;;
"test/Vertstat.test") CONFIG_FILES="$CONFIG_FILES test/Vertstat.test" ;;
"test/Fldstat.test") CONFIG_FILES="$CONFIG_FILES test/Fldstat.test" ;;
......@@ -24918,6 +24919,7 @@ _LT_EOF
"test/Seasstat.test":F) chmod a+x "$ac_file" ;;
"test/Runstat.test":F) chmod a+x "$ac_file" ;;
"test/Multiyearstat.test":F) chmod a+x "$ac_file" ;;
"test/Ydrunstat.test":F) chmod a+x "$ac_file" ;;
"test/Gridboxstat.test":F) chmod a+x "$ac_file" ;;
"test/Vertstat.test":F) chmod a+x "$ac_file" ;;
"test/Fldstat.test":F) chmod a+x "$ac_file" ;;
......
configure.ac
View file @ f1f6be2f
......@@ -262,7 +262,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],[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/Multiyearstat.test],[chmod a+x "$ac_file"])
AC_CONFIG_FILES([test/Timstat.test test/Timselstat.test test/Seasstat.test test/Runstat.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],[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"])
......
src/Ydrunstat.cc
View file @ f1f6be2f
......@@ -147,7 +147,7 @@ void *Ydrunstat(void *argument)
}
field_type *pvars1 = &vars1[tsID][varID][levelID];
field_type *pvars2 = vars2[tsID] ? &vars2[tsID][varID][levelID] : NULL;
field_type *pvars2 = (vars2 && vars2[tsID]) ? &vars2[tsID][varID][levelID] : NULL;
streamReadRecord(streamID1, pvars1->ptr, &nmiss);
pvars1->nmiss = nmiss;
......@@ -207,7 +207,7 @@ void *Ydrunstat(void *argument)
streamInqRecord(streamID1, &varID, &levelID);
field_type *pvars1 = &vars1[ndates-1][varID][levelID];
field_type *pvars2 = vars2[ndates-1] ? &vars2[ndates-1][varID][levelID] : NULL;
field_type *pvars2 = (vars2 && vars2[ndates-1]) ? &vars2[ndates-1][varID][levelID] : NULL;
streamReadRecord(streamID1, pvars1->ptr, &nmiss);
pvars1->nmiss = nmiss;
......@@ -312,6 +312,7 @@ YDAY_STATS *ydstatCreate(int vlistID)
stats->vars2[dayoy] = NULL;
stats->nsets[dayoy] = 0;
}
stats->vlist = vlistID;
return stats;
......@@ -362,9 +363,8 @@ void ydstatUpdate(YDAY_STATS *stats, int vdate, int vtime,
int varID, levelID, nvars, nlevels;
int gridsize;
int year, month, day, dayoy;
int lvarstd;
lvarstd = vars2 != NULL;
bool lvarstd = vars2 != NULL;
nvars = vlistNvars(stats->vlist);
......
test/Makefile.am
View file @ f1f6be2f
......@@ -17,7 +17,7 @@ TESTS = threads.test tsformat.test wildcard.test File.test Comp.test Compc.test
Ensstat.test Enspctl.test Gridboxstat.test \
Vertstat.test Fldstat.test Fldpctl.test Merstat.test Zonstat.test \
Timstat.test Timselstat.test Seasstat.test \
Runstat.test Multiyearstat.test \
Runstat.test Multiyearstat.test Ydrunstat.test \
EOF.test \
Vertint.test Afterburner.test Arithc.test Arith.test Expr.test \
Gradsdes.test Collgrid.test MapReduce.test Ninfo.test
......
test/Makefile.in
View file @ f1f6be2f
......@@ -90,17 +90,17 @@ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(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)/Multiyearstat.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)/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)/MapReduce.test.in \
$(srcdir)/Ninfo.test.in README
$(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)/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)/MapReduce.test.in $(srcdir)/Ninfo.test.in README
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/acx_options.m4 \
$(top_srcdir)/m4/ax_cxx_compile_stdcxx.m4 \
......@@ -117,12 +117,12 @@ 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 EOF.test Select.test \
Spectral.test Vertint.test Timstat.test Timselstat.test \
Seasstat.test Runstat.test Multiyearstat.test Gridboxstat.test \
Vertstat.test Fldstat.test Fldpctl.test Ensstat.test \
Enspctl.test Merstat.test Zonstat.test Afterburner.test \
Detrend.test Arithc.test Arith.test Expr.test Gradsdes.test \
Collgrid.test threads.test tsformat.test wildcard.test \
MapReduce.test Ninfo.test
Seasstat.test Runstat.test Multiyearstat.test Ydrunstat.test \
Gridboxstat.test Vertstat.test Fldstat.test Fldpctl.test \
Ensstat.test Enspctl.test Merstat.test Zonstat.test \
Afterburner.test Detrend.test Arithc.test Arith.test Expr.test \
Gradsdes.test Collgrid.test threads.test tsformat.test \
wildcard.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@)
......@@ -538,7 +538,7 @@ TESTS = threads.test tsformat.test wildcard.test File.test Comp.test Compc.test
Ensstat.test Enspctl.test Gridboxstat.test \
Vertstat.test Fldstat.test Fldpctl.test Merstat.test Zonstat.test \
Timstat.test Timselstat.test Seasstat.test \
Runstat.test Multiyearstat.test \
Runstat.test Multiyearstat.test Ydrunstat.test \
EOF.test \
Vertint.test Afterburner.test Arithc.test Arith.test Expr.test \
Gradsdes.test Collgrid.test MapReduce.test Ninfo.test
......@@ -630,6 +630,8 @@ Runstat.test: $(top_builddir)/config.status $(srcdir)/Runstat.test.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
Multiyearstat.test: $(top_builddir)/config.status $(srcdir)/Multiyearstat.test.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
Ydrunstat.test: $(top_builddir)/config.status $(srcdir)/Ydrunstat.test.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
Gridboxstat.test: $(top_builddir)/config.status $(srcdir)/Gridboxstat.test.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
Vertstat.test: $(top_builddir)/config.status $(srcdir)/Vertstat.test.in
......
test/Ydrunstat.test.in 0 → 100644
View file @ f1f6be2f
#! @BASH@
echo 1..9 # Number of tests to be executed.
#
test -n "$CDO" || CDO=cdo
test -n "$DATAPATH" || DATAPATH=./data
#
CDOOUT=cout$$
CDOERR=cerr$$
TYPES="ydrun"
STATS="min max sum avg mean std std1 var var1"
#
IFILE=$DATAPATH/ts_mm_5years
NTEST=1
#
for TYPE in $TYPES; do
for STAT in $STATS; do
RSTAT=0
RFILE=$DATAPATH/${TYPE}${STAT}_ref
OFILE=${TYPE}${STAT}_res
CDOTEST="${TYPE}$STAT"
CDOCOMMAND="$CDO ${TYPE}${STAT},8 $IFILE $OFILE"
echo "Running test: $NTEST"
echo "$CDOCOMMAND"
$CDOCOMMAND
test $? -eq 0 || let RSTAT+=1
$CDO 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
done
#
rm -f $CDOOUT $CDOERR
#
exit 0
test/data/Makefile.am
View file @ f1f6be2f
......@@ -7,6 +7,7 @@ GRIB_REF = grib_testfile01_sinfo_ref grib_testfile01_info_ref grib_testfile0
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
YSEASSTAT_REF = yseasmin_ref yseasmax_ref yseassum_ref yseasavg_ref yseasmean_ref yseasstd_ref yseasstd1_ref yseasvar_ref yseasvar1_ref
SEASSTAT_REF = seasmin_ref seasmax_ref seassum_ref seasavg_ref seasmean_ref seasstd_ref seasstd1_ref seasvar_ref seasvar1_ref seasrange_ref
......
test/data/Makefile.in
View file @ f1f6be2f
......@@ -297,6 +297,7 @@ GRIB_REF = grib_testfile01_sinfo_ref grib_testfile01_info_ref grib_testfile02_si
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
YSEASSTAT_REF = yseasmin_ref yseasmax_ref yseassum_ref yseasavg_ref yseasmean_ref yseasstd_ref yseasstd1_ref yseasvar_ref yseasvar1_ref
SEASSTAT_REF = seasmin_ref seasmax_ref seassum_ref seasavg_ref seasmean_ref seasstd_ref seasstd1_ref seasvar_ref seasvar1_ref seasrange_ref
......
test/data/gen_refdata.sh
View file @ f1f6be2f
......@@ -115,6 +115,16 @@ done
exit
########################################################################
#
# Ydrunstat
#
STATS="min max sum avg mean std std1 var var1"
#
IFILE=ts_mm_5years
for STAT in $STATS; do
$CDO $FORMAT ydrun$STAT,8 $IFILE ydrun${STAT}_ref
done
########################################################################
#
# Ymonstat
#
STATS="min max sum avg mean std std1 var var1"
......
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