diff --git a/DESCRIPTION b/DESCRIPTION index ecaa3a6ba2ad44e8fbc3b78b0e493ed64567d43c..d5549d6d7d6b261c9d0277ade6f023c28676378a 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.9 +Version: 1.2.11.10 Date: 2019-03-25 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 bc0032051f096dc23b5e39fd6f77fdec9b80a91a..3c71ce5a127df5c3dfee664ae751af2e51ffc605 100644 --- a/NEWS.rmd +++ b/NEWS.rmd @@ -13,7 +13,7 @@ output: -### 1.2.11.9 Release Notes (2019-03-25) +### 1.2.11.10 Release Notes (2019-03-25) diff --git a/R/CreateInputsCrit.R b/R/CreateInputsCrit.R index aa73a2a1378367fd43df075996124ca61af5f728..4d84ec9447ba11581ad394088133f33f9a0563b9 100644 --- a/R/CreateInputsCrit.R +++ b/R/CreateInputsCrit.R @@ -85,6 +85,9 @@ CreateInputsCrit <- function(FUN_CRIT, listArgs[[iArgs]] <- lapply(seq_along(listArgs$FUN_CRIT), function(x) NULL) } } + if (iArgs %in% c("FUN_CRIT", "varObs", "transfo", "weights") & length(listArgs[[iArgs]]) > 1L) { + listArgs[[iArgs]] <- as.list(listArgs[[iArgs]]) + } if (!is.list(listArgs[[iArgs]])) { listArgs[[iArgs]] <- list(listArgs[[iArgs]]) } @@ -196,7 +199,11 @@ CreateInputsCrit <- function(FUN_CRIT, ## check 'varObs' + 'obs' if (any(iListArgs2$varObs %in% "SCA")) { idSCA <- which(iListArgs2$varObs == "SCA") - vecSCA <- unlist(iListArgs2$obs[idSCA]) + if (length(idSCA) == 1L) { + vecSCA <- iListArgs2$obs + } else { + vecSCA <- unlist(iListArgs2$obs[idSCA]) + } if (min(vecSCA, na.rm = TRUE) < 0 | max(vecSCA, na.rm = TRUE) > 1) { stop("'obs' outside [0,1] for \"SCA\"", call. = FALSE) } @@ -204,7 +211,11 @@ CreateInputsCrit <- function(FUN_CRIT, inPosVarObs <- c("Q", "SWE") if (any(iListArgs2$varObs %in% inPosVarObs)) { idQSS <- which(iListArgs2$varObs %in% inPosVarObs) - vecQSS <- unlist(iListArgs2$obs[idQSS]) + if (length(idQSS) == 1L) { + vecQSS <- iListArgs2$obs + } else { + vecQSS <- unlist(iListArgs2$obs[idQSS]) + } if (min(vecQSS, na.rm = TRUE) < 0) { stop(sprintf("'obs' outside [0,Inf[ for \"%s\"", iListArgs2$varObs), call. = FALSE) } @@ -248,7 +259,7 @@ CreateInputsCrit <- function(FUN_CRIT, obs = iListArgs2$obs, varObs = iListArgs2$varObs, BoolCrit = iListArgs2$BoolCrit, - idLayer = iListArgs2$idLayer, + idLayer = iListArgs2$idLayer, transfo = iListArgs2$transfo, epsilon = iListArgs2$epsilon, weights = iListArgs2$weights)