diff --git a/DESCRIPTION b/DESCRIPTION index 71f677dd1923a687a3329f00cfa1a0e1eab88860..8835ee74b41bb65170a17e7f85f958c57464aebc 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: airGR Type: Package Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling -Version: 1.2.12.23 +Version: 1.2.12.24 Date: 2019-04-01 Authors@R: c( person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")), diff --git a/NEWS.rmd b/NEWS.rmd index 3acd26e6637d2811cb701f97f94a2322a27b90d4..7f993906c58e5f13e622d1ebf2253280f704f0f1 100644 --- a/NEWS.rmd +++ b/NEWS.rmd @@ -13,7 +13,7 @@ output: -### 1.2.12.23 Release Notes (2019-04-01) +### 1.2.12.24 Release Notes (2019-04-01) diff --git a/R/ErrorCrit_KGE.R b/R/ErrorCrit_KGE.R index c21d07abdf84f2be6d9fdf11f4883e6c8e64a04f..f4fb2f5350b0dad08177799d0f02dce8d3280ff2 100644 --- a/R/ErrorCrit_KGE.R +++ b/R/ErrorCrit_KGE.R @@ -15,7 +15,7 @@ ErrorCrit_KGE <- function(InputsCrit, OutputsModel, warnings = TRUE, verbose = T ##Initialisation_________________________________ CritName <- NA - CritVar <- InputsCrit$varObs + CritVar <- InputsCrit$VarObs if (InputsCrit$transfo == "") { CritName <- "KGE[CritVar]" } @@ -41,13 +41,13 @@ ErrorCrit_KGE <- function(InputsCrit, OutputsModel, warnings = TRUE, verbose = T ##Data_preparation_______________________________ VarObs <- InputsCrit$Obs VarObs[!InputsCrit$BoolCrit] <- NA - if (InputsCrit$varObs == "Q") { + if (InputsCrit$VarObs == "Q") { VarSim <- OutputsModel$Qsim } - if (InputsCrit$varObs == "SCA") { + if (InputsCrit$VarObs == "SCA") { VarSim <- rowMeans(sapply(OutputsModel$CemaNeigeLayers[InputsCrit$idLayer], FUN = "[[", "Gratio")) } - if (InputsCrit$varObs == "SWE") { + if (InputsCrit$VarObs == "SWE") { VarSim <- rowMeans(sapply(OutputsModel$CemaNeigeLayers[InputsCrit$idLayer], FUN = "[[", "SnowPack")) } VarSim[!InputsCrit$BoolCrit] <- NA diff --git a/R/ErrorCrit_KGE2.R b/R/ErrorCrit_KGE2.R index f0675fe12432c49ce3679de03f5d3d9dbb519bb5..abf6e4525c85fa9b09dd9d40f5c1fe318e21a2c3 100644 --- a/R/ErrorCrit_KGE2.R +++ b/R/ErrorCrit_KGE2.R @@ -15,7 +15,7 @@ ErrorCrit_KGE2 <- function(InputsCrit, OutputsModel, warnings = TRUE, verbose = ##Initialisation_________________________________ CritName <- NA - CritVar <- InputsCrit$varObs + CritVar <- InputsCrit$VarObs if (InputsCrit$transfo == "") { CritName <- "KGE'[CritVar]" } @@ -41,13 +41,13 @@ ErrorCrit_KGE2 <- function(InputsCrit, OutputsModel, warnings = TRUE, verbose = ##Data_preparation_______________________________ VarObs <- InputsCrit$Obs VarObs[!InputsCrit$BoolCrit] <- NA - if (InputsCrit$varObs == "Q") { + if (InputsCrit$VarObs == "Q") { VarSim <- OutputsModel$Qsim } - if (InputsCrit$varObs == "SCA") { + if (InputsCrit$VarObs == "SCA") { VarSim <- rowMeans(sapply(OutputsModel$CemaNeigeLayers[InputsCrit$idLayer], FUN = "[[", "Gratio")) } - if (InputsCrit$varObs == "SWE") { + if (InputsCrit$VarObs == "SWE") { VarSim <- rowMeans(sapply(OutputsModel$CemaNeigeLayers[InputsCrit$idLayer], FUN = "[[", "SnowPack")) } VarSim[!InputsCrit$BoolCrit] <- NA diff --git a/R/ErrorCrit_NSE.R b/R/ErrorCrit_NSE.R index 0d4058576fd3c4fa314885e053a1afc0d2a5fd0b..599c6f138a2aa312fafd55fa83ed3d63e550bd27 100644 --- a/R/ErrorCrit_NSE.R +++ b/R/ErrorCrit_NSE.R @@ -15,7 +15,7 @@ ErrorCrit_NSE <- function(InputsCrit, OutputsModel, warnings = TRUE, verbose = T ##Initialisation_________________________________ CritName <- NA - CritVar <- InputsCrit$varObs + CritVar <- InputsCrit$VarObs if (InputsCrit$transfo == "") { CritName <- "NSE[CritVar]" } @@ -41,13 +41,13 @@ ErrorCrit_NSE <- function(InputsCrit, OutputsModel, warnings = TRUE, verbose = T ##Data_preparation_______________________________ VarObs <- InputsCrit$Obs VarObs[!InputsCrit$BoolCrit] <- NA - if (InputsCrit$varObs == "Q") { + if (InputsCrit$VarObs == "Q") { VarSim <- OutputsModel$Qsim } - if (InputsCrit$varObs == "SCA") { + if (InputsCrit$VarObs == "SCA") { VarSim <- rowMeans(sapply(OutputsModel$CemaNeigeLayers[InputsCrit$idLayer], FUN = "[[", "Gratio")) } - if (InputsCrit$varObs == "SWE") { + if (InputsCrit$VarObs == "SWE") { VarSim <- rowMeans(sapply(OutputsModel$CemaNeigeLayers[InputsCrit$idLayer], FUN = "[[", "SnowPack")) } VarSim[!InputsCrit$BoolCrit] <- NA diff --git a/R/ErrorCrit_RMSE.R b/R/ErrorCrit_RMSE.R index 1f2a62435380db040992d7b78cbb2f5d850d2f80..826db9c098265c823663902d6e18b8bb6d745bd4 100644 --- a/R/ErrorCrit_RMSE.R +++ b/R/ErrorCrit_RMSE.R @@ -15,7 +15,7 @@ ErrorCrit_RMSE <- function(InputsCrit, OutputsModel, warnings = TRUE, verbose = ##Initialisation_________________________________ CritName <- NA - CritVar <- InputsCrit$varObs + CritVar <- InputsCrit$VarObs if (InputsCrit$transfo == "") { CritName <- "RMSE[CritVar]" } @@ -41,13 +41,13 @@ ErrorCrit_RMSE <- function(InputsCrit, OutputsModel, warnings = TRUE, verbose = ##Data_preparation_______________________________ VarObs <- InputsCrit$Obs VarObs[!InputsCrit$BoolCrit] <- NA - if (InputsCrit$varObs == "Q") { + if (InputsCrit$VarObs == "Q") { VarSim <- OutputsModel$Qsim } - if (InputsCrit$varObs == "SCA") { + if (InputsCrit$VarObs == "SCA") { VarSim <- rowMeans(sapply(OutputsModel$CemaNeigeLayers[InputsCrit$idLayer], FUN = "[[", "Gratio")) } - if (InputsCrit$varObs == "SWE") { + if (InputsCrit$VarObs == "SWE") { VarSim <- rowMeans(sapply(OutputsModel$CemaNeigeLayers[InputsCrit$idLayer], FUN = "[[", "SnowPack")) } VarSim[!InputsCrit$BoolCrit] <- NA