diff --git a/R/CreateRunOptions.R b/R/CreateRunOptions.R index 8821935b9b971faf543f3a5f47735376a5a1edb2..b91342b524526a9ba840d57fa644376bd9a587f3 100644 --- a/R/CreateRunOptions.R +++ b/R/CreateRunOptions.R @@ -295,7 +295,7 @@ CreateRunOptions <- function(FUN_MOD, InputsModel, ##check_Outputs_Cal_and_Sim ##Outputs_all - Outputs_all <- c("DatesR", unlist(FortranOutputs), "WarmUpQsim", "StateEnd") + Outputs_all <- c("DatesR", unlist(FortranOutputs), "WarmUpQsim", "StateEnd", "Param") ##check_Outputs_Sim if (!is.vector(Outputs_Sim)) { diff --git a/R/RunModel_CemaNeigeGR4H.R b/R/RunModel_CemaNeigeGR4H.R index 51318c1faa81aea3bfad90c75b2eb1771b65a6b3..7bba7814f6ebac4e39ef288900fdddf27a8e8c1d 100644 --- a/R/RunModel_CemaNeigeGR4H.R +++ b/R/RunModel_CemaNeigeGR4H.R @@ -167,5 +167,6 @@ RunModel_CemaNeigeGR4H <- function(InputsModel, RunOptions, Param) { RunOptions, RESULTS, LInputSeries, + Param, CemaNeigeLayers) } diff --git a/R/RunModel_CemaNeigeGR4J.R b/R/RunModel_CemaNeigeGR4J.R index 34f15d5ea3c3a546e30a5de3b857c4484e315194..28eceb59e732aba01819e2e7f58b4f6416711c44 100644 --- a/R/RunModel_CemaNeigeGR4J.R +++ b/R/RunModel_CemaNeigeGR4J.R @@ -166,5 +166,6 @@ RunModel_CemaNeigeGR4J <- function(InputsModel, RunOptions, Param) { RunOptions, RESULTS, LInputSeries, + Param, CemaNeigeLayers) } diff --git a/R/RunModel_CemaNeigeGR5H.R b/R/RunModel_CemaNeigeGR5H.R index a78946b618549ee741ee2c06daf58000ea147505..8cb99dc0d13c4c7a23be6d39a901a4658ded93d6 100644 --- a/R/RunModel_CemaNeigeGR5H.R +++ b/R/RunModel_CemaNeigeGR5H.R @@ -177,5 +177,6 @@ RunModel_CemaNeigeGR5H <- function(InputsModel, RunOptions, Param) { RunOptions, RESULTS, LInputSeries, + Param, CemaNeigeLayers) } diff --git a/R/RunModel_CemaNeigeGR5J.R b/R/RunModel_CemaNeigeGR5J.R index cdc4faaeae4263dd5a54f3559f67ec7a35b4b899..1b42b04fcc9d7d220d48947621a4539f8570ce21 100644 --- a/R/RunModel_CemaNeigeGR5J.R +++ b/R/RunModel_CemaNeigeGR5J.R @@ -164,5 +164,6 @@ RunModel_CemaNeigeGR5J <- function(InputsModel, RunOptions, Param) { RunOptions, RESULTS, LInputSeries, + Param, CemaNeigeLayers) } diff --git a/R/RunModel_CemaNeigeGR6J.R b/R/RunModel_CemaNeigeGR6J.R index 6199e4178d8e02f7ffd8930eee623105e8f3b51b..dc011ce480f668ebc20f866354c7f50597007c8e 100644 --- a/R/RunModel_CemaNeigeGR6J.R +++ b/R/RunModel_CemaNeigeGR6J.R @@ -169,6 +169,7 @@ RunModel_CemaNeigeGR6J <- function(InputsModel, RunOptions, Param) { RunOptions, RESULTS, LInputSeries, + Param, CemaNeigeLayers) } diff --git a/R/RunModel_GR1A.R b/R/RunModel_GR1A.R index 87ff6aceb6d53f9b745f2542c2ed85b29f223b2f..b4ddd4f5a784b4b34ca7989c1e8ddc4ba64aa2b6 100644 --- a/R/RunModel_GR1A.R +++ b/R/RunModel_GR1A.R @@ -47,5 +47,6 @@ RunModel_GR1A <- function(InputsModel, RunOptions, Param) { .GetOutputsModelGR(InputsModel, RunOptions, RESULTS, - LInputSeries) + LInputSeries, + Param) } diff --git a/R/RunModel_GR2M.R b/R/RunModel_GR2M.R index dd2f696d5cc30f0dd5e98f8f7a4198f4964aca6c..6b89b73dafe44c16ee065b69bddc3edbf317c5b6 100644 --- a/R/RunModel_GR2M.R +++ b/R/RunModel_GR2M.R @@ -69,5 +69,6 @@ RunModel_GR2M <- function(InputsModel, RunOptions, Param) { .GetOutputsModelGR(InputsModel, RunOptions, RESULTS, - LInputSeries) + LInputSeries, + Param) } diff --git a/R/RunModel_GR4H.R b/R/RunModel_GR4H.R index f70f3a1d0f165c51ef451e44d56ca50f83a685b6..01caa6d78f781517f1baa63a5638cb2db8f7fd55 100644 --- a/R/RunModel_GR4H.R +++ b/R/RunModel_GR4H.R @@ -74,5 +74,6 @@ RunModel_GR4H <- function(InputsModel, RunOptions, Param) { .GetOutputsModelGR(InputsModel, RunOptions, RESULTS, - LInputSeries) + LInputSeries, + Param) } diff --git a/R/RunModel_GR4J.R b/R/RunModel_GR4J.R index fab8517e6383fbcfcf0244bd285d547ead1c3ea2..88f129d3c789df37c013b4779bf9d6dc64cd4c50 100644 --- a/R/RunModel_GR4J.R +++ b/R/RunModel_GR4J.R @@ -69,5 +69,6 @@ RunModel_GR4J <- function(InputsModel, RunOptions, Param) { .GetOutputsModelGR(InputsModel, RunOptions, RESULTS, - LInputSeries) + LInputSeries, + Param) } diff --git a/R/RunModel_GR5H.R b/R/RunModel_GR5H.R index 1d0139741fbcd7cda8bd567ee388ba7ef9805580..6c5fb4323b477b1316d51feede865e405c23206f 100644 --- a/R/RunModel_GR5H.R +++ b/R/RunModel_GR5H.R @@ -88,5 +88,6 @@ RunModel_GR5H <- function(InputsModel, RunOptions, Param) { .GetOutputsModelGR(InputsModel, RunOptions, RESULTS, - LInputSeries) + LInputSeries, + Param) } diff --git a/R/RunModel_GR5J.R b/R/RunModel_GR5J.R index 73e17c6cb32116164131153a9e6decf7f49ce39b..f5d2bdc34560ac16076e50a5af4dd985d99c7921 100644 --- a/R/RunModel_GR5J.R +++ b/R/RunModel_GR5J.R @@ -74,5 +74,6 @@ RunModel_GR5J <- function(InputsModel, RunOptions, Param) { .GetOutputsModelGR(InputsModel, RunOptions, RESULTS, - LInputSeries) + LInputSeries, + Param) } diff --git a/R/RunModel_GR6J.R b/R/RunModel_GR6J.R index 659a0b5cbece1c88aa883fc3a5d4247fccd0f98e..8175af9564636f3c2392451918877fd7faf1dcbe 100644 --- a/R/RunModel_GR6J.R +++ b/R/RunModel_GR6J.R @@ -79,5 +79,6 @@ RunModel_GR6J <- function(InputsModel, RunOptions, Param) { .GetOutputsModelGR(InputsModel, RunOptions, RESULTS, - LInputSeries) + LInputSeries, + Param) } diff --git a/R/UtilsRunModel.R b/R/UtilsRunModel.R index 096aff84a47a57e68253a14b75b3d3a9b56115e3..846f018214f2b4ac21805d727b3974e6be1896ac 100644 --- a/R/UtilsRunModel.R +++ b/R/UtilsRunModel.R @@ -4,6 +4,7 @@ #' @param RunOptions output of [CreateRunOptions] #' @param RESULTS outputs of [.Fortran] #' @param LInputSeries number of time steps of warm-up + run periods +#' @param Param [numeric] vector of model parameters #' @param CemaNeigeLayers outputs of Cemaneige pre-process #' #' @return OutputsModel object @@ -13,6 +14,7 @@ RunOptions, RESULTS, LInputSeries, + Param, CemaNeigeLayers = NULL) { IndPeriod2 <- (length(RunOptions$IndPeriod_WarmUp)+1):LInputSeries @@ -46,6 +48,10 @@ OutputsModel$StateEnd <- RESULTS$StateEnd } + if ("Param" %in% RunOptions$Outputs_Sim) { + OutputsModel$Param <- Param + } + class(OutputsModel) <- c("OutputsModel", class(RunOptions)[-1]) return(OutputsModel)