From 6983d111d22212416c0f386af2e649be79bfc323 Mon Sep 17 00:00:00 2001 From: aho Date: Thu, 8 Jul 2021 17:10:18 +0200 Subject: [PATCH] Bugfix for 2-dim data input --- R/WeightedMean.R | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/R/WeightedMean.R b/R/WeightedMean.R index 2ab1a1a..81077ca 100644 --- a/R/WeightedMean.R +++ b/R/WeightedMean.R @@ -103,9 +103,13 @@ WeightedMean <- function(data, lon, lat, region = NULL, mask = NULL, londim = NU mask <- aux$mask } } - wtmean <- aaply(data, .margins = dims[c(-londim, -latdim)], - .fun = .WeightedMean, lon, lat, mask, .drop = FALSE) - dim(wtmean) <- dim(data)[-c(latdim,londim)] + if (length(dim(data)) > 2) { + wtmean <- aaply(data, .margins = dims[c(-londim, -latdim)], + .fun = .WeightedMean, lon, lat, mask, .drop = FALSE) + dim(wtmean) <- dim(data)[-c(latdim,londim)] + } else { + wtmean <- .WeightedMean(data, lon = lon, lat = lat, mask = mask) + } if(length(dim(data)) > 3) { if (is.null(dim_names)) { dim_names <- paste0("dim", 1:length(dim(data))) -- GitLab