From bda2f44dc2bad5b91c63264783f2b5c4c1fc6e90 Mon Sep 17 00:00:00 2001
From: Delaigue Olivier <olivier.delaigue@irstea.fr>
Date: Tue, 5 Jan 2021 18:13:45 +0100
Subject: [PATCH] v1.6.8.34 refactor: remove useless warning message in
getAggregConvertFun Refs 213e4c9b, 3e49873d #41
---
DESCRIPTION | 2 +-
NEWS.md | 2 +-
R/SeriesAggreg.InputsModel.R | 11 ++++-------
R/SeriesAggreg.OutputsModel.R | 11 ++++-------
R/UtilsSeriesAggreg.R | 6 ------
5 files changed, 10 insertions(+), 22 deletions(-)
diff --git a/DESCRIPTION b/DESCRIPTION
index a572c530..6af3f94b 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 9addb94c..f377f10d 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 b8ddd79b..9902fb97 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 17eab059..ad680452 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 1f489e80..bb371746 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)
}
--
GitLab