From cc7433c3d802417e8ae2edc81e44a9e6e5784b67 Mon Sep 17 00:00:00 2001
From: Delaigue Olivier <olivier.delaigue@irstea.fr>
Date: Sun, 5 Apr 2020 10:19:59 +0200
Subject: [PATCH] v1.6.1.4 UPDATE: variables are renamed in RunModel #34
---
DESCRIPTION | 2 +-
NEWS.md | 2 +-
R/RunModel.R | 12 ++++++------
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/DESCRIPTION b/DESCRIPTION
index 4db15260..79c605fb 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.3
+Version: 1.6.1.4
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 0596a350..51dcad03 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -2,7 +2,7 @@
-### 1.6.1.3 Release Notes (2020-04-05)
+### 1.6.1.4 Release Notes (2020-04-05)
#### New features
diff --git a/R/RunModel.R b/R/RunModel.R
index a5d5824e..e8f7cf1f 100644
--- a/R/RunModel.R
+++ b/R/RunModel.R
@@ -1,21 +1,21 @@
RunModel <- function (InputsModel, RunOptions, Param, FUN_MOD) {
FUN_MOD <- match.fun(FUN_MOD)
if (inherits(InputsModel, "SD")) {
- Outputs_down <- FUN_MOD(InputsModel = InputsModel, RunOptions = RunOptions,
+ OutputsModelDown <- FUN_MOD(InputsModel = InputsModel, RunOptions = RunOptions,
Param = Param[-length(Param)])
- Outputs_down$Qdown <- Outputs_down$Qsim
+ OutputsModelDown$QsimDown <- OutputsModelDown$Qsim
if (inherits(InputsModel, "daily")) {
TimeStep <- 60 * 60 * 24
}
if (inherits(InputsModel, "hourly")) {
TimeStep <- 60 * 60
}
- surf_tot <- sum(InputsModel$BasinAreas)
- Outputs_down$Qsim <- Outputs_down$Qdown * InputsModel$BasinAreas[length(InputsModel$BasinAreas)] / surf_tot +
+ AreaTot <- sum(InputsModel$BasinAreas)
+ OutputsModelDown$Qsim <- OutputsModelDown$QsimDown * InputsModel$BasinAreas[length(InputsModel$BasinAreas)] / AreaTot +
1000 / Param[-length(Param)] / TimeStep *
InputsModel$QobsUpstr %*% (InputsModel$LengthHydro[1, ] * InputsModel$BasinAreas[1:length(InputsModel$LengthHydro)])
} 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)
}
--
GitLab