Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
HYCAR-Hydro
airGR
Commits
576bacdc
Commit
576bacdc
authored
Sep 13, 2017
by
unknown
Browse files
v1.0.9.47 bug fixed inCreateIniStates when state values < 0
parent
73a63ea3
Changes
5
Hide whitespace changes
Inline
Side-by-side
DESCRIPTION
View file @
576bacdc
Package: airGR
Type: Package
Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling
Version: 1.0.9.4
6
Date: 2017-09-1
2
Version: 1.0.9.4
7
Date: 2017-09-1
3
Authors@R: c(
person("Laurent", "Coron", role = c("aut", "trl")),
person("Charles", "Perrin", role = c("aut", "ths")),
...
...
NEWS.html
View file @
576bacdc
...
...
@@ -203,8 +203,8 @@ div.tocify {
</div>
<div id="release-notes-2017-09-1
2
" class="section level3">
<h3>1.0.9.4
6
Release Notes (2017-09-1
2
)</h3>
<div id="release-notes-2017-09-1
3
" class="section level3">
<h3>1.0.9.4
7
Release Notes (2017-09-1
3
)</h3>
<div id="new-features" class="section level4">
<h4>New features</h4>
<ul>
NEWS.md
View file @
576bacdc
...
...
@@ -3,7 +3,7 @@
### 1.0.9.4
6
Release Notes (2017-09-1
2
)
### 1.0.9.4
7
Release Notes (2017-09-1
3
)
#### New features
...
...
NEWS.rmd
View file @
576bacdc
...
...
@@ -14,7 +14,7 @@ output:
### 1.0.9.4
6
Release Notes (2017-09-1
2
)
### 1.0.9.4
7
Release Notes (2017-09-1
3
)
#### New features
...
...
R/CreateIniStates.R
View file @
576bacdc
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment