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
29d8e36f
Commit
29d8e36f
authored
Nov 09, 2017
by
unknown
Browse files
v1.0.9.60 minor typo revisions in CreateRunOptions messages
parent
443dc0b8
Changes
3
Hide whitespace changes
Inline
Side-by-side
DESCRIPTION
View file @
29d8e36f
Package: airGR
Type: Package
Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling
Version: 1.0.9.
59
Version: 1.0.9.
60
Date: 2017-11-09
Authors@R: c(
person("Laurent", "Coron", role = c("aut", "trl")),
...
...
NEWS.rmd
View file @
29d8e36f
...
...
@@ -14,7 +14,7 @@ output:
### 1.0.9.
59
Release Notes (2017-11-09)
### 1.0.9.
60
Release Notes (2017-11-09)
#### New features
...
...
R/CreateRunOptions.R
View file @
29d8e36f
...
...
@@ -64,11 +64,11 @@ CreateRunOptions <- function(FUN_MOD, InputsModel, IndPeriod_WarmUp = NULL, IndP
##check_IndPeriod_WarmUp
WTxt
<-
NULL
;
if
(
is.null
(
IndPeriod_WarmUp
)){
WTxt
<-
paste
(
WTxt
,
"\t Model warm
-
up period not defined -> default configuration used \n"
,
sep
=
""
);
WTxt
<-
paste
(
WTxt
,
"\t Model warm
up period not defined -> default configuration used \n"
,
sep
=
""
);
##If_the_run_period_starts_at_the_very_beginning_of_the_time_series
if
(
IndPeriod_Run
[
1
]
==
as.integer
(
1
)){
IndPeriod_WarmUp
<-
as.integer
(
0
);
WTxt
<-
paste
(
WTxt
,
"\t No data were found for model warm
-
up! \n"
,
sep
=
""
);
WTxt
<-
paste
(
WTxt
,
"\t No data were found for model warm
up! \n"
,
sep
=
""
);
##We_look_for_the_longest_period_preceeding_the_run_period_with_a_maximum_of_one_year
}
else
{
TmpDateR
<-
InputsModel
$
DatesR
[
IndPeriod_Run
[
1
]]
-
365
*
24
*
60
*
60
;
### minimal date to start the warmup
...
...
@@ -80,7 +80,7 @@ CreateRunOptions <- function(FUN_MOD, InputsModel, IndPeriod_WarmUp = NULL, IndP
if
(
length
(
IndPeriod_WarmUp
)
*
TimeStep
/
(
365
*
24
*
60
*
60
)
>=
1
){
WTxt
<-
paste
(
WTxt
,
"\t The year preceding the run period is used \n"
,
sep
=
""
);
}
else
{
WTxt
<-
paste
(
WTxt
,
"\t Less than a year (without missing values) was found for model warm
-
up: \n"
,
sep
=
""
);
WTxt
<-
paste
(
WTxt
,
"\t Less than a year (without missing values) was found for model warm
up: \n"
,
sep
=
""
);
WTxt
<-
paste
(
WTxt
,
"\t ("
,
length
(
IndPeriod_WarmUp
),
" time-steps are used for initialisation) \n"
,
sep
=
""
);
}
}
...
...
@@ -90,9 +90,9 @@ CreateRunOptions <- function(FUN_MOD, InputsModel, IndPeriod_WarmUp = NULL, IndP
if
(
!
is.numeric
(
IndPeriod_WarmUp
)){
stop
(
"IndPeriod_Run must be a vector of numeric values \n"
);
return
(
NULL
);
}
if
(
storage.mode
(
IndPeriod_WarmUp
)
!=
"integer"
){
stop
(
"IndPeriod_Run should be of type integer \n"
);
return
(
NULL
);
}
if
(
identical
(
IndPeriod_WarmUp
,
as.integer
(
0
))){
WTxt
<-
paste
(
WTxt
,
"\t No warm
-
up period is used! \n"
,
sep
=
""
);
}
WTxt
<-
paste
(
WTxt
,
"\t No warm
up period is used! \n"
,
sep
=
""
);
}
if
((
IndPeriod_Run
[
1
]
-1
)
!=
tail
(
IndPeriod_WarmUp
,
1
)
&
!
identical
(
IndPeriod_WarmUp
,
as.integer
(
0
))){
WTxt
<-
paste
(
WTxt
,
"\t Model warm
-
up period is not directly before the model run period \n"
,
sep
=
""
);
}
WTxt
<-
paste
(
WTxt
,
"\t Model warm
up period is not directly before the model run period \n"
,
sep
=
""
);
}
}
if
(
!
is.null
(
WTxt
)
&
verbose
){
warning
(
WTxt
);
}
...
...
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