From b7a47e92cf929a349badd7fbf0d4221d728eaf57 Mon Sep 17 00:00:00 2001
From: Delaigue Olivier <olivier.delaigue@irstea.priv>
Date: Thu, 19 Sep 2019 17:51:07 +0200
Subject: [PATCH] v1.3.2.36 BUG: wrong conditional expressions correcttd to
have a right number of end states returned by CreateIniStates for CemaNeige
whithout hysteresis #5618
---
DESCRIPTION | 2 +-
NEWS.md | 2 +-
R/CreateIniStates.R | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/DESCRIPTION b/DESCRIPTION
index b8854187..18dd4327 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.3.2.35
+Version: 1.3.2.36
Date: 2019-09-19
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 db3bdbd5..efba7945 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -2,7 +2,7 @@
-### 1.3.2.35 Release Notes (2019-09-19)
+### 1.3.2.36 Release Notes (2019-09-19)
#### Version control and issue tracking
diff --git a/R/CreateIniStates.R b/R/CreateIniStates.R
index e9830b0a..996f178d 100644
--- a/R/CreateIniStates.R
+++ b/R/CreateIniStates.R
@@ -203,13 +203,13 @@ CreateIniStates <- function(FUN_MOD, InputsModel, IsHyst = FALSE,
if (is.null(GthrCemaNeigeLayers)) {
GthrCemaNeigeLayers <- rep(Inf, NLayers)
}
- if (is.infinite(GthrCemaNeigeLayers)) {
+ if (any(is.infinite(GthrCemaNeigeLayers))) {
GthrCemaNeigeLayers <- rep(Inf, NLayers)
}
if (is.null(GlocmaxCemaNeigeLayers)) {
GlocmaxCemaNeigeLayers <- rep(Inf, NLayers)
}
- if (is.infinite(GlocmaxCemaNeigeLayers)) {
+ if (any(is.infinite(GlocmaxCemaNeigeLayers))) {
GlocmaxCemaNeigeLayers <- rep(Inf, NLayers)
}
--
GitLab