diff --git a/DESCRIPTION b/DESCRIPTION index a91b746ddad5f626ce883b1d1c656c4a0967cb32..78963e7f66a266a43878cb5480c77403f4a61f47 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 8f28e154c06ec62aa348e0968632f5a3d4aa2627..8a3f3339bef0d0e68345d3fb2f9168931cf17c1e 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 c9124c485a7d62251ac5812cb113ce2f6e228934..bfc6b07f8f405a130130c1478255d79a5505ef9a 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 422d2c1853d94cdadc85d40c6d44c39b57b2c7f5..5815beb7b86c6306c09b4e9b3959660c37866ec7 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 795c39018f61a0b7ef36008eecd5889ccb266f9b..a123e366705dd0de3b2cba80d5a3c70eef49e85e 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 c484bf7892102f274f0033a27fa79e6eec214236..2294d0ab2442c860d8b6078580cc42583bc37130 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 fe8dd15f54c02365a4c9c2dcdab0752b371d71a9..de58b74b8908342e621d973d77e5e7eaef589440 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}