Commit 4d01d96c authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

Renamed Subtrend.cc to Trendarith.cc.

parent eedd70cc
......@@ -495,7 +495,8 @@ Operator catalog:
Regres regres Regression
Detrend detrend Detrend
Trend trend Trend
Subtrend subtrend Subtract trend
Trendarith addtrend Add trend
Trendarith subtrend Subtract trend
-------------------------------------------------------------
EOFs
-------------------------------------------------------------
......
......@@ -101,7 +101,7 @@ Timcovar Correlation and co.
Regres Regression
Detrend Regression
Trend Regression
Subtrend Regression
Trendarith Regression
EOFs EOFs
Eofcoeff EOFs
Remapbil Interpolation
......
@BeginModule
@Name = Subtrend
@Title = Subtract a trend
@NewPage
@Name = Trendarith
@Title = Add or subtract a trend
@Section = Regression
@Class = Regression
@Arguments = infile1 infile2 infile3 outfile
@Operators = subtrend
@Operators = addtrend subtrend
@BeginDescription
This module is for adding or subtracting a trend computed by the operator @mod{trend}.
@EndDescription
@EndModule
@BeginOperator_addtrend
@Title = Add trend
@BeginDescription
@IfMan
It is
o(t,x) = i_1(t,x) + (i_2(1,x) + i_3(1,x)*t)
@EndifMan
@IfDoc
It is
@BeginDisplayMath
o(t,x) = i_1(t,x) + (i_2(1,x) + i_3(1,x) \cdot t)
@EndDisplayMath
@EndifDoc
where t is the timesteps.
@EndDescription
@EndOperator
@BeginOperator_subtrend
@Title = Subtract trend
@BeginDescription
This operator is for subtracting a trend computed by the operator @mod{trend}.
@IfMan
It is
......
......@@ -408,7 +408,6 @@ cdo_SOURCES += Adisit.cc \
Splitsel.cc \
Splittime.cc \
Splityear.cc \
Subtrend.cc \
Tee.cc \
Templates.cc \
Test.cc \
......@@ -426,6 +425,7 @@ cdo_SOURCES += Adisit.cc \
Tocomplex.cc \
Transpose.cc \
Trend.cc \
Trendarith.cc \
Tstepcount.cc \
Unpack.cc \
Vargen.cc \
......
......@@ -38,7 +38,7 @@ subtrend(int tsID, const Field &field1, const Field &field2, const Field &field3
}
void *
Subtrend(void *process)
Trendarith(void *process)
{
int varID, levelID;
......
......@@ -1647,7 +1647,6 @@ void init_modules()
{"Splitsel" ,module_Splitsel },
{"Splittime" ,module_Splittime },
{"Splityear" ,module_Splityear },
{"Subtrend" ,module_Subtrend },
{"Tee" ,module_Tee },
{"Template1" ,module_Template1 },
{"Template2" ,module_Template2 },
......@@ -1682,6 +1681,7 @@ void init_modules()
{"Tocomplex" ,module_Tocomplex },
{"Transpose" ,module_Transpose },
{"Trend" ,module_Trend },
{"Trendarith" ,module_Trendarith },
{"Tstepcount" ,module_Tstepcount },
{"Unpack" ,module_Unpack },
{"Vargen" ,module_Vargen },
......
......@@ -478,9 +478,6 @@ void *Splittime(void *argument);
void *Splityear(void *argument);
#define SplityearOperators {"splityear", "splityearmon"}
void *Subtrend(void *argument);
#define SubtrendOperators {"subtrend"}
void *Tee(void *argument);
#define TeeOperators {"tee"}
......@@ -556,6 +553,9 @@ void *Transpose(void *argument);
void *Trend(void *argument);
#define TrendOperators {"trend"}
void *Trendarith(void *argument);
#define TrendarithOperators {"addtrend", "subtrend"}
void *Tstepcount(void *argument);
#define TstepcountOperators {"tstepcount"}
......
......@@ -180,7 +180,6 @@ static const module_t module_Splitrec = {Splitrec , SplitHelp
static const module_t module_Splitsel = {Splitsel , SplitselHelp , SplitselOperators , EXPOSED , CDI_BOTH , 1 , OBASE , OnlyFirst };
static const module_t module_Splittime = {Splittime , SplittimeHelp , SplittimeOperators , EXPOSED , CDI_BOTH , 1 , OBASE , OnlyFirst };
static const module_t module_Splityear = {Splityear , SplittimeHelp , SplityearOperators , EXPOSED , CDI_BOTH , 1 , OBASE , NoRestriction };
static const module_t module_Subtrend = {Subtrend , SubtrendHelp , SubtrendOperators , EXPOSED , CDI_REAL , 3 , 1 , NoRestriction };
static const module_t module_Tee = {Tee , TeeHelp , TeeOperators , EXPOSED , CDI_REAL , 1 , 1 , NoRestriction };
static const module_t module_Template1 = {Template1 , {} , Template1Operators , INTERNAL , CDI_REAL , 1 , 1 , NoRestriction };
static const module_t module_Template2 = {Template2 , {} , Template2Operators , INTERNAL , CDI_REAL , 1 , 1 , NoRestriction };
......@@ -215,6 +214,7 @@ static const module_t module_Tinfo = {Tinfo , {}
static const module_t module_Tocomplex = {Tocomplex , {} , TocomplexOperators , EXPOSED , CDI_REAL , 1 , 1 , NoRestriction };
static const module_t module_Transpose = {Transpose , {} , TransposeOperators , EXPOSED , CDI_REAL , 1 , 1 , NoRestriction };
static const module_t module_Trend = {Trend , TrendHelp , TrendOperators , EXPOSED , CDI_REAL , 1 , 2 , OnlyFirst };
static const module_t module_Trendarith = {Trendarith , TrendarithHelp , TrendarithOperators , EXPOSED , CDI_REAL , 3 , 1 , NoRestriction };
static const module_t module_Tstepcount = {Tstepcount , {} , TstepcountOperators , EXPOSED , CDI_REAL , 1 , 1 , NoRestriction };
static const module_t module_Unpack = {Unpack , {} , UnpackOperators , EXPOSED , CDI_REAL , 1 , 1 , NoRestriction };
static const module_t module_Vargen = {Vargen , VargenHelp , VargenOperators , EXPOSED , CDI_REAL , 0 , 1 , NoRestriction };
......
......@@ -3756,19 +3756,27 @@ static const std::vector<std::string> TrendHelp = {
" equal BOOL Set to false for unequal distributed timesteps (default: true)",
};
static const std::vector<std::string> SubtrendHelp = {
static const std::vector<std::string> TrendarithHelp = {
"NAME",
" subtrend - Subtract a trend",
" addtrend, subtrend - Add or subtract a trend",
"",
"SYNOPSIS",
" subtrend infile1 infile2 infile3 outfile",
" <operator> infile1 infile2 infile3 outfile",
"",
"DESCRIPTION",
" This operator is for subtracting a trend computed by the operator trend.",
" It is",
" ",
" o(t,x) = i_1(t,x) - (i_2(1,x) + i_3(1,x)*t)",
" where t is the timesteps.",
" This module is for adding or subtracting a trend computed by the operator trend.",
"",
"OPERATORS",
" addtrend Add trend",
" It is",
" ",
" o(t,x) = i_1(t,x) + (i_2(1,x) + i_3(1,x)*t)",
" where t is the timesteps.",
" subtrend Subtract trend",
" It is",
" ",
" o(t,x) = i_1(t,x) - (i_2(1,x) + i_3(1,x)*t)",
" where t is the timesteps.",
};
static const std::vector<std::string> EOFsHelp = {
......
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