From 5b29a0ff1ac8e2705e070522c86c8e20f508d4dc Mon Sep 17 00:00:00 2001
From: Delaigue Olivier <olivier.delaigue@irstea.fr>
Date: Mon, 13 Apr 2020 18:40:44 +0000
Subject: [PATCH] v0.2.10.0 NEW: GR2M model added in the ui file of the GUI #14
---
DESCRIPTION | 4 ++--
NEWS.md | 3 ++-
inst/ShinyGR/ui.R | 25 ++++++++++++++++---------
3 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/DESCRIPTION b/DESCRIPTION
index 39d9a87..3a1b4fa 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,8 +1,8 @@
Package: airGRteaching
Type: Package
Title: Teaching Hydrological Modelling with the GR Rainfall-Runoff Models ('Shiny' Interface Included)
-Version: 0.2.9.24
-Date: 2020-03-30
+Version: 0.2.10.0
+Date: 2020-04-13
Authors@R: c(
person("Olivier", "Delaigue", role = c("aut", "cre"), comment = c(ORCID = "0000-0002-7668-8468"), email = "airGR@inrae.fr"),
person("Laurent", "Coron", role = c("aut"), comment = c(ORCID = "0000-0002-1503-6204")),
diff --git a/NEWS.md b/NEWS.md
index 90ce27f..42e4140 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -4,11 +4,12 @@
-### 0.2.9.24 Release Notes (2020-03-30)
+### 0.2.10.0 Release Notes (2020-04-13)
#### New features
+- the <code>ShinyGR()</code> interface, can now run on monthly time series, using the GR2M model
- in the <code>ShinyGR()</code> interface, there is a new tab panel that shows a summary sheets of basin if the name of the dataset contains the code station (8 characters : 1 letter and 7 numbers) of the Banque Hydro French database (so it is available only for the dataset of this database)
diff --git a/inst/ShinyGR/ui.R b/inst/ShinyGR/ui.R
index 6138111..d9d5d24 100644
--- a/inst/ShinyGR/ui.R
+++ b/inst/ShinyGR/ui.R
@@ -50,20 +50,27 @@ navbarPage(title = div("airGRteaching",
h4("Choose a model:"),
fluidRow(
column(width = 6, selectInput("HydroModel", label = "Hydrological model",
- choices = c("GR4J", "GR5J", "GR6J"))),
+ choices = c("GR4J", "GR5J", "GR6J", "GR2M"))),
column(width = 6, selectInput("SnowModel", label = "Snow model",
choices = c("None", "CemaNeige")))
),
h4("Parameters values:"),
- conditionalPanel(condition = "input.HydroModel == 'GR4J' || input.HydroModel =='GR5J' || input.HydroModel =='GR6J'",
- sliderInput("X1", label = "X1 (production store capacity)",
- post = " [mm]",
- min = 0,
- max = 2500,
- step = 10,
- value = 1250),
+ sliderInput("X1", label = "X1 (production store capacity)",
+ post = " [mm]",
+ min = 0,
+ max = 2500,
+ step = 10,
+ value = 1250),
+ conditionalPanel(condition = "input.HydroModel == 'GR2M'",
+ sliderInput("X2GR2M", label = "X2 (groundwater exchange coeff.)",
+ post = " [-]",
+ min = -5,
+ max = +5,
+ step = 0.05,
+ value = 0)),
+ conditionalPanel(condition = "input.HydroModel != 'GR2M'",
sliderInput("X2", label = "X2 (intercatchment exchange coeff.)",
post = " [mm/d]",
min = -5,
@@ -109,7 +116,7 @@ navbarPage(title = div("airGRteaching",
max = 10,
step = 0.5,
value = 5)),
-
+
h4("Automatic calibration:"),
fluidRow(
column(width = 6, selectInput("TypeCrit", label = "Objective function",
--
GitLab