From a8c2d08d28df583811bcc4b34ebb49cce00abf65 Mon Sep 17 00:00:00 2001
From: Delaigue Olivier <olivier.delaigue@irstea.priv>
Date: Mon, 1 Apr 2019 11:49:21 +0200
Subject: [PATCH] v1.2.12.24 UPDATE: ErrorCrit* funs now use VarObs argument of
 CreateRunOptions instead varObs

---
 DESCRIPTION        | 2 +-
 NEWS.rmd           | 2 +-
 R/ErrorCrit_KGE.R  | 8 ++++----
 R/ErrorCrit_KGE2.R | 8 ++++----
 R/ErrorCrit_NSE.R  | 8 ++++----
 R/ErrorCrit_RMSE.R | 8 ++++----
 6 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/DESCRIPTION b/DESCRIPTION
index 71f677dd..8835ee74 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 3acd26e6..7f993906 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 c21d07ab..f4fb2f53 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 f0675fe1..abf6e452 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 0d405857..599c6f13 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 1f2a6243..826db9c0 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
-- 
GitLab