From 576bacdccf513b99bde8021d63dbdbad2e628be5 Mon Sep 17 00:00:00 2001
From: unknown <olivier.delaigue@ANPI1430.antony.irstea.priv>
Date: Wed, 13 Sep 2017 14:49:09 +0200
Subject: [PATCH] v1.0.9.47 bug fixed inCreateIniStates when state values < 0
---
DESCRIPTION | 4 ++--
NEWS.html | 4 ++--
NEWS.md | 2 +-
NEWS.rmd | 2 +-
R/CreateIniStates.R | 15 +++++++++------
5 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/DESCRIPTION b/DESCRIPTION
index d5e6224e..995ff8e3 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,8 +1,8 @@
Package: airGR
Type: Package
Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling
-Version: 1.0.9.46
-Date: 2017-09-12
+Version: 1.0.9.47
+Date: 2017-09-13
Authors@R: c(
person("Laurent", "Coron", role = c("aut", "trl")),
person("Charles", "Perrin", role = c("aut", "ths")),
diff --git a/NEWS.html b/NEWS.html
index d0a41b5a..09281776 100644
--- a/NEWS.html
+++ b/NEWS.html
@@ -203,8 +203,8 @@ div.tocify {
</div>
-<div id="release-notes-2017-09-12" class="section level3">
-<h3>1.0.9.46 Release Notes (2017-09-12)</h3>
+<div id="release-notes-2017-09-13" class="section level3">
+<h3>1.0.9.47 Release Notes (2017-09-13)</h3>
<div id="new-features" class="section level4">
<h4>New features</h4>
<ul>
diff --git a/NEWS.md b/NEWS.md
index a410bc94..e3235de3 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -3,7 +3,7 @@
-### 1.0.9.46 Release Notes (2017-09-12)
+### 1.0.9.47 Release Notes (2017-09-13)
#### New features
diff --git a/NEWS.rmd b/NEWS.rmd
index cc730197..b34afa84 100644
--- a/NEWS.rmd
+++ b/NEWS.rmd
@@ -14,7 +14,7 @@ output:
-### 1.0.9.46 Release Notes (2017-09-12)
+### 1.0.9.47 Release Notes (2017-09-13)
#### New features
diff --git a/R/CreateIniStates.R b/R/CreateIniStates.R
index 6cf925a4..290105d0 100644
--- a/R/CreateIniStates.R
+++ b/R/CreateIniStates.R
@@ -62,11 +62,6 @@ CreateIniStates <- function(FUN_MOD, InputsModel,
## check states
- if (any(ProdStore < 0) | any(RoutStore < 0) |
- any(UH1 < 0) | any(UH2 < 0) |
- any(GCemaNeigeLayers < 0)) {
- stop("Negative values are not allowed for any of 'ProdStore', 'RoutStore', 'UH1', 'UH2', 'GCemaNeigeLayers'")
- }
if (any(eTGCemaNeigeLayers > 0)) {
stop("Positive values are not allowed for 'eTGCemaNeigeLayers'")
}
@@ -185,7 +180,15 @@ CreateIniStates <- function(FUN_MOD, InputsModel,
}
if (is.null(eTGCemaNeigeLayers)) {
eTGCemaNeigeLayers <- rep(Inf, NLayers)
- }
+ }
+
+
+ # check negative values
+ if (any(ProdStore < 0) | any(RoutStore < 0) |
+ any(UH1 < 0) | any(UH2 < 0) |
+ any(GCemaNeigeLayers < 0)) {
+ stop("Negative values are not allowed for any of 'ProdStore', 'RoutStore', 'UH1', 'UH2', 'GCemaNeigeLayers'")
+ }
## check length
--
GitLab