From 15be80666290746a7c46a3bfc94b4207873e12a8 Mon Sep 17 00:00:00 2001 From: Delaigue Olivier <olivier.delaigue@irstea.priv> Date: Thu, 6 Jun 2019 17:30:46 +0200 Subject: [PATCH] v1.2.16.17 CLEAN: minor syntax modif in plot.OutputsModel fun --- DESCRIPTION | 2 +- NEWS.rmd | 2 +- R/plot.OutputsModel.R | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index d7064aea..1bfb2f09 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.2.16.16 +Version: 1.2.16.17 Date: 2019-06-06 Authors@R: c( person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")), diff --git a/NEWS.rmd b/NEWS.rmd index aa243a13..f9d4f8aa 100644 --- a/NEWS.rmd +++ b/NEWS.rmd @@ -14,7 +14,7 @@ output: -### 1.2.16.16 Release Notes (2019-06-06) +### 1.2.16.17 Release Notes (2019-06-06) #### New features diff --git a/R/plot.OutputsModel.R b/R/plot.OutputsModel.R index 321455ff..802a8162 100644 --- a/R/plot.OutputsModel.R +++ b/R/plot.OutputsModel.R @@ -228,13 +228,13 @@ plot.OutputsModel <- function(x, Qobs = NULL, IndPeriod_Plot = NULL, BasinArea = ## ---------- plot ## plot choices - BOOLPLOT_Precip <- "Precip" %in% which & BOOL_Pobs - BOOLPLOT_PotEvap <- "PotEvap" %in% which & BOOL_Eobs - BOOLPLOT_Temp <- "Temp" %in% which & BOOL_Snow - BOOLPLOT_SnowPack <- "SnowPack" %in% which & BOOL_Snow + BOOLPLOT_Precip <- "Precip" %in% which & BOOL_Pobs + BOOLPLOT_PotEvap <- "PotEvap" %in% which & BOOL_Eobs + BOOLPLOT_Temp <- "Temp" %in% which & BOOL_Snow + BOOLPLOT_SnowPack <- "SnowPack" %in% which & BOOL_Snow BOOLPLOT_Flows <- "Flows" %in% which & (BOOL_Qsim | BOOL_Qobs) - BOOLPLOT_Error <- "Error" %in% which & BOOL_Error - BOOLPLOT_Regime <- "Regime" %in% which & BOOL_TS & BOOL_Qsim & (NameTS %in% c("hour", "day", "month")) + BOOLPLOT_Error <- "Error" %in% which & BOOL_Error + BOOLPLOT_Regime <- "Regime" %in% which & BOOL_Qsim & BOOL_TS & (NameTS %in% c("hour", "day", "month")) BOOLPLOT_CumFreq <- "CumFreq" %in% which & (BOOL_Qsim | BOOL_Qobs) & BOOL_FilterZero BOOLPLOT_CorQQ <- "CorQQ" %in% which & (BOOL_Qsim & BOOL_Qobs) & BOOL_FilterZero -- GitLab