Commit 87eeb465 authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

Docu update

parent dbd0a92a
......@@ -356,8 +356,10 @@ Operator catalog:
Seasstat seassum Seasonal sum
Seasstat seasmean Seasonal mean
Seasstat seasavg Seasonal average
Seasstat seasvar Seasonal variance
Seasstat seasstd Seasonal standard deviation
Seasstat seasstd1 Seasonal standard deviation
Seasstat seasvar Seasonal variance
Seasstat seasvar1 Seasonal variance
Seaspctl seaspctl Seasonal percentiles
Yhourstat yhourmin Multi-year hourly minimum
Yhourstat yhourmax Multi-year hourly maximum
......@@ -393,8 +395,10 @@ Operator catalog:
Yseasstat yseassum Multi-year seasonal sum
Yseasstat yseasmean Multi-year seasonal mean
Yseasstat yseasavg Multi-year seasonal average
Yseasstat yseasvar Multi-year seasonal variance
Yseasstat yseasstd Multi-year seasonal standard deviation
Yseasstat yseasstd1 Multi-year seasonal standard deviation
Yseasstat yseasvar Multi-year seasonal variance
Yseasstat yseasvar1 Multi-year seasonal variance
Yseaspctl yseaspctl Multi-year seasonal percentiles
Ydrunstat ydrunmin Multi-year daily running minimum
Ydrunstat ydrunmax Multi-year daily running maximum
......
No preview for this file type
......@@ -181,7 +181,7 @@
\end{picture}
\begin{flushright}
\large\bf{Climate Data Operators \\ Version 1.6.9 \\ May 2015}
\large\bf{Climate Data Operators \\ Version 1.7.0 \\ October 2015}
\end{flushright}
\vfill
......
......@@ -14,7 +14,7 @@
\put(0,0.0){\line(1,0){3.95}}
\end{picture}
\begin{flushright}
{\small{Climate Data Operators \\ Version 1.6.9 \\ May 2015}}
{\small{Climate Data Operators \\ Version 1.7.0 \\ October 2015}}
\end{flushright}
\vspace*{0mm}
......
......@@ -666,7 +666,7 @@ while (<MOFILE>) {
$operfunc = $operatorx;
$operfunc =~ s/$modulname//;
$statfunc = 0;
if ( $trskip == 1 ) {
if ( $trskip == 1 && $modulname ne "yearmon" ) {
if ( $operfunc eq "min" || $operfunc eq "max" || $operfunc eq "sum" || $operfunc eq "mean" || $operfunc eq "avg" || $operfunc eq "var" || $operfunc eq "var1" || $operfunc eq "std" || $operfunc eq "std1" ) { $statfunc = 1; }
}
if ( $refskip == 0 && $norefoper == 0 ) {
......
......@@ -5,7 +5,7 @@
@Section = Statistical values
@Class = Statistic
@Arguments = ifile ofile
@Operators = seasmin seasmax seassum seasmean seasavg seasvar seasstd
@Operators = seasmin seasmax seassum seasmean seasavg seasstd seasstd1 seasvar seasvar1
@BeginDescription
This module computes statistical values over timesteps of the same season.
......@@ -123,12 +123,12 @@ o(t,x) = \mbox{\bf avg}\{i(t',x), t_1 < t' \le t_n\}
@BeginDescription
@IfMan
For every adjacent sequence t_1, ...,t_n of timesteps of the same season it is
Divisor is n. For every adjacent sequence t_1, ...,t_n of timesteps of the same season it is
o(t,x) = var{i(t',x), t1 < t' <= tn}
@EndifMan
@IfDoc
For every adjacent sequence \begin{math}t_1, ...,t_n\end{math} of timesteps of
Divisor is n. 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{\bf var}\{i(t',x), t_1 < t' \le t_n\}
......@@ -138,17 +138,37 @@ o(t,x) = \mbox{\bf var}\{i(t',x), t_1 < t' \le t_n\}
@EndOperator
@BeginOperator_seasvar1
@Title = Seasonal variance
@BeginDescription
@IfMan
Divisor is (n-1). For every adjacent sequence t_1, ...,t_n of timesteps of the same season it is
o(t,x) = var1{i(t',x), t1 < t' <= tn}
@EndifMan
@IfDoc
Divisor is (n-1). 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{\bf var1}\{i(t',x), t_1 < t' \le t_n\}
@EndMath
@EndifDoc
@EndDescription
@EndOperator
@BeginOperator_seasstd
@Title = Seasonal standard deviation
@BeginDescription
@IfMan
For every adjacent sequence t_1, ...,t_n of timesteps of the same season it is
Divisor is n. For every adjacent sequence t_1, ...,t_n of timesteps of the same season it is
o(t,x) = std{i(t',x), t1 < t' <= tn}
@EndifMan
@IfDoc
For every adjacent sequence \begin{math}t_1, ...,t_n\end{math} of timesteps of
Divisor is n. 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{\bf std}\{i(t',x), t_1 < t' \le t_n\}
......@@ -158,6 +178,26 @@ o(t,x) = \mbox{\bf std}\{i(t',x), t_1 < t' \le t_n\}
@EndOperator
@BeginOperator_seasstd1
@Title = Seasonal standard deviation
@BeginDescription
@IfMan
Divisor is (n-1). For every adjacent sequence t_1, ...,t_n of timesteps of the same season it is
o(t,x) = std1{i(t',x), t1 < t' <= tn}
@EndifMan
@IfDoc
Divisor is (n-1). 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{\bf std1}\{i(t',x), t_1 < t' \le t_n\}
@EndMath
@EndifDoc
@EndDescription
@EndOperator
@BeginExample
To compute the seasonal mean of a time series use:
@BeginVerbatim
......
@BeginModule
@NewPage
@Name = Yearmonmean
@Name = Yearmonstat
@Title = Yearly mean from monthly data
@Section = Statistical values
@Class = Statistic
......
......@@ -5,7 +5,7 @@
@Section = Statistical values
@Class = Statistic
@Arguments = ifile ofile
@Operators = yseasmin yseasmax yseassum yseasmean yseasavg yseasvar yseasstd
@Operators = yseasmin yseasmax yseassum yseasmean yseasavg yseasstd yseasstd1 yseasvar yseasvar1
@BeginDescription
This module computes statistical values of each season.
......@@ -160,6 +160,30 @@ o(\mbox{4},x) = \mbox{\bf var}\{i(t,x), \mbox{month}(i(t)) = \mbox{09, 10, 11}\}
@EndOperator
@BeginOperator_yseasvar1
@Title = Multi-year seasonal variance
@BeginDescription
@IfMan
o(1,x) = var1{i(t,x), month(i(t)) = 12, 01, 02}
o(2,x) = var1{i(t,x), month(i(t)) = 03, 04, 05}
o(3,x) = var1{i(t,x), month(i(t)) = 06, 07, 08}
o(4,x) = var1{i(t,x), month(i(t)) = 09, 10, 11}
@EndifMan
@IfDoc
@BeginMath
\begin{array}{c}
o(\mbox{1},x) = \mbox{\bf var1}\{i(t,x), \mbox{month}(i(t)) = \mbox{12, 01, 02}\} \\
o(\mbox{2},x) = \mbox{\bf var1}\{i(t,x), \mbox{month}(i(t)) = \mbox{03, 04, 05}\} \\
o(\mbox{3},x) = \mbox{\bf var1}\{i(t,x), \mbox{month}(i(t)) = \mbox{06, 07, 08}\} \\
o(\mbox{4},x) = \mbox{\bf var1}\{i(t,x), \mbox{month}(i(t)) = \mbox{09, 10, 11}\} \\
\end{array}
@EndMath
@EndifDoc
@EndDescription
@EndOperator
@BeginOperator_yseasstd
@Title = Multi-year seasonal standard deviation
......@@ -184,6 +208,30 @@ o(\mbox{4},x) = \mbox{\bf std}\{i(t,x), \mbox{month}(i(t)) = \mbox{09, 10, 11}\}
@EndOperator
@BeginOperator_yseasstd1
@Title = Multi-year seasonal standard deviation
@BeginDescription
@IfMan
o(1,x) = std1{i(t,x), month(i(t)) = 12, 01, 02}
o(2,x) = std1{i(t,x), month(i(t)) = 03, 04, 05}
o(3,x) = std1{i(t,x), month(i(t)) = 06, 07, 08}
o(4,x) = std1{i(t,x), month(i(t)) = 09, 10, 11}
@EndifMan
@IfDoc
@BeginMath
\begin{array}{c}
o(\mbox{1},x) = \mbox{\bf std1}\{i(t,x), \mbox{month}(i(t)) = \mbox{12, 01, 02}\} \\
o(\mbox{2},x) = \mbox{\bf std1}\{i(t,x), \mbox{month}(i(t)) = \mbox{03, 04, 05}\} \\
o(\mbox{3},x) = \mbox{\bf std1}\{i(t,x), \mbox{month}(i(t)) = \mbox{06, 07, 08}\} \\
o(\mbox{4},x) = \mbox{\bf std1}\{i(t,x), \mbox{month}(i(t)) = \mbox{09, 10, 11}\} \\
\end{array}
@EndMath
@EndifDoc
@EndDescription
@EndOperator
@BeginExample
To compute the seasonal mean over all input years use:
@BeginVerbatim
......
......@@ -2475,7 +2475,7 @@ static char *MonpctlHelp[] = {
NULL
};
static char *YearmonmeanHelp[] = {
static char *YearmonstatHelp[] = {
"NAME",
" yearmonmean - Yearly mean from monthly data",
"",
......@@ -2585,8 +2585,8 @@ static char *YearpctlHelp[] = {
static char *SeasstatHelp[] = {
"NAME",
" seasmin, seasmax, seassum, seasmean, seasavg, seasvar, seasstd - ",
" Seasonal statistical values",
" seasmin, seasmax, seassum, seasmean, seasavg, seasstd, seasstd1, seasvar, ",
" seasvar1 - Seasonal statistical values",
"",
"SYNOPSIS",
" <operator> ifile ofile",
......@@ -2620,14 +2620,22 @@ static char *SeasstatHelp[] = {
" For every adjacent sequence t_1, ...,t_n of timesteps of the same season it is",
" ",
" o(t,x) = avg{i(t',x), t1 < t' <= tn}",
" seasstd Seasonal standard deviation",
" Divisor is n. For every adjacent sequence t_1, ...,t_n of timesteps of the same season it is",
" ",
" o(t,x) = std{i(t',x), t1 < t' <= tn}",
" seasstd1 Seasonal standard deviation",
" Divisor is (n-1). For every adjacent sequence t_1, ...,t_n of timesteps of the same season it is",
" ",
" o(t,x) = std1{i(t',x), t1 < t' <= tn}",
" seasvar Seasonal variance",
" For every adjacent sequence t_1, ...,t_n of timesteps of the same season it is",
" Divisor is n. For every adjacent sequence t_1, ...,t_n of timesteps of the same season it is",
" ",
" o(t,x) = var{i(t',x), t1 < t' <= tn}",
" seasstd Seasonal standard deviation",
" For every adjacent sequence t_1, ...,t_n of timesteps of the same season it is",
" seasvar1 Seasonal variance",
" Divisor is (n-1). For every adjacent sequence t_1, ...,t_n of timesteps of the same season it is",
" ",
" o(t,x) = std{i(t',x), t1 < t' <= tn}",
" o(t,x) = var1{i(t',x), t1 < t' <= tn}",
NULL
};
......@@ -2908,8 +2916,8 @@ static char *YmonpctlHelp[] = {
static char *YseasstatHelp[] = {
"NAME",
" yseasmin, yseasmax, yseassum, yseasmean, yseasavg, yseasvar, yseasstd - ",
" Multi-year seasonal statistical values",
" yseasmin, yseasmax, yseassum, yseasmean, yseasavg, yseasstd, yseasstd1, ",
" yseasvar, yseasvar1 - Multi-year seasonal statistical values",
"",
"SYNOPSIS",
" <operator> ifile ofile",
......@@ -2946,16 +2954,26 @@ static char *YseasstatHelp[] = {
" o(2,x) = avg{i(t,x), month(i(t)) = 03, 04, 05}",
" o(3,x) = avg{i(t,x), month(i(t)) = 06, 07, 08}",
" o(4,x) = avg{i(t,x), month(i(t)) = 09, 10, 11}",
" yseasvar Multi-year seasonal variance",
" o(1,x) = var{i(t,x), month(i(t)) = 12, 01, 02}",
" o(2,x) = var{i(t,x), month(i(t)) = 03, 04, 05}",
" o(3,x) = var{i(t,x), month(i(t)) = 06, 07, 08}",
" o(4,x) = var{i(t,x), month(i(t)) = 09, 10, 11}",
" yseasstd Multi-year seasonal standard deviation",
" o(1,x) = std{i(t,x), month(i(t)) = 12, 01, 02}",
" o(2,x) = std{i(t,x), month(i(t)) = 03, 04, 05}",
" o(3,x) = std{i(t,x), month(i(t)) = 06, 07, 08}",
" o(4,x) = std{i(t,x), month(i(t)) = 09, 10, 11}",
" yseasstd1 Multi-year seasonal standard deviation",
" o(1,x) = std1{i(t,x), month(i(t)) = 12, 01, 02}",
" o(2,x) = std1{i(t,x), month(i(t)) = 03, 04, 05}",
" o(3,x) = std1{i(t,x), month(i(t)) = 06, 07, 08}",
" o(4,x) = std1{i(t,x), month(i(t)) = 09, 10, 11}",
" yseasvar Multi-year seasonal variance",
" o(1,x) = var{i(t,x), month(i(t)) = 12, 01, 02}",
" o(2,x) = var{i(t,x), month(i(t)) = 03, 04, 05}",
" o(3,x) = var{i(t,x), month(i(t)) = 06, 07, 08}",
" o(4,x) = var{i(t,x), month(i(t)) = 09, 10, 11}",
" yseasvar1 Multi-year seasonal variance",
" o(1,x) = var1{i(t,x), month(i(t)) = 12, 01, 02}",
" o(2,x) = var1{i(t,x), month(i(t)) = 03, 04, 05}",
" o(3,x) = var1{i(t,x), month(i(t)) = 06, 07, 08}",
" o(4,x) = var1{i(t,x), month(i(t)) = 09, 10, 11}",
NULL
};
......
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