From a2ae0d35fe274edb689a34fa042f79dbcf5fc32e Mon Sep 17 00:00:00 2001
From: unknown <olivier.delaigue@ANPI1430.antony.irstea.priv>
Date: Thu, 16 Feb 2017 16:09:58 +0100
Subject: [PATCH] v1.0.5.20 function TransfoParam_GR1A() cleaned
---
DESCRIPTION | 2 +-
R/TransfoParam_GR1A.R | 45 ++++++++++++++++++++++++++-----------------
2 files changed, 28 insertions(+), 19 deletions(-)
diff --git a/DESCRIPTION b/DESCRIPTION
index 24d869a6..1c52a2e1 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.0.5.19
+Version: 1.0.5.20
Date: 2017-01-23
Authors@R: c(
person("Laurent", "Coron", role = c("aut", "trl")),
diff --git a/R/TransfoParam_GR1A.R b/R/TransfoParam_GR1A.R
index b29fc1ec..ac9c39ab 100644
--- a/R/TransfoParam_GR1A.R
+++ b/R/TransfoParam_GR1A.R
@@ -1,19 +1,28 @@
-TransfoParam_GR1A <- function(ParamIn,Direction){
-
- NParam <- 1;
- Bool <- is.matrix(ParamIn);
- if(Bool==FALSE){ ParamIn <- rbind(ParamIn); }
- if(ncol(ParamIn)!=NParam){ stop(paste("the GR1A model requires ",NParam," parameters \n",sep="")); return(NULL); }
-
- if(Direction=="TR"){
- ParamOut <- (ParamIn+10.0)/8;
- }
- if(Direction=="RT"){
- ParamOut <- ParamIn*8-10.0;
- }
-
- if(Bool==FALSE){ ParamOut <- ParamOut[1,]; }
- return(ParamOut);
-
+TransfoParam_GR1A <- function(ParamIn, Direction) {
+
+ NParam <- 1
+ Bool <- is.matrix(ParamIn)
+
+ if (Bool == FALSE) {
+ ParamIn <- rbind(ParamIn)
+ }
+
+ if (ncol(ParamIn) != NParam) {
+ stop(paste("the GR1A model requires ", NParam, " parameters \n", sep = ""))
+ return(NULL)
+ }
+
+ if (Direction == "TR") {
+ ParamOut <- (ParamIn + 10.0) / 8
+ }
+ if (Direction == "RT") {
+ ParamOut <- ParamIn * 8 - 10.0
+ }
+
+ if (Bool == FALSE) {
+ ParamOut <- ParamOut[1, ]
+
+ }
+ return(ParamOut)
+
}
-
--
GitLab