From b1644c21feb033d96d004c8bc7c0fa04ba597166 Mon Sep 17 00:00:00 2001
From: Dorchies David <david.dorchies@inrae.fr>
Date: Tue, 24 May 2022 21:00:17 +0200
Subject: [PATCH] fix(RunModel_LLR): use RunModel_Lag by default
When running SD model without defining the routing model as before.
Refs HYCAR-Hydro/airgr#152, HYCAR-Hydro/airgr#153
---
R/CreateCalibOptions.R | 2 +-
R/CreateRunOptions.R | 7 +++++--
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/R/CreateCalibOptions.R b/R/CreateCalibOptions.R
index a33384b..10be5da 100644
--- a/R/CreateCalibOptions.R
+++ b/R/CreateCalibOptions.R
@@ -3,7 +3,7 @@ CreateCalibOptions <- function(FUN_MOD,
FUN_TRANSFO = NULL,
IsHyst = FALSE,
IsSD = FALSE,
- FUN_SD = NULL,
+ FUN_SD = RunModel_Lag,
FixedParam = NULL,
SearchRanges = NULL,
StartParamList = NULL,
diff --git a/R/CreateRunOptions.R b/R/CreateRunOptions.R
index 9a8b4e9..8fb3262 100644
--- a/R/CreateRunOptions.R
+++ b/R/CreateRunOptions.R
@@ -2,8 +2,8 @@ CreateRunOptions <- function(FUN_MOD, InputsModel,
IndPeriod_WarmUp = NULL, IndPeriod_Run,
IniStates = NULL, IniResLevels = NULL, Imax = NULL,
Outputs_Cal = NULL, Outputs_Sim = "all",
- MeanAnSolidPrecip = NULL, FUN_SD = NULL, IsHyst = FALSE,
- warnings = TRUE, verbose = TRUE) {
+ MeanAnSolidPrecip = NULL, FUN_SD = RunModel_Lag,
+ IsHyst = FALSE, warnings = TRUE, verbose = TRUE) {
if (!is.null(Imax)) {
if (!is.numeric(Imax) | length(Imax) != 1L) {
@@ -20,6 +20,9 @@ CreateRunOptions <- function(FUN_MOD, InputsModel,
## check FUN_MOD
FUN_MOD <- match.fun(FUN_MOD)
+ if (!inherits(InputsModel, "SD")) {
+ FUN_SD <- NULL
+ }
FeatFUN_MOD <- .GetFeatModel(FUN_MOD = FUN_MOD, DatesR = InputsModel$DatesR,
FUN_SD = FUN_SD)
ObjectClass <- FeatFUN_MOD$Class
--
GitLab