Commit cc7433c3 authored by Delaigue Olivier's avatar Delaigue Olivier Committed by Dorchies David
Browse files

v1.6.1.4 UPDATE: variables are renamed in RunModel #34

Showing with 8 additions and 8 deletions
+8 -8
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.3 Version: 1.6.1.4
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")),
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
### 1.6.1.3 Release Notes (2020-04-05) ### 1.6.1.4 Release Notes (2020-04-05)
#### New features #### New features
......
RunModel <- function (InputsModel, RunOptions, Param, FUN_MOD) { RunModel <- function (InputsModel, RunOptions, Param, FUN_MOD) {
FUN_MOD <- match.fun(FUN_MOD) FUN_MOD <- match.fun(FUN_MOD)
if (inherits(InputsModel, "SD")) { if (inherits(InputsModel, "SD")) {
Outputs_down <- FUN_MOD(InputsModel = InputsModel, RunOptions = RunOptions, OutputsModelDown <- FUN_MOD(InputsModel = InputsModel, RunOptions = RunOptions,
Param = Param[-length(Param)]) Param = Param[-length(Param)])
Outputs_down$Qdown <- Outputs_down$Qsim OutputsModelDown$QsimDown <- OutputsModelDown$Qsim
if (inherits(InputsModel, "daily")) { if (inherits(InputsModel, "daily")) {
TimeStep <- 60 * 60 * 24 TimeStep <- 60 * 60 * 24
} }
if (inherits(InputsModel, "hourly")) { if (inherits(InputsModel, "hourly")) {
TimeStep <- 60 * 60 TimeStep <- 60 * 60
} }
surf_tot <- sum(InputsModel$BasinAreas) AreaTot <- sum(InputsModel$BasinAreas)
Outputs_down$Qsim <- Outputs_down$Qdown * InputsModel$BasinAreas[length(InputsModel$BasinAreas)] / surf_tot + OutputsModelDown$Qsim <- OutputsModelDown$QsimDown * InputsModel$BasinAreas[length(InputsModel$BasinAreas)] / AreaTot +
1000 / Param[-length(Param)] / TimeStep * 1000 / Param[-length(Param)] / TimeStep *
InputsModel$QobsUpstr %*% (InputsModel$LengthHydro[1, ] * InputsModel$BasinAreas[1:length(InputsModel$LengthHydro)]) InputsModel$QobsUpstr %*% (InputsModel$LengthHydro[1, ] * InputsModel$BasinAreas[1:length(InputsModel$LengthHydro)])
} else { } else {
Outputs_down <- FUN_MOD(InputsModel = InputsModel, RunOptions = RunOptions, Param = Param) OutputsModelDown <- FUN_MOD(InputsModel = InputsModel, RunOptions = RunOptions, Param = Param)
} }
return(Outputs_down) return(OutputsModelDown)
} }
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