Commit 3b649a32 authored by Delaigue Olivier's avatar Delaigue Olivier
Browse files

v1.2.16.8 CLEAN: "which" allowed values reorderd in werning msg of plot.OutputsModel

Showing with 3 additions and 3 deletions
+3 -3
Package: airGR Package: airGR
Type: Package Type: Package
Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling
Version: 1.2.16.7 Version: 1.2.16.8
Date: 2019-05-24 Date: 2019-05-24
Authors@R: c( Authors@R: c(
person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")), person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")),
......
...@@ -14,7 +14,7 @@ output: ...@@ -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 #### New features
......
...@@ -79,7 +79,7 @@ plot.OutputsModel <- function(x, Qobs = NULL, IndPeriod_Plot = NULL, BasinArea = ...@@ -79,7 +79,7 @@ plot.OutputsModel <- function(x, Qobs = NULL, IndPeriod_Plot = NULL, BasinArea =
if (!is.character(which)) { if (!is.character(which)) {
stop("'which' must be a vector of character") 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'") 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")) { if (all(which %in% c("Temp", "SnowPack")) & !inherits(OutputsModel, "CemaNeige")) {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment