diff --git a/DESCRIPTION b/DESCRIPTION
index 7def0fac7ea0e355830c07e293995190fa5a7950..a572c530999730690ddab6428dd5605b7e64c929 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.8.32
-Date: 2020-12-23
+Version: 1.6.8.33
+Date: 2021-01-05
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/NAMESPACE b/NAMESPACE
index 1be9c1e1924aa1bd1855188711b0f0c2ca1814dc..5d211da10e84c0fd65df7e835c17e466ee96d4a7 100644
--- a/NAMESPACE
+++ b/NAMESPACE
@@ -63,9 +63,6 @@ export(TransfoParam_GR5J)
export(TransfoParam_GR6J)
export(TransfoParam_Lag)
export(.ErrorCrit)
-export(.AggregConvertFunTable)
-
-
#####################################
diff --git a/NEWS.md b/NEWS.md
index f32128778331da4728d239ca53797f85d7fe3e0b..9addb94c20e0f94c59411696f9e2d4df4c98fb8f 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -2,7 +2,7 @@
-### 1.6.8.32 Release Notes (2020-12-23)
+### 1.6.8.33 Release Notes (2021-01-05)
#### New features
diff --git a/R/SeriesAggreg.data.frame.R b/R/SeriesAggreg.data.frame.R
index efbd9bec12c341ed62e3d43c4c29014fa39dee32..fd97145bf0994bdbaf5dba0f45163f002f65714c 100644
--- a/R/SeriesAggreg.data.frame.R
+++ b/R/SeriesAggreg.data.frame.R
@@ -1,6 +1,6 @@
SeriesAggreg.data.frame <- function(x,
Format,
- ConvertFun = getAggregConvertFun(names(x)[-1]),
+ ConvertFun,
TimeFormat = NULL,
NewTimeFormat = NULL,
YearFirstMonth = 1,
diff --git a/man/SeriesAggreg.Rd b/man/SeriesAggreg.Rd
index 2fe8a567753d9c24efaf4567ed8f60435147855c..41d4a8a341b24ebaad551e80942a3b392fb7b0b9 100644
--- a/man/SeriesAggreg.Rd
+++ b/man/SeriesAggreg.Rd
@@ -24,16 +24,11 @@ Warning: on the aggregated outputs, the dates correspond to the beginning of the
\code{\link{SeriesAggreg.InputsModel}} and \code{\link{SeriesAggreg.OutputsModel}}
call \code{\link{SeriesAggreg.list}} which itself calls \code{\link{SeriesAggreg.data.frame}}.
So, all arguments passed to any \code{\link{SeriesAggreg}} method will be passed to \code{\link{SeriesAggreg.data.frame}}.
-
- If \code{ConvertFun} is not provided, the operation to perform is guessed from the name of the list items or column
- name dataframe in respect with the matching table \code{.AggregConvertFunTable}.
}
-
-
\usage{
\method{SeriesAggreg}{data.frame}(x,
Format,
- ConvertFun = getAggregConvertFun(names(x)[-1]),
+ ConvertFun,
TimeFormat = NULL,
NewTimeFormat = NULL,
YearFirstMonth = 1,
diff --git a/tests/testthat/test-SeriesAggreg.R b/tests/testthat/test-SeriesAggreg.R
index 905a6f19bf717bdee5b1600963bdd4ad91362305..f71db81857c4531093ed3c6d123dcbea053dfe45 100644
--- a/tests/testthat/test-SeriesAggreg.R
+++ b/tests/testthat/test-SeriesAggreg.R
@@ -66,7 +66,8 @@ test_that("Check SeriesAggreg output values on yearly aggregation", {
c("P", "E", "Qmm")], 2, sum)
TestedValues <- unlist(SeriesAggreg(TabSeries,
Format = "%Y",
- YearFirstMonth = 9)[1, c("P", "E", "Qmm")])
+ YearFirstMonth = 9,
+ ConvertFun = rep("sum", 3))[1, c("P", "E", "Qmm")])
expect_equal(GoodValues, TestedValues)
})