From 9cb45ef6cad1c032e38b58ceaab9a05cd902c780 Mon Sep 17 00:00:00 2001
From: Delaigue Olivier <olivier.delaigue@irstea.fr>
Date: Wed, 14 Oct 2020 17:30:37 +0200
Subject: [PATCH] v1.6.3.12 style: TransfoParam_LAG renamed into Refs #34
---
DESCRIPTION | 2 +-
NAMESPACE | 2 +-
NEWS.md | 2 +-
R/CreateCalibOptions.R | 2 +-
R/RunModel.R | 10 +++++-----
R/TransfoParam_LAG.R | 2 +-
man/TransfoParam.Rd | 2 +-
7 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/DESCRIPTION b/DESCRIPTION
index a91b746d..78963e7f 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.6.3.11
+Version: 1.6.3.12
Date: 2020-10-14
Authors@R: c(
person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")),
diff --git a/NAMESPACE b/NAMESPACE
index 8f28e154..8a3f3339 100644
--- a/NAMESPACE
+++ b/NAMESPACE
@@ -57,7 +57,7 @@ export(TransfoParam_GR5H)
export(TransfoParam_GR4J)
export(TransfoParam_GR5J)
export(TransfoParam_GR6J)
-export(TransfoParam_LAG)
+export(TransfoParam_Lag)
export(plot.OutputsModel)
exportPattern(".FortranOutputs")
exportPattern(".ErrorCrit")
diff --git a/NEWS.md b/NEWS.md
index c9124c48..bfc6b07f 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -2,7 +2,7 @@
-### 1.6.3.11 Release Notes (2020-10-14)
+### 1.6.3.12 Release Notes (2020-10-14)
#### New features
diff --git a/R/CreateCalibOptions.R b/R/CreateCalibOptions.R
index 422d2c18..5815beb7 100644
--- a/R/CreateCalibOptions.R
+++ b/R/CreateCalibOptions.R
@@ -148,7 +148,7 @@ CreateCalibOptions <- function(FUN_MOD,
}
##_set_FUN_LAG
if (IsSD) {
- FUN_LAG <- TransfoParam_LAG
+ FUN_LAG <- TransfoParam_Lag
}
##_set_FUN_TRANSFO
if (sum(ObjectClass %in% c("GR4H", "GR5H", "GR4J", "GR5J", "GR6J", "GR2M", "GR1A", "CemaNeige")) > 0) {
diff --git a/R/RunModel.R b/R/RunModel.R
index 795c3901..a123e366 100644
--- a/R/RunModel.R
+++ b/R/RunModel.R
@@ -1,7 +1,7 @@
RunModel <- function(InputsModel, RunOptions, Param, FUN_MOD) {
-
+
FUN_MOD <- match.fun(FUN_MOD)
-
+
if (inherits(InputsModel, "SD")) {
# LAG Model take one parameter at the beginning of the vector
iFirstParamRunOffModel <- 2
@@ -9,13 +9,13 @@ RunModel <- function(InputsModel, RunOptions, Param, FUN_MOD) {
# All parameters
iFirstParamRunOffModel <- 1
}
-
+
OutputsModel <- FUN_MOD(InputsModel = InputsModel, RunOptions = RunOptions,
- Param = Param[iFirstParamRunOffModel:length(Param)])
+ Param = Param[iFirstParamRunOffModel:length(Param)])
if (inherits(InputsModel, "SD")) {
InputsModel$OutputsModel <- OutputsModel
- OutputsModel <- RunModel_LAG(InputsModel, RunOptions, Param[1])
+ OutputsModel <- RunModel_Lag(InputsModel, RunOptions, Param[1])
}
return(OutputsModel)
}
\ No newline at end of file
diff --git a/R/TransfoParam_LAG.R b/R/TransfoParam_LAG.R
index c484bf78..2294d0ab 100644
--- a/R/TransfoParam_LAG.R
+++ b/R/TransfoParam_LAG.R
@@ -1,4 +1,4 @@
-TransfoParam_LAG <- function(ParamIn, Direction) {
+TransfoParam_Lag <- function(ParamIn, Direction) {
## number of model parameters
NParam <- 1L
diff --git a/man/TransfoParam.Rd b/man/TransfoParam.Rd
index fe8dd15f..de58b74b 100644
--- a/man/TransfoParam.Rd
+++ b/man/TransfoParam.Rd
@@ -12,7 +12,7 @@
\alias{TransfoParam_GR5H}
\alias{TransfoParam_CemaNeige}
\alias{TransfoParam_CemaNeigeHyst}
-\alias{TransfoParam_LAG}
+\alias{TransfoParam_Lag}
\title{Transformation of the parameters using the provided function}
--
GitLab