makeAnnualStat array code doesn't handle custom FUN

[bpbond]

...as far as I can see. The test code passes weighted.mean into makeAnnualStat and is getting back the unweighted mean.

[ktoddbrown]

Is it resolved now?

[bpbond]

Hmm, no:

1. Failure(@test_makeAnnualStat.R#151): makeAnnualStat handles custom function and dots -------
RCMIP5:::vals(res1) not equal to ans$value
Mean relative difference: 0.2777778
array

The test code that gets executed:

years <- 1850:1851
llsize <- 2
d <- cmip5data(years, lonsize=llsize, latsize=llsize, loadAs="array")
        # All data 1, except December, which is 2
d$val <- array(1, dim=dim(d$val))
d$val[,,,round(d$time %% 1, 3)==.958] <- 2                
        # Weights are all 1 except December, which is 11
w <- c(rep(1, 11), 11)
res1 <- makeAnnualStat(d, verbose=F, sortData=F, filterNum=T, FUN=weighted.mean, w)

...which (wrongly) returns 1.083, the unweighted mean.

[ktoddbrown]

On it.

[ktoddbrown]

Done, see d1202b1