diff --git a/DESCRIPTION b/DESCRIPTION index 3616934d992e4ab4177facb6cbc225916d97f3d8..90a4e0250c15840ccc5b7bd228c4a70ca5b6d81e 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.8.0 +Version: 1.2.8.1 Date: 2019-03-06 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 ae7516590d0bb1e17caf1590db189abfb8aafd0a..e5cafd7cd84cfbffb1439a7f7693677a03d8f54f 100644 --- a/NEWS.rmd +++ b/NEWS.rmd @@ -13,7 +13,7 @@ output: -### 1.2.8.0 Release Notes (2019-03-06) +### 1.2.8.1 Release Notes (2019-03-06) diff --git a/R/TransfoParam_CemaNeige.R b/R/TransfoParam_CemaNeige.R index 52edc628768e148a4166fc27f84561c196ed2abc..9c0152762e125868a70e67d4d5a248a5dcfd45ef 100644 --- a/R/TransfoParam_CemaNeige.R +++ b/R/TransfoParam_CemaNeige.R @@ -1,12 +1,12 @@ TransfoParam_CemaNeige <- function(ParamIn, Direction) { - + ## number of model parameters NParam <- 2L ## check_arguments - Bool <- is.vector(ParamIn) - if (Bool) { + isVecParamIn <- is.vector(ParamIn) + if (isVecParamIn) { ParamIn <- matrix(ParamIn, nrow = 1) } if (!inherits(ParamIn, "matrix")) { @@ -20,6 +20,7 @@ TransfoParam_CemaNeige <- function(ParamIn, Direction) { } + ## transformation if (Direction == "TR") { ParamOut <- ParamIn ParamOut[, 1] <- (ParamIn[, 1] + 9.99) / 19.98 ### CemaNeige X1 (weighting coefficient for snow pack thermal state) @@ -31,7 +32,7 @@ TransfoParam_CemaNeige <- function(ParamIn, Direction) { ParamOut[, 2] <- log(ParamIn[, 2] * 200) ### CemaNeige X2 (degree-day melt coefficient) } - if (Bool) { + if (isVecParamIn) { ParamOut <- as.vector(ParamOut) } diff --git a/R/TransfoParam_CemaNeigeHyst.R b/R/TransfoParam_CemaNeigeHyst.R index a82491a3158e369e09e0d03cd56d9ba3a67d6358..9f055538fb52f0cec8f59227a3b62e18226c5c9e 100644 --- a/R/TransfoParam_CemaNeigeHyst.R +++ b/R/TransfoParam_CemaNeigeHyst.R @@ -1,12 +1,12 @@ TransfoParam_CemaNeigeHyst <- function(ParamIn, Direction) { - + ## number of model parameters NParam <- 4L ## check_arguments - Bool <- is.vector(ParamIn) - if (Bool) { + isVecParamIn <- is.vector(ParamIn) + if (isVecParamIn) { ParamIn <- matrix(ParamIn, nrow = 1) } if (!inherits(ParamIn, "matrix")) { @@ -20,6 +20,7 @@ TransfoParam_CemaNeigeHyst <- function(ParamIn, Direction) { } + ## transformation if (Direction == "TR") { ParamOut <- ParamIn ParamOut[, 1] <- (ParamIn[, 1] + 9.99) / 19.98 ### CemaNeige X1 (weighting coefficient for snow pack thermal state) @@ -35,7 +36,7 @@ TransfoParam_CemaNeigeHyst <- function(ParamIn, Direction) { ParamOut[, 4] <- (ParamIn[, 4] - 0.5) * 19.98 ### Hyst CV } - if (Bool) { + if (isVecParamIn) { ParamOut <- as.vector(ParamOut) }