From 3b649a32d469efd1c88c187c6358080029c835ef Mon Sep 17 00:00:00 2001 From: Delaigue Olivier <olivier.delaigue@irstea.priv> Date: Thu, 6 Jun 2019 08:54:19 +0200 Subject: [PATCH] v1.2.16.8 CLEAN: "which" allowed values reorderd in werning msg of plot.OutputsModel --- DESCRIPTION | 2 +- NEWS.rmd | 2 +- R/plot.OutputsModel.R | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index b00fb722..7719b701 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.7 +Version: 1.2.16.8 Date: 2019-05-24 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 f2a7219a..4475cdea 100644 --- a/NEWS.rmd +++ b/NEWS.rmd @@ -14,7 +14,7 @@ output: -### 1.2.16.7 Release Notes (2019-05-23) +### 1.2.16.8 Release Notes (2019-05-23) #### New features diff --git a/R/plot.OutputsModel.R b/R/plot.OutputsModel.R index ccb297b2..d2bf5374 100644 --- a/R/plot.OutputsModel.R +++ b/R/plot.OutputsModel.R @@ -79,7 +79,7 @@ plot.OutputsModel <- function(x, Qobs = NULL, IndPeriod_Plot = NULL, BasinArea = if (!is.character(which)) { stop("'which' must be a vector of character") } - if (any(!which %in% c("all", "synth", "ts", "perf", "PotEvap", "Precip", "Temp", "SnowPack", "Flows", "Error", "Regime", "CumFreq", "CorQQ"))) { + if (any(!which %in% c("all", "synth", "ts", "perf", "Precip", "PotEvap", "Temp", "SnowPack", "Flows", "Error", "Regime", "CumFreq", "CorQQ"))) { stop("incorrect element found in argument 'which':\nit can only contain 'all', 'synth', 'ts', 'perf', 'Precip', 'PotEvap', 'Temp', 'SnowPack', 'Error', 'Flows', 'Regime', 'CumFreq' or 'CorQQ'") } if (all(which %in% c("Temp", "SnowPack")) & !inherits(OutputsModel, "CemaNeige")) { -- GitLab