From 6e4e1a1a58b0f2f3514d61e3527fef7f2833ecd6 Mon Sep 17 00:00:00 2001
From: Dorchies David <david.dorchies@inrae.fr>
Date: Tue, 2 Aug 2022 11:41:04 +0200
Subject: [PATCH] refactor(CreateCalibOptions): adjust screening for all
routing models
Refs HYCAR-Hydro/airgr#152, HYCAR-Hydro/airgr#153
---
R/CreateCalibOptions.R | 23 ++++++++++++++---------
1 file changed, 14 insertions(+), 9 deletions(-)
diff --git a/R/CreateCalibOptions.R b/R/CreateCalibOptions.R
index 8c2cb2e..8a974aa 100644
--- a/R/CreateCalibOptions.R
+++ b/R/CreateCalibOptions.R
@@ -202,21 +202,26 @@ CreateCalibOptions <- function(FUN_MOD,
}
if (IsSD) {
if (identical(RunModel_Lag, FUN_SD)){
- ParamTSD <- matrix(c(+1.25,
- +2.50,
- +5.00), ncol = 1, byrow = TRUE)
+ ParamTSD <- matrix(c(-9.00,
+ -7.00,
+ -5.00), ncol = 1, byrow = TRUE)
ParamT <- cbind(ParamTSD, ParamT)
}
else if (identical(RunModel_LLR, FUN_SD)){
- ParamTSD <- matrix(c(+1.25, 0,
- +2.50, 250,
- +5.00, 500), ncol = 2, byrow = TRUE)
+ ParamTSD <- matrix(c(-9.00, -5,
+ -7.00, 0,
+ -5.00, +5), ncol = 2, byrow = TRUE)
ParamT <- cbind(ParamTSD, ParamT)
}
else if (identical(RunModel_LBLR, FUN_SD)){
- ParamTSD <- matrix(c(+1.25, 0,
- +2.50, 250,
- +5.00, 500), ncol = 2, byrow = TRUE)
+ ParamTSD <- matrix(c(-9.00, -5,
+ -7.00, 0,
+ -5.00, +5), ncol = 2, byrow = TRUE)
+ ParamT <- cbind(ParamTSD, ParamT)
+ } else if (identical(RunModel_LRQ, FUN_SD)){
+ ParamTSD <- matrix(c(-9.00, -5,
+ -7.00, 0,
+ -5.00, +5), ncol = 2, byrow = TRUE)
ParamT <- cbind(ParamTSD, ParamT)
}
}
--
GitLab