Commit ac753d03 authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

renamed prevarsum() to prevarsumw().

parent a9d61320
...@@ -402,8 +402,8 @@ double fldavgw(field_type field) ...@@ -402,8 +402,8 @@ double fldavgw(field_type field)
} }
static static
void prevarsum(const double *restrict array, const double *restrict w, size_t len, int nmiss, void prevarsumw(const double *restrict array, const double *restrict w, size_t len, int nmiss,
double missval, double *rsum, double *rsumw, double *rsumq, double *rsumwq) double missval, double *rsum, double *rsumw, double *rsumq, double *rsumwq)
{ {
assert(array!=NULL); assert(array!=NULL);
assert(w!=NULL); assert(w!=NULL);
...@@ -448,7 +448,7 @@ double fldvar(field_type field) ...@@ -448,7 +448,7 @@ double fldvar(field_type field)
double rsum, rsumw; double rsum, rsumw;
double rsumq, rsumwq; double rsumq, rsumwq;
prevarsum(field.ptr, field.weight, len, nmiss, missval, &rsum, &rsumw, &rsumq, &rsumwq); prevarsumw(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; double rvar = IS_NOT_EQUAL(rsumw, 0) ? (rsumq*rsumw - rsum*rsum) / (rsumw*rsumw) : missval;
if ( rvar < 0 && rvar > -1.e-5 ) rvar = 0; if ( rvar < 0 && rvar > -1.e-5 ) rvar = 0;
...@@ -465,7 +465,7 @@ double fldvar1(field_type field) ...@@ -465,7 +465,7 @@ double fldvar1(field_type field)
double rsum, rsumw; double rsum, rsumw;
double rsumq, rsumwq; double rsumq, rsumwq;
prevarsum(field.ptr, field.weight, len, nmiss, missval, &rsum, &rsumw, &rsumq, &rsumwq); prevarsumw(field.ptr, field.weight, len, nmiss, missval, &rsum, &rsumw, &rsumq, &rsumwq);
double rvar = (rsumw*rsumw > rsumwq) ? (rsumq*rsumw - rsum*rsum) / (rsumw*rsumw - rsumwq) : missval; double rvar = (rsumw*rsumw > rsumwq) ? (rsumq*rsumw - rsum*rsum) / (rsumw*rsumw - rsumwq) : missval;
if ( rvar < 0 && rvar > -1.e-5 ) rvar = 0; if ( rvar < 0 && rvar > -1.e-5 ) rvar = 0;
......
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