Commit 31d5890d authored by Delaigue Olivier's avatar Delaigue Olivier
Browse files

v0.2.6.15 DOC: PrepGR doc improved to explain that CemaNeige do not used the hysteresis

Showing with 19 additions and 6 deletions
+19 -6
Package: airGRteaching
Type: Package
Title: Teaching Hydrological Modelling with the GR Rainfall-Runoff Models ('Shiny' Interface Included)
Version: 0.2.6.14
Date: 2019-04-03
Version: 0.2.6.15
Date: 2019-04-16
Authors@R: c(
person("Olivier", "Delaigue", role = c("aut", "cre"), comment = c(ORCID = "0000-0002-7668-8468"), email = "airGR@irstea.fr"),
person("Laurent", "Coron", role = c("aut"), comment = c(ORCID = "0000-0002-1503-6204")),
......
......@@ -13,13 +13,24 @@ output:
### 0.2.6.15 Release Notes (2019-04-16)
#### Bug fixes
- <code>ShinyGR()</code> may now run for all <code>"LC_TIME"</code>
- <code>ShinyGR()</code> takes into account the changes done in airGR to compute multi criteria (temporary patch)
____________________________________________________________________________________
### 0.2.6.14 Release Notes (2019-04-03)
#### CRAN-compatibility updates
- now depends on the latest version (1.2.13.16) of the airGR package.
<code>CalGR()</code>, <code>SimGR()</code> and <code>ShinyGR()</code> have been updated.
- now depends on the latest version (1.2.13.16) of the airGR package: <code>CalGR()</code>, <code>SimGR()</code> and <code>ShinyGR()</code> have been updated
- the htmlwidget package is no longer imported
......
......@@ -33,7 +33,7 @@ PrepGR(ObsDF = NULL, DatesR = NULL, Precip = NULL, PotEvap = NULL,
\item{HydroModel}{[character] name of the hydrological model (must be one of \code{"GR1A"}, \code{"GR2M"}, \code{"GR4J"}, \code{"GR5J"}, \code{"GR6J"} or \code{"GR4H"})}
\item{CemaNeige}{[boolean] option indicating whether CemaNeige should be activated (only available when \code{HydroModel} is equal to any of \code{"GR4J"}, \code{"GR5J"} or \code{"GR6J"})}
\item{CemaNeige}{[boolean] option indicating whether CemaNeige should be activated (only available when \code{HydroModel} is equal to any of \code{"GR4J"}, \code{"GR5J"} or \code{"GR6J"}). See details}
}
......@@ -53,7 +53,9 @@ PrepGR(ObsDF = NULL, DatesR = NULL, Precip = NULL, PotEvap = NULL,
\description{Creation of the inputs required to run the CalGR and SimGR functions}
\details{
If the \code{ObsDF} argument is provided, \code{DatesR}, \code{Precip}, \code{PotEvap}, \code{Qobs} and \code{TempMean} are not necessary, and vice-versa. If one variable is provided in \code{ObsDF} and also separately, then only the data included in \code{ObsDF} are used.
If the \code{ObsDF} argument is provided, \code{DatesR}, \code{Precip}, \code{PotEvap}, \code{Qobs} and \code{TempMean} are not necessary, and vice-versa. If one variable is provided in \code{ObsDF} and also separately, then only the data included in \code{ObsDF} are used.
\cr \cr
If the \code{CemaNeige} argument is set to \code{TRUE}, the default version of CemaNeige is used (i.e. without the Linear Hysteresis, see the details part in \code{\link{CreateRunOptions}}).
}
\author{Olivier Delaigue}
......
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