Commit 26ab68c8 authored by Delaigue Olivier's avatar Delaigue Olivier
Browse files

v1.1.2.29 CLEAN: error message modified in SeriesAggreg #5423

parent e6a53d09
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")),
......
......@@ -13,7 +13,7 @@ output:
### 1.1.2.28 Release Notes (2019-01-18)
### 1.1.2.29 Release Notes (2019-01-18)
......
......@@ -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
......
Markdown is supported
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