From c3cb2324dcd1a97940651177d2928a731e66bc87 Mon Sep 17 00:00:00 2001 From: Delaigue Olivier <olivier.delaigue@irstea.fr> Date: Thu, 12 Dec 2019 16:03:20 +0100 Subject: [PATCH] v1.4.3.5 BUG: wrong contionnal test fixed in CreatIniStates #13 --- DESCRIPTION | 2 +- NEWS.md | 2 +- R/CreateIniStates.R | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 1bafe679..345698f5 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.4.3.4 +Version: 1.4.3.5 Date: 2019-12-12 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 58f7e06c..4dd5a64f 100644 --- a/NEWS.md +++ b/NEWS.md @@ -2,7 +2,7 @@ -### 1.4.3.4 Release Notes (2019-12-12) +### 1.4.3.5 Release Notes (2019-12-12) #### New features diff --git a/R/CreateIniStates.R b/R/CreateIniStates.R index 3a5da97f..d3a6c948 100644 --- a/R/CreateIniStates.R +++ b/R/CreateIniStates.R @@ -53,7 +53,7 @@ CreateIniStates <- function(FUN_MOD, InputsModel, IsHyst = FALSE, IsIntStore = F if (!"CemaNeige" %in% ObjectClass & IsHyst) { stop("'IsHyst' cannot be TRUE if CemaNeige is not used in 'FUN_MOD'") } - if (!(identical(FUN_MOD, RunModel_GR5H | identical(FUN_MOD, RunModel_CemaNeigeGR5H))) & IsIntStore) { + if (!(identical(FUN_MOD, RunModel_GR5H) | identical(FUN_MOD, RunModel_CemaNeigeGR5H)) & IsIntStore) { stop("'IsIntStore' cannot be TRUE if GR5H is not used in 'FUN_MOD'") } -- GitLab