From 8e89eef682591d2467bd0e6f128f04212d50a42f Mon Sep 17 00:00:00 2001
From: Delaigue Olivier <olivier.delaigue@irstea.fr>
Date: Mon, 4 May 2020 15:13:53 +0200
Subject: [PATCH] v1.4.8.6 style: commented command lines removed in
SeriesAggreg2.InputsModel #41
---
DESCRIPTION | 2 +-
NEWS.md | 2 +-
R/SeriesAggreg2.InputsModel.R | 45 +----------------------------------
3 files changed, 3 insertions(+), 46 deletions(-)
diff --git a/DESCRIPTION b/DESCRIPTION
index 5fe7580b..93f4a718 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 03fe8048..b16c5533 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 f15181ea..892e1377 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
--
GitLab