From c764c87af1fc3093e37aa1f287eaf881406cc19e Mon Sep 17 00:00:00 2001 From: Dorchies David <david.dorchies@inrae.fr> Date: Tue, 2 Mar 2021 18:22:42 +0100 Subject: [PATCH] ci: solve R CMD check issues - Missing documentation - wrong variable - use x[length(x)] instead of tail(x,1) Refs #19 --- R/CreateInputsModel.GRiwrm.R | 2 ++ R/RunModel.SD.R | 2 +- R/RunModel.Supervisor.R | 2 +- R/RunModel_Lag.R | 4 ++-- R/utils.R | 1 + 5 files changed, 7 insertions(+), 4 deletions(-) diff --git a/R/CreateInputsModel.GRiwrm.R b/R/CreateInputsModel.GRiwrm.R index 04ab3f8..9f28b80 100644 --- a/R/CreateInputsModel.GRiwrm.R +++ b/R/CreateInputsModel.GRiwrm.R @@ -26,6 +26,8 @@ CreateInputsModel.GRiwrm <- function(x, DatesR, Precip, PotEvap, Qobs, ...) { #' Create an empty InputsModel object for **airGRiwrm** nodes #' +#' @param griwrm a `GRiwrm` object (See [GRiwrm]) +#' #' @return \emph{GRiwrmInputsModel} empty object CreateEmptyGRiwrmInputsModel <- function(griwrm) { InputsModel <- list() diff --git a/R/RunModel.SD.R b/R/RunModel.SD.R index dfff38f..284a85a 100644 --- a/R/RunModel.SD.R +++ b/R/RunModel.SD.R @@ -2,7 +2,7 @@ #' #' @inheritParams airGR::RunModel_Lag #' @param x `InputsModel` used as `InputsModel` parameter for [airGR::RunModel_Lag] -#' @param QSimDown a [numeric] corresponding to the runoff of the sub-basin (Typically the `Qsim` outputs of the GR model) +#' @param QsimDown a [numeric] corresponding to the runoff of the sub-basin (Typically the `Qsim` outputs of the GR model) #' @param ... further arguments passed to or from other methods #' #' @return `OutputsModel` object. See [airGR::RunModel_Lag] diff --git a/R/RunModel.Supervisor.R b/R/RunModel.Supervisor.R index 6a10e2b..6500f12 100644 --- a/R/RunModel.Supervisor.R +++ b/R/RunModel.Supervisor.R @@ -63,7 +63,7 @@ RunModel.Supervisor <- function(x, RunOptions, Param, ...) { Qsim[[id]][x$ts.index] <- x$OutputsModel[[id]]$Qsim # Routing Qsim to the downstream node if(!is.na(x$InputsModel[[id]]$down)) { - x$InputsModel[[x$InputsModel[[id]]$down]]$Qupstream[iTS, i] <- + x$InputsModel[[x$InputsModel[[id]]$down]]$Qupstream[iTS, id] <- x$OutputsModel[[id]]$Qsim } } diff --git a/R/RunModel_Lag.R b/R/RunModel_Lag.R index 398478a..b246b1f 100644 --- a/R/RunModel_Lag.R +++ b/R/RunModel_Lag.R @@ -101,8 +101,8 @@ RunModel_Lag <- function(InputsModel, RunOptions, Param) { if ("StateEnd" %in% RunOptions$Outputs_Sim) { OutputsModel$StateEnd$SD <- lapply(seq(NbUpBasins), function(x) { - LengthTs <- tail(RunOptions$IndPeriod_Run,1) - InputsModel$Qupstream[(LengthTs - floor(PT[x])):LengthTs, x] + lastTS <- RunOptions$IndPeriod_Run[length(RunOptions$IndPeriod_Run)] + InputsModel$Qupstream[(lastTS - floor(PT[x])):lastTS, x] }) #message("StateEnd: ",paste(OutputsModel$StateEnd$SD, collapse = ", ")) } diff --git a/R/utils.R b/R/utils.R index 5f56506..7d3e0cf 100644 --- a/R/utils.R +++ b/R/utils.R @@ -87,6 +87,7 @@ doSupervision <- function(supervisor) { #' #' Stop the execution if an error is detected. #' +#' @param InputsModel a `GRiwrmInputsModel` object (See [CreateInputsModel.GRiwrm]) #' @param RunOptions a `GRiwrmRunOptions` object (See [CreateRunOptions.GRiwrmInputsModel]) #' @param Param a [list] of [numeric] containing model parameters of each node of the network #' -- GitLab