From a037e702c8977543c2079d05f8eea81af151a216 Mon Sep 17 00:00:00 2001
From: Delaigue Olivier <olivier.delaigue@irstea.fr>
Date: Sun, 5 Apr 2020 09:41:51 +0200
Subject: [PATCH] v1.6.1.2 UPDATE: new names of the outputs returned by the
CreateInputsModel function are now used in RunModel #34 Linked to commit
617bc09d
---
DESCRIPTION | 2 +-
NEWS.md | 2 +-
R/RunModel.R | 6 +++---
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/DESCRIPTION b/DESCRIPTION
index 7504fd06..43cde6b7 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 db482535..03863c7f 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -2,7 +2,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 84cf66d9..4fab1150 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)
}
--
GitLab