Commit 15e3b4ab authored by Delaigue Olivier's avatar Delaigue Olivier
Browse files

v0.2.10.100 refactor(GUI): display a space separator between thousands places in numbers in the GUI

Refs #32
1 merge request!13CRAN v0.2.10.112
Pipeline #18765 passed with stages
in 5 minutes and 28 seconds
Showing with 20 additions and 11 deletions
+20 -11
Package: airGRteaching Package: airGRteaching
Type: Package Type: Package
Title: Teaching Hydrological Modelling with the GR Rainfall-Runoff Models ('Shiny' Interface Included) Title: Teaching Hydrological Modelling with the GR Rainfall-Runoff Models ('Shiny' Interface Included)
Version: 0.2.10.99 Version: 0.2.10.100
Date: 2020-12-21 Date: 2020-12-21
Authors@R: c( Authors@R: c(
person("Olivier", "Delaigue", role = c("aut", "cre"), comment = c(ORCID = "0000-0002-7668-8468"), email = "airGR@inrae.fr"), person("Olivier", "Delaigue", role = c("aut", "cre"), comment = c(ORCID = "0000-0002-7668-8468"), email = "airGR@inrae.fr"),
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
### 0.2.10.99 Release Notes (2020-12-21) ### 0.2.10.100 Release Notes (2020-12-21)
#### New features #### New features
......
...@@ -62,60 +62,69 @@ navbarPage(title = div("airGRteaching", ...@@ -62,60 +62,69 @@ navbarPage(title = div("airGRteaching",
min = 0, min = 0,
max = 2500, max = 2500,
step = 10, step = 10,
value = 1250), value = 1250,
sep = " "),
conditionalPanel(condition = "input.HydroModel == 'GR2M'", conditionalPanel(condition = "input.HydroModel == 'GR2M'",
sliderInput("X2GR2M", label = "X2 (groundwater exchange coeff.)", sliderInput("X2GR2M", label = "X2 (groundwater exchange coeff.)",
post = " [-]", post = " [-]",
min = +0.05, min = +0.05,
max = +4, max = +4,
step = 0.05, step = 0.05,
value = 2)), value = 2,
sep = " ")),
conditionalPanel(condition = "input.HydroModel != 'GR2M'", conditionalPanel(condition = "input.HydroModel != 'GR2M'",
sliderInput("X2", label = "X2 (intercatchment exchange coeff.)", sliderInput("X2", label = "X2 (intercatchment exchange coeff.)",
post = " [mm/d]", post = " [mm/d]",
min = -5, min = -5,
max = +5, max = +5,
step = 0.05, step = 0.05,
value = 0), value = 0,
sep = " "),
sliderInput("X3", label = "X3 (routing store capacity)", sliderInput("X3", label = "X3 (routing store capacity)",
post = " [mm]", post = " [mm]",
min = 0, min = 0,
max = 1000, max = 1000,
step = 5, step = 5,
value = 500), value = 500,
sep = " "),
sliderInput("X4", label = "X4 (unit hydrograph time constant)", sliderInput("X4", label = "X4 (unit hydrograph time constant)",
post = " [d]", post = " [d]",
min = 0.5, min = 0.5,
max = 10, max = 10,
step = 0.1, step = 0.1,
value = 5.2)), value = 5.2,
sep = " ")),
conditionalPanel(condition = "input.HydroModel == 'GR5J' || input.HydroModel =='GR6J'", conditionalPanel(condition = "input.HydroModel == 'GR5J' || input.HydroModel =='GR6J'",
sliderInput("X5", label = "X5 (intercatchment exchange threshold)", sliderInput("X5", label = "X5 (intercatchment exchange threshold)",
post = " [-]", post = " [-]",
min = -4, min = -4,
max = +4, max = +4,
step = 0.05, step = 0.05,
value = 0)), value = 0,
sep = " ")),
conditionalPanel(condition = "input.HydroModel == 'GR6J'", conditionalPanel(condition = "input.HydroModel == 'GR6J'",
sliderInput("X6", label = "X6 (exponential store depletion coeff.)", sliderInput("X6", label = "X6 (exponential store depletion coeff.)",
post = " [mm]", post = " [mm]",
min = 0, min = 0,
max = 20, max = 20,
step = 0.5, step = 0.5,
value = 10)), value = 10,
sep = " ")),
conditionalPanel(condition = "input.SnowModel == 'CemaNeige'", conditionalPanel(condition = "input.SnowModel == 'CemaNeige'",
sliderInput("C1", label = "C1 (weighting coeff. for snow pack thermal state)", sliderInput("C1", label = "C1 (weighting coeff. for snow pack thermal state)",
post = " [-]", post = " [-]",
min = 0, min = 0,
max = 1, max = 1,
step = 0.01, step = 0.01,
value = 0.5), value = 0.5,
sep = " "),
sliderInput("C2", label = "C2 (degree-day melt coefficient)", sliderInput("C2", label = "C2 (degree-day melt coefficient)",
post = " [mm/°C/d]", post = " [mm/°C/d]",
min = 0, min = 0,
max = 10, max = 10,
step = 0.5, step = 0.5,
value = 5)), value = 5,
sep = " ")),
h4("Automatic calibration:"), h4("Automatic calibration:"),
fluidRow( fluidRow(
......
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