From 1ea399933098a4bd48a8f3921b90ff1c9a20e8ec Mon Sep 17 00:00:00 2001 From: Delaigue Olivier <olivier.delaigue@irstea.priv> Date: Fri, 24 May 2019 08:44:24 +0200 Subject: [PATCH] v1.3.2.15 CLEAN: sinus_D2H raviable renamed into parab_D2H into PE_Oudin --- DESCRIPTION | 2 +- NEWS.rmd | 2 +- R/PE_Oudin.R | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index ccda7967..b2730a77 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.14 +Version: 1.3.2.15 Date: 2019-05-24 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 ff671815..e0d5723c 100644 --- a/NEWS.rmd +++ b/NEWS.rmd @@ -14,7 +14,7 @@ output: -### 1.3.2.14 Release Notes (2019-05-24) +### 54 Release Notes (2019-05-24) #### New features diff --git a/R/PE_Oudin.R b/R/PE_Oudin.R index cd30b495..9814dc7f 100644 --- a/R/PE_Oudin.R +++ b/R/PE_Oudin.R @@ -126,11 +126,11 @@ 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, + parab_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) - PE_Oudin_H <- rep(PE_Oudin_D, each = 24) * rep(sinus_D2H, times = length(PE_Oudin_D)) + PE_Oudin_H <- rep(PE_Oudin_D, each = 24) * rep(parab_D2H, times = length(PE_Oudin_D)) } -- GitLab