diff --git a/DESCRIPTION b/DESCRIPTION index 34d9f34b60ee2c416d94a551bb1f103b52d957e4..b07b949f9de91d7258efd30fae41f04de950f1d0 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: airGR Type: Package Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling -Version: 1.1.2.28 +Version: 1.1.2.29 Date: 2019-01-18 Authors@R: c( person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")), diff --git a/NEWS.rmd b/NEWS.rmd index 75ccf96970008e91b364a2336f5f4ed6e4305c24..8159e5f4f8dd751c3f4a4e041a89da0953ee5f57 100644 --- a/NEWS.rmd +++ b/NEWS.rmd @@ -13,7 +13,7 @@ output: -### 1.1.2.28 Release Notes (2019-01-18) +### 1.1.2.29 Release Notes (2019-01-18) diff --git a/R/SeriesAggreg.R b/R/SeriesAggreg.R index c7fb15f53df20c4dc6e8481c682fd4e26c28ab47..17080f312f69bf53a86439f8d2a00280d8124f21 100644 --- a/R/SeriesAggreg.R +++ b/R/SeriesAggreg.R @@ -137,14 +137,14 @@ SeriesAggreg <- function(TabSeries, } TmpDatesR <- seq(from = TabSeries[1, 1], to = tail(TabSeries[, 1], 1), by = by) if (!identical(TabSeries[, 1], TmpDatesR)) { - stop("Problem detected in TabSeries dates vector (in comparison with seq(from=TabSeries[1,1],to=tail(TabSeries[,1],1))) \n") + stop("Some dates might not be ordered or are missing in TabSeries \n") return(NULL) } ##check_conversion_direction if ((TimeFormat == "daily" & NewTimeFormat %in% c("hourly") ) | (TimeFormat == "monthly" & NewTimeFormat %in% c("hourly","daily") ) | (TimeFormat == "yearly" & NewTimeFormat %in% c("hourly","daily","monthly"))) { - stop("only time aggregation can be performed \n") + stop("Only time aggregation can be performed \n") return(NULL) } ##check_if_conversion_not_needed