diff --git a/DESCRIPTION b/DESCRIPTION index 37a89c17c051f9c26a97d4aea868d8b731278037..547f14b5c8914a2a5c42d5fb87d43e1b71c6ab52 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.6.9.35 -Date: 2021-01-27 +Version: 1.6.9.36 +Date: 2021-01-28 Authors@R: c( person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")), person("Olivier", "Delaigue", role = c("aut", "cre"), comment = c(ORCID = "0000-0002-7668-8468"), email = "airGR@inrae.fr"), diff --git a/NEWS.md b/NEWS.md index baf0f1777248dbc548e688d8d359250a083ef804..46673817153ed075f2c3db073aaaac682d2c4e62 100644 --- a/NEWS.md +++ b/NEWS.md @@ -2,7 +2,7 @@ -### 1.6.9.35 Release Notes (2021-01-27) +### 1.6.9.36 Release Notes (2021-01-28) #### Major user-visible changes @@ -10,7 +10,13 @@ #### Minor user-visible changes -- Fixed warning returned by GCC Fortran when compiling`frun_GR5H.f90`. ([#93](https://gitlab.irstea.fr/HYCAR-Hydro/airgr/-/issues/93)) + +- Fixed warning returned by GCC Fortran when compiling `frun_GR5H.f90`. ([#93](https://gitlab.irstea.fr/HYCAR-Hydro/airgr/-/issues/93)) + + +#### CRAN-compatibility updates + +- Coerce `POSIXlt` dates into character in `RunModel_GR1A()` example and in `SeriesAggreg()` tests in order to avoid bad subsetting time series due to mixing UTC and local time on macOS flavors. ([#94](https://gitlab.irstea.fr/HYCAR-Hydro/airgr/-/issues/94)) ____________________________________________________________________________________ diff --git a/man/RunModel_GR1A.Rd b/man/RunModel_GR1A.Rd index 56b2bce2c475ab9ab23219ba10580efe8a2ada9d..107f3ab4bacb8b27575d9730297a2ba98d4135f6 100644 --- a/man/RunModel_GR1A.Rd +++ b/man/RunModel_GR1A.Rd @@ -60,7 +60,7 @@ TabSeries <- data.frame(DatesR = BasinObs$DatesR, P = BasinObs$P, E = BasinObs$E, Qmm = BasinObs$Qmm) -TabSeries <- TabSeries[TabSeries$DatesR < "2012-09-01", ] +TabSeries <- TabSeries[as.character(TabSeries$DatesR) < "2012-09-01", ] BasinObs <- SeriesAggreg(TabSeries, Format = "\%Y", YearFirstMonth = 09, ConvertFun = c("sum", "sum", "sum")) diff --git a/tests/testthat/test-SeriesAggreg.R b/tests/testthat/test-SeriesAggreg.R index 48eb1afd6fd1aaca908de5fdc751e257c4661e77..fea48ae26ef37eb19930d01c47585b00174f2e5c 100644 --- a/tests/testthat/test-SeriesAggreg.R +++ b/tests/testthat/test-SeriesAggreg.R @@ -61,9 +61,10 @@ test_that("Check SeriesAggreg output values on yearly aggregation", { E = BasinObs$E, Qmm = BasinObs$Qmm ) - GoodValues <- apply(BasinObs[BasinObs$DatesR >= "1984-09-01" & - BasinObs$DatesR < "1985-09-01", - c("P", "E", "Qmm")], 2, sum) + GoodValues <- apply(BasinObs[as.character(BasinObs$DatesR) >= "1984-09-01" & + as.character(BasinObs$DatesR) < "1985-09-01", + c("P", "E", "Qmm")], + MARGIN = 2, FUN = sum) TestedValues <- unlist(SeriesAggreg(TabSeries, Format = "%Y", YearFirstMonth = 9,