Skip to content
GitLab
Menu
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
ac753d03
Commit
ac753d03
authored
Apr 16, 2017
by
Uwe Schulzweida
Browse files
renamed prevarsum() to prevarsumw().
parent
a9d61320
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/field.c
View file @
ac753d03
...
...
@@ -402,8 +402,8 @@ double fldavgw(field_type field)
}
static
void
prevarsum
(
const
double
*
restrict
array
,
const
double
*
restrict
w
,
size_t
len
,
int
nmiss
,
double
missval
,
double
*
rsum
,
double
*
rsumw
,
double
*
rsumq
,
double
*
rsumwq
)
void
prevarsum
w
(
const
double
*
restrict
array
,
const
double
*
restrict
w
,
size_t
len
,
int
nmiss
,
double
missval
,
double
*
rsum
,
double
*
rsumw
,
double
*
rsumq
,
double
*
rsumwq
)
{
assert
(
array
!=
NULL
);
assert
(
w
!=
NULL
);
...
...
@@ -448,7 +448,7 @@ double fldvar(field_type field)
double
rsum
,
rsumw
;
double
rsumq
,
rsumwq
;
prevarsum
(
field
.
ptr
,
field
.
weight
,
len
,
nmiss
,
missval
,
&
rsum
,
&
rsumw
,
&
rsumq
,
&
rsumwq
);
prevarsum
w
(
field
.
ptr
,
field
.
weight
,
len
,
nmiss
,
missval
,
&
rsum
,
&
rsumw
,
&
rsumq
,
&
rsumwq
);
double
rvar
=
IS_NOT_EQUAL
(
rsumw
,
0
)
?
(
rsumq
*
rsumw
-
rsum
*
rsum
)
/
(
rsumw
*
rsumw
)
:
missval
;
if
(
rvar
<
0
&&
rvar
>
-
1.e-5
)
rvar
=
0
;
...
...
@@ -465,7 +465,7 @@ double fldvar1(field_type field)
double
rsum
,
rsumw
;
double
rsumq
,
rsumwq
;
prevarsum
(
field
.
ptr
,
field
.
weight
,
len
,
nmiss
,
missval
,
&
rsum
,
&
rsumw
,
&
rsumq
,
&
rsumwq
);
prevarsum
w
(
field
.
ptr
,
field
.
weight
,
len
,
nmiss
,
missval
,
&
rsum
,
&
rsumw
,
&
rsumq
,
&
rsumwq
);
double
rvar
=
(
rsumw
*
rsumw
>
rsumwq
)
?
(
rsumq
*
rsumw
-
rsum
*
rsum
)
/
(
rsumw
*
rsumw
-
rsumwq
)
:
missval
;
if
(
rvar
<
0
&&
rvar
>
-
1.e-5
)
rvar
=
0
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a 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