Commit ae7c3914 authored by Hban Mesure's avatar Hban Mesure
Browse files

v1.4.1.17 BUG: tests using the non existing RunModel_CemaNeigeGR5H are...

v1.4.1.17 BUG: tests using the non existing RunModel_CemaNeigeGR5H are temporary removed from Calibration_Michel and CreateCalibOption #13
Showing with 13 additions and 12 deletions
+13 -12
Package: airGR
Type: Package
Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling
Version: 1.4.1.16
Version: 1.4.1.17
Date: 2019-12-05
Authors@R: c(
person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")),
......
......@@ -2,7 +2,7 @@
### 1.4.1.16 Release Notes (2019-12-05)
### 1.4.1.17 Release Notes (2019-12-05)
#### New features
......
......@@ -85,14 +85,14 @@ Calibration_Michel <- function(InputsModel,
FUN_TRANSFO <- TransfoParam_CemaNeige
}
}
if (identical(FUN_MOD, RunModel_CemaNeigeGR4H) | identical(FUN_MOD, RunModel_CemaNeigeGR5H) |
if (identical(FUN_MOD, RunModel_CemaNeigeGR4H) | #identical(FUN_MOD, RunModel_CemaNeigeGR5H) |
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_CemaNeigeGR5H)) {
FUN1 <- TransfoParam_GR5H
}
# if (identical(FUN_MOD, RunModel_CemaNeigeGR5H)) {
# FUN1 <- TransfoParam_GR5H
# }
if (identical(FUN_MOD, RunModel_CemaNeigeGR4J)) {
FUN1 <- TransfoParam_GR4J
}
......
......@@ -60,10 +60,10 @@ CreateCalibOptions <- function(FUN_MOD,
ObjectClass <- c(ObjectClass, "CemaNeigeGR4H")
BOOL <- TRUE
}
if (identical(FUN_MOD, RunModel_CemaNeigeGR5H)) {
ObjectClass <- c(ObjectClass, "CemaNeigeGR5H")
BOOL <- TRUE
}
# if (identical(FUN_MOD, RunModel_CemaNeigeGR5H)) {
# ObjectClass <- c(ObjectClass, "CemaNeigeGR5H")
# BOOL <- TRUE
# }
if (identical(FUN_MOD, RunModel_CemaNeigeGR4J)) {
ObjectClass <- c(ObjectClass, "CemaNeigeGR4J")
BOOL <- TRUE
......@@ -107,8 +107,9 @@ CreateCalibOptions <- function(FUN_MOD,
identical(FUN_MOD, RunModel_CemaNeigeGR4H)) {
FUN1 <- TransfoParam_GR4H
}
if (identical(FUN_MOD, RunModel_GR5H) |
identical(FUN_MOD, RunModel_CemaNeigeGR5H)) {
# if (identical(FUN_MOD, RunModel_GR5H) |
# identical(FUN_MOD, RunModel_CemaNeigeGR5H)) {
if (identical(FUN_MOD, RunModel_GR5H)) {
FUN1 <- TransfoParam_GR5H
}
if (identical(FUN_MOD, RunModel_GR4J) |
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment