diff --git a/DESCRIPTION b/DESCRIPTION index 36432b713979b42e4dd0ffd634ceca92a97bbc07..2b880025e89d6d19222226c9f4972acffe72df8f 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.5 +Version: 1.6.3.6 Date: 2020-10-14 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 542cbc48815f326bccad8cc52e842920ef254df6..e355d94fddfcd1dcfc99aa9c48e8301de08bd425 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,6 +1,6 @@ ## Release History of the airGR Package -### 1.6.3.5 Release Notes (2020-10-14) +### 1.6.3.6 Release Notes (2020-10-14) #### New features diff --git a/R/RunModel_LAG.R b/R/RunModel_LAG.R index 2a84d411ee31cd56c44951f1c1db86ad85a70b2b..db073e78ee8199d36a0047df79c25dd96c743809 100644 --- a/R/RunModel_LAG.R +++ b/R/RunModel_LAG.R @@ -44,13 +44,13 @@ RunModel_LAG <- function(InputsModel, RunOptions, Param) { NbUpBasins <- length(InputsModel$LengthHydro) LengthTs <- length(OutputsModel$QsimDown) - OutputsModel$Qsim <- OutputsModel$QsimDown * InputsModel$BasinAreas[length(InputsModel$BasinAreas)] * 1E3 + OutputsModel$Qsim <- OutputsModel$QsimDown * InputsModel$BasinAreas[length(InputsModel$BasinAreas)] * 1e3 for (upstream_basin in seq_len(NbUpBasins)) { Qupstream <- InputsModel$Qupstream[RunOptions$IndPeriod_Run, upstream_basin] if (!is.na(InputsModel$BasinAreas[upstream_basin])) { # Upstream flow with area needs to be converted to m3 by time step - Qupstream <- Qupstream * InputsModel$BasinAreas[upstream_basin] * 1E3 + Qupstream <- Qupstream * InputsModel$BasinAreas[upstream_basin] * 1e3 } OutputsModel$Qsim <- OutputsModel$Qsim + c(rep(0, floor(PT[upstream_basin])), @@ -66,6 +66,6 @@ RunModel_LAG <- function(InputsModel, RunOptions, Param) { OutputsModel$Qsim[OutputsModel$Qsim < 0] <- 0 } # Convert back Qsim to mm - OutputsModel$Qsim <- OutputsModel$Qsim / sum(InputsModel$BasinAreas, na.rm = TRUE) / 1E3 + OutputsModel$Qsim <- OutputsModel$Qsim / sum(InputsModel$BasinAreas, na.rm = TRUE) / 1e3 return(OutputsModel) } \ No newline at end of file