From db8393d0db201b54adf55473368613b4be6d18e4 Mon Sep 17 00:00:00 2001
From: Delaigue Olivier <olivier.delaigue@irstea.priv>
Date: Wed, 6 Mar 2019 09:29:24 +0100
Subject: [PATCH] v1.2.8.1 CLEAN: typo revision in TransfoParam_CemaNeige* fun
---
DESCRIPTION | 2 +-
NEWS.rmd | 2 +-
R/TransfoParam_CemaNeige.R | 9 +++++----
R/TransfoParam_CemaNeigeHyst.R | 9 +++++----
4 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/DESCRIPTION b/DESCRIPTION
index 3616934d..90a4e025 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 ae751659..e5cafd7c 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 52edc628..9c015276 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 a82491a3..9f055538 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)
}
--
GitLab