From a554af6f39b02535432b77b50b50969274bddc0f Mon Sep 17 00:00:00 2001
From: Delaigue Olivier <olivier.delaigue@irstea.fr>
Date: Thu, 9 Apr 2020 16:23:54 +0200
Subject: [PATCH] v1.4.4.5 CLEAN: variable renamed in SeriesAggreg2
---
DESCRIPTION | 4 ++--
NEWS.md | 2 +-
R/SeriesAggreg2.R | 10 +++++-----
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/DESCRIPTION b/DESCRIPTION
index ef6db04f..6a68551f 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.4
-Date: 2020-04-07
+Version: 1.4.4.5
+Date: 2020-04-09
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 cd22b291..b3be2055 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -4,7 +4,7 @@
-### 1.4.4.4 Release Notes (2020-04-07)
+### 1.4.4.5 Release Notes (2020-04-09)
#### New features
diff --git a/R/SeriesAggreg2.R b/R/SeriesAggreg2.R
index a6d15dbd..25bb8b5f 100644
--- a/R/SeriesAggreg2.R
+++ b/R/SeriesAggreg2.R
@@ -12,16 +12,16 @@ SeriesAggreg2 <- function(TabSeries, Format, ConvertFun,
start <- sprintf("%i-01-01 00:00:00", as.numeric(format(TabSeries2$DatesR[1L], format = "%Y"))-1)
stop <- sprintf("%i-12-31 00:00:00", as.numeric(format(TabSeries2$DatesR[nrow(TabSeries2)], format = "%Y"))+1)
by <- ifelse(grepl("hours", format(diff(TabSeries$DatesR[1:2]))), yes = "hours", no = "days")
- aa <- data.frame(DatesR = seq(from = as.POSIXct(start, tz = "UTC"),
- to = as.POSIXct(stop , tz = "UTC"),
- by = by) + TimeLag)
- TabSeries2 <- merge(aa, TabSeries2, by = "DatesR", all.x = TRUE)
+ fakeTs <- data.frame(DatesR = seq(from = as.POSIXct(start, tz = "UTC"),
+ to = as.POSIXct(stop , tz = "UTC"),
+ by = by) + TimeLag)
+ TabSeries2 <- merge(fakeTs, TabSeries2, by = "DatesR", all.x = TRUE)
}
TabSeries2$DatesRini <- TabSeries2$DatesR %in% TabSeries0$DatesR
TabSeries2$Selec2 <- format(TabSeries2$DatesR, Format)
-
+
if (nchar(Format) > 2 | Format == "%Y") {
TabSeries2$sp <- !duplicated(TabSeries2$Selec2)
if (all(TabSeries2$sp)) {
--
GitLab