diff --git a/DESCRIPTION b/DESCRIPTION index 6399e0364bd2736131c6f2d8170bfc67c9de846c..6b5a8e36489ea135d7ffc7dcab4423fc48b0bf59 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 3ce055e68d48b76f80bce7b5af0e50ca78f9adf7..d4a0622a90b336f700a1a2f64a28b2748ff3b047 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 dfb198ccef9d1c361c076e595d46e9821845ff8d..dced731bdf80843a13bfdf3598976a6d6f7f06dd 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 12d4f99e60f5fb39c235798217e73ca06e337f98..973eba0b88f8c8c2045c4c5a9fdc5fd3ed752d74 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 9f5927bf0a6ab90b860cf40b6bb37d9fd08259b9..c86f7bcbde72f99ec0705b488d2d245acbd2ac64 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 07d1bee96fdd0614b4074a9139bb63379b1bb7e4..a3c41d06b978364e17eca6c025c0f520bddb0ef1 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 843d1b7735468d85d1442e011641a3c6ff26f31f..cfb4d234529fc2492d4a57d4e8f7ab72f25e8828 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 90255dbdee20076254e19b465debb518206949fe..0cf0fcec3b5765752be2c11555343caf7f2243f5 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 9620a630115d193d776e0de0cf85d039e0ec3550..7a53b891b94ab473c265505194ed83e8c2a7aac1 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 00e1f10ca79f33b24c3e419ed837b7797f4baf83..92fd979df7618b92dab0c5e28c271ac54f3a90bd 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 6291e7b1dbf36e5a4611f600fa6ace1582659ca1..ca920b91744b2adeb54c829811f6cf6ba8483ce1 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 5322ea032c3b395b4c1c5bd9b91b4408f133f904..862bb1dbe760829d08dd135d51d47cead92f4581 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 c5b9f4313f05b3ae5c91416e9135b76ced218233..4f4e317bced78fc08555d8a1b67b4631a39636aa 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)