From ab7dc6e7089af48ae579b721f84babf1cf93c5ae Mon Sep 17 00:00:00 2001 From: Delaigue Olivier <olivier.delaigue@irstea.fr> Date: Mon, 4 Jan 2021 16:55:26 +0100 Subject: [PATCH] v1.6.3.75 fix: remove useless old code in RunModel_CemaNeigeGR6J condition test Refs #73 --- DESCRIPTION | 4 ++-- NEWS.md | 2 +- R/RunModel_CemaNeigeGR6J.R | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 1e4601b4..40e4e2c4 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Package: airGR Type: Package Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling -Version: 1.6.3.74 -Date: 2020-12-31 +Version: 1.6.3.75 +Date: 2021-01-04 Authors@R: c( person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")), person("Olivier", "Delaigue", role = c("aut", "cre"), comment = c(ORCID = "0000-0002-7668-8468"), email = "airGR@inrae.fr"), diff --git a/NEWS.md b/NEWS.md index db1d0aa9..c60eaf79 100644 --- a/NEWS.md +++ b/NEWS.md @@ -4,7 +4,7 @@ -### 1.6.3.74 Release Notes (2020-12-31) +### 1.6.3.75 Release Notes (2021-01-04) #### New features diff --git a/R/RunModel_CemaNeigeGR6J.R b/R/RunModel_CemaNeigeGR6J.R index d82a0241..60c32a26 100644 --- a/R/RunModel_CemaNeigeGR6J.R +++ b/R/RunModel_CemaNeigeGR6J.R @@ -192,7 +192,7 @@ RunModel_CemaNeigeGR6J <- function(InputsModel, RunOptions, Param) { ## Output data preparation ## OutputsModel only - if (!ExportDatesR== FALSE & !ExportStateEnd) { + if (!ExportDatesR & !ExportStateEnd) { OutputsModel <- c(lapply(seq_len(RESULTS$NOutputs), function(i) RESULTS$Outputs[IndPeriod2, i]), list(CemaNeigeLayers)) names(OutputsModel) <- c(FortranOutputs$GR[IndOutputsMod], NameCemaNeigeLayers) -- GitLab