Commit 705dae5d authored by Delaigue Olivier's avatar Delaigue Olivier
Browse files

v1.5.0.0 BUG: CReatInputsCrit can use RunOptions objects of class "LibMod"

No related merge requests found
Showing with 8 additions and 4 deletions
+8 -4
Package: airGR Package: airGR
Type: Package Type: Package
Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling
Version: 1.4.3.63 Version: 1.5.0.0
Date: 2020-02-26 Date: 2020-02-28
Authors@R: c( Authors@R: c(
person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")), 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@inrae.fr"), person("Olivier", "Delaigue", role = c("aut", "cre"), comment = c(ORCID = "0000-0002-7668-8468"), email = "airGR@inrae.fr"),
......
...@@ -4,7 +4,11 @@ ...@@ -4,7 +4,11 @@
### 1.4.3.63 Release Notes (2020-02-26) ### 1.5.0.0 Release Notes (2020-02-28)
#### Minor user-visible changes
- Codedaptations to make the package compatible with airGRplus.
____________________________________________________________________________________ ____________________________________________________________________________________
......
...@@ -107,7 +107,7 @@ CreateInputsCrit <- function(FUN_CRIT, ...@@ -107,7 +107,7 @@ CreateInputsCrit <- function(FUN_CRIT,
## check 'VarObs' + 'RunOptions' ## check 'VarObs' + 'RunOptions'
if ("Q" %in% VarObs & !inherits(RunOptions, "GR")) { if ("Q" %in% VarObs & !inherits(RunOptions, c("GR", "LibMod"))) {
stop("'VarObs' cannot contain Q if a GR rainfall-runoff model is not used") stop("'VarObs' cannot contain Q if a GR rainfall-runoff model is not used")
} }
if (any(c("SCA", "SWE") %in% VarObs) & !inherits(RunOptions, "CemaNeige")) { if (any(c("SCA", "SWE") %in% VarObs) & !inherits(RunOptions, "CemaNeige")) {
......
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