v1.3.2.28 BUG: wrong conditional expressions correctd to have a right number...

v1.3.2.28 BUG: wrong conditional expressions correctd to have a right number of end states returned by CreateIniStates for CemaNeige whithout hysteresis #5618

DESCRIPTION

 Package: airGR
 Type: Package
 Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling
-Version: 1.3.2.27
+Version: 1.3.2.28
 Date: 2019-09-04
 Authors@R: c(
   person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")),

NEWS.rmd

@@ -14,7 +14,7 @@ output:
 
 
 
-### 1.3.2.27 Release Notes (2019-09-04)
+### 1.3.2.28 Release Notes (2019-09-04)
 
 
 

R/CreateIniStates.R

@@ -200,13 +200,18 @@ CreateIniStates <- function(FUN_MOD, InputsModel, IsHyst = FALSE,
   if (is.null(eTGCemaNeigeLayers)) {
     eTGCemaNeigeLayers <- rep(Inf, NLayers)
   }
-  if (is.null(GthrCemaNeigeLayers) | is.infinite(GthrCemaNeigeLayers)) {
+  if (is.null(GthrCemaNeigeLayers)) {
     GthrCemaNeigeLayers <- rep(Inf, NLayers)
   }
-  if (is.null(GlocmaxCemaNeigeLayers) | is.infinite(GlocmaxCemaNeigeLayers)) {
+  if (is.infinite(GthrCemaNeigeLayers)) {
+    GthrCemaNeigeLayers <- rep(Inf, NLayers)
+  }
+  if (is.null(GlocmaxCemaNeigeLayers)) {
     GlocmaxCemaNeigeLayers <- rep(Inf, NLayers)
   }
-  
+  if (is.infinite(GlocmaxCemaNeigeLayers)) {
+    GlocmaxCemaNeigeLayers <- rep(Inf, NLayers)
+  }  
   
   # check negative values
   if (any(ProdStore < 0) | any(RoutStore < 0) |