From d6f27bc0bc4ae66f4b464bd48dd27f371f387f82 Mon Sep 17 00:00:00 2001
From: Delaigue Olivier <olivier.delaigue@irstea.fr>
Date: Mon, 23 Nov 2020 17:01:54 +0100
Subject: [PATCH] v1.6.3.70 style: clean PE_Oudin R code Refs #62
---
DESCRIPTION | 2 +-
NEWS.md | 2 +-
R/PE_Oudin.R | 8 ++------
3 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/DESCRIPTION b/DESCRIPTION
index 50051874..3f18ce20 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.6.3.69
+Version: 1.6.3.70
Date: 2020-11-23
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 e53fabac..23725f3f 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -4,7 +4,7 @@
-### 1.6.3.69 Release Notes (2020-11-23)
+### 1.6.3.70 Release Notes (2020-11-23)
#### New features
diff --git a/R/PE_Oudin.R b/R/PE_Oudin.R
index 54198f18..92468df8 100644
--- a/R/PE_Oudin.R
+++ b/R/PE_Oudin.R
@@ -28,10 +28,10 @@ PE_Oudin <- function(JD, Temp,
if (LatUnit[1L] == "deg" & (all(Lat >= 90) | all(Lat <= -90))) {
stop("'Lat' must be comprised between -90 and +90 degrees")
}
- if (!RunFortran & LatUnit[1L] == "rad") {
+ if (LatUnit[1L] == "rad") {
FI <- Lat
}
- if (!RunFortran & LatUnit[1L] == "deg") {
+ if (LatUnit[1L] == "deg") {
FI <- Lat / (180 / pi)
}
if (any(JD < 0) | any(JD > 366)) {
@@ -61,9 +61,6 @@ PE_Oudin <- function(JD, Temp,
## ---------- Oudin's formula
if (RunFortran) {
- if (LatUnit[1L] == "rad") {
- Lat = Lat * 180 / pi
- }
LInputs = as.integer(length(Temp))
@@ -86,7 +83,6 @@ PE_Oudin <- function(JD, Temp,
PE_Oudin_D <- rep(NA, length(Temp))
COSFI <- cos(FI)
- AFI <- abs(FI / 42)
for (k in seq_along(Temp)) {
--
GitLab