diff --git a/DESCRIPTION b/DESCRIPTION index e10821892e52bbedeb0290bf5bb8c47afcf33504..fb0d44de5fb1b3bebebce074acc51ee7e4405ebf 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.2.9.29 +Version: 1.2.9.30 Date: 2019-03-20 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 91b1edad0844f8c5a900e2b138bf3ce2b2a583ec..d4d6e2c6e00a2736b71700c8e4cbb87d40e19946 100644 --- a/NEWS.rmd +++ b/NEWS.rmd @@ -13,7 +13,7 @@ output: -### 1.2.9.29 Release Notes (2019-03-20) +### 1.2.9.30 Release Notes (2019-03-20) diff --git a/R/Calibration_Michel.R b/R/Calibration_Michel.R index 6aadfdc03d056aa13857fc96876a554cf9e9d6cd..b782e309479e9e7aa689fd4ea7c138a758838e38 100644 --- a/R/Calibration_Michel.R +++ b/R/Calibration_Michel.R @@ -1,9 +1,15 @@ -Calibration_Michel <- function(InputsModel, RunOptions, InputsCrit, CalibOptions, - FUN_MOD, FUN_CRIT, FUN_TRANSFO = NULL, verbose = TRUE) { - - - FUN_MOD <- match.fun(FUN_MOD) - FUN_CRIT <- match.fun(FUN_CRIT) +Calibration_Michel <- function(InputsModel, + RunOptions, + InputsCrit, + CalibOptions, + FUN_MOD, + FUN_CRIT, # deprecated + FUN_TRANSFO = NULL, + verbose = TRUE) { + + + FUN_MOD <- match.fun(FUN_MOD) + FUN_CRIT <- match.fun(FUN_CRIT) if (!is.null(FUN_TRANSFO)) { FUN_TRANSFO <- match.fun(FUN_TRANSFO) }