diff --git a/DESCRIPTION b/DESCRIPTION index e949a9750a2f942381326382f76d4e0db23e4f31..de8de46d95f4bdabec98a1f591d6fd7bfdf49df7 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.6.3.52 +Version: 1.6.3.53 Date: 2020-11-11 Authors@R: c( person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")), diff --git a/NEWS.md b/NEWS.md index 0ff11b945e16be71d6cf1584b44a07c62477db45..18b21a79694189c1e0c27ea559e42d9f01ff4196 100644 --- a/NEWS.md +++ b/NEWS.md @@ -4,7 +4,7 @@ -### 1.6.3.52 Release Notes (2020-11-11) +### 1.6.3.53 Release Notes (2020-11-11) #### New features diff --git a/R/RunModel_GR2M.R b/R/RunModel_GR2M.R index a40a49666d8c2832d0d1a620a6c4984fd3f57b94..c0955435c1145889c442c09e3a5894234c8b8110 100644 --- a/R/RunModel_GR2M.R +++ b/R/RunModel_GR2M.R @@ -13,7 +13,7 @@ RunModel_GR2M <- function(InputsModel,RunOptions,Param) { if (inherits(RunOptions,"RunOptions" ) == FALSE) { stop("'RunOptions' must be of class 'RunOptions' ") } if (inherits(RunOptions,"GR" ) == FALSE) { stop("'RunOptions' must be of class 'GR' ") } if (!is.vector(Param) | !is.numeric(Param)) { stop("'Param' must be a numeric vector") } - if (sum(!is.na(Param))! = NParam) { stop(paste("'Param' must be a vector of length ",NParam," and contain no NA",sep = "")) } + if (sum(!is.na(Param)) != NParam) { stop(paste("'Param' must be a vector of length ",NParam," and contain no NA",sep = "")) } Param <- as.double(Param); Param_X1X2_threshold <- 1e-2 diff --git a/R/RunModel_GR4H.R b/R/RunModel_GR4H.R index 7cbe925a6772162d62b87d5402bbaeabe304a4ac..3f11612a2e5f5bd594c670306f7b0af1c86ae84b 100644 --- a/R/RunModel_GR4H.R +++ b/R/RunModel_GR4H.R @@ -13,7 +13,7 @@ RunModel_GR4H <- function(InputsModel,RunOptions,Param) { if (inherits(RunOptions,"RunOptions" ) == FALSE) { stop("'RunOptions' must be of class 'RunOptions' ") } if (inherits(RunOptions,"GR" ) == FALSE) { stop("'RunOptions' must be of class 'GR' ") } if (!is.vector(Param) | !is.numeric(Param)) { stop("'Param' must be a numeric vector") } - if (sum(!is.na(Param))! = NParam) { stop(paste("'Param' must be a vector of length ",NParam," and contain no NA",sep = "")) } + if (sum(!is.na(Param)) != NParam) { stop(paste("'Param' must be a vector of length ",NParam," and contain no NA",sep = "")) } Param <- as.double(Param); Param_X1X3_threshold <- 1e-2 diff --git a/R/RunModel_GR4J.R b/R/RunModel_GR4J.R index 4ba3dac322291ef8c106967ddfc66856dd643fb1..ce7fc48900ecec9e5d465a5493562398754539c2 100644 --- a/R/RunModel_GR4J.R +++ b/R/RunModel_GR4J.R @@ -13,7 +13,7 @@ RunModel_GR4J <- function(InputsModel,RunOptions,Param) { if (inherits(RunOptions,"RunOptions" ) == FALSE) { stop("'RunOptions' must be of class 'RunOptions' ") } if (inherits(RunOptions,"GR" ) == FALSE) { stop("'RunOptions' must be of class 'GR' ") } if (!is.vector(Param) | !is.numeric(Param)) { stop("'Param' must be a numeric vector") } - if (sum(!is.na(Param))! = NParam) { stop(paste("'Param' must be a vector of length ",NParam," and contain no NA",sep = "")) } + if (sum(!is.na(Param)) != NParam) { stop(paste("'Param' must be a vector of length ",NParam," and contain no NA",sep = "")) } Param <- as.double(Param); Param_X1X3_threshold <- 1e-2 diff --git a/R/RunModel_GR5H.R b/R/RunModel_GR5H.R index c6ec844a68c164a9b30b45ce6c8b6544778dedda..6d548944ea803bf70911f0379fd44c21b1209c8d 100644 --- a/R/RunModel_GR5H.R +++ b/R/RunModel_GR5H.R @@ -19,7 +19,7 @@ RunModel_GR5H <- function(InputsModel,RunOptions,Param) { if (inherits(RunOptions,"RunOptions" ) == FALSE) { stop("'RunOptions' must be of class 'RunOptions' ") } if (inherits(RunOptions,"GR" ) == FALSE) { stop("'RunOptions' must be of class 'GR' ") } if (!is.vector(Param) | !is.numeric(Param)) { stop("'Param' must be a numeric vector") } - if (sum(!is.na(Param))! = NParam) { stop(paste("'Param' must be a vector of length ",NParam," and contain no NA",sep = "")) } + if (sum(!is.na(Param)) != NParam) { stop(paste("'Param' must be a vector of length ",NParam," and contain no NA",sep = "")) } Param <- as.double(Param); Param_X1X3_threshold <- 1e-2 diff --git a/R/RunModel_GR5J.R b/R/RunModel_GR5J.R index e1b9a85a75b2a7270cff9982631f2c0e60342ceb..a67b07d77f648d28f7d69c26e3e38a1efd88fac6 100644 --- a/R/RunModel_GR5J.R +++ b/R/RunModel_GR5J.R @@ -13,7 +13,7 @@ RunModel_GR5J <- function(InputsModel,RunOptions,Param) { if (inherits(RunOptions,"RunOptions" ) == FALSE) { stop("'RunOptions' must be of class 'RunOptions' ") } if (inherits(RunOptions,"GR" ) == FALSE) { stop("'RunOptions' must be of class 'GR' ") } if (!is.vector(Param) | !is.numeric(Param)) { stop("'Param' must be a numeric vector") } - if (sum(!is.na(Param))! = NParam) { stop(paste("'Param' must be a vector of length ",NParam," and contain no NA",sep = "")) } + if (sum(!is.na(Param)) != NParam) { stop(paste("'Param' must be a vector of length ",NParam," and contain no NA",sep = "")) } Param <- as.double(Param); Param_X1X3_threshold <- 1e-2 diff --git a/R/RunModel_GR6J.R b/R/RunModel_GR6J.R index 9b98e18e01aaff1b2dec8ef0bb0fdf249bce998b..b69f5c2cf14e5c61551bca992aded29b60d8d443 100644 --- a/R/RunModel_GR6J.R +++ b/R/RunModel_GR6J.R @@ -13,7 +13,7 @@ RunModel_GR6J <- function(InputsModel,RunOptions,Param) { if (inherits(RunOptions,"RunOptions" ) == FALSE) { stop("'RunOptions' must be of class 'RunOptions' ") } if (inherits(RunOptions,"GR" ) == FALSE) { stop("'RunOptions' must be of class 'GR' ") } if (!is.vector(Param) | !is.numeric(Param)) { stop("'Param' must be a numeric vector") } - if (sum(!is.na(Param))! = NParam) { stop(paste("'Param' must be a vector of length ",NParam," and contain no NA",sep = "")) } + if (sum(!is.na(Param)) != NParam) { stop(paste("'Param' must be a vector of length ",NParam," and contain no NA",sep = "")) } Param <- as.double(Param); Param_X1X3X6_threshold <- 1e-2