Skip to content
GitLab
Commit 2c49cda5 authored by Delaigue Olivier's avatar Delaigue Olivier Committed by Dorchies David
Browse files

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

parent 6c7b3a0a
dev 115-add-pcict-date-format-managment 118-plot-outputsmodel-remove-case-sensitivity-to-the-which-argument 136-decreased-performance-of-calibration-execution-time 161-runmodel_lag-proposal-for-a-better-transformation-and-screening-of-the-parameters 165-add-missing-isintstore-argument-in-createcaliboptions 171-check-error-direct-call-of-as-data-frame-posixct-is-deprecated-use-as-data-frame-vector-or-as 191-speed-up-runmodel_lag-when-it-is-used-alone 33-merge-airgr-and-airgrplus-functions 96-parallelize-the-grid-screening-step-during-calibration master rmOptions CRAN_v1.7.6 CRAN_v1.7.5 CRAN_v1.7.4 CRAN_v1.7.3 CRAN_v1.7.2 CRAN_v1.7.1 CRAN_v1.7.0 CRAN_v1.6.12 CRAN_v1.6.11 CRAN_v1.6.10.4 CRAN_v1.6.9.27 CRAN_v1.6.9.24 CRAN_v1.6.9.23 CRAN_v1.6.9.21
2 merge requests!26CRAN v1.6.9.21,!12New series aggreg
Hide whitespace changes
Inline Side-by-side
Showing
with 4 additions and 2 deletions
+4 -2
DESCRIPTION
+ 1
− 1
View file @ 2c49cda5
Package: airGR Package: airGR
Type: Package Type: Package
Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling
Version: 1.4.4.20 Version: 1.4.4.21
Date: 2020-04-20 Date: 2020-04-20
Authors@R: c( Authors@R: c(
person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")), person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")),
......
NEWS.md
+ 1
− 1
View file @ 2c49cda5
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
### 1.4.4.20 Release Notes (2020-04-20) ### 1.4.4.21 Release Notes (2020-04-20)
#### New features #### New features
......
R/SeriesAggreg2.R
+ 2
− 0
View file @ 2c49cda5
...@@ -7,6 +7,8 @@ SeriesAggreg2 <- function(TabSeries, Format, TimeFormat, NewTimeFormat, ConvertF ...@@ -7,6 +7,8 @@ SeriesAggreg2 <- function(TabSeries, Format, TimeFormat, NewTimeFormat, ConvertF
} }
if (!missing(NewTimeFormat)) { if (!missing(NewTimeFormat)) {
if (missing(Format)) { if (missing(Format)) {
TimeStep <- c("hourly", "daily", "monthly", "yearly")
NewTimeFormat <- match.arg(NewTimeFormat, choices = TimeStep)
Format <- switch(NewTimeFormat, Format <- switch(NewTimeFormat,
hourly = "%Y%m%d%h", hourly = "%Y%m%d%h",
daily = "%Y%m%d", daily = "%Y%m%d",
......
Supports Markdown
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