diff --git a/DESCRIPTION b/DESCRIPTION index 729f9b3f58d663fe98eb264ee99fc8ef4e9348d3..870ed9b449e0253a87da23058a12d84d28db2f03 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.3.2.8 +Version: 1.3.2.9 Date: 2019-05-23 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 d80af8b615a43d28e55895457a870ab614a3d1d0..b80581999dcbfe80b31b57421de3023c8a9cea41 100644 --- a/NEWS.rmd +++ b/NEWS.rmd @@ -14,7 +14,7 @@ output: -### 1.3.2.8 Release Notes (2019-05-23) +### 1.3.2.9 Release Notes (2019-05-23) #### New features diff --git a/R/PE_Oudin.R b/R/PE_Oudin.R index 6b865df15e5b89b005ec062e5ab709ae7a0290a1..cd30b49571125cbca5187f4f1b0d6ff9356b4375 100644 --- a/R/PE_Oudin.R +++ b/R/PE_Oudin.R @@ -1,16 +1,16 @@ PE_Oudin <- function(JD, Temp, - LatRad, Lat, LatUnit = c("rad", "deg"), + Lat, LatUnit = c("rad", "deg"), TimeStepIn = "daily", TimeStepOut = "daily") { ## ---------- check arguments - if (!missing(LatRad)) { - warning("Deprecated 'LatRad' argument. Please, use 'Lat' instead.") - if (missing(Lat)) { - Lat <- LatRad - } - } + # if (!missing(LatRad)) { + # warning("Deprecated 'LatRad' argument. Please, use 'Lat' instead.") + # if (missing(Lat)) { + # Lat <- LatRad + # } + # } if (!(inherits(JD, "numeric") | inherits(JD, "integer"))) { stop("'JD' must be of class 'numeric'") } @@ -126,10 +126,10 @@ PE_Oudin <- function(JD, Temp, ## ---------- disaggregate PE from daily to hourly if (TimeStepOut == "hourly") { - sinus_D2H <- c(0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, + sinus_D2H <- c(0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.035, 0.062, 0.079, 0.097, 0.110, 0.117, 0.117, 0.110, 0.097, 0.079, 0.062, 0.035, - 0.000, 0.000, 0.000, 0.000, 0.000) + 0.000, 0.000, 0.000, 0.000, 0.000, 0.000) PE_Oudin_H <- rep(PE_Oudin_D, each = 24) * rep(sinus_D2H, times = length(PE_Oudin_D)) }