fix(RunModel.Supervisor): miising attributes to OutputsModel

Refs #174

R/RunModel.GRiwrmInputsModel.R

@@ -43,8 +43,6 @@ RunModel.GRiwrmInputsModel <- function(x, RunOptions, Param, ...) {
       Param = Param[[id]]
     )
   }
-  attr(OutputsModel, "Qm3s") <- OutputsModelQsim(x, OutputsModel, RunOptions[[1]]$IndPeriod_Run)
-  attr(OutputsModel, "GRiwrm") <- attr(x, "GRiwrm")
-  attr(OutputsModel, "TimeStep") <- attr(x, "TimeStep")
+  OutputsModel <- add_OutputsModel_attributes(x, OutputsModel, RunOptions[[1]]$IndPeriod_Run)
   return(OutputsModel)
 }

R/RunModel.Supervisor.R

@@ -151,7 +151,8 @@ RunModel.Supervisor <- function(x, RunOptions, Param, ...) {
     x$OutputsModel[[id]]$Qsim <-
       x$storedOutputs$Qsim_m3[, id] / sum(x$InputsModel[[id]]$BasinAreas, na.rm = TRUE) / 1e3
   }
-  attr(x$OutputsModel, "Qm3s") <- OutputsModelQsim(x$InputsModel, x$OutputsModel, IndPeriod_Run)
+
+  x$OutputsModel <- add_OutputsModel_attributes(x$InputsModel, x$OutputsModel, IndPeriod_Run)
 
   # restoration of InputsModel (Supervisor is an environment...)
   x$InputsModel <- InputsModelBackup

R/utils.RunModel.R

@@ -142,3 +142,10 @@ merge.GRiwrmOutputsModel <- function(x, y, ...) {
   attr(y, "Qm3s") <- rbind(attr(x, "Qm3s"), attr(y, "Qm3s"))
   return(y)
 }
+
+add_OutputsModel_attributes <- function(InputsModel, OutputsModel, IndPeriod_Run) {
+  attr(OutputsModel, "Qm3s") <- OutputsModelQsim(InputsModel, OutputsModel, IndPeriod_Run)
+  attr(OutputsModel, "GRiwrm") <- attr(InputsModel, "GRiwrm")
+  attr(OutputsModel, "TimeStep") <- attr(InputsModel, "TimeStep")
+  return(OutputsModel)
+}