diff --git a/DESCRIPTION b/DESCRIPTION index e1705ce736bbd2da7c29b2a5f691940fb29f9b0c..a237d3942aff51c0052af7edd2ee2bd0d4fa3d90 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Package: airGR Type: Package Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling -Version: 1.2.13.8 -Date: 2019-04-02 +Version: 1.2.13.9 +Date: 2019-04-03 Authors@R: c( person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")), person("Olivier", "Delaigue", role = c("aut", "cre"), comment = c(ORCID = "0000-0002-7668-8468"), email = "airGR@irstea.fr"), diff --git a/NEWS.rmd b/NEWS.rmd index 5ca0fedef78f7783d3363f4d0ab8caef0810868d..a4eaddcbc1e13ff3038194c39bfd0d4f3852304d 100644 --- a/NEWS.rmd +++ b/NEWS.rmd @@ -13,7 +13,7 @@ output: -### 1.2.13.8 Release Notes (2019-04-02) +### 1.2.13.9 Release Notes (2019-04-03) diff --git a/R/Calibration_Michel.R b/R/Calibration_Michel.R index 377ccc7a317419f02573a1dd2e227dc820414b2d..122c50d081c966a5a695da2c0c336637f8f7aadc 100644 --- a/R/Calibration_Michel.R +++ b/R/Calibration_Michel.R @@ -258,7 +258,7 @@ Calibration_Michel <- function(InputsModel, if (Ncandidates == 1) { message("\t Starting point for steepest-descent local search:") } - message("\t Param = ", paste(sprintf("%8.3f", ParamStartR), collapse = " , ")) + message("\t Param = ", paste(sprintf("%8.3f", ParamStartR), collapse = ", ")) message(sprintf("\t Crit. %-12s = %.4f", CritName, CritStart * Multiplier)) } ##Results_archiving________________________________________________________ @@ -472,8 +472,8 @@ Calibration_Michel <- function(InputsModel, NIter <- 1 + ITER if (verbose) { message(sprintf("\t Calibration completed (%s iterations, %s runs)", NIter, NRuns)) - message("\t Param = ", paste(sprintf("%8.3f", ParamFinalR), collapse = " , ")) - message(sprintf("\t Crit. %-12s = %.4f", CritName, CritFinal * Multiplier), "\n") + message("\t Param = ", paste(sprintf("%8.3f", ParamFinalR), collapse = ", ")) + message(sprintf("\t Crit. %-12s = %.4f", CritName, CritFinal * Multiplier)) if (inherits(InputsCrit, "Compo")) { listweights <- OutputsCrit$CritCompo$MultiCritWeights listNameCrit <- OutputsCrit$CritCompo$MultiCritNames @@ -482,7 +482,7 @@ Calibration_Michel <- function(InputsModel, msgFormSep <- rep(c(",", ",", ",\n\t\t "), times = ceiling(length(msgForm)/3))[1: length(msgForm)] msgForm <- paste(msgForm, msgFormSep, sep = "", collapse = "") msgForm <- gsub("\\,\\\n\\\t\\\t $|\\,$", "", msgForm) - message("\tFormula: sum(", msgForm, ")\n") + message("\tFormula: sum(", msgForm, ")") } } ##Results_archiving_______________________________________________________