diff --git a/DESCRIPTION b/DESCRIPTION index a8cf73ddf662f144233b0f10439cbfe5f605d14c..3258fcf3663792f1946f6e736f5e3ae2b6ef47b7 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: airGR Type: Package Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling -Version: 1.6.1.1 +Version: 1.6.1.2 Date: 2020-04-05 Authors@R: c( person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")), diff --git a/NEWS.md b/NEWS.md index ac872dbaf2ff77662900dcb57cd6e28195343ff8..5517de7a88401d5a596307207fcfae187f319f9d 100644 --- a/NEWS.md +++ b/NEWS.md @@ -4,7 +4,7 @@ -### 1.6.1.1 Release Notes (2020-04-05) +### 1.6.1.2 Release Notes (2020-04-05) #### New features diff --git a/R/RunModel.R b/R/RunModel.R index 84cf66d90e9e5252b4272c07429a4c58c9e38e8c..4fab1150b6b8619c125e3255735dd0b4103903af 100644 --- a/R/RunModel.R +++ b/R/RunModel.R @@ -10,10 +10,10 @@ RunModel <- function (InputsModel, RunOptions, Param, FUN_MOD) { if ("hourly" %in% class(InputsModel)) { TimeStep <- 60 * 60 } - surf_tot <- sum(InputsModel$S_basin) - Outputs_down$Qsim <- Outputs_down$Qdown * InputsModel$S_basin[length(InputsModel$S_basin)] / surf_tot + + surf_tot <- sum(InputsModel$BasinAreas) + Outputs_down$Qsim <- Outputs_down$Qdown * InputsModel$BasinAreas[length(InputsModel$BasinAreas)] / surf_tot + 1000 / tail(Param, 1) / TimeStep * - InputsModel$Q_upstr %*% (InputsModel$L_hyd[1, ] * InputsModel$S_basin[1:length(InputsModel$L_hyd)]) + InputsModel$QobsUpstr %*% (InputsModel$LengthHydro[1, ] * InputsModel$BasinAreas[1:length(InputsModel$LengthHydro)]) } else { Outputs_down <- FUN_MOD(InputsModel = InputsModel, RunOptions = RunOptions, Param = Param) }