From f8a7393b54e4dba4b61f8cbc8faaa7b40af7fe83 Mon Sep 17 00:00:00 2001
From: David <david.dorchies@inrae.fr>
Date: Wed, 26 Oct 2022 10:46:52 +0200
Subject: [PATCH] docs: add progression bar in RunModel.Supervisor and some
corrections
Refs #100
---
R/Calibration.GRiwrmInputsModel.R | 2 +-
R/CreateInputsModel.GRiwrm.R | 2 +-
R/RunModel.GRiwrmInputsModel.R | 2 +-
R/RunModel.Supervisor.R | 13 ++++++++++++-
4 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/R/Calibration.GRiwrmInputsModel.R b/R/Calibration.GRiwrmInputsModel.R
index f191088..f4671e1 100644
--- a/R/Calibration.GRiwrmInputsModel.R
+++ b/R/Calibration.GRiwrmInputsModel.R
@@ -36,7 +36,7 @@ Calibration.GRiwrmInputsModel <- function(InputsModel,
for(id in gaugedIds) {
IM <- InputsModel[[id]]
- message("Calibration.GRiwrmInputsModel: Treating sub-basin ", id, "...")
+ message("Calibration.GRiwrmInputsModel: Processing sub-basin ", id, "...")
if (inherits(InputsCrit[[id]], "InputsCritLavenneFunction")) {
IC <- getInputsCrit_Lavenne(id, OutputsModel, InputsCrit)
diff --git a/R/CreateInputsModel.GRiwrm.R b/R/CreateInputsModel.GRiwrm.R
index ed5a5bf..ec38978 100644
--- a/R/CreateInputsModel.GRiwrm.R
+++ b/R/CreateInputsModel.GRiwrm.R
@@ -192,7 +192,7 @@ CreateInputsModel.GRiwrm <- function(x, DatesR,
}
for(id in getNodeRanking(x)) {
- message("CreateInputsModel.GRiwrm: Treating sub-basin ", id, "...")
+ message("CreateInputsModel.GRiwrm: Processing sub-basin ", id, "...")
InputsModel[[id]] <-
CreateOneGRiwrmInputsModel(id = id,
diff --git a/R/RunModel.GRiwrmInputsModel.R b/R/RunModel.GRiwrmInputsModel.R
index 88edc07..bd0f983 100644
--- a/R/RunModel.GRiwrmInputsModel.R
+++ b/R/RunModel.GRiwrmInputsModel.R
@@ -16,7 +16,7 @@ RunModel.GRiwrmInputsModel <- function(x, RunOptions, Param, ...) {
class(OutputsModel) <- c("GRiwrmOutputsModel", class(OutputsModel))
for(id in names(x)) {
- message("RunModel.GRiwrmInputsModel: Treating sub-basin ", x[[id]]$id, "...")
+ message("RunModel.GRiwrmInputsModel: Processing sub-basin ", x[[id]]$id, "...")
# Update x[[id]]$Qupstream with simulated upstream flows
if(any(x[[id]]$UpstreamIsModeled)) {
diff --git a/R/RunModel.Supervisor.R b/R/RunModel.Supervisor.R
index fa75961..ed7a588 100644
--- a/R/RunModel.Supervisor.R
+++ b/R/RunModel.Supervisor.R
@@ -78,8 +78,16 @@ RunModel.Supervisor <- function(x, RunOptions, Param, ...) {
x$OutputsModel[[id]]$StateEnd <- serializeIniStates(OM_WarmUp[[id]]$StateEnd)
}
+ message("Processing: 0%", appendLF = FALSE)
+ iProgressSteps <- round(length(lSuperTS) * seq(0.1, 0.9, 0.1))
+
# Loop over time steps with a step equal to the supervision time step
- for(iTS in lSuperTS) {
+ for(i in seq_along(lSuperTS)) {
+ iProgressMessage <- which(i == iProgressSteps)
+ if (length(iProgressMessage) == 1) {
+ message(" ", 10 * iProgressMessage, "%", appendLF = FALSE)
+ }
+ iTS <- lSuperTS[[i]]
# Run regulation on the whole basin for the current time step
x$ts.index <- iTS - x$ts.index0
x$ts.date <- x$InputsModel[[1]]$DatesR[iTS]
@@ -108,6 +116,9 @@ RunModel.Supervisor <- function(x, RunOptions, Param, ...) {
}
x$ts.previous <- x$ts.index
}
+
+ message(" 100%")
+
for(id in getSD_Ids(x$InputsModel)) {
x$OutputsModel[[id]]$Qsim_m3 <- Qsim_m3[, id]
x$OutputsModel[[id]]$Qsim <-
--
GitLab