From 2dec31be1b1d0e4a8449176fc5832a654a46aa24 Mon Sep 17 00:00:00 2001
From: Delaigue Olivier <olivier.delaigue@irstea.priv>
Date: Thu, 21 Feb 2019 15:50:54 +0100
Subject: [PATCH] v1.1.3.11 CLEAN: remove return(NULL) after error in
 ErrorCrit_*

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

diff --git a/DESCRIPTION b/DESCRIPTION
index 7085f381..f857e81d 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.1.3.10
+Version: 1.1.3.11
 Date: 2019-02-21
 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 53b87d5e..3ae207dc 100644
--- a/NEWS.rmd
+++ b/NEWS.rmd
@@ -13,7 +13,7 @@ output:
 
 
 
-### 1.1.3.10 Release Notes (2019-02-21)
+### 1.1.3.11 Release Notes (2019-02-21)
 
 
 
diff --git a/R/ErrorCrit_KGE.R b/R/ErrorCrit_KGE.R
index 2e4b01f3..c5796743 100644
--- a/R/ErrorCrit_KGE.R
+++ b/R/ErrorCrit_KGE.R
@@ -4,15 +4,12 @@ ErrorCrit_KGE <- function(InputsCrit, OutputsModel, warnings = TRUE, verbose = T
   ##Arguments_check________________________________
   if (!inherits(InputsCrit, "InputsCrit")) {
     stop("InputsCrit must be of class 'InputsCrit'")
-    return(NULL)
   }
   if (inherits(InputsCrit, "Multi") | inherits(InputsCrit, "Compo")) {
     stop("InputsCrit must be of class 'Single'. Use the ErrorCrit function on objects of class 'Multi' or 'Compo' with KGE")
-    return(NULL)
   }
   if (!inherits(OutputsModel, "OutputsModel")) {
     stop("OutputsModel must be of class 'OutputsModel'")
-    return(NULL)
   }
   
   
diff --git a/R/ErrorCrit_KGE2.R b/R/ErrorCrit_KGE2.R
index 682bdc66..868a614e 100644
--- a/R/ErrorCrit_KGE2.R
+++ b/R/ErrorCrit_KGE2.R
@@ -4,15 +4,12 @@ ErrorCrit_KGE2 <- function(InputsCrit, OutputsModel, warnings = TRUE, verbose =
   ##Arguments_check________________________________
   if (!inherits(InputsCrit, "InputsCrit")) {
     stop("InputsCrit must be of class 'InputsCrit'")
-    return(NULL)
   }
   if (inherits(InputsCrit, "Multi") | inherits(InputsCrit, "Compo")) {
     stop("InputsCrit must be of class 'Single'. Use the ErrorCrit function on objects of class 'Multi' or 'Compo' with KGE'")
-    return(NULL)
   }
   if (!inherits(OutputsModel, "OutputsModel")) {
     stop("OutputsModel must be of class 'OutputsModel'")
-    return(NULL)
   }
   
   
diff --git a/R/ErrorCrit_NSE.R b/R/ErrorCrit_NSE.R
index 5f17df0d..db3b8ad3 100644
--- a/R/ErrorCrit_NSE.R
+++ b/R/ErrorCrit_NSE.R
@@ -4,15 +4,12 @@ ErrorCrit_NSE <- function(InputsCrit, OutputsModel, warnings = TRUE, verbose = T
   ##Arguments_check________________________________
   if (!inherits(InputsCrit, "InputsCrit")) {
     stop("InputsCrit must be of class 'InputsCrit'")
-    return(NULL)
   }
   if (inherits(InputsCrit, "Multi") | inherits(InputsCrit, "Compo")) {
     stop("InputsCrit must be of class 'Single'. Use the ErrorCrit function on objects of class 'Multi' or 'Compo' with NSE")
-    return(NULL)
   }
   if (!inherits(OutputsModel, "OutputsModel")) {
     stop("OutputsModel must be of class 'OutputsModel'")
-    return(NULL)
   }
   
   
diff --git a/R/ErrorCrit_RMSE.R b/R/ErrorCrit_RMSE.R
index 599502e9..fd3fa6d4 100644
--- a/R/ErrorCrit_RMSE.R
+++ b/R/ErrorCrit_RMSE.R
@@ -4,15 +4,12 @@ ErrorCrit_RMSE <- function(InputsCrit, OutputsModel, warnings = TRUE, verbose =
   ##Arguments_check________________________________
   if (!inherits(InputsCrit, "InputsCrit")) {
     stop("InputsCrit must be of class 'InputsCrit'")
-    return(NULL)
   }
   if (inherits(InputsCrit, "Multi") | inherits(InputsCrit, "Compo")) {
     stop("InputsCrit must be of class 'Single'. Use the ErrorCrit function on objects of class 'Multi' with RMSE")
-    return(NULL)
   }
   if (!inherits(OutputsModel, "OutputsModel")) {
     stop("OutputsModel must be of class 'OutputsModel'")
-    return(NULL)
   }
   
   
-- 
GitLab