From 5da5ccf0f299da17e00a0b819a6edf113de5f452 Mon Sep 17 00:00:00 2001
From: Dorchies David <david.dorchies@inrae.fr>
Date: Tue, 2 Aug 2022 15:44:01 +0200
Subject: [PATCH] lint: RunModel_LLR and RunModel_LBLR
Refs HYCAR-Hydro/airgr#152, HYCAR-Hydro/airgr#153
---
R/RunModel_LBLR.R | 15 +++++++--------
R/RunModel_LLR.R | 4 ++--
2 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/R/RunModel_LBLR.R b/R/RunModel_LBLR.R
index 089bffb..c8591ea 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 111a380..8bc6519 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))
--
GitLab