refactor: breaking change in airGR.

- Change variable name InputsModel$QobsUpstr to InputsModel$Qupstream

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)
     }
 

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),
     ...
   )
 }

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
   )

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

R/UpdateQsimUpstream.R

-#' 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)
       }
     }
   }