From a2b406dbdc434829475bb0dcf17e691cf9950ab7 Mon Sep 17 00:00:00 2001
From: David <david.dorchies@inrae.fr>
Date: Wed, 26 Oct 2022 19:09:37 +0200
Subject: [PATCH] fix: check issues
- POSIXct comparaison issue on Linux
- wrong variable in RunModel.Supervisor
Refs #95, #100
---
R/RunModel.Supervisor.R | 2 +-
vignettes/V06_Modelling_regulated_diversion.Rmd | 5 ++---
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/R/RunModel.Supervisor.R b/R/RunModel.Supervisor.R
index 78f6f2b..3c9518f 100644
--- a/R/RunModel.Supervisor.R
+++ b/R/RunModel.Supervisor.R
@@ -57,7 +57,7 @@ RunModel.Supervisor <- function(x, RunOptions, Param, ...) {
)
if (length(getDiversionRows(x$griwrm)) > 0) {
# Outputs of Diversion nodes
- Qdiv_m3 <- Qsim_m3[, sv$griwrm$id[getDiversionRows(x$griwrm)], drop = FALSE] * NA
+ Qdiv_m3 <- Qsim_m3[, x$griwrm$id[getDiversionRows(x$griwrm)], drop = FALSE] * NA
Qnat <- Qdiv_m3
}
diff --git a/vignettes/V06_Modelling_regulated_diversion.Rmd b/vignettes/V06_Modelling_regulated_diversion.Rmd
index f8f4c36..6841a89 100644
--- a/vignettes/V06_Modelling_regulated_diversion.Rmd
+++ b/vignettes/V06_Modelling_regulated_diversion.Rmd
@@ -152,9 +152,8 @@ First we need to create a `GRiwrmRunOptions` object and load the parameters cali
```{r}
# Running simulation between 2002 and 2005
-IndPeriod_Run <- seq(
- which(DatesR == as.POSIXct("2002-01-01")),
- which(DatesR == as.POSIXct("2005-01-01"))
+IndPeriod_Run <- which(
+ DatesR >= as.POSIXct("2002-01-01") & DatesR <= as.POSIXct("2005-01-01")
)
IndPeriod_WarmUp = seq(IndPeriod_Run[1] - 366,IndPeriod_Run[1] - 1)
RunOptions <- CreateRunOptions(IM_div,
--
GitLab