From 977eb64bf0ffdfa9fb5ff779ae9908551002b1fb Mon Sep 17 00:00:00 2001
From: unknown <olivier.delaigue@ANPI1430.antony.irstea.priv>
Date: Thu, 16 Feb 2017 16:13:52 +0100
Subject: [PATCH] v1.0.5.21 function TransfoParam_GR2M() cleaned
---
DESCRIPTION | 4 ++--
R/TransfoParam_GR2M.R | 51 ++++++++++++++++++++++++-------------------
2 files changed, 31 insertions(+), 24 deletions(-)
diff --git a/DESCRIPTION b/DESCRIPTION
index 1c52a2e1..6d7bc795 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,8 +1,8 @@
Package: airGR
Type: Package
Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling
-Version: 1.0.5.20
-Date: 2017-01-23
+Version: 1.0.5.21
+Date: 2017-02-16
Authors@R: c(
person("Laurent", "Coron", role = c("aut", "trl")),
person("Charles", "Perrin", role = c("aut", "ths")),
diff --git a/R/TransfoParam_GR2M.R b/R/TransfoParam_GR2M.R
index 6a963f62..75e5c364 100644
--- a/R/TransfoParam_GR2M.R
+++ b/R/TransfoParam_GR2M.R
@@ -1,23 +1,30 @@
-TransfoParam_GR2M <- function(ParamIn,Direction){
-
- NParam <- 2;
- Bool <- is.matrix(ParamIn);
- if(Bool==FALSE){ ParamIn <- rbind(ParamIn); }
- if(ncol(ParamIn)!=NParam){ stop(paste("the GR2M model requires ",NParam," parameters \n",sep="")); return(NULL); }
-
- if(Direction=="TR"){
- ParamOut <- ParamIn;
- ParamOut[,1] <- exp(ParamIn[,1]);
- ParamOut[,2] <- ParamIn[, 2] / 4 + 2.5;
- }
- if(Direction=="RT"){
- ParamOut <- ParamIn;
- ParamOut[,1] <- log(ParamIn[,1]);
- ParamOut[,2] <- (ParamIn[,2] - 2.5) * 4;
- }
-
- if(Bool==FALSE){ ParamOut <- ParamOut[1,]; }
- return(ParamOut);
-
+TransfoParam_GR2M <- function(ParamIn, Direction) {
+
+ NParam <- 2
+ Bool <- is.matrix(ParamIn)
+
+ if (Bool == FALSE) {
+ ParamIn <- rbind(ParamIn)
+ }
+ if (ncol(ParamIn) != NParam) {
+ stop(paste("the GR2M model requires ", NParam, " parameters \n", sep = ""))
+ return(NULL)
+ }
+
+ if (Direction == "TR") {
+ ParamOut <- ParamIn
+ ParamOut[, 1] <- exp(ParamIn[, 1])
+ ParamOut[, 2] <- ParamIn[, 2] / 4 + 2.5
+ }
+ if (Direction == "RT") {
+ ParamOut <- ParamIn
+ ParamOut[, 1] <- log(ParamIn[, 1])
+ ParamOut[, 2] <- (ParamIn[, 2] - 2.5) * 4
+ }
+
+ if (Bool == FALSE) {
+ ParamOut <- ParamOut[1, ]
+ }
+ return(ParamOut)
+
}
-
--
GitLab