Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
mpim-sw
cdo
Commits
21065eea
Commit
21065eea
authored
Jun 14, 2017
by
Oliver Heidmann
Browse files
Merge branch 'develop' of git.mpimet.mpg.de:cdo into develop
parents
ff3ca441
7a2c0dab
Changes
42
Hide whitespace changes
Inline
Side-by-side
src/Yseasstat.cc
View file @
21065eea
...
...
@@ -78,6 +78,7 @@ void *Yseasstat(void *argument)
cdoInitialize
(
argument
);
// clang-format off
cdoOperatorAdd
(
"yseasrange"
,
func_range
,
0
,
NULL
);
cdoOperatorAdd
(
"yseasmin"
,
func_min
,
0
,
NULL
);
cdoOperatorAdd
(
"yseasmax"
,
func_max
,
0
,
NULL
);
...
...
@@ -92,6 +93,13 @@ void *Yseasstat(void *argument)
int
operatorID
=
cdoOperatorID
();
int
operfunc
=
cdoOperatorF1
(
operatorID
);
bool
lrange
=
operfunc
==
func_range
;
bool
lmean
=
operfunc
==
func_mean
||
operfunc
==
func_avg
;
bool
lstd
=
operfunc
==
func_std
||
operfunc
==
func_std1
;
bool
lvarstd
=
operfunc
==
func_std
||
operfunc
==
func_var
||
operfunc
==
func_std1
||
operfunc
==
func_var1
;
int
divisor
=
operfunc
==
func_std1
||
operfunc
==
func_var1
;
// clang-format on
for
(
int
seas
=
0
;
seas
<
NSEAS
;
seas
++
)
{
vars1
[
seas
]
=
NULL
;
...
...
@@ -102,12 +110,6 @@ void *Yseasstat(void *argument)
datetime
[
seas
].
vtime
=
0
;
}
bool
lrange
=
operfunc
==
func_range
;
bool
lmean
=
operfunc
==
func_mean
||
operfunc
==
func_avg
;
bool
lstd
=
operfunc
==
func_std
||
operfunc
==
func_std1
;
bool
lvarstd
=
operfunc
==
func_std
||
operfunc
==
func_var
||
operfunc
==
func_std1
||
operfunc
==
func_var1
;
int
divisor
=
operfunc
==
func_std1
||
operfunc
==
func_var1
;
int
streamID1
=
pstreamOpenRead
(
cdoStreamName
(
0
));
int
vlistID1
=
pstreamInqVlist
(
streamID1
);
...
...
src/Zonstat.cc
View file @
21065eea
...
...
@@ -50,6 +50,7 @@ void *Zonstat(void *argument)
cdoInitialize
(
argument
);
// clang-format off
cdoOperatorAdd
(
"zonmin"
,
func_min
,
0
,
NULL
);
cdoOperatorAdd
(
"zonmax"
,
func_max
,
0
,
NULL
);
cdoOperatorAdd
(
"zonrange"
,
func_range
,
0
,
NULL
);
...
...
@@ -61,6 +62,7 @@ void *Zonstat(void *argument)
cdoOperatorAdd
(
"zonstd"
,
func_std
,
0
,
NULL
);
cdoOperatorAdd
(
"zonstd1"
,
func_std1
,
0
,
NULL
);
cdoOperatorAdd
(
"zonpctl"
,
func_pctl
,
0
,
NULL
);
// clang-format on
int
operatorID
=
cdoOperatorID
();
int
operfunc
=
cdoOperatorF1
(
operatorID
);
...
...
Prev
1
2
3
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment