diff --git a/DESCRIPTION b/DESCRIPTION index fcac31e8b66bca424314ee678b552c8180454ad4..1fc8b8a925c31466d9639d6077e1d15acda7f4ed 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.1.9 +Version: 1.6.1.10 Date: 2020-04-07 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 255eb93cf9c7f7321ddc3993561def84723dbf1f..45272340d01c2548d8b1d0e3cd9e1eb4242fefd8 100644 --- a/NEWS.md +++ b/NEWS.md @@ -2,7 +2,7 @@ -### 1.6.1.9 Release Notes (2020-04-07) +### 1.6.1.10 Release Notes (2020-04-07) #### New features diff --git a/R/Calibration_Michel.R b/R/Calibration_Michel.R index dc813358f4086c7d4f819a992eea8a5b01ff3922..9e21db3245b55e4217606395e05310de4df59843 100644 --- a/R/Calibration_Michel.R +++ b/R/Calibration_Michel.R @@ -276,7 +276,7 @@ Calibration_Michel <- function(InputsModel, } ##Model_run Param <- CandidatesParamR[iNew, ] - OutputsModel <- FUN_MOD(InputsModel, RunOptions, Param) + OutputsModel <- RunModel(InputsModel, RunOptions, Param, FUN_MOD = FUN_MOD) ##Calibration_criterion_computation OutputsCrit <- ErrorCrit(InputsCrit, OutputsModel, verbose = FALSE) @@ -425,7 +425,7 @@ Calibration_Michel <- function(InputsModel, for (iNew in 1:nrow(CandidatesParamR)) { ##Model_run Param <- CandidatesParamR[iNew, ] - OutputsModel <- FUN_MOD(InputsModel, RunOptions, Param) + OutputsModel <- RunModel(InputsModel, RunOptions, Param, FUN_MOD = FUN_MOD) ##Calibration_criterion_computation OutputsCrit <- ErrorCrit(InputsCrit, OutputsModel, verbose = FALSE) if (!is.na(OutputsCrit$CritValue)) { @@ -486,7 +486,7 @@ Calibration_Michel <- function(InputsModel, CandidatesParamR <- FUN_TRANSFO(CandidatesParamT, "TR") ##Model_run Param <- CandidatesParamR[iNew, ] - OutputsModel <- FUN_MOD(InputsModel, RunOptions, Param) + OutputsModel <- RunModel(InputsModel, RunOptions, Param, FUN_MOD = FUN_MOD) ##Calibration_criterion_computation OutputsCrit <- ErrorCrit(InputsCrit, OutputsModel, verbose = FALSE) if (OutputsCrit$CritValue * OutputsCrit$Multiplier < CritOptim) { @@ -566,4 +566,3 @@ Calibration_Michel <- function(InputsModel, } -