diff --git a/DESCRIPTION b/DESCRIPTION index 68fa7d0ba0b0dd9f3d418cb71e3afc32f64032f2..5d7afda920e67de11cfad23eed5f505906ebab1e 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.8.3 +Version: 1.4.8.4 Date: 2020-05-04 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 e7932dbad1dd0ab3dfa622a869b7b2bea4d3051b..32b79c5a47804a88a9cd05841fc8e04b2d803902 100644 --- a/NEWS.md +++ b/NEWS.md @@ -4,7 +4,7 @@ -### 1.4.8.3 Release Notes (2020-05-04) +### 1.4.8.4 Release Notes (2020-05-04) #### New features diff --git a/R/Utils.R b/R/Utils.R index cdcbc627301d06fcca88b66ac592fd0f155983f7..773d403d04c290f1ea1df4baa4712fbc2bb06e9b 100644 --- a/R/Utils.R +++ b/R/Utils.R @@ -19,8 +19,8 @@ .AggregConvertFun <- function(Outputs) { Table <- list( - Outputs = c("PotEvap", "Precip", "Prod", "Pn", "Ps", "AE", "Perc", "PR", "Q9", "Q1", "Rout", "Exch", "AExch1", "AExch2", "AExch", "QR", "QRExp", "Exp", "QD", "Qsim", "Pliq", "Psol", "SnowPack", "ThermalState", "Gratio", "PotMelt", "Melt", "PliqAndMelt", "Temp", "Gthreshold", "Glocalmax", "LayerPrecip", "LayerTempMean", "LayerFracSolidPrecip"), - ConvertFun = c("sum", "sum", "mean", "sum", "sum", "sum", "sum", "sum", "sum", "sum", "mean", "sum", "sum", "sum", "sum", "sum", "sum", "mean", "sum", "sum", "sum", "sum", "mean", "mean", "mean", "sum", "sum", "sum", "mean", "mean", "mean", "sum", "mean", "sum") + Outputs = c("zzz", "PotEvap", "Precip", "Prod", "Pn", "Ps", "AE", "Perc", "PR", "Q9", "Q1", "Rout", "Exch", "AExch1", "AExch2", "AExch", "QR", "QRExp", "Exp", "QD", "Qsim", "Pliq", "Psol", "SnowPack", "ThermalState", "Gratio", "PotMelt", "Melt", "PliqAndMelt", "Temp", "Gthreshold", "Glocalmax", "LayerPrecip", "LayerTempMean", "LayerFracSolidPrecip"), + ConvertFun = c("sum", "sum", "sum", "mean", "sum", "sum", "sum", "sum", "sum", "sum", "sum", "mean", "sum", "sum", "sum", "sum", "sum", "sum", "mean", "sum", "sum", "sum", "sum", "mean", "mean", "mean", "sum", "sum", "sum", "mean", "mean", "mean", "sum", "mean", "sum") ) if (length(Table$Outputs) != length(Table$ConvertFun)) { stop("'.AggregOutputs' is out of order")