fix(Utils): fix monthly and yearly time step management in .GetFeatModel

Refs #106

fix(Utils): fix monthly and yearly time step management in .GetFeatModel
Refs #106
b6f18ce9 · Delaigue Olivier · 91cdf61a · b6f18ce9
Commit b6f18ce9 authored 3 years ago by Delaigue Olivier
Hide whitespace changes
Inline Side-by-side

Showing

with 4 additions and 5 deletions
+4 -5
--- a/R/Utils.R
+++ b/R/Utils.R
@@ -49,17 +49,16 @@
    }
    res$TimeStep <- switch(res$TimeUnit,
                           hourly  =       1,
-                           daily   =      24,
+                           daily   =       1 * 24,
-                           monthly =   28:31,
+                           monthly =   28:31 * 24,
-                           yearly  = 365:366)
+                           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)