From 26ab68c81ae8eb4e44ad2b67c5ec20df569a2f20 Mon Sep 17 00:00:00 2001
From: Delaigue Olivier <olivier.delaigue@irstea.priv>
Date: Fri, 18 Jan 2019 15:10:41 +0100
Subject: [PATCH] v1.1.2.29 CLEAN: error message modified in SeriesAggreg #5423
---
DESCRIPTION | 2 +-
NEWS.rmd | 2 +-
R/SeriesAggreg.R | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/DESCRIPTION b/DESCRIPTION
index 34d9f34b..b07b949f 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 75ccf969..8159e5f4 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 c7fb15f5..17080f31 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
--
GitLab