diff --git a/DESCRIPTION b/DESCRIPTION index 5fe7580bdb2e49a8d78774c95a06266c71174b8e..93f4a71875db9d1747f2c88b4bea339b9dd123fe 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.8.5 +Version: 1.4.8.6 Date: 2020-05-04 Authors@R: c( person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")), diff --git a/NEWS.md b/NEWS.md index 03fe8048998c5f3708dbda9d75b9b019468c25d5..b16c55338e67ad8b23a83a2a52b271202a6ad91c 100644 --- a/NEWS.md +++ b/NEWS.md @@ -4,7 +4,7 @@ -### 1.4.8.5 Release Notes (2020-05-04) +### 1.4.8.6 Release Notes (2020-05-04) #### New features diff --git a/R/SeriesAggreg2.InputsModel.R b/R/SeriesAggreg2.InputsModel.R index f15181ea4536117ba8f256df0a98967bb5f29bdd..892e1377e40b9caa832239eb363e0987dffe4e25 100644 --- a/R/SeriesAggreg2.InputsModel.R +++ b/R/SeriesAggreg2.InputsModel.R @@ -22,48 +22,5 @@ SeriesAggreg2.InputsModel <- function(TabSeries, } return(res) - # TabSeries <- as.data.frame.list(TabSeries) - # - # # NewTimeFormat <- c(hourly = "hourly", - # # daily = "daily", - # # monthly = "monthly", - # # yearly = "yearly") - # # Format <- switch(Format, - # # hourly = "%Y%m%d%h", - # # daily = "%Y%m%d", - # # monthly = "%Y%m", - # # yearly = "%Y") - # # - # # TimeFormat <- intersect(class(InputsModel), listTimeFormat) - # # - # # if (length(TimeFormat) == 0) { - # # stop("wrong time step") - # # } - # # - # - # - # NewTabSeries <- SeriesAggreg2(TabSeries = TabSeries, - # Format = Format, - # TimeFormat = TimeFormat, NewTimeFormat = NewTimeFormat, - # ConvertFun = c("sum", "sum"), - # YearFirstMonth = YearFirstMonth, TimeLag = TimeLag, - # verbose = verbose) - # - # ## to be consistent with InputsModel class - # NewTabSeries$DatesR <- as.POSIXlt(NewTabSeries$DatesR) - # - # ClassFormat <- class(NewTabSeries)[class(NewTabSeries) != "SeriesAggreg"] - # - # SuffixRunModel <- switch(ClassFormat, - # hourly = "4H", - # daily = "4J", - # monthly = "2M", - # yearly = "1A") - # - # RunModel <- paste0("RunModel_GR", SuffixRunModel) - # - # InputsModel <- CreateInputsModel(FUN_MOD = RunModel, - # DatesR = NewTabSeries$DatesR, Precip = NewTabSeries$Precip, PotEvap = NewTabSeries$PotEvap) - # - # + } \ No newline at end of file