diff --git a/DESCRIPTION b/DESCRIPTION index 63011b1de60a25787c5b1b897b0091c8c10fa699..b2c77fcefdaa9f3be7b7c250bfd2f7f512b1edda 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.9.33 +Version: 1.2.9.34 Date: 2019-03-21 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 6e4cff93f17a966327a9e126dbff1345736d5193..e89e0352aa9994c852feb4343d391d24cc933b72 100644 --- a/NEWS.rmd +++ b/NEWS.rmd @@ -13,7 +13,7 @@ output: -### 1.2.9.33 Release Notes (2019-03-21) +### 1.2.9.34 Release Notes (2019-03-21) diff --git a/R/ErrorCrit.R b/R/ErrorCrit.R index 80a25770937e5c426f5c4190b026cf95dc2c7a6d..5ea035f3cac912a9f1569d0d799df8016804f107 100644 --- a/R/ErrorCrit.R +++ b/R/ErrorCrit.R @@ -19,8 +19,8 @@ ErrorCrit <- function(InputsCrit, OutputsModel, FUN_CRIT, warnings = TRUE, verbo ## ----- Single criterion if (inherits(InputsCrit, "Single")) { - OutputsCrit <- InputsCrit$FUN_CRIT(InputsCrit, - OutputsModel, + OutputsCrit <- InputsCrit$FUN_CRIT(InputsCrit = InputsCrit, + OutputsModel = OutputsModel, warnings = warnings, verbose = verbose) } @@ -30,7 +30,10 @@ ErrorCrit <- function(InputsCrit, OutputsModel, FUN_CRIT, warnings = TRUE, verbo if (inherits(InputsCrit, "Multi") | inherits(InputsCrit, "Compo")) { listOutputsCrit <- lapply(InputsCrit, FUN = function(iInputsCrit) { - iInputsCrit$FUN_CRIT(iInputsCrit, OutputsModel, warnings = warnings, verbose = verbose) + iInputsCrit$FUN_CRIT(InputsCrit = iInputsCrit, + OutputsModel = OutputsModel, + warnings = warnings, + verbose = verbose) }) listValCrit <- sapply(listOutputsCrit, function(x) x[["CritValue"]])