From 3a1d358d26daaf468ccdc46c86b5e2a59498361a Mon Sep 17 00:00:00 2001
From: Dorchies David <david.dorchies@inrae.fr>
Date: Wed, 29 Jun 2022 09:15:40 +0200
Subject: [PATCH] refactor(SD): Generic transformation in UtilsCalibOptions for
all routing models
Version from Enola 09/06/2022
Refs HYCAR-Hydro/airgr#152, HYCAR-Hydro/airgr#153
---
R/UtilsCalibOptions.R | 23 ++++++-----------------
1 file changed, 6 insertions(+), 17 deletions(-)
diff --git a/R/UtilsCalibOptions.R b/R/UtilsCalibOptions.R
index 18a0ad1..38d1c03 100644
--- a/R/UtilsCalibOptions.R
+++ b/R/UtilsCalibOptions.R
@@ -48,13 +48,8 @@
ParamOut <- NA * ParamIn
NParam <- ncol(ParamIn)
ParamOut[, (FeatFUN_MOD$NParamSD + 1):NParam] <- FUN_GR(ParamIn[, (FeatFUN_MOD$NParamSD + 1):NParam], Direction)
-
- if (identical(RunModel_Lag, FUN_SD)){
- ParamOut[, 1 ] <- FUN_ROUT(as.matrix(ParamIn[, 1]), Direction)
- } else if (identical(RunModel_LLR, FUN_SD)){
- ParamOut[, 1:FeatFUN_MOD$NParamSD] <- FUN_ROUT(ParamIn[, 1:FeatFUN_MOD$NParamSD], Direction)
- }
-
+ ParamOut[, 1:FeatFUN_MOD$NParamSD] <- FUN_ROUT(ParamIn[, 1:FeatFUN_MOD$NParamSD, drop = FALSE],
+ Direction)
if (!Bool) {
ParamOut <- ParamOut[1, ]
}
@@ -108,11 +103,8 @@
NParam <- ncol(ParamIn)
ParamOut[, 2:(NParam - 4) ] <- FUN_GR(ParamIn[, 2:(NParam - 4)], Direction)
ParamOut[, (NParam - 3):NParam] <- FUN_SNOW(ParamIn[, (NParam - 3):NParam], Direction)
- if (identical(RunModel_Lag, FUN_SD)){
- ParamOut[, 1 ] <- FUN_ROUT(as.matrix(ParamIn[, 1]), Direction)
- } else if (identical(RunModel_LLR, FUN_SD)){
- ParamOut[, 1:FeatFUN_MOD$NParamSD] <- FUN_ROUT(ParamIn[, 1:FeatFUN_MOD$NParamSD], Direction)
- }
+ ParamOut[, 1:FeatFUN_MOD$NParamSD] <- FUN_ROUT(ParamIn[, 1:FeatFUN_MOD$NParamSD, drop = FALSE],
+ Direction)
if (!Bool) {
ParamOut <- ParamOut[1, ]
}
@@ -133,11 +125,8 @@
ParamOut[, 2:(NParam - 2)] <- FUN_GR(ParamIn[, 2:(NParam - 2)], Direction)
}
ParamOut[, (NParam - 1):NParam] <- FUN_SNOW(ParamIn[, (NParam - 1):NParam], Direction)
- if (identical(RunModel_Lag, FUN_SD)){
- ParamOut[, 1 ] <- FUN_ROUT(as.matrix(ParamIn[, 1]), Direction)
- } else if (identical(RunModel_LLR, FUN_SD)){
- ParamOut[, 1:FeatFUN_MOD$NParamSD] <- FUN_ROUT(ParamIn[, 1:FeatFUN_MOD$NParamSD], Direction)
- }
+ ParamOut[, 1:FeatFUN_MOD$NParamSD] <- FUN_ROUT(ParamIn[, 1:FeatFUN_MOD$NParamSD, drop = FALSE],
+ Direction)
if (!Bool) {
ParamOut <- ParamOut[1, ]
}
--
GitLab