diff --git a/DESCRIPTION b/DESCRIPTION index 705286396d4281d20c7555fb58b1ca7969e6c4e4..75ed0a819760dae0cb7b497e241684e1b65ee4d2 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.2.3 +Version: 1.2.2.4 Date: 2019-02-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 4196c64e909eaf5a19d8f5e949690a743cbef127..e194daac845fa7560ff7036ca1baa9db20c3a846 100644 --- a/NEWS.rmd +++ b/NEWS.rmd @@ -13,7 +13,7 @@ output: -### 1.2.2.3 Release Notes (2019-01-30) +### 1.2.2.4 Release Notes (2019-01-30) diff --git a/R/Calibration_Michel.R b/R/Calibration_Michel.R index 4b58ed75c0f32f05250e7e2be52816d891be006b..b21367c0538ba8a3c6835c32ab43ecc3d96e0483 100644 --- a/R/Calibration_Michel.R +++ b/R/Calibration_Michel.R @@ -54,19 +54,25 @@ Calibration_Michel <- function(InputsModel, RunOptions, InputsCrit, CalibOptions FUN_TRANSFO <- TransfoParam_GR1A } if (identical(FUN_MOD, RunModel_CemaNeige )) { - FUN_TRANSFO <- TransfoParam_CemaNeige + if (inherits(FUN_MOD, "hysteresis")) { + FUN_TRANSFO <- TransfoParam_CemaNeigeHyst + } else { + FUN_TRANSFO <- TransfoParam_CemaNeige + } } if (identical(FUN_MOD, RunModel_CemaNeigeGR4J) | identical(FUN_MOD, RunModel_CemaNeigeGR5J) | identical(FUN_MOD, RunModel_CemaNeigeGR6J)) { if (identical(FUN_MOD, RunModel_CemaNeigeGR4J)) { FUN1 <- TransfoParam_GR4J - FUN2 <- TransfoParam_CemaNeige } if (identical(FUN_MOD, RunModel_CemaNeigeGR5J)) { FUN1 <- TransfoParam_GR5J - FUN2 <- TransfoParam_CemaNeige } if (identical(FUN_MOD,RunModel_CemaNeigeGR6J)) { FUN1 <- TransfoParam_GR6J + } + if (inherits(FUN_MOD, "hysteresis")) { + FUN2 <- TransfoParam_CemaNeigeHyst + } else { FUN2 <- TransfoParam_CemaNeige } FUN_TRANSFO <- function(ParamIn, Direction) {