diff --git a/DESCRIPTION b/DESCRIPTION index a572c530999730690ddab6428dd5605b7e64c929..6af3f94b416e5dcf383cdff278cf08e8676f136e 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.6.8.33 +Version: 1.6.8.34 Date: 2021-01-05 Authors@R: c( person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")), diff --git a/NEWS.md b/NEWS.md index 9addb94c20e0f94c59411696f9e2d4df4c98fb8f..f377f10d4e0e5ede5e2a7d8a3ee842e12d5434e8 100644 --- a/NEWS.md +++ b/NEWS.md @@ -2,7 +2,7 @@ -### 1.6.8.33 Release Notes (2021-01-05) +### 1.6.8.34 Release Notes (2021-01-05) #### New features diff --git a/R/SeriesAggreg.InputsModel.R b/R/SeriesAggreg.InputsModel.R index b8ddd79be85d94d407c34bc593362011ee2aea52..9902fb97dea8f00db7286737722c41a3437b8d03 100644 --- a/R/SeriesAggreg.InputsModel.R +++ b/R/SeriesAggreg.InputsModel.R @@ -1,9 +1,6 @@ SeriesAggreg.InputsModel <- function(x, ...) { - res <- suppressMessages( - SeriesAggreg.list(x, - ConvertFun = getAggregConvertFun(names(x)), - except = c("ZLayers", "LengthHydro", "BasinAreas"), - ...) - ) - return(res) + SeriesAggreg.list(x, + ConvertFun = getAggregConvertFun(names(x)), + except = c("ZLayers", "LengthHydro", "BasinAreas"), + ...) } diff --git a/R/SeriesAggreg.OutputsModel.R b/R/SeriesAggreg.OutputsModel.R index 17eab0594fc6e1a3360f2be64ceb74cc933a51dd..ad680452168344d573522fbb3dbf56a068be9c8a 100644 --- a/R/SeriesAggreg.OutputsModel.R +++ b/R/SeriesAggreg.OutputsModel.R @@ -1,9 +1,6 @@ SeriesAggreg.OutputsModel <- function(x, ...) { - res <- suppressMessages( - SeriesAggreg.list(x, - ConvertFun = getAggregConvertFun(names(x)), - except = "StateEnd", - ...) - ) - return(res) + SeriesAggreg.list(x, + ConvertFun = getAggregConvertFun(names(x)), + except = "StateEnd", + ...) } diff --git a/R/UtilsSeriesAggreg.R b/R/UtilsSeriesAggreg.R index 1f489e80f9d3a1a0098fe02580dadce4fd58d549..bb371746d2798a653eb7feca5721d89f439e3bed 100644 --- a/R/UtilsSeriesAggreg.R +++ b/R/UtilsSeriesAggreg.R @@ -53,11 +53,5 @@ getAggregConvertFun <- function(Outputs) { iRes <- AggregConvertFunTable$ConvertFun[AggregConvertFunTable$Outputs == iOutputs] iRes <- ifelse(test = any(is.na(iRes)), yes = NA, no = iRes) # R < 4.0 compatibility }) - if (length(res) > 0) { - message("Variables automatically aggregated as follow:") - widthMsg <- max(nchar(c(names(res), res)), na.rm = TRUE) + 1 + 2 - message(format(names(res) , width = widthMsg, justify = "right")) - message(format(shQuote(res), width = widthMsg, justify = "right")) - } return(res) }