diff --git a/R/CreateRunOptions.R b/R/CreateRunOptions.R index d43e99b7dd1e2e5506ad240c74de0d1c5b7f372b..8821935b9b971faf543f3a5f47735376a5a1edb2 100644 --- a/R/CreateRunOptions.R +++ b/R/CreateRunOptions.R @@ -318,7 +318,7 @@ CreateRunOptions <- function(FUN_MOD, InputsModel, Outputs_Sim <- Outputs_Sim[!duplicated(Outputs_Sim)] - ##check_Outputs_Cal + ##check_Outputs_Cal if (is.null(Outputs_Cal)) { if ("GR" %in% ObjectClass) { Outputs_Cal <- c("Qsim") diff --git a/R/RunModel_Lag.R b/R/RunModel_Lag.R index 29712446727d0e8f652d15e0b417b009308dbade..28c1180e84461844e6dbbac58d219e83768d9479 100644 --- a/R/RunModel_Lag.R +++ b/R/RunModel_Lag.R @@ -73,8 +73,8 @@ RunModel_Lag <- function(InputsModel, RunOptions, Param, QcontribDown) { seq_len(NbUpBasins), function(iUpBasins) { iWarmUp <- seq.int( - max(1, RunOptions$IndPeriod_WarmUp[length(RunOptions$IndPeriod_WarmUp)] - floor(PT[iUpBasins])), - max(1, RunOptions$IndPeriod_WarmUp[length(RunOptions$IndPeriod_WarmUp)]) + from = max(1, RunOptions$IndPeriod_WarmUp[length(RunOptions$IndPeriod_WarmUp)] - floor(PT[iUpBasins])), + to = max(1, RunOptions$IndPeriod_WarmUp[length(RunOptions$IndPeriod_WarmUp)]) ) ini <- InputsModel$Qupstream[iWarmUp, iUpBasins] if(length(ini) != floor(PT[iUpBasins] + 1)) { diff --git a/R/UtilsRunModel.R b/R/UtilsRunModel.R index b79809f68ce84cab3bdc3448376ed462497c1bba..096aff84a47a57e68253a14b75b3d3a9b56115e3 100644 --- a/R/UtilsRunModel.R +++ b/R/UtilsRunModel.R @@ -10,10 +10,10 @@ #' @noRd #' .GetOutputsModelGR <- function(InputsModel, - RunOptions, - RESULTS, - LInputSeries, - CemaNeigeLayers = NULL) { + RunOptions, + RESULTS, + LInputSeries, + CemaNeigeLayers = NULL) { IndPeriod2 <- (length(RunOptions$IndPeriod_WarmUp)+1):LInputSeries FortranOutputs <- RunOptions$FortranOutputs$GR diff --git a/tests/testthat/test-RunModel_Lag.R b/tests/testthat/test-RunModel_Lag.R index d71189c1705344793a32b21b041778f94364e6a3..81537b6bda92f61c04007ef532d60207141d7f07 100644 --- a/tests/testthat/test-RunModel_Lag.R +++ b/tests/testthat/test-RunModel_Lag.R @@ -180,8 +180,8 @@ test_that("1 input with lag of 0.5 time step delay out gives an output delayed o test_that("Qupstream in different units should return the same result", { OutputsSD_mm <- RunModel(InputsModel, RunOptions, - Param = ParamSD, - FUN_MOD = RunModel_GR4J) + Param = ParamSD, + FUN_MOD = RunModel_GR4J) InputsModel_m3 <- CreateInputsModel( FUN_MOD = RunModel_GR4J, DatesR = BasinObs$DatesR, @@ -208,8 +208,8 @@ test_that("Qupstream in different units should return the same result", { QupstrUnit = "m3/s" ) OutputsSD_m3s <- RunModel(InputsModel_m3s, RunOptions, - Param = ParamSD, - FUN_MOD = RunModel_GR4J) + Param = ParamSD, + FUN_MOD = RunModel_GR4J) expect_equal(OutputsSD_mm$Qsim, OutputsSD_m3s$Qsim) InputsModel_ls <- CreateInputsModel(