From 87487b781c20a7f63416887f3ee9be6a62bda849 Mon Sep 17 00:00:00 2001
From: Delaigue Olivier <olivier.delaigue@irstea.priv>
Date: Tue, 19 Feb 2019 08:43:45 +0100
Subject: [PATCH] v1.2.2.4 UPDATE: Calibration_Michel can now use
TransfoParam_CemaNeigeHyst
---
DESCRIPTION | 2 +-
NEWS.rmd | 2 +-
R/Calibration_Michel.R | 12 +++++++++---
3 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/DESCRIPTION b/DESCRIPTION
index 70528639..75ed0a81 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 4196c64e..e194daac 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 4b58ed75..b21367c0 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) {
--
GitLab