diff --git a/DESCRIPTION b/DESCRIPTION index 2e8e1f83c28069b6ba38be8f00a13243a1c4862a..93bc07ce6c08c1011063cf3b1dc2308d85c9b728 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.9.26 +Version: 1.0.9.27 Date: 2017-08-18 Authors@R: c( person("Laurent", "Coron", role = c("aut", "trl")), diff --git a/NEWS.html b/NEWS.html index 40e5d5afbe10956aee95c4e496ffc54a51b7a2df..d05b438708af04ef72d0ed352d31e231d8f6911c 100644 --- a/NEWS.html +++ b/NEWS.html @@ -121,7 +121,7 @@ $(document).ready(function () { <div id="release-notes-2017-08-18" class="section level3"> -<h3>1.0.9.26 Release Notes (2017-08-18)</h3> +<h3>1.0.9.27 Release Notes (2017-08-18)</h3> <div id="new-features" class="section level4"> <h4>New features</h4> <ul> @@ -133,7 +133,7 @@ $(document).ready(function () { <div id="bug-fixes" class="section level4"> <h4>Bug fixes</h4> <ul> -<li><p>Fixed bug in <code>RunModel_GR4H()</code>: in <code>frun_GR4H</code> fortran subroutine, <code>St(2)</code> is now set to 0 (and not <code>St(1)</code>) when <code>St(2) < 0</code>.</p></li> +<li><p>Fixed bug in <code>RunModel_GR4H()</code>: in <code>frun_GR4H</code> Fortran subroutine, <code>St(2)</code> is now set to 0 (and not <code>St(1)</code>) when <code>St(2) < 0</code>.</p></li> <li><p>Fixed bug in <code>plot.OutputsModel()</code> for the regime plot when the period is less than 1 year.</p></li> <li><p>Fixed bug in <code>plot.OutputsModel()</code> when there is no common data to plot the cumulative frequency or the correlation QQ.</p></li> <li><p>Fixed bug in <code>plot.OutputsModel()</code> for y-axis labelling of flows time series when <code>log_scale = TRUE</code> and <code>BasinArea</code> used.</p></li> @@ -297,7 +297,7 @@ $(document).ready(function () { <div id="minor-user-visible-changes-2" class="section level4"> <h4>Minor user-visible changes</h4> <ul> -<li>The FORTRAN model core codes have been modified: +<li>The Fortran model core codes have been modified: <ul> <li>optimisation of the codes for fastening of computation;</li> <li>simplification of the internal variables for easier reading and understanding.</li> @@ -350,7 +350,7 @@ $(document).ready(function () { <h4>Major user-visible changes</h4> <ul> <li><p>Update of the functions <code>CreateRunOptions()</code>, <code>CreateCalibOptions()</code> and <code>plot_OutputsModel()</code> to handle the new models.</p></li> -<li><p>Modification of CemaNeige FORTRAN code to add an update of Gratio after the SnowPack update (no impact on snow simulation).</p></li> +<li><p>Modification of CemaNeige Fortran code to add an update of Gratio after the SnowPack update (no impact on snow simulation).</p></li> </ul> </div> <div id="minor-user-visible-changes-4" class="section level4"> @@ -529,7 +529,7 @@ $(document).ready(function () { <div id="minor-user-visible-changes-8" class="section level4"> <h4>Minor user-visible changes</h4> <ul> -<li>Missing values in FORTRAN are now -999.999 instead of -9.999.</li> +<li>Missing values in Fortran are now -999.999 instead of -9.999.</li> </ul> <hr /> </div> diff --git a/NEWS.md b/NEWS.md index 9013b9ca5246c832c3c61fa6148df75be784d8cb..53497261bf60153e5e34a8e8a4c8268058b1ac53 100644 --- a/NEWS.md +++ b/NEWS.md @@ -3,7 +3,7 @@ -### 1.0.9.26 Release Notes (2017-08-18) +### 1.0.9.27 Release Notes (2017-08-18) #### New features @@ -16,7 +16,7 @@ #### Bug fixes -- Fixed bug in <code>RunModel_GR4H()</code>: in <code>frun_GR4H</code> fortran subroutine, <code>St(2)</code> is now set to 0 (and not <code>St(1)</code>) when <code>St(2) < 0</code>. +- Fixed bug in <code>RunModel_GR4H()</code>: in <code>frun_GR4H</code> Fortran subroutine, <code>St(2)</code> is now set to 0 (and not <code>St(1)</code>) when <code>St(2) < 0</code>. - Fixed bug in <code>plot.OutputsModel()</code> for the regime plot when the period is less than 1 year. @@ -187,7 +187,7 @@ ________________________________________________________________________________ #### Minor user-visible changes -- The FORTRAN model core codes have been modified: +- The Fortran model core codes have been modified: - optimisation of the codes for fastening of computation; - simplification of the internal variables for easier reading and understanding. @@ -239,7 +239,7 @@ ________________________________________________________________________________ - Update of the functions <code>CreateRunOptions()</code>, <code>CreateCalibOptions()</code> and <code>plot_OutputsModel()</code> to handle the new models. -- Modification of CemaNeige FORTRAN code to add an update of Gratio after the SnowPack update (no impact on snow simulation). +- Modification of CemaNeige Fortran code to add an update of Gratio after the SnowPack update (no impact on snow simulation). #### Minor user-visible changes @@ -430,7 +430,7 @@ ________________________________________________________________________________ #### Minor user-visible changes -- Missing values in FORTRAN are now -999.999 instead of -9.999. +- Missing values in Fortran are now -999.999 instead of -9.999. ____________________________________________________________________________________ diff --git a/NEWS.rmd b/NEWS.rmd index 46bab05f6228028090c1d2fdd4619edc3e00fe3b..003b6ca06528ff7f98baf8dd7db37b7da701c2fa 100644 --- a/NEWS.rmd +++ b/NEWS.rmd @@ -8,7 +8,7 @@ output: -### 1.0.9.26 Release Notes (2017-08-18) +### 1.0.9.27 Release Notes (2017-08-18) #### New features @@ -21,7 +21,7 @@ output: #### Bug fixes -- Fixed bug in <code>RunModel_GR4H()</code>: in <code>frun_GR4H</code> fortran subroutine, <code>St(2)</code> is now set to 0 (and not <code>St(1)</code>) when <code>St(2) < 0</code>. +- Fixed bug in <code>RunModel_GR4H()</code>: in <code>frun_GR4H</code> Fortran subroutine, <code>St(2)</code> is now set to 0 (and not <code>St(1)</code>) when <code>St(2) < 0</code>. - Fixed bug in <code>plot.OutputsModel()</code> for the regime plot when the period is less than 1 year. @@ -192,7 +192,7 @@ ________________________________________________________________________________ #### Minor user-visible changes -- The FORTRAN model core codes have been modified: +- The Fortran model core codes have been modified: - optimisation of the codes for fastening of computation; - simplification of the internal variables for easier reading and understanding. @@ -244,7 +244,7 @@ ________________________________________________________________________________ - Update of the functions <code>CreateRunOptions()</code>, <code>CreateCalibOptions()</code> and <code>plot_OutputsModel()</code> to handle the new models. -- Modification of CemaNeige FORTRAN code to add an update of Gratio after the SnowPack update (no impact on snow simulation). +- Modification of CemaNeige Fortran code to add an update of Gratio after the SnowPack update (no impact on snow simulation). #### Minor user-visible changes @@ -435,7 +435,7 @@ ________________________________________________________________________________ #### Minor user-visible changes -- Missing values in FORTRAN are now -999.999 instead of -9.999. +- Missing values in Fortran are now -999.999 instead of -9.999. ____________________________________________________________________________________ diff --git a/man/TransfoParam.Rd b/man/TransfoParam.Rd index b0ad9738255f9dac47e5b7ee9686e9050983fc56..196bfc8d4acd0e884b407446084bcd3ec0360bca 100644 --- a/man/TransfoParam.Rd +++ b/man/TransfoParam.Rd @@ -18,7 +18,7 @@ TransfoParam(ParamIn, Direction, FUN_TRANSFO) \item{Direction}{[character] direction of the transformation: use \code{"RT"} for Raw -> Transformed and \code{"TR"} for Transformed -> Raw} -\item{FUN_TRANSFO}{[function] model parameters transformation function (e.g. \code{\link{TransfoParam_GR4J}}, \code{\link{TransfoParam_CemaNeigeGR4J}})} +\item{FUN_TRANSFO}{[function] model parameters transformation function (e.g. \code{\link{TransfoParam_GR4J}}, \code{\link{TransfoParam_CemaNeige}})} } \value{ \emph{ParamOut} [numeric] matrix of parameter sets (sets in line, parameter values in column) @@ -33,14 +33,14 @@ Function which transforms model parameters using the provided function (from raw \examples{ library(airGR) -## transformation Raw->Transformed for the GR4J model +## transformation Raw -> Transformed for the GR4J model Xraw <- matrix(c(+221.41, -3.63, +30.00, +1.37, +347.23, -1.03, +60.34, +1.76, +854.06, -0.10, +148.41, +2.34), ncol = 4, byrow = TRUE) Xtran <- TransfoParam(ParamIn = Xraw, Direction = "RT", FUN_TRANSFO = TransfoParam_GR4J) -## transformation Transformed->Raw for the GR4J model +## transformation Transformed -> Raw for the GR4J model Xtran <- matrix(c(+3.60, -2.00, +3.40, -9.10, +3.90, -0.90, +4.10, -8.70, +4.50, -0.10, +5.00, -8.10), diff --git a/man/TransfoParam_CemaNeige.Rd b/man/TransfoParam_CemaNeige.Rd index c0dfd4e4fb01cc3668e8e3affc45948004dc28d8..87f3a65078bd23485057eaed87440db86a2bb741 100644 --- a/man/TransfoParam_CemaNeige.Rd +++ b/man/TransfoParam_CemaNeige.Rd @@ -33,14 +33,14 @@ Function which transforms model parameters of the CemaNeige module (from raw to \examples{ library(airGR) -## transformation Raw->Transformed for the CemaNeige module +## transformation Raw -> Transformed for the CemaNeige module Xraw <- matrix(c(+0.19, +1.73, +0.39, +2.51, +0.74, +4.06), ncol = 2, byrow = TRUE) Xtran <- TransfoParam_CemaNeige(ParamIn = Xraw , Direction = "RT") -## transformation Transformed->Raw for the CemaNeige module +## transformation Transformed -> Raw for the CemaNeige module Xtran <- matrix(c(-6.26, +0.55, -2.13, +0.92, +4.86, +1.40), diff --git a/man/TransfoParam_GR4J.Rd b/man/TransfoParam_GR4J.Rd index c3c115c748fb6ade942e5d3781379961dc4eeca8..e0c7383e5aafb7a58d5125a5fd8bcae23a621ba5 100644 --- a/man/TransfoParam_GR4J.Rd +++ b/man/TransfoParam_GR4J.Rd @@ -16,7 +16,7 @@ TransfoParam_GR4J(ParamIn, Direction) \arguments{ \item{ParamIn}{[numeric] matrix of parameter sets (sets in line, parameter values in column)} -\item{Direction}{[character] direction of the transformation: use \code{"RT"} for Raw -> Transformed and \code{"TR"} for Transformed- > Raw} +\item{Direction}{[character] direction of the transformation: use \code{"RT"} for Raw -> Transformed and \code{"TR"} for Transformed -> Raw} } @@ -33,14 +33,14 @@ Function which transforms model parameters of the GR4J model (from real to trans \examples{ library(airGR) -## transformation Raw->Transformed for the GR4J model +## transformation Raw -> Transformed for the GR4J model Xraw <- matrix(c(+221.41, -3.63, +30.00, +1.37, +347.23, -1.03, +60.34, +1.76, +854.06, -0.10, +148.41, +2.34), ncol = 4, byrow = TRUE) Xtran <- TransfoParam_GR4J(ParamIn = Xraw , Direction = "RT") -## transformation Transformed->Raw for the GR4J model +## transformation Transformed -> Raw for the GR4J model Xtran <- matrix(c(+3.60, -2.00, +3.40, -9.10, +3.90, -0.90, +4.10, -8.70, +4.50, -0.10, +5.00, -8.10), diff --git a/man/TransfoParam_GR5J.Rd b/man/TransfoParam_GR5J.Rd index c204c9701ae2a1202f838eac399c5fdd695a15fd..7e09bffdb9e8cc0c05e1819fe82d4818c0ea0054 100644 --- a/man/TransfoParam_GR5J.Rd +++ b/man/TransfoParam_GR5J.Rd @@ -33,14 +33,14 @@ Function which transforms model parameters of the GR5J model (from real to trans \examples{ library(airGR) -## transformation Raw->Transformed for the GR5J model +## transformation Raw -> Transformed for the GR5J model Xraw <- matrix(c(+221.41, -2.65, +27.11, +1.37, -0.76, +347.23, -0.64, +60.34, +1.76, +0.30, +854.01, -0.10, +148.41, +2.34, +0.52), ncol = 5, byrow = TRUE) Xtran <- TransfoParam_GR5J(ParamIn = Xraw , Direction = "RT") -## transformation Transformed->Raw for the GR5J model +## transformation Transformed -> Raw for the GR5J model Xtran <- matrix(c(+3.60, -1.70, +3.30, -9.10, -0.70, +3.90, -0.60, +4.10, -8.70, +0.30, +4.50, -0.10, +5.00, -8.10, +0.50), diff --git a/man/TransfoParam_GR6J.Rd b/man/TransfoParam_GR6J.Rd index 30cc7e3044d7a9bf9b469b27d83d78976303d965..47d290db4c756751de6d569664196ed0ce7db7f3 100644 --- a/man/TransfoParam_GR6J.Rd +++ b/man/TransfoParam_GR6J.Rd @@ -33,14 +33,14 @@ Function which transforms model parameters of the GR6J model (from real to trans \examples{ library(airGR) -## transformation Raw->Transformed for the GR6J model +## transformation Raw -> Transformed for the GR6J model Xraw <- matrix(c(+221.41, -1.18, +27.11, 1.37, -0.18, +20.09, +347.23, -0.52, +60.34, 1.76, +0.02, +54.60, +854.06, +0.52, +148.41, 2.34, +0.22, +148.41), ncol = 6, byrow = TRUE) Xtran <- TransfoParam_GR6J(ParamIn = Xraw , Direction = "RT") -## transformation Transformed->Raw for the GR6J model +## transformation Transformed -> Raw for the GR6J model Xtran <- matrix(c(+3.60, -1.00, +3.30, -9.10, -0.90, +3.00, +3.90, -0.50, +4.10, -8.70, +0.10, +4.00, +4.50, +0.50, +5.00, -8.10, +1.10, +5.00),