From 611fb3f209241b6b7e270a1db85655c1fb3e6aa8 Mon Sep 17 00:00:00 2001
From: Delaigue Olivier <olivier.delaigue@irstea.priv>
Date: Fri, 7 Jun 2019 08:35:51 +0200
Subject: [PATCH] v1.2.16.21 NEW: Error plot of plot.OutputsModel can bes
display in m3/s
---
DESCRIPTION | 4 ++--
NEWS.rmd | 2 +-
R/plot.OutputsModel.R | 5 +++++
3 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/DESCRIPTION b/DESCRIPTION
index 4587a6a5..5beae294 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.20
-Date: 2019-06-06
+Version: 1.2.16.21
+Date: 2019-06-07
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 36d879a1..7f293213 100644
--- a/NEWS.rmd
+++ b/NEWS.rmd
@@ -14,7 +14,7 @@ output:
-### 1.2.16.20 Release Notes (2019-06-06)
+### 1.2.16.21 Release Notes (2019-06-07)
#### New features
diff --git a/R/plot.OutputsModel.R b/R/plot.OutputsModel.R
index 42d5fbab..6c0355f6 100644
--- a/R/plot.OutputsModel.R
+++ b/R/plot.OutputsModel.R
@@ -582,6 +582,11 @@ plot.OutputsModel <- function(x, Qobs = NULL, IndPeriod_Plot = NULL, BasinArea =
panel.first = abline(h = 0, col = "royalblue"), ...)
axis(side = 2, at = pretty(ylim1), labels = pretty(ylim1), cex.axis = cex.axis, ...)
mtext(side = 2, paste("flow error", plotunit), cex = cex.lab, line = line)
+ if (!is.null(BasinArea)) {
+ Factor <- Factor_UNIT_M3S
+ axis(side = 4, at = pretty(ylim1*Factor)/Factor, labels = pretty(ylim1*Factor), cex.axis = cex.axis, ...)
+ mtext(side = 4, paste("flow error", "[m3/s]"), line = line, cex = cex.lab)
+ }
if (BOOL_Dates) {
axis(side = 1, at = Seq1, labels = FALSE, cex.axis = cex.axis, ...)
axis(side = 1, at = Seq2, labels = Labels2, lwd.ticks = 1.5, cex.axis = cex.axis, ...)
--
GitLab