v1.2.12.25 UPDATE: Calibration_Michel now use VarObs argument of CreateRunOptions instead varObs

e533e90c · Delaigue Olivier · a8c2d08d · e533e90c · e533e90c · e533e90c
Commit e533e90c authored 6 years ago by Delaigue Olivier
Hide whitespace changes
Inline Side-by-side

Showing

with 4 additions and 4 deletions
+4 -4
--- a/DESCRIPTION
+++ b/DESCRIPTION
 Package: airGR
 Type: Package
 Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling
-Version: 1.2.12.24
+Version: 1.2.12.25
 Date: 2019-04-01
 Authors@R: c(
  person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")),

--- a/NEWS.rmd
+++ b/NEWS.rmd
@@ -13,7 +13,7 @@ output:
-### 1.2.12.24 Release Notes (2019-04-01) 
+### 1.2.12.25 Release Notes (2019-04-01) 

--- a/R/Calibration_Michel.R
+++ b/R/Calibration_Michel.R
@@ -31,10 +31,10 @@ Calibration_Michel <- function(InputsModel,
    stop("'InputsCrit' must be of class 'Single' or 'Compo'")
  }
  if (inherits(InputsCrit, "Single")) {
-    listVarObs <- InputsCrit$varObs
+    listVarObs <- InputsCrit$VarObs
  }
  if (inherits(InputsCrit, "Compo")) {
-    listVarObs <- sapply(InputsCrit, FUN = "[[", "varObs")
+    listVarObs <- sapply(InputsCrit, FUN = "[[", "VarObs")
  }
  if ("SCA" %in% listVarObs & !"Gratio" %in% RunOptions$Outputs_Cal) {
    warning("Missing 'Gratio' is automatically added to 'Output_Cal' in 'RunOptions' as it is necessary in the objective function for comparison with SCA")