diff --git a/DESCRIPTION b/DESCRIPTION index 72c0b398fc532d6349c9e5bdfd806cfa504c3d43..5639505f5eef4fe79fda26f6150c3e9202e8dace 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.4.6.0 +Version: 1.4.7.0 Date: 2020-04-30 Authors@R: c( person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")), diff --git a/NAMESPACE b/NAMESPACE index 679085a8727f4e2dcde61b99582cb66ed31531f7..7e422d5652c99098cbf2b2af13e4e0500ea45c81 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -12,6 +12,7 @@ S3method("plot", "OutputsModel") S3method("SeriesAggreg2", "data.frame") S3method("SeriesAggreg2", "default") S3method("SeriesAggreg2", "InputsModel") +S3method("SeriesAggreg2", "OutputsModel") @@ -53,7 +54,7 @@ export(SeriesAggreg) export(SeriesAggreg2) #export(SeriesAggreg2.data.frame) export(SeriesAggreg2.InputsModel) -#export(SeriesAggreg2.OutputsModel) +export(SeriesAggreg2.OutputsModel) export(TransfoParam) export(TransfoParam_CemaNeige) export(TransfoParam_CemaNeigeHyst) diff --git a/NEWS.md b/NEWS.md index 3b37e9961c7f58cf9acf621a0f4e6ed5aefa1ce3..648b0ee02424447aa48ea65e604bdb96c5d70c21 100644 --- a/NEWS.md +++ b/NEWS.md @@ -4,13 +4,14 @@ -### 1.4.6.0 Release Notes (2020-04-30) +### 1.4.7.0 Release Notes (2020-04-30) #### New features - Added <code>SeriesAggreg2</code> method. - Added <code>SeriesAggreg2.default()</code> function. - Added <code>SeriesAggreg2.InputsModel()</code> function. +- Added <code>SeriesAggreg2.OutputsModel()</code> function. - Added <code>SeriesAggreg2.data.frame()</code> function. This new verson of the <code>SeriesAggreg()</code> function allows to compute regimes. diff --git a/R/SeriesAggreg2.OutputsModel.R b/R/SeriesAggreg2.OutputsModel.R new file mode 100644 index 0000000000000000000000000000000000000000..6c086f4dba5055b3b0d4567d928e88f62879b570 --- /dev/null +++ b/R/SeriesAggreg2.OutputsModel.R @@ -0,0 +1,24 @@ +SeriesAggreg2.OutputsModel <- function(TabSeries, + Format, + TimeFormat, + NewTimeFormat, + YearFirstMonth = 1, TimeLag = 0, + verbose = TRUE, ..., simplify = FALSE) { + + if (!inherits(TabSeries, "OutputsModel")) { + stop("to be used with 'OutputsModel' object") + } + + res <- SeriesAggreg2.default(TabSeries = TabSeries, + Format = Format, + TimeFormat = TimeFormat, + NewTimeFormat = NewTimeFormat, + YearFirstMonth = YearFirstMonth, TimeLag = TimeLag, + verbose = verbose, + simplify = simplify) + + res$StateEnd <- TabSeries$StateEnd + + return(res) + +} \ No newline at end of file