diff --git a/DESCRIPTION b/DESCRIPTION index 8b9a3c26d3d14d27e7ffd5f6165ffb551567dc92..01382f947663a53965fdacf6b4f37108ee1f0506 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.4.4.18 -Date: 2020-04-09 +Version: 1.4.4.19 +Date: 2020-04-10 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/NEWS.md b/NEWS.md index d62bd6b94189375ec22328a81c0a93e4ffe0093f..16ef4ca68c18db9a05199e99518e1f7acd579fce 100644 --- a/NEWS.md +++ b/NEWS.md @@ -4,7 +4,7 @@ -### 1.4.4.18 Release Notes (2020-04-09) +### 1.4.4.19 Release Notes (2020-04-10) #### New features diff --git a/R/SeriesAggreg2.R b/R/SeriesAggreg2.R index 412029943eaee2ea9677d8b78a9e7873aacd7379..9e2a7aac9581c72d29684eadde4047d5bbc7c79b 100644 --- a/R/SeriesAggreg2.R +++ b/R/SeriesAggreg2.R @@ -1,8 +1,24 @@ -SeriesAggreg2 <- function(TabSeries, Format, ConvertFun, +SeriesAggreg2 <- function(TabSeries, Format, TimeFormat, NewTimeFormat, ConvertFun, YearFirstMonth = 1, TimeLag = 0, verbose = TRUE) { - ## Arguments_check - + ## Arguments checks + if (!missing(TimeFormat)) { + warning("deprecated 'TimeFormat' argument", call. = FALSE) + } + if (!missing(NewTimeFormat)) { + if (missing(Format)) { + Format <- switch(NewTimeFormat, + hourly = "%Y%m%d%h", + daily = "%Y%m%d", + monthly = "%Y%m", + yearly = "%Y") + msgNewTimeFormat <- sprintf(" 'Format' automatically set to %s", sQuote(Format)) + } else { + msgNewTimeFormat <- NULL + } + warning("deprecated 'NewTimeFormat' argument: please use 'Format' instead.", + msgNewTimeFormat, call. = FALSE) + } ## check TabSeries if (!is.data.frame(TabSeries)) { stop("'TabSeries' must be a data.frame containing the dates and data to be aggregated")