diff --git a/R/RunModel_LBLR.R b/R/RunModel_LBLR.R index 089bffb1d9721cb00a673d8b9c134ad6e37ae2cd..c8591eab39ebe4895839f094ff701a0da2931804 100644 --- a/R/RunModel_LBLR.R +++ b/R/RunModel_LBLR.R @@ -64,21 +64,20 @@ RunModel_LBLR <- function(InputsModel, RunOptions, Param, QcontribDown) { } ## Parameters set up - ## Param[1L] et Param[2L] : m/s - TParam <- max(InputsModel$LengthHydro) * 1e3 / Param[1L] / RunOptions$FeatFUN_MOD$TimeStep #T en pdt - KParam <- max(InputsModel$LengthHydro) * 1e3 / Param[2L] / RunOptions$FeatFUN_MOD$TimeStep # T en pdt - + ## Param[1L] and Param[2L] : m/s + TParam <- max(InputsModel$LengthHydro) * 1e3 / Param[1L] / RunOptions$FeatFUN_MOD$TimeStep # Tau0 en pdt + KParam <- max(InputsModel$LengthHydro) * 1e3 / Param[2L] / RunOptions$FeatFUN_MOD$TimeStep # K0 en pdt PK <- ifelse(InputsModel$LengthHydro == 0, 0, - sqrt(InputsModel$LengthHydro/max(InputsModel$LengthHydro)) * KParam) + sqrt(InputsModel$LengthHydro / max(InputsModel$LengthHydro)) * KParam) PT <- ifelse(InputsModel$LengthHydro == 0, 0, - InputsModel$LengthHydro/max(InputsModel$LengthHydro)) * (TParam + KParam) - PK - + InputsModel$LengthHydro / max(InputsModel$LengthHydro)) * (TParam + KParam) - PK PT <- ifelse(PT < 0, 0, PT) + PK[which(PT == 0)] <- ifelse(InputsModel$LengthHydro == 0, 0, InputsModel$LengthHydro/max(InputsModel$LengthHydro)) * (TParam + KParam) - rprop <- PT - floor(PT) + ## Lag set up lag <- function(t, Qroute, Qupstream){ Q <- c(Qupstream[1 : floor(t)], Qroute[1 : (length(Qroute) - floor(t))]) diff --git a/R/RunModel_LLR.R b/R/RunModel_LLR.R index 111a380d72db9a184d60c0807c007533e53d93ba..8bc6519856f824c28ca8d4e3600cc0556e840059 100644 --- a/R/RunModel_LLR.R +++ b/R/RunModel_LLR.R @@ -67,10 +67,10 @@ RunModel_LLR <- function(InputsModel, RunOptions, Param, QcontribDown) { ## Parameters set up - TParam <- Param[1L] + CParam <- Param[1L] KParam <- Param[2L] - PT <- InputsModel$LengthHydro * 1e3 / Param[1L] / RunOptions$FeatFUN_MOD$TimeStep + PT <- InputsModel$LengthHydro * 1e3 / CParam / RunOptions$FeatFUN_MOD$TimeStep PK <- KParam * PT C0 <- ifelse(PK == 0, 0, exp(-1/PK))