From 2590a4d2db4fd760518dd1f929df1ca7b596f93b Mon Sep 17 00:00:00 2001 From: Delaigue Olivier <olivier.delaigue@irstea.fr> Date: Sun, 5 Apr 2020 10:24:26 +0200 Subject: [PATCH] v1.6.1.5 BUG: wrong change introduced in commit 2ff9e331 is fixed #34 --- DESCRIPTION | 2 +- NEWS.md | 2 +- R/RunModel.R | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 79c605fb..0b28c685 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.4 +Version: 1.6.1.5 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 51dcad03..26f70024 100644 --- a/NEWS.md +++ b/NEWS.md @@ -2,7 +2,7 @@ -### 1.6.1.4 Release Notes (2020-04-05) +### 1.6.1.5 Release Notes (2020-04-05) #### New features diff --git a/R/RunModel.R b/R/RunModel.R index e8f7cf1f..dc135b28 100644 --- a/R/RunModel.R +++ b/R/RunModel.R @@ -12,7 +12,7 @@ RunModel <- function (InputsModel, RunOptions, Param, FUN_MOD) { } AreaTot <- sum(InputsModel$BasinAreas) 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)]) } else { OutputsModelDown <- FUN_MOD(InputsModel = InputsModel, RunOptions = RunOptions, Param = Param) -- GitLab