Commit f6d32d82 authored by Delaigue Olivier's avatar Delaigue Olivier
Browse files

v1.4.2.13 BUG: minor type revisions in CreatRunOptions

parent 0a940a9a
Package: airGR
Type: Package
Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling
Version: 1.4.2.12
Date: 2019-12-10
Version: 1.4.2.13
Date: 2019-12-11
Authors@R: c(
person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")),
person("Olivier", "Delaigue", role = c("aut", "cre"), comment = c(ORCID = "0000-0002-7668-8468"), email = "airGR@irstea.fr"),
......
......@@ -2,7 +2,7 @@
### 1.4.2.12 Release Notes (2019-12-10)
### 1.4.2.13 Release Notes (2019-12-11)
#### New features
......
......@@ -50,7 +50,7 @@ CreateRunOptions <- function(FUN_MOD, InputsModel, IndPeriod_WarmUp = NULL, IndP
ObjectClass <- c(ObjectClass, "GR", "CemaNeige", "daily")
BOOL <- TRUE
}
if (identical(FUN_MOD, RunModel_CemaNeigeGR4H)) {
if (identical(FUN_MOD, RunModel_CemaNeigeGR4H)) { # | identical(FUN_MOD, RunModel_CemaNeigeGR5H)
ObjectClass <- c(ObjectClass, "GR", "CemaNeige", "hourly")
BOOL <- TRUE
}
......@@ -69,7 +69,7 @@ CreateRunOptions <- function(FUN_MOD, InputsModel, IndPeriod_WarmUp = NULL, IndP
}
# if ((!(identical(FUN_MOD, RunModel_GR5H)) | !(identical(FUN_MOD, RunModel_CemaNeigeGR5H))) & "interception" %in% ObjectClass) {
if (!(identical(FUN_MOD, RunModel_GR5H)) & "interception" %in% ObjectClass) {
stop("'IMax' cannot be se for the chosen 'FUN_MOD'")
stop("'IMax' cannot be set for the chosen 'FUN_MOD'")
}
##check_InputsModel
......@@ -182,7 +182,7 @@ CreateRunOptions <- function(FUN_MOD, InputsModel, IndPeriod_WarmUp = NULL, IndP
stop("'IniResLevels' must be a vector of numeric values")
}
if ((identical(FUN_MOD, RunModel_GR4H) | identical(FUN_MOD, RunModel_CemaNeigeGR4H) |
(identical(FUN_MOD, RunModel_GR5H) & !IsIntStore) |
(identical(FUN_MOD, RunModel_GR5H) & !IsIntStore) |
identical(FUN_MOD, RunModel_GR4J) | identical(FUN_MOD, RunModel_CemaNeigeGR4J) |
identical(FUN_MOD, RunModel_GR5J) | identical(FUN_MOD, RunModel_CemaNeigeGR5J) |
identical(FUN_MOD, RunModel_GR2M)) &
......
Markdown is supported
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