From 761254d5f2c2ea417b4d94002a156c7e7b86e4ff Mon Sep 17 00:00:00 2001
From: unknown <olivier.delaigue@ANPI1430.antony.irstea.priv>
Date: Tue, 30 Jan 2018 11:42:04 +0100
Subject: [PATCH] v1.0.9.72 new error message when the time step is wrong in
data gave to CreateInputsModel
---
DESCRIPTION | 2 +-
R/CreateInputsModel.R | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/DESCRIPTION b/DESCRIPTION
index aff52af3..a86f8377 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.0.9.71
+Version: 1.0.9.72
Date: 2018-01-30
Authors@R: c(
person("Laurent", "Coron", role = c("aut", "trl")),
diff --git a/R/CreateInputsModel.R b/R/CreateInputsModel.R
index df46eb01..c090e7bd 100644
--- a/R/CreateInputsModel.R
+++ b/R/CreateInputsModel.R
@@ -76,7 +76,8 @@ CreateInputsModel <- function(FUN_MOD,
DatesR <- as.POSIXlt(DatesR)
}
if (difftime(tail(DatesR, 1), tail(DatesR, 2), units = "secs")[[1]] %in% TimeStep == FALSE) {
- stop(paste( "the time step of the model inputs must be ", TimeStep, " seconds \n", sep = ""))
+ TimeStepName <- grep("hourly|daily|monthly|yearly", ObjectClass, value = TRUE)
+ stop(paste0("The time step of the model inputs must be ", TimeStepName, "\n"))
return(NULL)
}
if (any(duplicated(DatesR))) {
--
GitLab