v1.4.4.21 CLEAN: deprecated NewTimeFormat argument now checked #41

2c49cda5 · Delaigue Olivier · Dorchies David · 6c7b3a0a · 2c49cda5 · 2c49cda5
Commit 2c49cda5 authored 4 years ago by Delaigue Olivier Committed by Dorchies David 4 years ago
Hide whitespace changes
Inline Side-by-side

Showing

with 4 additions and 2 deletions
+4 -2
--- a/DESCRIPTION
+++ b/DESCRIPTION
 Package: airGR
 Type: Package
 Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling
-Version: 1.4.4.20
+Version: 1.4.4.21
 Date: 2020-04-20
 Authors@R: c(
  person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")),

--- a/NEWS.md
+++ b/NEWS.md
@@ -4,7 +4,7 @@



-### 1.4.4.20 Release Notes (2020-04-20)
+### 1.4.4.21 Release Notes (2020-04-20)

 #### New features


--- a/R/SeriesAggreg2.R
+++ b/R/SeriesAggreg2.R
@@ -7,6 +7,8 @@ SeriesAggreg2 <- function(TabSeries, Format, TimeFormat, NewTimeFormat, ConvertF
  }
  if (!missing(NewTimeFormat)) {
    if (missing(Format)) {
+      TimeStep <- c("hourly", "daily", "monthly", "yearly")
+      NewTimeFormat <- match.arg(NewTimeFormat, choices = TimeStep)
      Format <- switch(NewTimeFormat,
                       hourly  = "%Y%m%d%h",
                       daily   = "%Y%m%d",