Commit 3e2a0f07 authored by Dorchies David's avatar Dorchies David
Browse files

Merge branch 'dev' into 'sd'

# Conflicts:
#   DESCRIPTION
Showing with 4 additions and 4 deletions
+4 -4
...@@ -39,7 +39,7 @@ ________________________________________________________________________________ ...@@ -39,7 +39,7 @@ ________________________________________________________________________________
____________________________________________________________________________________ ____________________________________________________________________________________
### 1.4.3.88 Release Notes (2020-04-24) ### 1.4.3.91 Release Notes (2020-08-26)
#### Version control and issue tracking #### Version control and issue tracking
......
...@@ -32,7 +32,7 @@ Six hydrological models and one snow melt and accumulation model are implemented ...@@ -32,7 +32,7 @@ Six hydrological models and one snow melt and accumulation model are implemented
These models can be called within airGR using the following functions: These models can be called within airGR using the following functions:
- `RunModel_GR4H`: four-parameter hourly lumped hydrological model (Mathevet, 2005) - `RunModel_GR4H`: four-parameter hourly lumped hydrological model (Mathevet, 2005)
- `RunModel_GR5H`: four-parameter hourly lumped hydrological model (Ficchi, 2017; Ficchi *et al.*, 2019) - `RunModel_GR5H`: five-parameter hourly lumped hydrological model (Ficchi, 2017; Ficchi *et al.*, 2019)
- `RunModel_GR4J`: four-parameter daily lumped hydrological model (Perrin *et al.*, 2003) - `RunModel_GR4J`: four-parameter daily lumped hydrological model (Perrin *et al.*, 2003)
- `RunModel_GR5J`: five-parameter daily lumped hydrological model (Le Moine, 2008) - `RunModel_GR5J`: five-parameter daily lumped hydrological model (Le Moine, 2008)
- `RunModel_GR6J`: six-parameter daily lumped hydrological model (Pushpalatha *et al.*, 2011) - `RunModel_GR6J`: six-parameter daily lumped hydrological model (Pushpalatha *et al.*, 2011)
...@@ -56,7 +56,7 @@ To learn how to use the functions from the airGR package, it is recommended to f ...@@ -56,7 +56,7 @@ To learn how to use the functions from the airGR package, it is recommended to f
4. refer to the help for `ErrorCrit_NSE` and `CreateInputsCrit` to understand how the computation of an error criterion is prepared/made; 4. refer to the help for `ErrorCrit_NSE` and `CreateInputsCrit` to understand how the computation of an error criterion is prepared/made;
5. refer to the help for `Calibration_Michel`, run the provided example and then refer to the help for `CreateCalibOptions` to understand how a model calibration is prepared/made. 5. refer to the help for `Calibration_Michel`, run the provided example and then refer to the help for `CreateCalibOptions` to understand how a model calibration is prepared/made.
For more information and to get started with the package, you can refer to the vignette (vignette("V01_get_started")`) and go on the [airGR website](https://hydrogr.github.io/airGR). For more information and to get started with the package, you can refer to the vignette (`vignette("V01_get_started")`) and go on the [airGR website](https://hydrogr.github.io/airGR).
## References ## References
......
...@@ -45,7 +45,7 @@ Function which computes PE using the formula from Oudin et al. (2005). PE can be ...@@ -45,7 +45,7 @@ Function which computes PE using the formula from Oudin et al. (2005). PE can be
} }
\details{ \details{
In the \code{JD} argument, the Julian day of the year of the 1st of January is equal to 1 and the 31st of December to 365 (366 in leap years)). If the Julian day of the year is computed on an object of the \code{POSIXlt} class, the user has to add 1 to the returned value (e.g. \code{as.POSIXlt("2016-12-31")$yday + 1}). In the \code{JD} argument, the Julian day of the year of the 1st of January is equal to 1 and the 31st of December to 365 (366 in leap years). If the Julian day of the year is computed on an object of the \code{POSIXlt} class, the user has to add 1 to the returned value (e.g. \code{as.POSIXlt("2016-12-31")$yday + 1}).
When hourly temperature is provided, all the values of the same day have to be set to the same Julian day of the year (e.g. \code{as.POSIXlt("2016-12-31 00:00:00")$yday + 1} and \code{as.POSIXlt("2016-12-31 00:01:00")$yday + 1}). Each single day must be provided 24 identical Julian day values (one for each hour). When hourly temperature is provided, all the values of the same day have to be set to the same Julian day of the year (e.g. \code{as.POSIXlt("2016-12-31 00:00:00")$yday + 1} and \code{as.POSIXlt("2016-12-31 00:01:00")$yday + 1}). Each single day must be provided 24 identical Julian day values (one for each hour).
......
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