From f040501ba03ae92e3153e8e0c2c7e140641b7375 Mon Sep 17 00:00:00 2001
From: Delaigue Olivier <olivier.delaigue@irstea.priv>
Date: Mon, 20 May 2019 11:11:09 +0200
Subject: [PATCH] v1.3.0.4 UPDATE: Calibration_Michel modified to take into
account RunModel_CemaNeigeGR4H
---
DESCRIPTION | 2 +-
NEWS.rmd | 2 +-
R/Calibration_Michel.R | 6 +++++-
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/DESCRIPTION b/DESCRIPTION
index e94b78b3..af6b6198 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.3.0.3
+Version: 1.3.0.4
Date: 2019-05-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 c32fb949..31d0a70e 100644
--- a/NEWS.rmd
+++ b/NEWS.rmd
@@ -14,7 +14,7 @@ output:
-### 1.3.0.3 Release Notes (2019-05-20)
+### 1.3.0.4 Release Notes (2019-05-20)
#### New features
diff --git a/R/Calibration_Michel.R b/R/Calibration_Michel.R
index 122c50d0..2f23888f 100644
--- a/R/Calibration_Michel.R
+++ b/R/Calibration_Michel.R
@@ -82,7 +82,11 @@ Calibration_Michel <- function(InputsModel,
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_CemaNeigeGR4H) |
+ identical(FUN_MOD, RunModel_CemaNeigeGR4J) | identical(FUN_MOD, RunModel_CemaNeigeGR5J) | identical(FUN_MOD, RunModel_CemaNeigeGR6J)) {
+ if (identical(FUN_MOD, RunModel_CemaNeigeGR4H)) {
+ FUN1 <- TransfoParam_GR4H
+ }
if (identical(FUN_MOD, RunModel_CemaNeigeGR4J)) {
FUN1 <- TransfoParam_GR4J
}
--
GitLab