diff --git a/DESCRIPTION b/DESCRIPTION index 7085f381cd39ae06c540367f7a38e8e85f0a3b22..f857e81d07104e2536e2349f8e6f2f7a155d9b94 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 53b87d5e79e371d59934ec7634c1f52ad490ab54..3ae207dc73d6fafe38f3f50ebb6340cfed763449 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 2e4b01f3be0646b9c5dde377b7fd67d68667db50..c5796743ecea6102209c27890340475b7de9cefb 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 682bdc66161dd3cfbfc6977559c631489dd6af42..868a614ef7f627101809a2c6a88eed09a0b9ccf5 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 5f17df0d7d24d28b526a18e5d32a9c718c41196a..db3b8ad3fa25f9b87e354ceec957994c9ed0daf5 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 599502e910e562a5407c07f07147c79638275e2b..fd3fa6d470c0b203c35ce40e253f155a3843f1fa 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) }