diff --git a/DESCRIPTION b/DESCRIPTION index 3f48cc824f00beaacad4856e9e5705cabad52d07..0457fba9392fa60f76c010b3514669f92bdd9a12 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.23 +Version: 1.2.9.24 Date: 2019-03-19 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 86355695022fcaf95599835367dacb3939da14f1..df544b7fd991c240f7d3c4d36a367ef2b370ad6a 100644 --- a/NEWS.rmd +++ b/NEWS.rmd @@ -13,7 +13,7 @@ output: -### 1.2.9.23 Release Notes (2019-03-19) +### 1.2.9.24 Release Notes (2019-03-19) diff --git a/R/Calibration_Michel.R b/R/Calibration_Michel.R index 8448ab52a2f3b44c26af2e86fad68d6dacc00698..6aadfdc03d056aa13857fc96876a554cf9e9d6cd 100644 --- a/R/Calibration_Michel.R +++ b/R/Calibration_Michel.R @@ -195,7 +195,12 @@ Calibration_Michel <- function(InputsModel, RunOptions, InputsCrit, CalibOptions } ##Model_run Param <- CandidatesParamR[iNew, ] - OutputsModel <- FUN_MOD(InputsModel, RunOptions, Param) + if (inherits(FUN_MOD, "hysteresis")) { + OutputsModel <- FUN_MOD(InputsModel, RunOptions, Param, IsHyst = TRUE) + } else { + OutputsModel <- FUN_MOD(InputsModel, RunOptions, Param) + } + ##Calibration_criterion_computation OutputsCrit <- ErrorCrit(InputsCrit, OutputsModel, verbose = FALSE) if (!is.na(OutputsCrit$CritValue)) { @@ -343,7 +348,11 @@ Calibration_Michel <- function(InputsModel, RunOptions, InputsCrit, CalibOptions for (iNew in 1:nrow(CandidatesParamR)) { ##Model_run Param <- CandidatesParamR[iNew, ] - OutputsModel <- FUN_MOD(InputsModel, RunOptions, Param) + if (inherits(FUN_MOD, "hysteresis")) { + OutputsModel <- FUN_MOD(InputsModel, RunOptions, Param, IsHyst = TRUE) + } else { + OutputsModel <- FUN_MOD(InputsModel, RunOptions, Param) + } ##Calibration_criterion_computation OutputsCrit <- ErrorCrit(InputsCrit, OutputsModel, verbose = FALSE) if (!is.na(OutputsCrit$CritValue)) { @@ -404,7 +413,11 @@ Calibration_Michel <- function(InputsModel, RunOptions, InputsCrit, CalibOptions CandidatesParamR <- FUN_TRANSFO(CandidatesParamT, "TR") ##Model_run Param <- CandidatesParamR[iNew, ] - OutputsModel <- FUN_MOD(InputsModel, RunOptions, Param) + if (inherits(FUN_MOD, "hysteresis")) { + OutputsModel <- FUN_MOD(InputsModel, RunOptions, Param, IsHyst = TRUE) + } else { + OutputsModel <- FUN_MOD(InputsModel, RunOptions, Param) + } ##Calibration_criterion_computation OutputsCrit <- ErrorCrit(InputsCrit, OutputsModel, verbose = FALSE) if (OutputsCrit$CritValue * OutputsCrit$Multiplier < CritOptim) {