From 76da62f09794dad29a402ed80bb6fb3e8b0dc5f5 Mon Sep 17 00:00:00 2001
From: Delaigue Olivier <olivier.delaigue@irstea.fr>
Date: Wed, 11 Nov 2020 15:11:26 +0100
Subject: [PATCH] vv1.6.3.51 fix: remove bad spaces from the RunModel_GR2*
functions Refs ec27c27c, #14
---
DESCRIPTION | 2 +-
NEWS.md | 2 +-
R/RunModel_GR2M.R | 2 +-
R/RunModel_GR4H.R | 2 +-
R/RunModel_GR4J.R | 2 +-
R/RunModel_GR5H.R | 2 +-
R/RunModel_GR5J.R | 2 +-
R/RunModel_GR6J.R | 2 +-
8 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/DESCRIPTION b/DESCRIPTION
index e949a975..de8de46d 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 0ff11b94..18b21a79 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 a40a4966..c0955435 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 7cbe925a..3f11612a 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 4ba3dac3..ce7fc489 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 c6ec844a..6d548944 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 e1b9a85a..a67b07d7 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 9b98e18e..b69f5c2c 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
--
GitLab