diff --git a/DESCRIPTION b/DESCRIPTION index 8835ee74b41bb65170a17e7f85f958c57464aebc..205afbf15604bd65214f46de0116fdd2ddcda0b8 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 7f993906c58e5f13e622d1ebf2253280f704f0f1..b82b25c59a8b0935e5ab8f7a5eed5f4e845aab7a 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 b19b05de5e8fa72a6efa73bc7f670a0996e2329c..377ccc7a317419f02573a1dd2e227dc820414b2d 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")