Commit 692e62cc authored by Delaigue Olivier's avatar Delaigue Olivier Committed by Dorchies David
Browse files

v1.4.8.3 fix: SeriesAggreg2.default now uses AggregConvertFun instead of .AggregOutput #41

see commit 312d7369
parent d7c694aa
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")),
......
......@@ -4,7 +4,7 @@
### 1.4.8.2 Release Notes (2020-05-04)
### 1.4.8.3 Release Notes (2020-05-04)
#### New features
......
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment