From 024d41af95cae5478214a5e2342a1b4b29a76216 Mon Sep 17 00:00:00 2001
From: Delaigue Olivier <olivier.delaigue@irstea.priv>
Date: Mon, 20 May 2019 11:06:50 +0200
Subject: [PATCH] v1.3.0.3 UPDATE: CreateCalibOptions modified to take into
account RunModel_CemaNeigeGR4H
---
DESCRIPTION | 2 +-
NEWS.rmd | 2 +-
R/CreateCalibOptions.R | 15 ++++++++++++++-
3 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/DESCRIPTION b/DESCRIPTION
index 012f5d14..e94b78b3 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.2
+Version: 1.3.0.3
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 a95daa51..c32fb949 100644
--- a/NEWS.rmd
+++ b/NEWS.rmd
@@ -14,7 +14,7 @@ output:
-### 1.3.0.2 Release Notes (2019-05-20)
+### 1.3.0.3 Release Notes (2019-05-20)
#### New features
diff --git a/R/CreateCalibOptions.R b/R/CreateCalibOptions.R
index 4df83ea2..b9c4f2b5 100644
--- a/R/CreateCalibOptions.R
+++ b/R/CreateCalibOptions.R
@@ -48,6 +48,10 @@ CreateCalibOptions <- function(FUN_MOD,
ObjectClass <- c(ObjectClass, "CemaNeige")
BOOL <- TRUE
}
+ if (identical(FUN_MOD, RunModel_CemaNeigeGR4H)) {
+ ObjectClass <- c(ObjectClass, "CemaNeigeGR4H")
+ BOOL <- TRUE
+ }
if (identical(FUN_MOD, RunModel_CemaNeigeGR4J)) {
ObjectClass <- c(ObjectClass, "CemaNeigeGR4J")
BOOL <- TRUE
@@ -84,7 +88,8 @@ CreateCalibOptions <- function(FUN_MOD,
##check_FUN_TRANSFO
if (is.null(FUN_TRANSFO)) {
##_set_FUN1
- if (identical(FUN_MOD, RunModel_GR4H)) {
+ if (identical(FUN_MOD, RunModel_GR4H) |
+ identical(FUN_MOD, RunModel_CemaNeigeGR4H)) {
FUN1 <- TransfoParam_GR4H
}
if (identical(FUN_MOD, RunModel_GR4J) |
@@ -190,6 +195,9 @@ CreateCalibOptions <- function(FUN_MOD,
if ("CemaNeige" %in% ObjectClass) {
NParam <- 2
}
+ if ("CemaNeigeGR4H" %in% ObjectClass) {
+ NParam <- 6
+ }
if ("CemaNeigeGR4J" %in% ObjectClass) {
NParam <- 6
}
@@ -305,6 +313,11 @@ CreateCalibOptions <- function(FUN_MOD,
-9.14, +6.90,
+4.10, +7.21), ncol = 2, byrow = TRUE)
}
+ if ("CemaNeigeGR4H" %in% ObjectClass) {
+ ParamT <- matrix(c(+5.12, -1.18, +4.34, -9.69, -9.96, +6.63,
+ +5.58, -0.85, +4.74, -9.47, -9.14, +6.90,
+ +6.01, -0.50, +5.14, -8.87, +4.10, +7.21), ncol = 6, byrow = TRUE)
+ }
if ("CemaNeigeGR4J" %in% ObjectClass) {
ParamT <- matrix(c(+5.13, -1.60, +3.03, -9.05, -9.96, +6.63,
+5.51, -0.61, +3.74, -8.51, -9.14, +6.90,
--
GitLab