Skip to content
GitLab
Commit 76da62f0 authored by Delaigue Olivier's avatar Delaigue Olivier
Browse files

vv1.6.3.51 fix: remove bad spaces from the RunModel_GR2* functions 

Refs ec27c27c, #14
parent ec27c27c
dev 115-add-pcict-date-format-managment 118-plot-outputsmodel-remove-case-sensitivity-to-the-which-argument 136-decreased-performance-of-calibration-execution-time 60-migrate-transfoparam-functions-and-createcaliboptions-to-s3-methods 96-parallelize-the-grid-screening-step-during-calibration master CRAN_v1.7.0 CRAN_v1.6.12 CRAN_v1.6.11 CRAN_v1.6.10.4 CRAN_v1.6.9.27 CRAN_v1.6.9.24 CRAN_v1.6.9.23 CRAN_v1.6.9.21
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 8 additions and 8 deletions
+8 -8
DESCRIPTION
+ 1
− 1
View file @ 76da62f0
Package: airGR Package: airGR
Type: Package Type: Package
Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling
Version: 1.6.3.52 Version: 1.6.3.53
Date: 2020-11-11 Date: 2020-11-11
Authors@R: c( Authors@R: c(
person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")), person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")),
......
NEWS.md
+ 1
− 1
View file @ 76da62f0
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
### 1.6.3.52 Release Notes (2020-11-11) ### 1.6.3.53 Release Notes (2020-11-11)
#### New features #### New features
......
R/RunModel_GR2M.R
+ 1
− 1
View file @ 76da62f0
...@@ -13,7 +13,7 @@ RunModel_GR2M <- function(InputsModel,RunOptions,Param) { ...@@ -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,"RunOptions" ) == FALSE) { stop("'RunOptions' must be of class 'RunOptions' ") }
if (inherits(RunOptions,"GR" ) == FALSE) { stop("'RunOptions' must be of class 'GR' ") } 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 (!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 <- as.double(Param);
Param_X1X2_threshold <- 1e-2 Param_X1X2_threshold <- 1e-2
......
R/RunModel_GR4H.R
+ 1
− 1
View file @ 76da62f0
...@@ -13,7 +13,7 @@ RunModel_GR4H <- function(InputsModel,RunOptions,Param) { ...@@ -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,"RunOptions" ) == FALSE) { stop("'RunOptions' must be of class 'RunOptions' ") }
if (inherits(RunOptions,"GR" ) == FALSE) { stop("'RunOptions' must be of class 'GR' ") } 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 (!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 <- as.double(Param);
Param_X1X3_threshold <- 1e-2 Param_X1X3_threshold <- 1e-2
......
R/RunModel_GR4J.R
+ 1
− 1
View file @ 76da62f0
...@@ -13,7 +13,7 @@ RunModel_GR4J <- function(InputsModel,RunOptions,Param) { ...@@ -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,"RunOptions" ) == FALSE) { stop("'RunOptions' must be of class 'RunOptions' ") }
if (inherits(RunOptions,"GR" ) == FALSE) { stop("'RunOptions' must be of class 'GR' ") } 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 (!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 <- as.double(Param);
Param_X1X3_threshold <- 1e-2 Param_X1X3_threshold <- 1e-2
......
R/RunModel_GR5H.R
+ 1
− 1
View file @ 76da62f0
...@@ -19,7 +19,7 @@ RunModel_GR5H <- function(InputsModel,RunOptions,Param) { ...@@ -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,"RunOptions" ) == FALSE) { stop("'RunOptions' must be of class 'RunOptions' ") }
if (inherits(RunOptions,"GR" ) == FALSE) { stop("'RunOptions' must be of class 'GR' ") } 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 (!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 <- as.double(Param);
Param_X1X3_threshold <- 1e-2 Param_X1X3_threshold <- 1e-2
......
R/RunModel_GR5J.R
+ 1
− 1
View file @ 76da62f0
...@@ -13,7 +13,7 @@ RunModel_GR5J <- function(InputsModel,RunOptions,Param) { ...@@ -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,"RunOptions" ) == FALSE) { stop("'RunOptions' must be of class 'RunOptions' ") }
if (inherits(RunOptions,"GR" ) == FALSE) { stop("'RunOptions' must be of class 'GR' ") } 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 (!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 <- as.double(Param);
Param_X1X3_threshold <- 1e-2 Param_X1X3_threshold <- 1e-2
......
R/RunModel_GR6J.R
+ 1
− 1
View file @ 76da62f0
...@@ -13,7 +13,7 @@ RunModel_GR6J <- function(InputsModel,RunOptions,Param) { ...@@ -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,"RunOptions" ) == FALSE) { stop("'RunOptions' must be of class 'RunOptions' ") }
if (inherits(RunOptions,"GR" ) == FALSE) { stop("'RunOptions' must be of class 'GR' ") } 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 (!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 <- as.double(Param);
Param_X1X3X6_threshold <- 1e-2 Param_X1X3X6_threshold <- 1e-2
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment