diff --git a/DESCRIPTION b/DESCRIPTION index a17e999b46d0ae6ba2946d7e73540be31579abe0..5221af4b55f04198447100f19baf3c78b0d5a611 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.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")), diff --git a/NEWS.Rmd b/NEWS.Rmd index 043eca2b9d728c8202232c0021af9791d6b932b7..80c5dbdd37de1cabe3a0bff72486d0e2e22f9fb9 100644 --- a/NEWS.Rmd +++ b/NEWS.Rmd @@ -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 diff --git a/man/PrepGR.Rd b/man/PrepGR.Rd index 2b8c1206341a0a696a8fcb563a2e30838d331169..680417d9058e9ae2da618bbbc0c4cbb471bf2642 100644 --- a/man/PrepGR.Rd +++ b/man/PrepGR.Rd @@ -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}