Commit f8a7393b authored by David's avatar David
Browse files

docs: add progression bar in RunModel.Supervisor and some corrections

Refs #100
Showing with 15 additions and 4 deletions
+15 -4
...@@ -36,7 +36,7 @@ Calibration.GRiwrmInputsModel <- function(InputsModel, ...@@ -36,7 +36,7 @@ Calibration.GRiwrmInputsModel <- function(InputsModel,
for(id in gaugedIds) { for(id in gaugedIds) {
IM <- InputsModel[[id]] IM <- InputsModel[[id]]
message("Calibration.GRiwrmInputsModel: Treating sub-basin ", id, "...") message("Calibration.GRiwrmInputsModel: Processing sub-basin ", id, "...")
if (inherits(InputsCrit[[id]], "InputsCritLavenneFunction")) { if (inherits(InputsCrit[[id]], "InputsCritLavenneFunction")) {
IC <- getInputsCrit_Lavenne(id, OutputsModel, InputsCrit) IC <- getInputsCrit_Lavenne(id, OutputsModel, InputsCrit)
......
...@@ -192,7 +192,7 @@ CreateInputsModel.GRiwrm <- function(x, DatesR, ...@@ -192,7 +192,7 @@ CreateInputsModel.GRiwrm <- function(x, DatesR,
} }
for(id in getNodeRanking(x)) { for(id in getNodeRanking(x)) {
message("CreateInputsModel.GRiwrm: Treating sub-basin ", id, "...") message("CreateInputsModel.GRiwrm: Processing sub-basin ", id, "...")
InputsModel[[id]] <- InputsModel[[id]] <-
CreateOneGRiwrmInputsModel(id = id, CreateOneGRiwrmInputsModel(id = id,
......
...@@ -16,7 +16,7 @@ RunModel.GRiwrmInputsModel <- function(x, RunOptions, Param, ...) { ...@@ -16,7 +16,7 @@ RunModel.GRiwrmInputsModel <- function(x, RunOptions, Param, ...) {
class(OutputsModel) <- c("GRiwrmOutputsModel", class(OutputsModel)) class(OutputsModel) <- c("GRiwrmOutputsModel", class(OutputsModel))
for(id in names(x)) { 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 # Update x[[id]]$Qupstream with simulated upstream flows
if(any(x[[id]]$UpstreamIsModeled)) { if(any(x[[id]]$UpstreamIsModeled)) {
......
...@@ -78,8 +78,16 @@ RunModel.Supervisor <- function(x, RunOptions, Param, ...) { ...@@ -78,8 +78,16 @@ RunModel.Supervisor <- function(x, RunOptions, Param, ...) {
x$OutputsModel[[id]]$StateEnd <- serializeIniStates(OM_WarmUp[[id]]$StateEnd) 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 # 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 # Run regulation on the whole basin for the current time step
x$ts.index <- iTS - x$ts.index0 x$ts.index <- iTS - x$ts.index0
x$ts.date <- x$InputsModel[[1]]$DatesR[iTS] x$ts.date <- x$InputsModel[[1]]$DatesR[iTS]
...@@ -108,6 +116,9 @@ RunModel.Supervisor <- function(x, RunOptions, Param, ...) { ...@@ -108,6 +116,9 @@ RunModel.Supervisor <- function(x, RunOptions, Param, ...) {
} }
x$ts.previous <- x$ts.index x$ts.previous <- x$ts.index
} }
message(" 100%")
for(id in getSD_Ids(x$InputsModel)) { for(id in getSD_Ids(x$InputsModel)) {
x$OutputsModel[[id]]$Qsim_m3 <- Qsim_m3[, id] x$OutputsModel[[id]]$Qsim_m3 <- Qsim_m3[, id]
x$OutputsModel[[id]]$Qsim <- x$OutputsModel[[id]]$Qsim <-
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment