From 8e57ee51368c31e1210fee411f359f82daee4dc7 Mon Sep 17 00:00:00 2001 From: Delaigue Olivier <olivier.delaigue@irstea.priv> Date: Fri, 18 Jan 2019 13:59:13 +0100 Subject: [PATCH] v1.1.2.27 CLEAN: example simplified in SeriesAggreg doc --- DESCRIPTION | 2 +- NEWS.rmd | 2 +- man/SeriesAggreg.Rd | 15 +++++++-------- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 5b9068a7..a418183b 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: airGR Type: Package Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling -Version: 1.1.2.26 +Version: 1.1.2.27 Date: 2019-01-18 Authors@R: c( person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")), diff --git a/NEWS.rmd b/NEWS.rmd index cdc00dc3..d48fe350 100644 --- a/NEWS.rmd +++ b/NEWS.rmd @@ -13,7 +13,7 @@ output: -### 1.1.2.26 Release Notes (2019-01-18) +### 1.1.2.27 Release Notes (2019-01-18) diff --git a/man/SeriesAggreg.Rd b/man/SeriesAggreg.Rd index 8b3be639..f85c512d 100644 --- a/man/SeriesAggreg.Rd +++ b/man/SeriesAggreg.Rd @@ -50,18 +50,17 @@ library(airGR) data(L0123002) ## preparation of the initial time series data frame at the daily time step -TabSeries <- data.frame(BasinObs$DatesR, BasinObs$P, BasinObs$E, BasinObs$T, BasinObs$Qmm) -TimeFormat <- "daily" +TabSeries <- BasinObs[, c("DatesR", "P", "E", "T", "Qmm")] ## conversion at the monthly time step -NewTimeFormat <- "monthly" -ConvertFun <- c("sum", "sum", "mean", "sum") -NewTabSeries <- SeriesAggreg(TabSeries = TabSeries, TimeFormat, NewTimeFormat, ConvertFun) +NewTabSeries <- SeriesAggreg(TabSeries = TabSeries, + TimeFormat = "daily", NewTimeFormat = "monthly", + ConvertFun = c("sum", "sum", "mean", "sum")) ## conversion at the yearly time step -NewTimeFormat <- "yearly" -ConvertFun <- c("sum", "sum", "mean", "sum") -NewTabSeries <- SeriesAggreg(TabSeries = TabSeries, TimeFormat, NewTimeFormat, ConvertFun) +NewTabSeries <- SeriesAggreg(TabSeries = TabSeries, + TimeFormat = "daily", NewTimeFormat = "yearly", + ConvertFun = c("sum", "sum", "mean", "sum")) } -- GitLab