diff --git a/DESCRIPTION b/DESCRIPTION index d3398c1d7bf0175870f83372246eec2610c4bfa4..24d869a67ec0a16aad67e3c9b8062ee1b39a46ae 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.18 +Version: 1.0.5.19 Date: 2017-01-23 Authors@R: c( person("Laurent", "Coron", role = c("aut", "trl")), diff --git a/R/TransfoParam_CemaNeige.R b/R/TransfoParam_CemaNeige.R index 41dd37033fde1ce68ceb97a1bbab086f0adb59da..d49d600d1c3b47024091dd635021a2ddec895da8 100644 --- a/R/TransfoParam_CemaNeige.R +++ b/R/TransfoParam_CemaNeige.R @@ -1,23 +1,33 @@ -TransfoParam_CemaNeige <- function(ParamIn,Direction){ - +TransfoParam_CemaNeige <- function(ParamIn, Direction) { + NParam <- 2 Bool <- is.matrix(ParamIn) - if(Bool==FALSE){ ParamIn <- rbind(ParamIn) } - if(ncol(ParamIn)!=NParam){ stop(paste("the CemaNeige module requires ",NParam," parameters \n",sep="")); return(NULL) } - - if(Direction=="TR"){ - ParamOut <- ParamIn; - ParamOut[,1] <- (ParamIn[,1]+9.99)/19.98 ### CemaNeige X1 (weighting coefficient for snow pack thermal state) - ParamOut[,2] <- exp(ParamIn[, 2]) / 200 ### CemaNeige X2 (degree-day melt coefficient) - } - if(Direction=="RT"){ - ParamOut <- ParamIn; - ParamOut[,1] <- ParamIn[,1]*19.98-9.99 ### CemaNeige X1 (weighting coefficient for snow pack thermal state) - ParamOut[,2] <- log(ParamIn[,2] * 200) ### CemaNeige X2 (degree-day melt coefficient) - } - - if(Bool==FALSE){ ParamOut <- ParamOut[1,] } + + if (Bool == FALSE) { + ParamIn <- rbind(ParamIn) + } + + if (ncol(ParamIn) != NParam) { + stop(paste( "the CemaNeige module requires ", NParam, " parameters \n", sep = "" )) + return(NULL) + } + + if (Direction == "TR") { + ParamOut <- ParamIn + ParamOut[, 1] <- (ParamIn[, 1] + 9.99) / 19.98 ### CemaNeige X1 (weighting coefficient for snow pack thermal state) + ParamOut[, 2] <- exp(ParamIn[, 2]) / 200 ### CemaNeige X2 (degree-day melt coefficient) + } + + if (Direction == "RT") { + ParamOut <- ParamIn + ParamOut[, 1] <- ParamIn[, 1] * 19.98 - 9.99 ### CemaNeige X1 (weighting coefficient for snow pack thermal state) + ParamOut[, 2] <- log(ParamIn[, 2] * 200) ### CemaNeige X2 (degree-day melt coefficient) + } + + if (Bool == FALSE) { + ParamOut <- ParamOut[1, ] + } + return(ParamOut) - + } -