diff --git a/DESCRIPTION b/DESCRIPTION index 4e1d7d011ac605a36235c1c03b7c4d83a9c6d96c..e86bef8590c2e9a82e0fbb5812c541b3326e433b 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.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")), diff --git a/NEWS.rmd b/NEWS.rmd index adba53665e73d1eb522f0e27e62098c98cfd27cc..c6b9b6b3e788ba16744f2ccaef26cf259ed2efbf 100644 --- a/NEWS.rmd +++ b/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) diff --git a/R/CreateIniStates.R b/R/CreateIniStates.R index b1748a896c5ab8fd6670f9372acec4a95b30cf27..e9830b0acfa7896f46d70264a39a3063a45a3bab 100644 --- a/R/CreateIniStates.R +++ b/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) |