diff --git a/DESCRIPTION b/DESCRIPTION index f4fabeb584f57164b2435dc5ff8e20a2ebf663dc..fac748323242a7f60dcbbe23de5f182631af1a65 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.4.2.5 +Version: 1.4.2.6 Date: 2019-12-10 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 cf83a3d96cafc5868832ed2ba8346dd58d1ff550..4ada447a7c8161f77a317175a6f3cfd8d5370a99 100644 --- a/NEWS.md +++ b/NEWS.md @@ -2,7 +2,7 @@ -### 1.4.2.5 Release Notes (2019-12-10) +### 1.4.2.6 Release Notes (2019-12-10) #### New features diff --git a/R/Imax.R b/R/Imax.R index 919ce850ca0a875f09d75ccdea485a81c6aa6eec..254c6e5a230df0e803869eb3ba5229a611f26de6 100644 --- a/R/Imax.R +++ b/R/Imax.R @@ -1,7 +1,7 @@ Imax <- function(InputsModel, IndPeriod_Run, - tested_values = seq(from = 0.1, to = 3, seq = 0.1)) { + TestedValues = seq(from = 0.1, to = 3, seq = 0.1)) { ##_____Arguments_check_____________________________________________________________________ if (!inherits(InputsModel, "InputsModel")) { @@ -22,9 +22,9 @@ Imax <- function(InputsModel, stop("'IndPeriod_Run' must be a continuous sequence of integers") } - ##tested_values - if (!(is.numeric(tested_values))) { - stop("'tested_values' must be 'numeric'") + ##TestedValues + if (!(is.numeric(TestedValues))) { + stop("'TestedValues' must be 'numeric'") } @@ -40,8 +40,8 @@ Imax <- function(InputsModel, ##calculate total interception of the GR5H interception store on the period ## and compute difference with daily values - differences <- array(NA, c(length(tested_values))) - for (Imax in tested_values) { + differences <- array(NA, c(length(TestedValues))) + for (Imax in TestedValues) { C0 <- 0 cum_hourly <- 0 for (i in IndPeriod_Run) { @@ -50,10 +50,10 @@ Imax <- function(InputsModel, C0 <- C0 + InputsModel$Precip[i] - Ec - Pth cum_hourly <- cum_hourly + Ec } - differences[which(Imax == tested_values)] <- abs(cum_hourly - cum_daily) + differences[which(Imax == TestedValues)] <- abs(cum_hourly - cum_daily) } ##return the Imax value that minimises the difference - return(tested_values[which.min(differences)]) + return(TestedValues[which.min(differences)]) }