diff --git a/DESCRIPTION b/DESCRIPTION index 7676f2362be7aabe97d12bd70c8541170b9e9b72..d6b90c08ace6f4e051dfbafa97e456e7362dae12 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.4.8.2 +Version: 1.4.8.3 Date: 2020-05-04 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 2150d9b7a434007b464c905b91537906ddd82c6a..847893cc085f272ac506ae8f22765f9726151277 100644 --- a/NEWS.md +++ b/NEWS.md @@ -4,7 +4,7 @@ -### 1.4.8.2 Release Notes (2020-05-04) +### 1.4.8.3 Release Notes (2020-05-04) #### New features diff --git a/R/SeriesAggreg2.default.R b/R/SeriesAggreg2.default.R index fd4d44e3e15b78cb4891452ff4de8d29ec2473b4..fb2c61efafae1b6b34e315eb39ebf92faf953cb3 100644 --- a/R/SeriesAggreg2.default.R +++ b/R/SeriesAggreg2.default.R @@ -41,7 +41,7 @@ SeriesAggreg2.default <- function(TabSeries, tmp <- cbind(TabSeries$DatesR, as.data.frame(iLayer)) res <- SeriesAggreg2(tmp, Format = Format, TimeFormat = TimeFormat, NewTimeFormat = NewTimeFormat, - ConvertFun = .AggregOutputs(gsub("[.].*", "", colnames(tmp)[-1L])), + ConvertFun = .AggregConvertFun(gsub("[.].*", "", colnames(tmp)[-1L])), YearFirstMonth = YearFirstMonth, TimeLag = TimeLag, verbose = verbose) res <- res[, -1L] @@ -54,7 +54,7 @@ SeriesAggreg2.default <- function(TabSeries, NewTabSeries <- SeriesAggreg2(TabSeries = TabSeries2, Format = Format, TimeFormat = TimeFormat, NewTimeFormat = NewTimeFormat, - ConvertFun = .AggregOutputs(colnames(TabSeries2)[-1L]), + ConvertFun = .AggregConvertFun(colnames(TabSeries2)[-1L]), YearFirstMonth = YearFirstMonth, TimeLag = TimeLag, verbose = verbose) TabSeries$zzz <- NULL