From 02de391783caa02b67949e24ca6e8f784389777e Mon Sep 17 00:00:00 2001
From: Delaigue Olivier <olivier.delaigue@irstea.fr>
Date: Tue, 17 Nov 2020 08:21:29 +0100
Subject: [PATCH] v1.6.3.64 stye: add breaklines afet else conditions in
RunModel_CemaNeigeGR* functions Refs #14
---
DESCRIPTION | 2 +-
NEWS.md | 2 +-
R/RunModel_CemaNeigeGR4J.R | 6 ++++--
R/RunModel_CemaNeigeGR5H.R | 3 ++-
4 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/DESCRIPTION b/DESCRIPTION
index 2262f50b..91026ab8 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.63
+Version: 1.6.3.64
Date: 2020-11-17
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 505395fe..37d17e1a 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -4,7 +4,7 @@
-### 1.6.3.63 Release Notes (2020-11-17)
+### 1.6.3.64 Release Notes (2020-11-17)
#### New features
diff --git a/R/RunModel_CemaNeigeGR4J.R b/R/RunModel_CemaNeigeGR4J.R
index 973eba0b..d525bdbb 100644
--- a/R/RunModel_CemaNeigeGR4J.R
+++ b/R/RunModel_CemaNeigeGR4J.R
@@ -74,7 +74,8 @@ RunModel_CemaNeigeGR4J <- function(InputsModel, RunOptions, Param) {
if (inherits(RunOptions, "CemaNeige")) {
if ("all" %in% RunOptions$Outputs_Sim) {
IndOutputsCemaNeige <- as.integer(1:length(FortranOutputs$CN))
- } else { IndOutputsCemaNeige <- which(FortranOutputs$CN %in% RunOptions$Outputs_Sim)
+ } else {
+ IndOutputsCemaNeige <- which(FortranOutputs$CN %in% RunOptions$Outputs_Sim)
}
CemaNeigeLayers <- list()
CemaNeigeStateEnd <- NULL
@@ -138,7 +139,8 @@ RunModel_CemaNeigeGR4J <- function(InputsModel, RunOptions, Param) {
## MODEL______________________________________________________________________________________
if ("all" %in% RunOptions$Outputs_Sim) {
IndOutputsMod <- as.integer(1:length(FortranOutputs$GR))
- } else { IndOutputsMod <- which(FortranOutputs$GR %in% RunOptions$Outputs_Sim)
+ } else {
+ IndOutputsMod <- which(FortranOutputs$GR %in% RunOptions$Outputs_Sim)
}
## Use_of_IniResLevels
diff --git a/R/RunModel_CemaNeigeGR5H.R b/R/RunModel_CemaNeigeGR5H.R
index c86f7bcb..5bb10771 100644
--- a/R/RunModel_CemaNeigeGR5H.R
+++ b/R/RunModel_CemaNeigeGR5H.R
@@ -90,7 +90,8 @@ RunModel_CemaNeigeGR5H <- function(InputsModel, RunOptions, Param) {
if (inherits(RunOptions, "CemaNeige")) {
if ("all" %in% RunOptions$Outputs_Sim) {
IndOutputsCemaNeige <- as.integer(1:length(FortranOutputs$CN))
- } else { IndOutputsCemaNeige <- which(FortranOutputs$CN %in% RunOptions$Outputs_Sim)
+ } else {
+ IndOutputsCemaNeige <- which(FortranOutputs$CN %in% RunOptions$Outputs_Sim)
}
CemaNeigeLayers <- list()
CemaNeigeStateEnd <- NULL
--
GitLab