From f715a150bf8ee943fdc27922293e6251225f22d1 Mon Sep 17 00:00:00 2001
From: Delaigue Olivier <olivier.delaigue@irstea.priv>
Date: Wed, 20 Mar 2019 08:28:34 +0100
Subject: [PATCH] v1.2.9.30 CLEAN: minor syntax revision in Calibration_Michel
---
DESCRIPTION | 2 +-
NEWS.rmd | 2 +-
R/Calibration_Michel.R | 18 ++++++++++++------
3 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/DESCRIPTION b/DESCRIPTION
index e1082189..fb0d44de 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.9.29
+Version: 1.2.9.30
Date: 2019-03-20
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 91b1edad..d4d6e2c6 100644
--- a/NEWS.rmd
+++ b/NEWS.rmd
@@ -13,7 +13,7 @@ output:
-### 1.2.9.29 Release Notes (2019-03-20)
+### 1.2.9.30 Release Notes (2019-03-20)
diff --git a/R/Calibration_Michel.R b/R/Calibration_Michel.R
index 6aadfdc0..b782e309 100644
--- a/R/Calibration_Michel.R
+++ b/R/Calibration_Michel.R
@@ -1,9 +1,15 @@
-Calibration_Michel <- function(InputsModel, RunOptions, InputsCrit, CalibOptions,
- FUN_MOD, FUN_CRIT, FUN_TRANSFO = NULL, verbose = TRUE) {
-
-
- FUN_MOD <- match.fun(FUN_MOD)
- FUN_CRIT <- match.fun(FUN_CRIT)
+Calibration_Michel <- function(InputsModel,
+ RunOptions,
+ InputsCrit,
+ CalibOptions,
+ FUN_MOD,
+ FUN_CRIT, # deprecated
+ FUN_TRANSFO = NULL,
+ verbose = TRUE) {
+
+
+ FUN_MOD <- match.fun(FUN_MOD)
+ FUN_CRIT <- match.fun(FUN_CRIT)
if (!is.null(FUN_TRANSFO)) {
FUN_TRANSFO <- match.fun(FUN_TRANSFO)
}
--
GitLab