diff --git a/R/Calibration.GriwrmInputsModel.R b/R/Calibration.GriwrmInputsModel.R index e580fe847801b99e3874a2ed68fb7ea09d4dca06..372e087a6ab4db133986d70d58196d9fadd33829 100644 --- a/R/Calibration.GriwrmInputsModel.R +++ b/R/Calibration.GriwrmInputsModel.R @@ -28,7 +28,7 @@ Calibration.GriwrmInputsModel <- function(InputsModel, if(verbose) cat("Calibration.GriwrmInputsModel: Treating sub-basin", IM$id, "...\n") if(useUpstreamQsim) { - # Update InputsModel$QobsUpstr with simulated upstream flows + # Update InputsModel$Qupstream with simulated upstream flows IM <- UpdateQsimUpstream(IM, OutputsModel) } diff --git a/R/CreateCalibOptions.InputsModel.R b/R/CreateCalibOptions.InputsModel.R index 0099cf7f2ca852132208af0a859dca71d83a9ef0..b8fc8a6b64332edc50a4c79328204e178920b2e0 100644 --- a/R/CreateCalibOptions.InputsModel.R +++ b/R/CreateCalibOptions.InputsModel.R @@ -9,7 +9,7 @@ CreateCalibOptions.InputsModel <- function(InputsModel, ...) { airGR::CreateCalibOptions( FUN_MOD = InputsModel$FUN_MOD, - IsSD = !is.null(InputsModel$QobsUpstr), + IsSD = !is.null(InputsModel$Qupstream), ... ) } diff --git a/R/CreateInputsModel.Griwrm.R b/R/CreateInputsModel.Griwrm.R index 52ddce9f6657da2d6b74b715894e796debea7536..56c1cc98cacf79a0c0253e198b48d955627785f6 100644 --- a/R/CreateInputsModel.Griwrm.R +++ b/R/CreateInputsModel.Griwrm.R @@ -44,18 +44,18 @@ CreateOneGriwrmInputsModel <- function(id, ginet, girop, gits) { # Set hydraulic parameters UpstreamNodes <- ginet$id[ginet$down == id & !is.na(ginet$down)] - QobsUpstr <- NULL + Qupstream <- NULL LengthHydro <- NULL BasinAreas <- NULL if(length(UpstreamNodes) > 0) { # Sub-basin with hydraulic routing for(idUpstrNode in UpstreamNodes) { - QobsUpstr1 <- matrix(gits[[idUpstrNode]]$Qobs, ncol = 1) - if(is.null(QobsUpstr)) { - QobsUpstr <- QobsUpstr1 + Qupstream1 <- matrix(gits[[idUpstrNode]]$Qobs, ncol = 1) + if(is.null(Qupstream)) { + Qupstream <- Qupstream1 } else { - QobsUpstr <- cbind(QobsUpstr, QobsUpstr1) + Qupstream <- cbind(Qupstream, Qupstream1) } } LengthHydro <- matrix(ginet$length[girop$id %in% UpstreamNodes] , nrow = 1) @@ -74,7 +74,7 @@ CreateOneGriwrmInputsModel <- function(id, ginet, girop, gits) { DatesR = gits$date, Precip = gits[[id]]$Precip, PotEvap = gits[[id]]$PotEvap, - QobsUpstr = QobsUpstr, + Qupstream = Qupstream, LengthHydro = LengthHydro, BasinAreas = BasinAreas ) diff --git a/R/RunModel.GriwrmInputsModel.R b/R/RunModel.GriwrmInputsModel.R index e508ba6b051bb401d44e68195c32393e42724177..10813896e205425288f8d95fa102b9f72375863f 100644 --- a/R/RunModel.GriwrmInputsModel.R +++ b/R/RunModel.GriwrmInputsModel.R @@ -16,7 +16,7 @@ RunModel.GriwrmInputsModel <- function(InputsModel, RunOptions, girop, verbose = for(IM in InputsModel) { if(verbose) cat("RunModel.GriwrmInputsModel: Treating sub-basin", IM$id, "...\n") - # Update InputsModel$QobsUpstr with simulated upstream flows + # Update InputsModel$Qupstream with simulated upstream flows IM <- UpdateQsimUpstream(IM, OutputsModel) # Run the model for the sub-basin diff --git a/R/UpdateQsimUpstream.R b/R/UpdateQsimUpstream.R index 2bccce8204e1c5f72e8a9e8d0c957705acefcdeb..e1fd8e592e42e1deba274aab0481cf9fb7becc44 100644 --- a/R/UpdateQsimUpstream.R +++ b/R/UpdateQsimUpstream.R @@ -1,4 +1,4 @@ -#' Update InputsModel$QobsUpstr with simulated upstream flows provided by GriwrmOutputsModels object. +#' Update InputsModel$Qupstream with simulated upstream flows provided by GriwrmOutputsModels object. #' #' @param InputsModel \emph{GriwrmInputsModel} object. See \code{[CreateInputsModel.Griwrm]}. #' @param OutputsModel \emph{GriwrmOutputsModel} object provided by \code{[RunModel.GriwrmInputsModel]}. @@ -10,16 +10,16 @@ UpdateQsimUpstream <- function(InputsModel, OutputsModel) { if(length(InputsModel$UpstreamNodes) > 0) { for(i in 1:length(InputsModel$UpstreamNodes)) { - QobsUpstr1 <- matrix( + Qupstream1 <- matrix( c( rep(0, length(RunOptions[[InputsModel$id]]$IndPeriod_WarmUp)), OutputsModel[[InputsModel$UpstreamNodes[i]]]$Qsim ), ncol = 1 ) if(i == 1) { - InputsModel$QobsUpstr <- QobsUpstr1 + InputsModel$Qupstream <- Qupstream1 } else { - InputsModel$QobsUpstr <- cbind(InputsModel$QobsUpstr, QobsUpstr1) + InputsModel$Qupstream <- cbind(InputsModel$Qupstream, Qupstream1) } } }