v1.3.2.6 CLEAN: PE_Oudin code slightly improved

DESCRIPTION

 Package: airGR
 Type: Package
 Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling
-Version: 1.3.2.5
+Version: 1.3.2.6
 Date: 2019-05-22
 Authors@R: c(
   person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")),

NEWS.rmd

@@ -14,7 +14,7 @@ output:
 
 
 
-### 1.3.2.5 Release Notes (2019-05-22)
+### 1.3.2.6 Release Notes (2019-05-22)
 
 
 #### New features

R/PE_Oudin.R

@@ -53,22 +53,19 @@ PE_Oudin <- function(JD, Temp,
   if (!(TimeStepOut %in% c("daily", "hourly"))) {
     stop("'TimeStepOut' must be one of \"daily\" or \"hourly\"")
   }
-  if (TimeStepIn == "daily") {
-    rleJD <- rle(JD)
-    if (any(rleJD$lengths != 1)) {
-      stop("each day must have only one identical value of julian days")
-    }
+  rleJD <- rle(JD)
+  if (TimeStepIn == "daily" & any(rleJD$lengths != 1)) {
+    stop("each day must have only one identical value of julian days")
+  }
+  if (TimeStepIn == "hourly" & any(rleJD$lengths != 24)) {
+    stop("each day must have 24 identical values of julian days (one for each hour)")
   }
   
   
   ## ---------- hourly inputs aggregation
   
   if (TimeStepIn == "hourly") {
-    rleJD <- rle(JD)
     JD <- rleJD$values
-    if (any(rleJD$lengths != 24)) {
-      stop("each day must have 24 identical values of julian days (one for each hour)")
-    }
     idJD <- rep(seq_along(JD), each = rleJD$lengths[1L])
     Temp <- as.vector(tapply(X = Temp, INDEX = idJD, FUN = mean))
   }