From 097552d1370f4c7e70a7012f0b2cacce37edcec3 Mon Sep 17 00:00:00 2001
From: Delaigue Olivier <olivier.delaigue@irstea.priv>
Date: Thu, 23 May 2019 15:20:25 +0200
Subject: [PATCH] v1.3.2.9 CLEAN: unused LatRad argument removed from PE_Oudin
fun
---
DESCRIPTION | 2 +-
NEWS.rmd | 2 +-
R/PE_Oudin.R | 18 +++++++++---------
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/DESCRIPTION b/DESCRIPTION
index 729f9b3f..870ed9b4 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 d80af8b6..b8058199 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 6b865df1..cd30b495 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))
}
--
GitLab