From 2ddf9dd5b263c49b1068f7df47c6f487a0e4b436 Mon Sep 17 00:00:00 2001 From: unknown <olivier.delaigue@ANPI1430.antony.irstea.priv> Date: Wed, 6 Dec 2017 08:04:03 +0100 Subject: [PATCH] v1.0.9.69 minor text revisions on vignettes --- DESCRIPTION | 4 ++-- vignettes/V00_airgr_ref.bib | 2 +- vignettes/V02.1_param_optim.Rmd | 4 ++-- vignettes/V02.2_param_mcmc.Rmd | 1 + vignettes/V03_param_sets_GR4J.Rmd | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index dd0e746f..4d592a57 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Package: airGR Type: Package Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling -Version: 1.0.9.68 -Date: 2017-12-05 +Version: 1.0.9.69 +Date: 2017-12-06 Authors@R: c( person("Laurent", "Coron", role = c("aut", "trl")), person("Charles", "Perrin", role = c("aut", "ths")), diff --git a/vignettes/V00_airgr_ref.bib b/vignettes/V00_airgr_ref.bib index 57f7e9a8..fea3ee5c 100644 --- a/vignettes/V00_airgr_ref.bib +++ b/vignettes/V00_airgr_ref.bib @@ -26,7 +26,7 @@ @phdthesis{le_moine_bassin_2008, title = {Le bassin versant de surface vu par le souterrain : une voie d’amélioration des performances et du réalisme des modèles pluie-débit ?}, url = {http://webgr.irstea.fr/wp-content/uploads/2012/07/2008-LE_MOINE-THESE.pdf}, - school = {Université Pierre et Marie Curie - Paris VI}, + school = {Université Pierre et Marie Curie, Paris 6}, author = {Le Moine, Nicolas}, year = {2008}, keywords = {airGR, IRSTEA-HBAN-HYDRO}, diff --git a/vignettes/V02.1_param_optim.Rmd b/vignettes/V02.1_param_optim.Rmd index 42da9a00..d2db4046 100644 --- a/vignettes/V02.1_param_optim.Rmd +++ b/vignettes/V02.1_param_optim.Rmd @@ -16,7 +16,7 @@ library(DEoptim) library(hydroPSO) library(Rmalschains) # source("airGR.R") - +set.seed(123) ``` @@ -29,7 +29,7 @@ The Michel's calibration strategy (`Calibration_Michel()` function) is the calib We show here how to use different R packages to perform parameter estimation. In this vignette, we use the **GR4J** model to illustrate the different optimization strategies. -In particular, we assume that the R global environment contains input climate data, observed discharge and functions from the **airGR** [Get Started](V01_get_started.html) vignette, as shown below. +In particular, we assume that the R global environment contains input climate data, observed discharge and functions from the [Get Started](V01_get_started.html) vignette, as shown below. Please note that the calibration period is defined in the `CreateRunOptions()` function . ```{r, warning=FALSE, fig.keep='none', results='hide', fig.height=10, fig.width=10, eval=TRUE, echo=FALSE, message=FALSE} diff --git a/vignettes/V02.2_param_mcmc.Rmd b/vignettes/V02.2_param_mcmc.Rmd index ab4feb30..768b388c 100644 --- a/vignettes/V02.2_param_mcmc.Rmd +++ b/vignettes/V02.2_param_mcmc.Rmd @@ -17,6 +17,7 @@ library(FME) library(ggmcmc) library(dplyr) # source("airGR.R") +set.seed(123) ``` diff --git a/vignettes/V03_param_sets_GR4J.Rmd b/vignettes/V03_param_sets_GR4J.Rmd index 3b2dc819..8cc407c0 100644 --- a/vignettes/V03_param_sets_GR4J.Rmd +++ b/vignettes/V03_param_sets_GR4J.Rmd @@ -63,7 +63,7 @@ summary(Param_Sets_GR4J) ## Object model preparation -We assume that the R global environment contains data and functions from the **airGR** [Get Started](V01_get_started.html) vignette. +We assume that the R global environment contains data and functions from the [Get Started](V01_get_started.html) vignette. The calibration period has been defined from **1990-01-01** to **1990-02-28**, and the validation period from **1990-03-01** to **1999-12-31**. -- GitLab