From b6f18ce914cf79c2a2f69a876b94a497941f0930 Mon Sep 17 00:00:00 2001
From: Delaigue Olivier <olivier.delaigue@irstea.fr>
Date: Mon, 29 Mar 2021 11:39:17 +0200
Subject: [PATCH] fix(Utils): fix monthly and yearly time step management in
.GetFeatModel Refs #106
---
R/Utils.R | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/R/Utils.R b/R/Utils.R
index 2351a168..f05c2333 100644
--- a/R/Utils.R
+++ b/R/Utils.R
@@ -49,17 +49,16 @@
}
res$TimeStep <- switch(res$TimeUnit,
hourly = 1,
- daily = 24,
- monthly = 28:31,
- yearly = 365:366)
+ daily = 1 * 24,
+ monthly = 28:31 * 24,
+ yearly = 365:366 * 24)
res$TimeStep <- res$TimeStep * 3600
-
res$Class <- c(res$TimeUnit, res$Class)
if (grepl("CemaNeige", res$NameFunMod)) {
res$Class <- unique(c(res$Class, "CemaNeige"))
}
- if (DiffTimeStep != res$TimeStep) {
+ if (all(DiffTimeStep != res$TimeStep)) {
stop("the time step of the model inputs must be ", res$TimeUnit, "\n")
}
return(res)
--
GitLab