From 29d64e4e0eceb8ef719978a9d3b56f74e12c1f5c Mon Sep 17 00:00:00 2001
From: Delaigue Olivier <olivier.delaigue@irstea.fr>
Date: Wed, 11 Nov 2020 14:38:09 +0100
Subject: [PATCH] v1.6.3.51 fix: add line of code unintentionally removed from
the RunModel_GR2M function Refs 4453a6fa, #14
---
DESCRIPTION | 2 +-
NEWS.md | 2 +-
R/RunModel_GR2M.R | 7 ++++---
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/DESCRIPTION b/DESCRIPTION
index f7f343c3..3f755b76 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.3.50
+Version: 1.6.3.51
Date: 2020-11-11
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 d990b93a..72b585ff 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -4,7 +4,7 @@
-### 1.6.3.50 Release Notes (2020-11-11)
+### 1.6.3.51 Release Notes (2020-11-11)
#### New features
diff --git a/R/RunModel_GR2M.R b/R/RunModel_GR2M.R
index 0a3683a1..fa0a1d6f 100644
--- a/R/RunModel_GR2M.R
+++ b/R/RunModel_GR2M.R
@@ -73,20 +73,21 @@ RunModel_GR2M <- function(InputsModel,RunOptions,Param) {
## Output_data_preparation
## OutputsModel_only
- if (ExportDatesR==FALSE & ExportStateEnd==FALSE) {
+ if (ExportDatesR == FALSE & ExportStateEnd == FALSE) {
OutputsModel <- lapply(seq_len(RESULTS$NOutputs), function(i) RESULTS$Outputs[IndPeriod2,i]);
names(OutputsModel) <- FortranOutputs[IndOutputs]; }
## DatesR_and_OutputsModel_only
- if (ExportDatesR==TRUE & ExportStateEnd==FALSE) {
+ if (ExportDatesR == TRUE & ExportStateEnd == FALSE) {
OutputsModel <- c( list(InputsModel$DatesR[RunOptions$IndPeriod_Run]),
lapply(seq_len(RESULTS$NOutputs), function(i) RESULTS$Outputs[IndPeriod2,i]) );
names(OutputsModel) <- c("DatesR",FortranOutputs[IndOutputs]); }
## OutputsModel_and_SateEnd_only
- if (ExportDatesR==FALSE & ExportStateEnd==TRUE) {
+ if (ExportDatesR == FALSE & ExportStateEnd == TRUE) {
OutputsModel <- c( lapply(seq_len(RESULTS$NOutputs), function(i) RESULTS$Outputs[IndPeriod2,i]),
list(RESULTS$StateEnd) );
names(OutputsModel) <- c(FortranOutputs[IndOutputs],"StateEnd"); }
## DatesR_and_OutputsModel_and_SateEnd
+ if ((ExportDatesR==TRUE & ExportStateEnd==TRUE) | "all" %in% RunOptions$Outputs_Sim) {
OutputsModel <- c( list(InputsModel$DatesR[RunOptions$IndPeriod_Run]),
lapply(seq_len(RESULTS$NOutputs), function(i) RESULTS$Outputs[IndPeriod2,i]),
list(RESULTS$StateEnd) );
--
GitLab