Commit 0ae0fb87 authored by Delaigue Olivier's avatar Delaigue Olivier
Browse files

v1.3.2.27 BUG: right number of end states returned by CreateIniStates for...

v1.3.2.27 BUG: right number of end states returned by CreateIniStates for CemaNeige whithout hysteresis #5618
Showing with 5 additions and 4 deletions
+5 -4
Package: airGR Package: airGR
Type: Package Type: Package
Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling
Version: 1.3.2.26 Version: 1.3.2.27
Date: 2019-09-04 Date: 2019-09-04
Authors@R: c( Authors@R: c(
person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")), person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")),
......
...@@ -14,13 +14,14 @@ output: ...@@ -14,13 +14,14 @@ output:
### 1.3.2.26 Release Notes (2019-09-04) ### 1.3.2.27 Release Notes (2019-09-04)
#### Bug fixes #### Bug fixes
- Fixed bug in <code>RunModel_CemaNeige()</code>. The function now runs correctly when <code>IndPeriod_WarmUp = 0L</code> in <code>CreateRunOptions()</code> value without <code>"CumFreq"</code> in order to completely disable the warm-up period (e.g. to perform a forecast form a given initial state). - Fixed bug in <code>RunModel_CemaNeige()</code>. The function now runs correctly when <code>IndPeriod_WarmUp = 0L</code> in <code>CreateRunOptions()</code> value without <code>"CumFreq"</code> in order to completely disable the warm-up period (e.g. to perform a forecast form a given initial state).
- Fixed bug in <code>CreateIniStates()</code>. The function now returns the right number of end states when CemaNeige is used whithout hysteresis.
- Fixed bug in the <code>RunModel_CemaNeige&#42;()</code> functions. G and Gthr end states are no more inversed in the output values. - Fixed bug in the <code>RunModel_CemaNeige&#42;()</code> functions. G and Gthr end states are no more inversed in the output values.
____________________________________________________________________________________ ____________________________________________________________________________________
......
...@@ -200,10 +200,10 @@ CreateIniStates <- function(FUN_MOD, InputsModel, IsHyst = FALSE, ...@@ -200,10 +200,10 @@ CreateIniStates <- function(FUN_MOD, InputsModel, IsHyst = FALSE,
if (is.null(eTGCemaNeigeLayers)) { if (is.null(eTGCemaNeigeLayers)) {
eTGCemaNeigeLayers <- rep(Inf, NLayers) eTGCemaNeigeLayers <- rep(Inf, NLayers)
} }
if (is.null(GthrCemaNeigeLayers)) { if (is.null(GthrCemaNeigeLayers) | is.infinite(GthrCemaNeigeLayers)) {
GthrCemaNeigeLayers <- rep(Inf, NLayers) GthrCemaNeigeLayers <- rep(Inf, NLayers)
} }
if (is.null(GlocmaxCemaNeigeLayers)) { if (is.null(GlocmaxCemaNeigeLayers) | is.infinite(GlocmaxCemaNeigeLayers)) {
GlocmaxCemaNeigeLayers <- rep(Inf, NLayers) GlocmaxCemaNeigeLayers <- rep(Inf, NLayers)
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment