From fe6b36f43e9767708c009bf1456fa8b70b5d8608 Mon Sep 17 00:00:00 2001 From: Delaigue Olivier <olivier.delaigue@irstea.fr> Date: Tue, 17 Nov 2020 08:08:26 +0100 Subject: [PATCH] v1.6.3.61 style: replace as.integer(0) by 0L In RunModel_* functions Refs #14 --- DESCRIPTION | 4 ++-- NEWS.md | 2 +- R/RunModel_CemaNeigeGR4H.R | 2 +- R/RunModel_CemaNeigeGR4J.R | 2 +- R/RunModel_CemaNeigeGR5H.R | 2 +- R/RunModel_CemaNeigeGR5J.R | 2 +- R/RunModel_CemaNeigeGR6J.R | 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 +- 13 files changed, 14 insertions(+), 14 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 6399e036..6b5a8e36 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Package: airGR Type: Package Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling -Version: 1.6.3.60 -Date: 2020-11-16 +Version: 1.6.3.61 +Date: 2020-11-17 Authors@R: c( person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")), person("Olivier", "Delaigue", role = c("aut", "cre"), comment = c(ORCID = "0000-0002-7668-8468"), email = "airGR@inrae.fr"), diff --git a/NEWS.md b/NEWS.md index 3ce055e6..d4a0622a 100644 --- a/NEWS.md +++ b/NEWS.md @@ -4,7 +4,7 @@ -### 1.6.3.60 Release Notes (2020-11-16) +### 1.6.3.61 Release Notes (2020-11-17) #### New features diff --git a/R/RunModel_CemaNeigeGR4H.R b/R/RunModel_CemaNeigeGR4H.R index dfb198cc..dced731b 100644 --- a/R/RunModel_CemaNeigeGR4H.R +++ b/R/RunModel_CemaNeigeGR4H.R @@ -56,7 +56,7 @@ RunModel_CemaNeigeGR4H <- function(InputsModel, RunOptions, Param) { } ## Input_data_preparation - if (identical(RunOptions$IndPeriod_WarmUp, as.integer(0))) { + if (identical(RunOptions$IndPeriod_WarmUp, 0L)) { RunOptions$IndPeriod_WarmUp <- NULL } IndPeriod1 <- c(RunOptions$IndPeriod_WarmUp, RunOptions$IndPeriod_Run) diff --git a/R/RunModel_CemaNeigeGR4J.R b/R/RunModel_CemaNeigeGR4J.R index 12d4f99e..973eba0b 100644 --- a/R/RunModel_CemaNeigeGR4J.R +++ b/R/RunModel_CemaNeigeGR4J.R @@ -55,7 +55,7 @@ RunModel_CemaNeigeGR4J <- function(InputsModel, RunOptions, Param) { } ## Input_data_preparation - if (identical(RunOptions$IndPeriod_WarmUp, as.integer(0))) { + if (identical(RunOptions$IndPeriod_WarmUp, 0L)) { RunOptions$IndPeriod_WarmUp <- NULL } IndPeriod1 <- c(RunOptions$IndPeriod_WarmUp, RunOptions$IndPeriod_Run) diff --git a/R/RunModel_CemaNeigeGR5H.R b/R/RunModel_CemaNeigeGR5H.R index 9f5927bf..c86f7bcb 100644 --- a/R/RunModel_CemaNeigeGR5H.R +++ b/R/RunModel_CemaNeigeGR5H.R @@ -62,7 +62,7 @@ RunModel_CemaNeigeGR5H <- function(InputsModel, RunOptions, Param) { } ## Input_data_preparation - if (identical(RunOptions$IndPeriod_WarmUp, as.integer(0))) { + if (identical(RunOptions$IndPeriod_WarmUp, 0L)) { RunOptions$IndPeriod_WarmUp <- NULL } IndPeriod1 <- c(RunOptions$IndPeriod_WarmUp, RunOptions$IndPeriod_Run) diff --git a/R/RunModel_CemaNeigeGR5J.R b/R/RunModel_CemaNeigeGR5J.R index 07d1bee9..a3c41d06 100644 --- a/R/RunModel_CemaNeigeGR5J.R +++ b/R/RunModel_CemaNeigeGR5J.R @@ -56,7 +56,7 @@ RunModel_CemaNeigeGR5J <- function(InputsModel, RunOptions, Param) { } ## Input_data_preparation - if (identical(RunOptions$IndPeriod_WarmUp, as.integer(0))) { + if (identical(RunOptions$IndPeriod_WarmUp, 0L)) { RunOptions$IndPeriod_WarmUp <- NULL } IndPeriod1 <- c(RunOptions$IndPeriod_WarmUp,RunOptions$IndPeriod_Run) diff --git a/R/RunModel_CemaNeigeGR6J.R b/R/RunModel_CemaNeigeGR6J.R index 843d1b77..cfb4d234 100644 --- a/R/RunModel_CemaNeigeGR6J.R +++ b/R/RunModel_CemaNeigeGR6J.R @@ -60,7 +60,7 @@ RunModel_CemaNeigeGR6J <- function(InputsModel, RunOptions, Param) { } ## Input_data_preparation - if (identical(RunOptions$IndPeriod_WarmUp, as.integer(0))) { + if (identical(RunOptions$IndPeriod_WarmUp, 0L)) { RunOptions$IndPeriod_WarmUp <- NULL } IndPeriod1 <- c(RunOptions$IndPeriod_WarmUp,RunOptions$IndPeriod_Run) diff --git a/R/RunModel_GR2M.R b/R/RunModel_GR2M.R index 90255dbd..0cf0fcec 100644 --- a/R/RunModel_GR2M.R +++ b/R/RunModel_GR2M.R @@ -41,7 +41,7 @@ RunModel_GR2M <- function(InputsModel, RunOptions, Param) { } ## Input_data_preparation - if (identical(RunOptions$IndPeriod_WarmUp, as.integer(0))) { + if (identical(RunOptions$IndPeriod_WarmUp, 0L)) { RunOptions$IndPeriod_WarmUp <- NULL } IndPeriod1 <- c(RunOptions$IndPeriod_WarmUp, RunOptions$IndPeriod_Run) diff --git a/R/RunModel_GR4H.R b/R/RunModel_GR4H.R index 9620a630..7a53b891 100644 --- a/R/RunModel_GR4H.R +++ b/R/RunModel_GR4H.R @@ -46,7 +46,7 @@ RunModel_GR4H <- function(InputsModel, RunOptions, Param) { } ## Input_data_preparation - if (identical(RunOptions$IndPeriod_WarmUp, as.integer(0))) { + if (identical(RunOptions$IndPeriod_WarmUp, 0L)) { RunOptions$IndPeriod_WarmUp <- NULL } IndPeriod1 <- c(RunOptions$IndPeriod_WarmUp, RunOptions$IndPeriod_Run) diff --git a/R/RunModel_GR4J.R b/R/RunModel_GR4J.R index 00e1f10c..92fd979d 100644 --- a/R/RunModel_GR4J.R +++ b/R/RunModel_GR4J.R @@ -46,7 +46,7 @@ RunModel_GR4J <- function(InputsModel, RunOptions, Param) { } ## Input_data_preparation - if (identical(RunOptions$IndPeriod_WarmUp, as.integer(0))) { + if (identical(RunOptions$IndPeriod_WarmUp, 0L)) { RunOptions$IndPeriod_WarmUp <- NULL } IndPeriod1 <- c(RunOptions$IndPeriod_WarmUp, RunOptions$IndPeriod_Run) diff --git a/R/RunModel_GR5H.R b/R/RunModel_GR5H.R index 6291e7b1..ca920b91 100644 --- a/R/RunModel_GR5H.R +++ b/R/RunModel_GR5H.R @@ -52,7 +52,7 @@ RunModel_GR5H <- function(InputsModel, RunOptions, Param) { } ## Input_data_preparation - if (identical(RunOptions$IndPeriod_WarmUp, as.integer(0))) { + if (identical(RunOptions$IndPeriod_WarmUp, 0L)) { RunOptions$IndPeriod_WarmUp <- NULL } IndPeriod1 <- c(RunOptions$IndPeriod_WarmUp, RunOptions$IndPeriod_Run) diff --git a/R/RunModel_GR5J.R b/R/RunModel_GR5J.R index 5322ea03..862bb1db 100644 --- a/R/RunModel_GR5J.R +++ b/R/RunModel_GR5J.R @@ -46,7 +46,7 @@ RunModel_GR5J <- function(InputsModel, RunOptions, Param) { } ## Input_data_preparation - if (identical(RunOptions$IndPeriod_WarmUp, as.integer(0))) { + if (identical(RunOptions$IndPeriod_WarmUp, 0L)) { RunOptions$IndPeriod_WarmUp <- NULL } IndPeriod1 <- c(RunOptions$IndPeriod_WarmUp, RunOptions$IndPeriod_Run) diff --git a/R/RunModel_GR6J.R b/R/RunModel_GR6J.R index c5b9f431..4f4e317b 100644 --- a/R/RunModel_GR6J.R +++ b/R/RunModel_GR6J.R @@ -50,7 +50,7 @@ RunModel_GR6J <- function(InputsModel, RunOptions, Param) { } ## Input_data_preparation - if (identical(RunOptions$IndPeriod_WarmUp, as.integer(0))) { + if (identical(RunOptions$IndPeriod_WarmUp, 0L)) { RunOptions$IndPeriod_WarmUp <- NULL } IndPeriod1 <- c(RunOptions$IndPeriod_WarmUp, RunOptions$IndPeriod_Run) -- GitLab