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

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
3a1d358d · Dorchies David · 60d9bf61 · 3a1d358d
Commit 3a1d358d authored 2 years ago by Dorchies David
Hide whitespace changes
Inline Side-by-side

Showing

with 6 additions and 17 deletions
+6 -17
--- 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, ]
        }