diff --git a/DESCRIPTION b/DESCRIPTION index 481de5209390f56875800948d061aefb75420269..5807afc31222c95f661dabb939f3ab916bcaa7b0 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Package: airGR Type: Package Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling -Version: 1.6.9.9 -Date: 2021-01-08 +Version: 1.6.9.10 +Date: 2021-01-11 Authors@R: c( person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")), person("Olivier", "Delaigue", role = c("aut", "cre"), comment = c(ORCID = "0000-0002-7668-8468"), email = "airGR@inrae.fr"), diff --git a/NEWS.md b/NEWS.md index 145e53bd95478c7dcf339e76889f0ca70b2a48e6..6b8f7269f19d991bcce243fd29c3a4d329805678 100644 --- a/NEWS.md +++ b/NEWS.md @@ -2,7 +2,7 @@ -### 1.6.9.9 Release Notes (2021-01-08) +### 1.6.9.10 Release Notes (2021-01-11) #### New features diff --git a/R/SeriesAggreg.list.R b/R/SeriesAggreg.list.R index 2298a9f136ab8d6117db83d100f5e17d295b9ab6..55f054b9c37a7bfaf3e8d6e1f8b9bc7419e9c39a 100644 --- a/R/SeriesAggreg.list.R +++ b/R/SeriesAggreg.list.R @@ -17,11 +17,11 @@ SeriesAggreg.list <- function(x, call. = FALSE) } # Check ConvertFun - if (any(class(x) %in% c("InputsModel", "OutputsModel"))) { + if (any(classIni %in% c("InputsModel", "OutputsModel"))) { if (!all(is.na(ConvertFun))) { warning("Argument 'ConvertFun' is ignored on 'InputsModel' and 'OutputsModel' objects") } - } else if (length(ConvertFun)!=1) { + } else if (length(ConvertFun) != 1) { stop("Argument 'ConvertFun' must be of length 1 with 'list' object") } else if (!is.character(ConvertFun)) { stop("Argument 'ConvertFun' must be a character")