Commit 576bacdc authored by unknown's avatar unknown
Browse files

v1.0.9.47 bug fixed inCreateIniStates when state values < 0

Showing with 15 additions and 12 deletions
+15 -12
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.0.9.46 Version: 1.0.9.47
Date: 2017-09-12 Date: 2017-09-13
Authors@R: c( Authors@R: c(
person("Laurent", "Coron", role = c("aut", "trl")), person("Laurent", "Coron", role = c("aut", "trl")),
person("Charles", "Perrin", role = c("aut", "ths")), person("Charles", "Perrin", role = c("aut", "ths")),
......
...@@ -203,8 +203,8 @@ div.tocify { ...@@ -203,8 +203,8 @@ div.tocify {
</div> </div>
   
   
<div id="release-notes-2017-09-12" class="section level3"> <div id="release-notes-2017-09-13" class="section level3">
<h3>1.0.9.46 Release Notes (2017-09-12)</h3> <h3>1.0.9.47 Release Notes (2017-09-13)</h3>
<div id="new-features" class="section level4"> <div id="new-features" class="section level4">
<h4>New features</h4> <h4>New features</h4>
<ul> <ul>
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
### 1.0.9.46 Release Notes (2017-09-12) ### 1.0.9.47 Release Notes (2017-09-13)
#### New features #### New features
......
...@@ -14,7 +14,7 @@ output: ...@@ -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 #### New features
......
...@@ -62,11 +62,6 @@ CreateIniStates <- function(FUN_MOD, InputsModel, ...@@ -62,11 +62,6 @@ CreateIniStates <- function(FUN_MOD, InputsModel,
## check states ## 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)) { if (any(eTGCemaNeigeLayers > 0)) {
stop("Positive values are not allowed for 'eTGCemaNeigeLayers'") stop("Positive values are not allowed for 'eTGCemaNeigeLayers'")
} }
...@@ -185,7 +180,15 @@ CreateIniStates <- function(FUN_MOD, InputsModel, ...@@ -185,7 +180,15 @@ CreateIniStates <- function(FUN_MOD, InputsModel,
} }
if (is.null(eTGCemaNeigeLayers)) { if (is.null(eTGCemaNeigeLayers)) {
eTGCemaNeigeLayers <- rep(Inf, NLayers) 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 ## check length
......
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