From 43d13a940adb195d137f2de79aa3baa283071b86 Mon Sep 17 00:00:00 2001 From: David <david.dorchies@inrae.fr> Date: Thu, 27 Oct 2022 11:03:53 +0200 Subject: [PATCH] change(CreateInputsModel): change signe of Qupstream for Diverted flows - Without consequence because diverted upstream flows are updated during simulation but it's more clear for InputsModel exploration prior to simulation Refs #95 --- R/CreateInputsModel.GRiwrm.R | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/R/CreateInputsModel.GRiwrm.R b/R/CreateInputsModel.GRiwrm.R index 6eb5dfb..557ae31 100644 --- a/R/CreateInputsModel.GRiwrm.R +++ b/R/CreateInputsModel.GRiwrm.R @@ -263,6 +263,15 @@ CreateOneGRiwrmInputsModel <- function(id, griwrm, ..., Qobs, Qmin) { if(length(UpstreamNodeRows) > 0) { # Sub-basin with hydraulic routing Qupstream <- as.matrix(Qobs[ , griwrm$id[UpstreamNodeRows], drop=FALSE]) + upstreamDiversion <- which( + sapply(griwrm$id[UpstreamNodeRows], + function(id) { + getNodeProperties(id, griwrm)$Diversion + }) + ) + if (length(upstreamDiversion) > 0) { + Qupstream[, upstreamDiversion] <- - Qupstream[, upstreamDiversion] + } LengthHydro <- griwrm$length[UpstreamNodeRows] names(LengthHydro) <- griwrm$id[UpstreamNodeRows] BasinAreas <- c( -- GitLab