Commit b3a15c70 authored by Dorchies David's avatar Dorchies David
Browse files

fix(RunModel.Supervisor): issues with in-line reservoir inside the network

Fix #51
Showing with 8 additions and 3 deletions
+8 -3
......@@ -36,8 +36,10 @@ RunModel.Supervisor <- function(x, RunOptions, Param, ...) {
# Copy simulated pure runoff flows (no SD nodes) to Qupstream in downstream SD nodes
for(id in getNoSD_Ids(x$InputsModel)) {
downId <- x$InputsModel[[id]]$down
x$InputsModel[[downId]]$Qupstream[RunOptions[[downId]]$IndPeriod_Run, id] <-
x$OutputsModel[[id]]$Qsim_m3
if(!is.null(x$InputsModel[[downId]])) {
x$InputsModel[[downId]]$Qupstream[RunOptions[[downId]]$IndPeriod_Run, id] <-
x$OutputsModel[[id]]$Qsim_m3
}
}
# Save Qsim for step by step simulation
......
......@@ -68,7 +68,10 @@ setDataToLocation <- function(ctrlr, sv) {
# limit U size to the number of simulation time steps of the current supervision time step
U <- ctrlr$U[seq.int(length(sv$ts.index)),i]
# ! Qupstream contains warm up period and run period => the index is shifted
sv$InputsModel[[node]]$Qupstream[sv$ts.index0 + sv$ts.index, ctrlr$Unames[i]] <- U
if(!is.null(sv$InputsModel[[node]])) {
sv$InputsModel[[node]]$Qupstream[sv$ts.index0 + sv$ts.index,
ctrlr$Unames[i]] <- U
}
})
}
......
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