diff --git a/DESCRIPTION b/DESCRIPTION index a5d0c44ab41efd480c77dab572872e5711b63502..0859ae207796719f21bb0c931ae6ab0d0ea3acb0 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.2.16.1 -Date: 2019-05-20 +Version: 1.2.16.2 +Date: 2019-05-22 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@irstea.fr"), diff --git a/NEWS.rmd b/NEWS.rmd index acd526469976d02294618a6c5d078d0aa66dfac6..a11d9c270f338f5d77788f7690e0e7cb571c88f1 100644 --- a/NEWS.rmd +++ b/NEWS.rmd @@ -14,7 +14,7 @@ output: -### 1.2.16.1 Release Notes (2019-05-20) +### 1.2.16.2 Release Notes (2019-05-22) #### New features diff --git a/R/plot.OutputsModel.R b/R/plot.OutputsModel.R index 9ac287b145b0c53e9b77e8c137859ebfc45c303b..007630be89466657c34fce819e28fd0305c9e9dc 100644 --- a/R/plot.OutputsModel.R +++ b/R/plot.OutputsModel.R @@ -78,7 +78,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", "PotEvap", "Precip", "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")) { @@ -103,11 +103,11 @@ plot.OutputsModel <- function(x, Qobs = NULL, IndPeriod_Plot = NULL, BasinArea = if (is.null(Qobs)) { if (length(which) == 1 & any(which %in% "Error")) { - stop("the 'Error' time srie cannot be draw if there is no 'Qobs'") + stop("the 'Error' time series cannot be drawn if there is no 'Qobs'") } if (length(which) != 1 & any(which %in% c("Error", "all"))) { BOOL_Error <- FALSE - warning("the 'Error' time serie cannot be draw if there is no 'Qobs'") + warning("the 'Error' time series cannot be drawn if there is no 'Qobs'") } }