Commit 329e4a8c authored by Delaigue Olivier's avatar Delaigue Olivier
Browse files

v1.6.1.1 CLEAN: minor typo revisions in new RunModel #34

parent fe2cc30d
No related merge requests found
Showing with 6 additions and 6 deletions
+6 -6
Package: airGR Package: airGR
Type: Package Type: Package
Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling
Version: 1.6.1.0 Version: 1.6.1.1
Date: 2020-04-05 Date: 2020-04-05
Authors@R: c( Authors@R: c(
person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")), person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")),
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
### 1.6.1.0 Release Notes (2020-04-05) ### 1.6.1.1 Release Notes (2020-04-05)
#### New features #### New features
......
...@@ -4,16 +4,16 @@ RunModel <- function (InputsModel, RunOptions, Param, FUN_MOD) { ...@@ -4,16 +4,16 @@ RunModel <- function (InputsModel, RunOptions, Param, FUN_MOD) {
Outputs_down <- FUN_MOD(InputsModel = InputsModel, RunOptions = RunOptions, Outputs_down <- FUN_MOD(InputsModel = InputsModel, RunOptions = RunOptions,
Param = Param[-length(Param)]) Param = Param[-length(Param)])
Outputs_down$Qdown <- Outputs_down$Qsim Outputs_down$Qdown <- Outputs_down$Qsim
if ("daily" %in% class(InputsModel)){ if ("daily" %in% class(InputsModel)) {
TimeStep <- 60 * 60 * 24 TimeStep <- 60 * 60 * 24
} }
if ("hourly" %in% class(InputsModel)){ if ("hourly" %in% class(InputsModel)) {
TimeStep <- 60 * 60 TimeStep <- 60 * 60
} }
surf_tot <- sum(InputsModel$S_basin) surf_tot <- sum(InputsModel$S_basin)
Outputs_down$Qsim <- Outputs_down$Qdown * InputsModel$S_basin[length(InputsModel$S_basin)] / surf_tot + Outputs_down$Qsim <- Outputs_down$Qdown * InputsModel$S_basin[length(InputsModel$S_basin)] / surf_tot +
1000 / tail(Param, 1) / TimeStep * 1000 / tail(Param, 1) / TimeStep *
InputsModel$Q_upstr %*% (InputsModel$L_hyd[1,] * InputsModel$S_basin[1:length(InputsModel$L_hyd)]) InputsModel$Q_upstr %*% (InputsModel$L_hyd[1, ] * InputsModel$S_basin[1:length(InputsModel$L_hyd)])
} else { } else {
Outputs_down <- FUN_MOD(InputsModel = InputsModel, RunOptions = RunOptions, Param = Param) Outputs_down <- FUN_MOD(InputsModel = InputsModel, RunOptions = RunOptions, Param = Param)
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment