From 354a51988970bdc8fee9446c3c5c3fe286cc77a5 Mon Sep 17 00:00:00 2001 From: Delaigue Olivier <olivier.delaigue@irstea.priv> Date: Tue, 12 Mar 2019 17:40:35 +0100 Subject: [PATCH] v1.2.9.1 BUG: check if FUN_TRANSFO = NULL in CreateCalibOptions --- DESCRIPTION | 2 +- NEWS.rmd | 2 +- R/CreateCalibOptions.R | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 842c7d74..daf24ee7 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.0 +Version: 1.2.9.1 Date: 2019-03-12 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 1c9aa297..9c5b9975 100644 --- a/NEWS.rmd +++ b/NEWS.rmd @@ -13,7 +13,7 @@ output: -### 1.2.9.0 Release Notes (2019-03-12) +### 1.2.9.1 Release Notes (2019-03-12) diff --git a/R/CreateCalibOptions.R b/R/CreateCalibOptions.R index 944d6360..e721c70b 100644 --- a/R/CreateCalibOptions.R +++ b/R/CreateCalibOptions.R @@ -10,7 +10,9 @@ CreateCalibOptions <- function(FUN_MOD, FUN_MOD <- match.fun(FUN_MOD) FUN_CALIB <- match.fun(FUN_CALIB) - FUN_TRANSFO <- match.fun(FUN_TRANSFO) + if(!is.null(FUN_TRANSFO)) { + FUN_TRANSFO <- match.fun(FUN_TRANSFO) + } ##check_FUN_MOD BOOL <- FALSE -- GitLab