From e533e90cf71834c2c0808cbe9a85c65f37eff09d Mon Sep 17 00:00:00 2001
From: Delaigue Olivier <olivier.delaigue@irstea.priv>
Date: Mon, 1 Apr 2019 11:52:23 +0200
Subject: [PATCH] v1.2.12.25 UPDATE: Calibration_Michel now use VarObs argument
of CreateRunOptions instead varObs
---
DESCRIPTION | 2 +-
NEWS.rmd | 2 +-
R/Calibration_Michel.R | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/DESCRIPTION b/DESCRIPTION
index 8835ee74..205afbf1 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.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")),
diff --git a/NEWS.rmd b/NEWS.rmd
index 7f993906..b82b25c5 100644
--- 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)
diff --git a/R/Calibration_Michel.R b/R/Calibration_Michel.R
index b19b05de..377ccc7a 100644
--- 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")
--
GitLab