Resolve "airGR compatibility: debugged version of RunModel_Lag"

Closes #33 (closed)

R/RunModel.Supervisor.R

@@ -90,7 +90,8 @@ RunModel.Supervisor <- function(x, RunOptions, Param, ...) {
   }
   for(id in getSD_Ids(x$InputsModel)) {
     x$OutputsModel[[id]]$Qsim_m3 <- Qsim_m3[, id]
-    x$OutputsModel[[id]]$Qsim <- Qsim_m3[, id] / x$griwrm$area[id] / 1e3
+    x$OutputsModel[[id]]$Qsim <-
+      Qsim_m3[, id] / sum(x$InputsModel[[id]]$BasinAreas, na.rm = TRUE) / 1e3
   }
   attr(x$OutputsModel, "Qm3s") <- OutputsModelQsim(x$InputsModel, x$OutputsModel, RunOptions[[1]]$IndPeriod_Run)
   return(x$OutputsModel)

man/RunModel.SD.Rd

@@ -4,7 +4,7 @@
 \alias{RunModel.SD}
 \title{Run SD Model from run-off model outputs}
 \usage{
-\method{RunModel}{SD}(x, RunOptions, Param, QsimDown, ...)
+\method{RunModel}{SD}(x, RunOptions, Param, QcontribDown, ...)
 }
 \arguments{
 \item{x}{\code{InputsModel} used as \code{InputsModel} parameter for \link[airGR:RunModel_Lag]{airGR::RunModel_Lag}}
@@ -17,7 +17,7 @@
     }
   }
 
-\item{QsimDown}{a \link{numeric} corresponding to the runoff of the sub-basin (Typically the \code{Qsim} outputs of the GR model)}
+\item{QcontribDown}{[numeric] vector or [OutputsModel] containing the time series of the runoff contribution of the downstream sub-basin}
 
 \item{...}{further arguments passed to or from other methods}
 }

tests/testthat/test-RunModel.R

@@ -5,7 +5,7 @@ data(Severn)
 
 # Network configuration
 nodes <- Severn$BasinsInfo[c(1,2,5), c("gauge_id", "downstream_id", "distance_downstream", "area")]
-nodes$distance_downstream <- nodes$distance_downstream * 1000 # Conversion km -> m
+nodes$distance_downstream <- nodes$distance_downstream # Conversion km -> m
 nodes$model <- NA
 nodes$model[1] <- "RunModel_GR4J"
 griwrm <- GRiwrm(nodes, list(id = "gauge_id", down = "downstream_id", length = "distance_downstream"))
@@ -55,7 +55,7 @@ griwrm2 <- rbind(griwrm,
                  data.frame(
                    id = c("R1", "R2"),
                    down = "54057",
-                   length = 100000,
+                   length = 100,
                    area = NA,
                    model = NA
                  ))