diff --git a/DESCRIPTION b/DESCRIPTION index ef6db04fc3a664edec5b23e293645e73124c332a..6a68551fe56c825984747af6e712cc6ae2fc537c 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 cd22b29142a54b002d6fac5be79ed76880d2785a..b3be2055d4babb358c881a1b54801c39e467b78f 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 a6d15dbda047a850c19de6ae30193a85b8af1b34..25bb8b5ffbe14fae863cf5e0a807be96197ccf24 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)) {