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
2ae49608
Commit
2ae49608
authored
Oct 14, 2020
by
Delaigue Olivier
Browse files
v1.6.3.6 style(RunModel_LAG): minor typo revisions
Refs
#34
parent
6c2eb581
Pipeline
#16637
passed with stages
in 11 minutes and 6 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
DESCRIPTION
View file @
2ae49608
Package: airGR
Type: Package
Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling
Version: 1.6.3.
5
Version: 1.6.3.
6
Date: 2020-10-14
Authors@R: c(
person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")),
...
...
NEWS.md
View file @
2ae49608
## Release History of the airGR Package
### 1.6.3.
5
Release Notes (2020-10-14)
### 1.6.3.
6
Release Notes (2020-10-14)
#### New features
...
...
R/RunModel_LAG.R
View file @
2ae49608
...
...
@@ -44,13 +44,13 @@ RunModel_LAG <- function(InputsModel, RunOptions, Param) {
NbUpBasins
<-
length
(
InputsModel
$
LengthHydro
)
LengthTs
<-
length
(
OutputsModel
$
QsimDown
)
OutputsModel
$
Qsim
<-
OutputsModel
$
QsimDown
*
InputsModel
$
BasinAreas
[
length
(
InputsModel
$
BasinAreas
)]
*
1
E
3
OutputsModel
$
Qsim
<-
OutputsModel
$
QsimDown
*
InputsModel
$
BasinAreas
[
length
(
InputsModel
$
BasinAreas
)]
*
1
e
3
for
(
upstream_basin
in
seq_len
(
NbUpBasins
))
{
Qupstream
<-
InputsModel
$
Qupstream
[
RunOptions
$
IndPeriod_Run
,
upstream_basin
]
if
(
!
is.na
(
InputsModel
$
BasinAreas
[
upstream_basin
]))
{
# Upstream flow with area needs to be converted to m3 by time step
Qupstream
<-
Qupstream
*
InputsModel
$
BasinAreas
[
upstream_basin
]
*
1
E
3
Qupstream
<-
Qupstream
*
InputsModel
$
BasinAreas
[
upstream_basin
]
*
1
e
3
}
OutputsModel
$
Qsim
<-
OutputsModel
$
Qsim
+
c
(
rep
(
0
,
floor
(
PT
[
upstream_basin
])),
...
...
@@ -66,6 +66,6 @@ RunModel_LAG <- function(InputsModel, RunOptions, Param) {
OutputsModel
$
Qsim
[
OutputsModel
$
Qsim
<
0
]
<-
0
}
# Convert back Qsim to mm
OutputsModel
$
Qsim
<-
OutputsModel
$
Qsim
/
sum
(
InputsModel
$
BasinAreas
,
na.rm
=
TRUE
)
/
1
E
3
OutputsModel
$
Qsim
<-
OutputsModel
$
Qsim
/
sum
(
InputsModel
$
BasinAreas
,
na.rm
=
TRUE
)
/
1
e
3
return
(
OutputsModel
)
}
\ No newline at end of file
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