Skip to content
GitLab
Commit a6f648d7 authored by Oliver Heidmann's avatar Oliver Heidmann
Browse files

Merge branch 'develop' of git.mpimet.mpg.de:cdo into develop

parents d058a428 bb3f024d
Hide whitespace changes
Inline Side-by-side
ChangeLog
View file @ a6f648d7
2017-08-15 Uwe Schulzweida
* Using CDI library version 1.8.3
* Using CDI library version 1.9.0
* Version 1.9.0 release
2017-05-30 Uwe Schulzweida
* New operator seasrange: seasonal range (seasmax-seasmin)
* New operator timselrange: time selection range (timmax-timmin)
* New operator runrange: running range (runmax-runmin)
2017-05-26 Uwe Schulzweida
* eca_gsl: set default to northern hemisphere
2017-05-23 Uwe Schulzweida
* expr: addeed support for variables starting with digits
2017-05-22 Uwe Schulzweida
* settbounds: added support for hourly frequencies
......
NEWS
View file @ a6f648d7
CDO NEWS
--------
Version 1.9.0 (15 September 2017):
New features:
* Added range operator to all statistic modules (e.g. yearrange, zonrange)
New operators:
*
Version 1.8.2 (15 May 2017):
Fixed bugs:
......
OPERATORS
View file @ a6f648d7
......@@ -258,6 +258,7 @@ Operator catalog:
Ensval ensbrs Ensemble Brier score
Fldstat fldmin Field minimum
Fldstat fldmax Field maximum
Fldstat fldrange Field range
Fldstat fldsum Field sum
Fldstat fldmean Field mean
Fldstat fldavg Field average
......@@ -268,6 +269,7 @@ Operator catalog:
Fldstat fldpctl Field percentiles
Zonstat zonmin Zonal minimum
Zonstat zonmax Zonal maximum
Zonstat zonrange Zonal range
Zonstat zonsum Zonal sum
Zonstat zonmean Zonal mean
Zonstat zonavg Zonal average
......@@ -304,18 +306,20 @@ Operator catalog:
Vertstat vertstd1 Vertical standard deviation (n-1)
Vertstat vertvar Vertical variance
Vertstat vertvar1 Vertical variance (n-1)
Timselstat timselmin Time range minimum
Timselstat timselmax Time range maximum
Timselstat timselsum Time range sum
Timselstat timselmean Time range mean
Timselstat timselavg Time range average
Timselstat timselstd Time range standard deviation
Timselstat timselstd1 Time range standard deviation (n-1)
Timselstat timselvar Time range variance
Timselstat timselvar1 Time range variance (n-1)
Timselstat timselmin Time selection minimum
Timselstat timselmax Time selection maximum
Timselstat timselrange Time selection range
Timselstat timselsum Time selection sum
Timselstat timselmean Time selection mean
Timselstat timselavg Time selection average
Timselstat timselstd Time selection standard deviation
Timselstat timselstd1 Time selection standard deviation (n-1)
Timselstat timselvar Time selection variance
Timselstat timselvar1 Time selection variance (n-1)
Timselpctl timselpctl Time range percentiles
Runstat runmin Running minimum
Runstat runmax Running maximum
Runstat runrange Running range
Runstat runsum Running sum
Runstat runmean Running mean
Runstat runavg Running average
......@@ -326,6 +330,7 @@ Operator catalog:
Runpctl runpctl Running percentiles
Timstat timmin Time minimum
Timstat timmax Time maximum
Timstat timrange Time range
Timstat timsum Time sum
Timstat timmean Time mean
Timstat timavg Time average
......@@ -336,6 +341,7 @@ Operator catalog:
Timpctl timpctl Time percentiles
Hourstat hourmin Hourly minimum
Hourstat hourmax Hourly maximum
Hourstat hourrange Hourly range
Hourstat hoursum Hourly sum
Hourstat hourmean Hourly mean
Hourstat houravg Hourly average
......@@ -346,6 +352,7 @@ Operator catalog:
Hourpctl hourpctl Hourly percentiles
Daystat daymin Daily minimum
Daystat daymax Daily maximum
Daystat dayrange Daily range
Daystat daysum Daily sum
Daystat daymean Daily mean
Daystat dayavg Daily average
......@@ -356,6 +363,7 @@ Operator catalog:
Daypctl daypctl Daily percentiles
Monstat monmin Monthly minimum
Monstat monmax Monthly maximum
Monstat monrange Monthly range
Monstat monsum Monthly sum
Monstat monmean Monthly mean
Monstat monavg Monthly average
......@@ -367,6 +375,7 @@ Operator catalog:
Yearmonstat yearmonmean Yearly mean from monthly data
Yearstat yearmin Yearly minimum
Yearstat yearmax Yearly maximum
Yearstat yearrange Yearly range
Yearstat yearsum Yearly sum
Yearstat yearmean Yearly mean
Yearstat yearavg Yearly average
......@@ -377,6 +386,7 @@ Operator catalog:
Yearpctl yearpctl Yearly percentiles
Seasstat seasmin Seasonal minimum
Seasstat seasmax Seasonal maximum
Seasstat seasrange Seasonal range
Seasstat seassum Seasonal sum
Seasstat seasmean Seasonal mean
Seasstat seasavg Seasonal average
......
config/default
View file @ a6f648d7
......@@ -49,7 +49,8 @@ case "${HOSTNAME}" in
CXX=icpc CXXFLAGS="-g -Wall -O2 -qopt-report=5 -march=native" \
CC=icc CFLAGS="-g -Wall -O2 -qopt-report=5 -march=native"
elif test "$COMP" = clang ; then
${CONFPATH}configure \
${CONFPATH}configure --prefix=$HOME/local \
--enable-maintainer-mode \
$CDOLIBS \
CXX=clang++ CXXFLAGS="-g -Wall -O3" \
CC=clang CFLAGS="-g -Wall -O3"
......@@ -57,20 +58,20 @@ case "${HOSTNAME}" in
${CONFPATH}configure --prefix=$HOME/local \
--enable-maintainer-mode \
$CDOLIBS \
CXX=g++-mp-4.9 CXXFLAGS="-g -Wall -W -Wfloat-equal -pedantic -O3 -march=native -march=native" \
CC=gcc-mp-4.9 CFLAGS="-g -Wall -W -Wfloat-equal -pedantic -O3 -march=native -march=native"
CXX=g++-mp-4.9 CXXFLAGS="-g -Wall -W -Wfloat-equal -pedantic -O3 -march=native" \
CC=gcc-mp-4.9 CFLAGS="-g -Wall -W -Wfloat-equal -pedantic -O3 -march=native"
elif test "$COMP" = gnu5 ; then
${CONFPATH}configure --prefix=$HOME/local \
--enable-maintainer-mode \
$CDOLIBS \
CXX=g++-mp-5 CXXFLAGS="-g -Wall -W -Wfloat-equal -pedantic -O3 -march=native -march=native" \
CC=gcc-mp-5 CFLAGS="-g -Wall -W -Wfloat-equal -pedantic -O3 -march=native -march=native"
CXX=g++-mp-5 CXXFLAGS="-g -Wall -W -Wfloat-equal -pedantic -O3 -march=native" \
CC=gcc-mp-5 CFLAGS="-g -Wall -W -Wfloat-equal -pedantic -O3 -march=native"
elif test "$COMP" = gnu ; then
${CONFPATH}configure --prefix=$HOME/local \
--enable-maintainer-mode \
$CDOLIBS \
CXX=g++ CXXFLAGS="-g -Wall -W -Wfloat-equal -pedantic -O3 -march=native -march=native" \
CC=gcc CFLAGS="-g -Wall -W -Wfloat-equal -pedantic -O3 -march=native -march=native"
CXX=g++ CXXFLAGS="-g -Wall -W -Wfloat-equal -pedantic -O3 -march=native" \
CC=gcc CFLAGS="-g -Wall -W -Wfloat-equal -pedantic -O3 -march=native"
# --with-libxml2=/usr
# --with-magics=/Users/m214003/local/magics-2.14.9
else
......@@ -103,8 +104,13 @@ case "${HOSTNAME}" in
elif test "$COMP" = clang ; then
${CONFPATH}configure \
$CDOLIBS \
CXX=clang++ CXXFLAGS="-g -Wall -O3" \
CC=clang CFLAGS="-g -Wall -O3"
CXX=clang++ CXXFLAGS="-g -Wall -pedantic -O3" \
CC=clang CFLAGS="-g -Wall -pedantic -O3"
elif test "$COMP" = clang4 ; then
${CONFPATH}configure \
$CDOLIBS \
CXX=clang++-mp-4.0 CXXFLAGS="-g -Wall -pedantic -O3" \
CC=clang-mp-4.0 CFLAGS="-g -Wall -pedantic -O3"
elif test "$COMP" = pgi ; then
${CONFPATH}configure --disable-openmp \
$CDOLIBS \
......
configure
View file @ a6f648d7
......@@ -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 @ a6f648d7
......@@ -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"])
......
doc/tex/mod/Daypctl
View file @ a6f648d7
@BeginModule
@NewPage
@Name = Daypctl
@Title = Daily percentile values
@Section = Statistical values
......
doc/tex/mod/Daystat
View file @ a6f648d7
......@@ -5,11 +5,11 @@
@Section = Statistical values
@Class = Statistic
@Arguments = infile outfile
@Operators = daymin daymax daysum daymean dayavg daystd daystd1 dayvar dayvar1
@Operators = daymin daymax dayrange daysum daymean dayavg daystd daystd1 dayvar dayvar1
@BeginDescription
This module computes statistical values over timesteps of the same day.
Depending on the chosen operator the minimum, maximum, sum, average, variance
Depending on the chosen operator the minimum, maximum, range, sum, average, variance
or standard deviation of timesteps of the same day is written to @file{outfile}.
The time of @file{outfile} is determined by the time in the middle of all contributing timesteps of @file{infile}.
@EndDescription
......@@ -54,6 +54,25 @@ o(t,x) = \mbox{\textbf{max}}\{i(t',x), t_1 < t' \leq t_n\}
@EndOperator
@BeginOperator_dayrange
@Title = Daily range
@BeginDescription
@IfMan
For every adjacent sequence t_1, ...,t_n of timesteps of the same day it is:
o(t,x) = range{i(t',x), t_1<t'<=t_n}
@EndifMan
@IfDoc
For every adjacent sequence \begin{math}t_1, ...,t_n\end{math} of timesteps of the same day it is: \\
@BeginMath
o(t,x) = \mbox{\textbf{range}}\{i(t',x), t_1 < t' \leq t_n\}
@EndMath
@EndifDoc
@EndDescription
@EndOperator
@BeginOperator_daysum
@Title = Daily sum
......
doc/tex/mod/EcaGsl
View file @ a6f648d7
......@@ -14,7 +14,7 @@ Within a period of 12 months, the thermal growing season length is officially de
@Item = first occurrence of at least nday consecutive days with TG > @math{T}
@Item = first occurrence of at least nday consecutive days with TG < @math{T} within the last 6 months
@EndItemize
On northern hemispere, this period corresponds with the regular year, whereas on southern hemispere, it starts
On northern hemisphere, this period corresponds with the regular year, whereas on southern hemisphere, it starts
at July 1st. Please note, that this definition may lead to weird results concerning values TG = @math{T}:
In the first half of the period, these days do not contribute to the gsl, but they do within the second half.
Moreover this definition could lead to discontinuous values in equatorial regions.
......
doc/tex/mod/Fldstat
View file @ a6f648d7
......@@ -5,11 +5,11 @@
@Section = Statistical values
@Class = Statistic
@Arguments = infile outfile
@Operators = fldmin fldmax fldsum fldmean fldavg fldstd fldstd1 fldvar fldvar1 fldpctl
@Operators = fldmin fldmax fldrange fldsum fldmean fldavg fldstd fldstd1 fldvar fldvar1 fldpctl
@BeginDescription
This module computes statistical values of the input fields. According to the chosen
operator the field minimum, maximum, sum, average, variance, standard deviation or
operator the field minimum, maximum, range, sum, average, variance, standard deviation or
a certain percentile is written to @file{outfile}.
@EndDescription
@EndModule
......@@ -53,6 +53,25 @@ o(t,1) = \mbox{\textbf{max}}\{i(t,x'), x_1 < x' \leq x_n\}
@EndOperator
@BeginOperator_fldrange
@Title = Field range
@BeginDescription
@IfMan
For every gridpoint x_1, ..., x_n of the same field it is:
o(t,1) = range{i(t,x'), x_1<x'<=x_n}
@EndifMan
@IfDoc
For every gridpoint \begin{math}x_1, ..., x_n\end{math} of the same field it is: \\
@BeginMath
o(t,1) = \mbox{\textbf{range}}\{i(t,x'), x_1 < x' \leq x_n\}
@EndMath
@EndifDoc
@EndDescription
@EndOperator
@BeginOperator_fldsum
@Title = Field sum
......
doc/tex/mod/Hourpctl
View file @ a6f648d7
@BeginModule
@NewPage
@Name = Hourpctl
@Title = Hourly percentile values
@Section = Statistical values
......
doc/tex/mod/Hourstat
View file @ a6f648d7
......@@ -5,11 +5,11 @@
@Section = Statistical values
@Class = Statistic
@Arguments = infile outfile
@Operators = hourmin hourmax hoursum hourmean houravg hourstd hourstd1 hourvar hourvar1
@Operators = hourmin hourmax hourrange hoursum hourmean houravg hourstd hourstd1 hourvar hourvar1
@BeginDescription
This module computes statistical values over timesteps of the same hour.
Depending on the chosen operator the minimum, maximum, sum, average, variance
Depending on the chosen operator the minimum, maximum, range, sum, average, variance
or standard deviation of timesteps of the same hour is written to @file{outfile}.
The time of @file{outfile} is determined by the time in the middle of all contributing timesteps of @file{infile}.
@EndDescription
......@@ -54,6 +54,25 @@ o(t,x) = \mbox{\textbf{max}}\{i(t',x), t_1 < t' \leq t_n\}
@EndOperator
@BeginOperator_hourrange
@Title = Hourly range
@BeginDescription
@IfMan
For every adjacent sequence t_1, ...,t_n of timesteps of the same hour it is:
o(t,x) = range{i(t',x), t_1<t'<=t_n}
@EndifMan
@IfDoc
For every adjacent sequence \begin{math}t_1, ...,t_n\end{math} of timesteps of the same hour it is: \\
@BeginMath
o(t,x) = \mbox{\textbf{range}}\{i(t',x), t_1 < t' \leq t_n\}
@EndMath
@EndifDoc
@EndDescription
@EndOperator
@BeginOperator_hoursum
@Title = Hourly sum
......
doc/tex/mod/Monpctl
View file @ a6f648d7
@BeginModule
@NewPage
@Name = Monpctl
@Title = Monthly percentile values
@Section = Statistical values
......
doc/tex/mod/Monstat
View file @ a6f648d7
......@@ -5,11 +5,11 @@
@Section = Statistical values
@Class = Statistic
@Arguments = infile outfile
@Operators = monmin monmax monsum monmean monavg monstd monstd1 monvar monvar1
@Operators = monmin monmax monrange monsum monmean monavg monstd monstd1 monvar monvar1
@BeginDescription
This module computes statistical values over timesteps of the same month.
Depending on the chosen operator the minimum, maximum, sum, average, variance
Depending on the chosen operator the minimum, maximum, range, sum, average, variance
or standard deviation of timesteps of the same month is written to @file{outfile}.
The time of @file{outfile} is determined by the time in the middle of all contributing timesteps of @file{infile}.
@EndDescription
......@@ -54,6 +54,25 @@ o(t,x) = \mbox{\textbf{max}}\{i(t',x), t_1 < t' \leq t_n\}
@EndOperator
@BeginOperator_monrange
@Title = Monthly range
@BeginDescription
@IfMan
For every adjacent sequence t_1, ...,t_n of timesteps of the same month it is:
o(t,x) = range{i(t',x), t_1<t'<=t_n}
@EndifMan
@IfDoc
For every adjacent sequence \begin{math}t_1, ...,t_n\end{math} of timesteps of the same month it is: \\
@BeginMath
o(t,x) = \mbox{\textbf{range}}\{i(t',x), t_1 < t' \leq t_n\}
@EndMath
@EndifDoc
@EndDescription
@EndOperator
@BeginOperator_monsum
@Title = Monthly sum
......
doc/tex/mod/Runstat
View file @ a6f648d7
......@@ -5,11 +5,11 @@
@Section = Statistical values
@Class = Statistic
@Arguments = infile outfile
@Operators = runmin runmax runsum runmean runavg runstd runstd1 runvar runvar1
@Operators = runmin runmax runrange runsum runmean runavg runstd runstd1 runvar runvar1
@BeginDescription
This module computes running statistical values over a selected number of timesteps. Depending on
the chosen operator the minimum, maximum, sum, average, variance or standard deviation of a selected
the chosen operator the minimum, maximum, range, sum, average, variance or standard deviation of a selected
number of consecutive timesteps read from @file{infile} is written to @file{outfile}.
The time of @file{outfile} is determined by the time in the middle of all contributing timesteps of @file{infile}.
@EndDescription
......@@ -50,6 +50,23 @@ o(t+(nts-1)/2,x) = \mbox{\textbf{max}}\{i(t,x), i(t+1,x), ..., i(t+nts-1,x)\}
@EndOperator
@BeginOperator_runrange
@Title = Running range
@Parameter = nts
@BeginDescription
@IfMan
o(t+(nts-1)/2,x) = range{i(t,x), i(t+1,x), ..., i(t+nts-1,x)}
@EndifMan
@IfDoc
@BeginMath
o(t+(nts-1)/2,x) = \mbox{\textbf{range}}\{i(t,x), i(t+1,x), ..., i(t+nts-1,x)\}
@EndMath
@EndifDoc
@EndDescription
@EndOperator
@BeginOperator_runsum
@Title = Running sum
@Parameter = nts
......
doc/tex/mod/Seaspctl
View file @ a6f648d7
@BeginModule
@NewPage
@Name = Seaspctl
@Title = Seasonal percentile values
@Section = Statistical values
......
doc/tex/mod/Seasstat
View file @ a6f648d7
......@@ -5,11 +5,11 @@
@Section = Statistical values
@Class = Statistic
@Arguments = infile outfile
@Operators = seasmin seasmax seassum seasmean seasavg seasstd seasstd1 seasvar seasvar1
@Operators = seasmin seasmax seasrange seassum seasmean seasavg seasstd seasstd1 seasvar seasvar1
@BeginDescription
This module computes statistical values over timesteps of the same season.
Depending on the chosen operator the minimum, maximum, sum, average, variance
Depending on the chosen operator the minimum, maximum, range, sum, average, variance
or standard deviation of timesteps of the same season is written to @file{outfile}.
The time of @file{outfile} is determined by the time in the middle of all contributing timesteps of @file{infile}.
Be careful about the first and the last output timestep, they may be incorrect values
......@@ -56,6 +56,25 @@ o(t,x) = \mbox{\textbf{max}}\{i(t',x), t_1 < t' \le t_n\}
@EndOperator
@BeginOperator_seasrange
@Title = Seasonal range
@BeginDescription
@IfMan
For every adjacent sequence t_1, ...,t_n of timesteps of the same season it is:
o(t,x) = range{i(t',x), t1 < t' <= tn}
@EndifMan
@IfDoc
For every adjacent sequence \begin{math}t_1, ...,t_n\end{math} of timesteps of the same season it is: \\
@BeginMath
o(t,x) = \mbox{\textbf{range}}\{i(t',x), t_1 < t' \le t_n\}
@EndMath
@EndifDoc
@EndDescription
@EndOperator
@BeginOperator_seassum
@Title = Seasonal sum
......
doc/tex/mod/Timselstat
View file @ a6f648d7
......@@ -5,11 +5,11 @@
@Section = Statistical values
@Class = Statistic
@Arguments = infile outfile
@Operators = timselmin timselmax timselsum timselmean timselavg timselstd timselstd1 timselvar timselvar1
@Operators = timselmin timselmax timselrange timselsum timselmean timselavg timselstd timselstd1 timselvar timselvar1
@BeginDescription
This module computes statistical values for a selected number of timesteps. According to
the chosen operator the minimum, maximum, sum, average, variance or standard deviation of
the chosen operator the minimum, maximum, range, sum, average, variance or standard deviation of
the selected timesteps is written to @file{outfile}.
The time of @file{outfile} is determined by the time in the middle of all contributing timesteps of @file{infile}.
@EndDescription
......@@ -17,7 +17,7 @@ The time of @file{outfile} is determined by the time in the middle of all contri
@BeginOperator_timselmin
@Title = Time range minimum
@Title = Time selection minimum
@Parameter = nsets [noffset] [nskip]
@BeginDescription
......@@ -37,7 +37,7 @@ o(t,x) = \mbox{\textbf{min}}\{i(t',x), t_1 < t' \le t_n\}
@BeginOperator_timselmax
@Title = Time range maximum
@Title = Time selection maximum
@Parameter = nsets [noffset] [nskip]
@BeginDescription
......@@ -56,8 +56,28 @@ o(t,x) = \mbox{\textbf{max}}\{i(t',x), t_1 < t' \le t_n\}
@EndOperator
@BeginOperator_timselrange
@Title = Time selection range
@Parameter = nsets [noffset] [nskip]
@BeginDescription
@IfMan
For every adjacent sequence t1, ...., tn of timesteps of the same selected time range it is:
o(t,x) = range{i(t',x), t1 < t' <= tn}
@EndifMan
@IfDoc
For every adjacent sequence \begin{math}t_1, ...,t_n\end{math} of timesteps of the same selected time range it is: \\
@BeginMath
o(t,x) = \mbox{\textbf{range}}\{i(t',x), t_1 < t' \le t_n\}
@EndMath
@EndifDoc
@EndDescription
@EndOperator
@BeginOperator_timselsum
@Title = Time range sum
@Title = Time selection sum
@Parameter = nsets [noffset] [nskip]
@BeginDescription
......@@ -77,7 +97,7 @@ o(t,x) = \mbox{\textbf{sum}}\{i(t',x), t_1 < t' \le t_n\}
@BeginOperator_timselmean
@Title = Time range mean
@Title = Time selection mean
@Parameter = nsets [noffset] [nskip]
@BeginDescription
......@@ -97,7 +117,7 @@ o(t,x) = \mbox{\textbf{mean}}\{i(t',x), t_1 < t' \le t_n\}
@BeginOperator_timselavg
@Title = Time range average
@Title = Time selection average
@Parameter = nsets [noffset] [nskip]
@BeginDescription
......@@ -117,7 +137,7 @@ o(t,x) = \mbox{\textbf{avg}}\{i(t',x), t_1 < t' \le t_n\}
@BeginOperator_timselvar
@Title = Time range variance
@Title = Time selection variance
@Parameter = nsets [noffset] [nskip]
@BeginDescription
......@@ -137,7 +157,7 @@ o(t,x) = \mbox{\textbf{var}}\{i(t',x), t_1 < t' \le t_n\}
@BeginOperator_timselvar1
@Title = Time range variance (n-1)
@Title = Time selection variance (n-1)
@Parameter = nsets [noffset] [nskip]
@BeginDescription
......@@ -157,7 +177,7 @@ o(t,x) = \mbox{\textbf{var1}}\{i(t',x), t_1 < t' \le t_n\}
@BeginOperator_timselstd
@Title = Time range standard deviation
@Title = Time selection standard deviation
@Parameter = nsets [noffset] [nskip]
@BeginDescription
......@@ -177,7 +197,7 @@ o(t,x) = \mbox{\textbf{std}}\{i(t',x), t_1 < t' \le t_n\}
@BeginOperator_timselstd1
@Title = Time range standard deviation (n-1)
@Title = Time selection standard deviation (n-1)
@Parameter = nsets [noffset] [nskip]
@BeginDescription
......
doc/tex/mod/Timstat
View file @ a6f648d7
......@@ -5,11 +5,11 @@
@Section = Statistical values
@Class = Statistic
@Arguments = infile outfile
@Operators = timmin timmax timsum timmean timavg timstd timstd1 timvar timvar1
@Operators = timmin timmax timrange timsum timmean timavg timstd timstd1 timvar timvar1
@BeginDescription
This module computes statistical values over all timesteps in @file{infile}. Depending on
the chosen operator the minimum, maximum, sum, average, variance or standard deviation of
This module computes statistical values over all timesteps in @file{infile}. Depending on
the chosen operator the minimum, maximum, range, sum, average, variance or standard deviation of
all timesteps read from @file{infile} is written to @file{outfile}.
The time of @file{outfile} is determined by the time in the middle of all contributing timesteps of @file{infile}.
@EndDescription
......@@ -48,6 +48,22 @@ o(1,x) = \mbox{\textbf{max}}\{i(t',x), t_1 < t' \leq t_n\}
@EndOperator
@BeginOperator_timrange
@Title = Time range
@BeginDescription
@IfMan
o(1,x) = range{i(t',x), t_1<t'<=t_n}
@EndifMan
@IfDoc
@BeginMath
o(1,x) = \mbox{\textbf{range}}\{i(t',x), t_1 < t' \leq t_n\}
@EndMath
@EndifDoc
@EndDescription
@EndOperator
@BeginOperator_timsum
@Title = Time sum
......
doc/tex/mod/Yearstat
View file @ a6f648d7
......@@ -5,11 +5,11 @@
@Section = Statistical values
@Class = Statistic
@Arguments = infile outfile
@Operators = yearmin yearmax yearsum yearmean yearavg yearstd yearstd1 yearvar yearvar1
@Operators = yearmin yearmax yearrange yearsum yearmean yearavg yearstd yearstd1 yearvar yearvar1
@BeginDescription
This module computes statistical values over timesteps of the same year.
Depending on the chosen operator the minimum, maximum, sum, average, variance
Depending on the chosen operator the minimum, maximum, range, sum, average, variance
or standard deviation of timesteps of the same year is written to @file{outfile}.
The time of @file{outfile} is determined by the time in the middle of all contributing timesteps of @file{infile}.
@EndDescription
......@@ -54,6 +54,25 @@ o(t,x) = \mbox{\textbf{max}}\{i(t',x), t_1 < t' \leq t_n\}
@EndOperator
@BeginOperator_yearrange
@Title = Yearly range