diff --git a/DESCRIPTION b/DESCRIPTION index 4fe571173830217815349bcfa3e8dfbc38e8d7c9..783d5584b235df383cc808e6308a707c555f94a1 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.0.15.3 +Version: 1.0.15.4 Date: 2018-10-15 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 06a7948afb53dc4ab2beb15611abbe8eb2a67a91..e9bc89c5240be85e17940acb10520fc4e2aa2ff8 100644 --- a/NEWS.rmd +++ b/NEWS.rmd @@ -13,7 +13,7 @@ output: -### 1.0.15.3 Release Notes (2018-10-15) +### 1.0.15.4 Release Notes (2018-10-15) diff --git a/R/ErrorCrit_KGE.R b/R/ErrorCrit_KGE.R index 7f45bfeffef969c60b9daa26860c5804859d8c00..dd15c658427b0cae362c00a2c71c4f285bc54e0d 100644 --- a/R/ErrorCrit_KGE.R +++ b/R/ErrorCrit_KGE.R @@ -44,10 +44,10 @@ ErrorCrit_KGE <- function(InputsCrit, OutputsModel, warnings = TRUE, verbose = T ##Data_transformation if (InputsCrit$transfo %in% c("log", "inv") & is.null(InputsCrit$epsilon) & verbose) { if (any(VarObs %in% 0)) { - warning("zeroes detected in Qobs: the corresponding time-steps will be exclude from the criteria computation if the epsilon agrument of 'CreateInputsCrit' = NULL") + warning("zeroes detected in Qobs: the corresponding time-steps will be excluded from the criteria computation if the epsilon argument of 'CreateInputsCrit' = NULL") } if (any(VarSim %in% 0)) { - warning("zeroes detected in Qsim: the corresponding time-steps will be exclude from the criteria computation if the epsilon agrument of 'CreateInputsCrit' = NULL") + warning("zeroes detected in Qsim: the corresponding time-steps will be excluded from the criteria computation if the epsilon argument of 'CreateInputsCrit' = NULL") } } if ("epsilon" %in% names(InputsCrit) & !is.null(InputsCrit$epsilon)) { diff --git a/R/ErrorCrit_KGE2.R b/R/ErrorCrit_KGE2.R index 9de2e220a472162d3cac810ed47d5ee2fdf40da6..37095d8ed6bb5f9adf7c9b850570fa04e6c099a7 100644 --- a/R/ErrorCrit_KGE2.R +++ b/R/ErrorCrit_KGE2.R @@ -44,10 +44,10 @@ ErrorCrit_KGE2 <- function(InputsCrit, OutputsModel, warnings = TRUE, verbose = ##Data_transformation if (InputsCrit$transfo %in% c("log", "inv") & is.null(InputsCrit$epsilon) & verbose) { if (any(VarObs %in% 0)) { - warning("zeroes detected in Qobs: the corresponding time-steps will be exclude from the criteria computation if the epsilon agrument of 'CreateInputsCrit' = NULL") + warning("zeroes detected in Qobs: the corresponding time-steps will be excluded from the criteria computation if the epsilon argument of 'CreateInputsCrit' = NULL") } if (any(VarSim %in% 0)) { - warning("zeroes detected in Qsim: the corresponding time-steps will be exclude from the criteria computation if the epsilon agrument of 'CreateInputsCrit' = NULL") + warning("zeroes detected in Qsim: the corresponding time-steps will be excluded from the criteria computation if the epsilon argument of 'CreateInputsCrit' = NULL") } } if ("epsilon" %in% names(InputsCrit) & !is.null(InputsCrit$epsilon)) { diff --git a/R/ErrorCrit_NSE.R b/R/ErrorCrit_NSE.R index 36d7bbfc2575bdc569a8eae18e50fab152e5526a..598778ce6e0497c9fe98c288fc14ffa1ffd8b397 100644 --- a/R/ErrorCrit_NSE.R +++ b/R/ErrorCrit_NSE.R @@ -44,10 +44,10 @@ ErrorCrit_NSE <- function(InputsCrit, OutputsModel, warnings = TRUE, verbose = T ##Data_transformation if (InputsCrit$transfo %in% c("log", "inv") & is.null(InputsCrit$epsilon) & verbose) { if (any(VarObs %in% 0)) { - warning("zeroes detected in Qobs: the corresponding time-steps will be exclude from the criteria computation if the epsilon agrument of 'CreateInputsCrit' = NULL") + warning("zeroes detected in Qobs: the corresponding time-steps will be excluded from the criteria computation if the epsilon argument of 'CreateInputsCrit' = NULL") } if (any(VarSim %in% 0)) { - warning("zeroes detected in Qsim: the corresponding time-steps will be exclude from the criteria computation if the epsilon agrument of 'CreateInputsCrit' = NULL") + warning("zeroes detected in Qsim: the corresponding time-steps will be excluded from the criteria computation if the epsilon argument of 'CreateInputsCrit' = NULL") } } if ("epsilon" %in% names(InputsCrit) & !is.null(InputsCrit$epsilon)) { diff --git a/R/ErrorCrit_RMSE.R b/R/ErrorCrit_RMSE.R index 9ac0256cdecb366580880884d0ed3dbcbded84fa..b21a8af6672359e1cfa2c05e12b1d40f605d0c9c 100644 --- a/R/ErrorCrit_RMSE.R +++ b/R/ErrorCrit_RMSE.R @@ -44,10 +44,10 @@ ErrorCrit_RMSE <- function(InputsCrit, OutputsModel, warnings = TRUE, verbose = ##Data_transformation if (InputsCrit$transfo %in% c("log", "inv") & is.null(InputsCrit$epsilon) & verbose) { if (any(VarObs %in% 0)) { - warning("zeroes detected in Qobs: the corresponding time-steps will be exclude from the criteria computation if the epsilon agrument of 'CreateInputsCrit' = NULL") + warning("zeroes detected in Qobs: the corresponding time-steps will be excluded from the criteria computation if the epsilon argument of 'CreateInputsCrit' = NULL") } if (any(VarSim %in% 0)) { - warning("zeroes detected in Qsim: the corresponding time-steps will be exclude from the criteria computation if the epsilon agrument of 'CreateInputsCrit' = NULL") + warning("zeroes detected in Qsim: the corresponding time-steps will be excluded from the criteria computation if the epsilon argument of 'CreateInputsCrit' = NULL") } } if ("epsilon" %in% names(InputsCrit) & !is.null(InputsCrit$epsilon)) {