v1.2.9.17 BUG: no more warning when Qobs = NULL in plot.OutputsModel

cc51a013 · Delaigue Olivier · 5ea0e01f · cc51a013 · cc51a013 · cc51a013
Commit cc51a013 authored 6 years ago by Delaigue Olivier
Hide whitespace changes
Inline Side-by-side

Showing

with 3 additions and 3 deletions
+3 -3
--- a/DESCRIPTION
+++ b/DESCRIPTION
 Package: airGR
 Type: Package
 Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling
-Version: 1.2.9.16
+Version: 1.2.9.17
 Date: 2019-03-18
 Authors@R: c(
  person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")),

--- a/NEWS.rmd
+++ b/NEWS.rmd
@@ -13,7 +13,7 @@ output:
-### 1.2.9.16 Release Notes (2019-03-18) 
+### 1.2.9.17 Release Notes (2019-03-18) 

--- a/R/plot.OutputsModel.R
+++ b/R/plot.OutputsModel.R
@@ -28,7 +28,7 @@ plot.OutputsModel <- function(x, Qobs = NULL, IndPeriod_Plot = NULL, BasinArea =
    if (sum(is.na(Qobs)) != length(Qobs)) {
      BOOL_Qobs <- TRUE
    }
-  } else if (inherits(OutputsModel, "GR")) {
+  } else if (inherits(OutputsModel, "GR") & !is.null(Qobs)) {
    warning("Incorrect length of 'Qobs'. Time series of observed flow not drawn")
  }
  BOOL_Snow <- FALSE