diff --git a/DESCRIPTION b/DESCRIPTION index d123a3efa8914fe55ffdb729efc446be32ce6d6e..6d93bc53ef00b855f3baa242b383f546f81cdde7 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: airGR Type: Package Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling -Version: 1.2.11.16 +Version: 1.2.11.17 Date: 2019-03-27 Authors@R: c( person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")), diff --git a/NEWS.rmd b/NEWS.rmd index 97cc789371635d60fc1eab6da06360afdc1288e3..88d99c4e49fdeeb6c17b00562965eb6b001d7939 100644 --- a/NEWS.rmd +++ b/NEWS.rmd @@ -13,7 +13,7 @@ output: -### 1.2.11.16 Release Notes (2019-03-27) +### 1.2.11.17 Release Notes (2019-03-27) diff --git a/R/ErrorCrit.R b/R/ErrorCrit.R index 5ea035f3cac912a9f1569d0d799df8016804f107..5c997e27d57595e11251a7b1ec182cd7a761eed1 100644 --- a/R/ErrorCrit.R +++ b/R/ErrorCrit.R @@ -41,7 +41,6 @@ ErrorCrit <- function(InputsCrit, OutputsModel, FUN_CRIT, warnings = TRUE, verbo listweights <- unlist(lapply(InputsCrit, function(x) x[["weights"]])) listweights <- listweights / sum(listweights) - if (inherits(InputsCrit, "Compo")) { CritValue <- sum(listValCrit * listweights) OutputsCritCompo <- list(MultiCritValues = listValCrit,