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
e538aac6
Commit
e538aac6
authored
Aug 11, 2017
by
unknown
Browse files
v1.0.9.19 bug fixed when verbose = FALSE in CreateIniStates, default favlues are now set
parent
264ac483
Changes
2
Hide whitespace changes
Inline
Side-by-side
DESCRIPTION
View file @
e538aac6
Package: airGR
Type: Package
Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling
Version: 1.0.9.1
8
Version: 1.0.9.1
9
Date: 2017-08-11
Authors@R: c(
person("Laurent", "Coron", role = c("aut", "trl")),
...
...
R/CreateIniStates.R
View file @
e538aac6
...
...
@@ -67,25 +67,33 @@ CreateIniStates <- function(FUN_MOD, InputsModel,
stop
(
"'RunModel_*GR6J' need an 'ExpStore' value"
)
return
(
NULL
)
}
}
else
if
(
!
is.null
(
ExpStore
)
&
verbose
)
{
warning
(
"This 'FUN_MOD' does not require 'ExpStore'. Value set to NA"
)
}
else
if
(
!
is.null
(
ExpStore
))
{
if
(
verbose
)
{
warning
(
"This 'FUN_MOD' does not require 'ExpStore'. Value set to NA"
)
}
ExpStore
<-
Inf
}
if
(
identical
(
FUN_MOD
,
RunModel_GR2M
)
&
verbose
)
{
if
(
identical
(
FUN_MOD
,
RunModel_GR2M
))
{
if
(
!
is.null
(
UH1
))
{
warning
(
"This 'FUN_MOD' does not require 'UH1'. Values set to NA"
)
if
(
verbose
)
{
warning
(
"This 'FUN_MOD' does not require 'UH1'. Values set to NA"
)
}
UH1
<-
rep
(
Inf
,
UH1n
)
}
if
(
!
is.null
(
UH2
))
{
warning
(
"This 'FUN_MOD' does not require 'UH2'. Values set to NA"
)
if
(
verbose
)
{
warning
(
"This 'FUN_MOD' does not require 'UH2'. Values set to NA"
)
}
UH2
<-
rep
(
Inf
,
UH2n
)
}
}
if
((
identical
(
FUN_MOD
,
RunModel_GR5J
)
|
identical
(
FUN_MOD
,
RunModel_CemaNeigeGR5J
))
&
!
is.null
(
UH1
)
&
verbose
)
{
warning
(
"This 'FUN_MOD' does not require 'UH1'. Values set to NA"
)
if
((
identical
(
FUN_MOD
,
RunModel_GR5J
)
|
identical
(
FUN_MOD
,
RunModel_CemaNeigeGR5J
))
&
!
is.null
(
UH1
))
{
if
(
verbose
)
{
warning
(
"This 'FUN_MOD' does not require 'UH1'. Values set to NA"
)
}
UH1
<-
rep
(
Inf
,
UH1n
)
}
...
...
@@ -95,8 +103,10 @@ CreateIniStates <- function(FUN_MOD, InputsModel,
return
(
NULL
)
}
if
(
!
"CemaNeige"
%in%
ObjectClass
&
(
!
is.null
(
GCemaNeigeLayers
)
|
!
is.null
(
eTGCemaNeigeLayers
))
&
verbose
)
{
warning
(
"This 'FUN_MOD' does not require 'GCemaNeigeLayers' and 'GCemaNeigeLayers'. Values set to NA"
)
(
!
is.null
(
GCemaNeigeLayers
)
|
!
is.null
(
eTGCemaNeigeLayers
)))
{
if
(
verbose
)
{
warning
(
"This 'FUN_MOD' does not require 'GCemaNeigeLayers' and 'GCemaNeigeLayers'. Values set to NA"
)
}
GCemaNeigeLayers
<-
Inf
eTGCemaNeigeLayers
<-
Inf
}
...
...
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