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
26ab68c8
Commit
26ab68c8
authored
Jan 18, 2019
by
Delaigue Olivier
Browse files
v1.1.2.29 CLEAN: error message modified in SeriesAggreg #5423
parent
e6a53d09
Changes
3
Hide whitespace changes
Inline
Side-by-side
DESCRIPTION
View file @
26ab68c8
Package: airGR
Type: Package
Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling
Version: 1.1.2.2
8
Version: 1.1.2.2
9
Date: 2019-01-18
Authors@R: c(
person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")),
...
...
NEWS.rmd
View file @
26ab68c8
...
...
@@ -13,7 +13,7 @@ output:
### 1.1.2.2
8
Release Notes (2019-01-18)
### 1.1.2.2
9
Release Notes (2019-01-18)
...
...
R/SeriesAggreg.R
View file @
26ab68c8
...
...
@@ -137,14 +137,14 @@ SeriesAggreg <- function(TabSeries,
}
TmpDatesR
<-
seq
(
from
=
TabSeries
[
1
,
1
],
to
=
tail
(
TabSeries
[,
1
],
1
),
by
=
by
)
if
(
!
identical
(
TabSeries
[,
1
],
TmpDatesR
))
{
stop
(
"
Problem
d
e
te
cted in TabSeries dates vector (in comparison with seq(from=TabSeries[1,1],to=tail(TabSeries[,1],1)))
\n"
)
stop
(
"
Some
d
a
te
s might not be ordered or are missing in TabSeries
\n"
)
return
(
NULL
)
}
##check_conversion_direction
if
((
TimeFormat
==
"daily"
&
NewTimeFormat
%in%
c
(
"hourly"
)
)
|
(
TimeFormat
==
"monthly"
&
NewTimeFormat
%in%
c
(
"hourly"
,
"daily"
)
)
|
(
TimeFormat
==
"yearly"
&
NewTimeFormat
%in%
c
(
"hourly"
,
"daily"
,
"monthly"
)))
{
stop
(
"
o
nly time aggregation can be performed \n"
)
stop
(
"
O
nly time aggregation can be performed \n"
)
return
(
NULL
)
}
##check_if_conversion_not_needed
...
...
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