Commit d3d61d2a authored by Delaigue Olivier's avatar Delaigue Olivier
Browse files

v0.2.10.79 build(dependencies): depend on airGR >= 1.6.8.24

- use of plot in plot.CalGR (airGR::plot.OutputsModels no more exported)
- use the new syntax of airGR::SerriesAggreg in ShinyGR example
parent a2075e5b
Pipeline #18073 failed with stages
in 6 seconds
Package: airGRteaching
Type: Package
Title: Teaching Hydrological Modelling with the GR Rainfall-Runoff Models ('Shiny' Interface Included)
Version: 0.2.10.78
Date: 2020-11-23
Version: 0.2.10.79
Date: 2020-12-03
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")),
person("Pierre", "Brigode", role = c("aut"), comment = c(ORCID = "0000-0001-8257-0741")),
person("Guillaume", "Thirel", role = c("ctb"), comment = c(ORCID = "0000-0002-1444-1830"))
)
Depends: airGR (>= 1.4.3.87)
Depends: airGR (>= 1.6.8.24)
Imports: dygraphs (>= 1.1.1.6), markdown, plotrix, shiny (>= 1.1.0), shinyjs (>= 1.0), xts
Suggests: knitr, rmarkdown
Description: Add-on package to the 'airGR' package that simplifies its use and is aimed at being used for teaching hydrology. The package provides 1) three functions that allow to complete very simply a hydrological modelling exercise 2) plotting functions to help students to explore observed data and to interpret the results of calibration and simulation of the GR ('Génie rural') models 3) a 'Shiny' graphical interface that allows for displaying the impact of model parameters on hydrographs and models internal variables.
......
......@@ -4,7 +4,11 @@
### 0.2.10.78 Release Notes (2020-11-23)
### 0.2.10.79 Release Notes (2020-12-03)
#### CRAN-compatibility updates
- now depends on the latest version (1.6.8.24) of the 'airGR' package: <code>plot.CalGR()</code>, and the example of <code>ShinyGR()</code> have been updated
#### Version control and issue tracking
......
......@@ -16,7 +16,7 @@ plot.CalGR <- function(x, xlab = NULL, ylab = NULL, main = NULL, which = c("per
on.exit(par(opar))
if (any(which[1L] %in% c("perf"))) {
plot.OutputsModel(x$OutputsModel, Qobs = x$Qobs, ...)
plot(x$OutputsModel, Qobs = x$Qobs, ...)
}
if (any(which[1L] %in% c("iter"))) {
......
......@@ -75,9 +75,8 @@ BV_L0123002 <- BasinObs[5000:9999, c("DatesR", "P", "E", "Qmm", "T")]
BI_L0123002 <- BasinInfo
## data.frame of monthly aggregated time series from daily observed data of a low-land basin
BV_L0123001m <- SeriesAggreg(TabSeries = BV_L0123001,
TimeFormat = "daily", NewTimeFormat = "monthly",
ConvertFun = c("sum", "sum", "sum", "mean"))
BV_L0123001m <- SeriesAggreg(BV_L0123001[BV_L0123001$DatesR < "2000-06-01", ],
Format = "\%Y\%m")
## Interactive simulation when inputs set by using a data.frame
......
Markdown is supported
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