diff --git a/DESCRIPTION b/DESCRIPTION
index f13dbbfb2a4a4aba14fa6ec03ea05b1d887e8943..2e8e1f83c28069b6ba38be8f00a13243a1c4862a 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.25
+Version: 1.0.9.26
Date: 2017-08-18
Authors@R: c(
person("Laurent", "Coron", role = c("aut", "trl")),
diff --git a/NEWS.html b/NEWS.html
index 444197a8be2a564a5ebfc0efa08506fa5258d258..40e5d5afbe10956aee95c4e496ffc54a51b7a2df 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.25 Release Notes (2017-08-18)</h3>
+<h3>1.0.9.26 Release Notes (2017-08-18)</h3>
<div id="new-features" class="section level4">
<h4>New features</h4>
<ul>
diff --git a/NEWS.md b/NEWS.md
index d0df6403c8f421ed5abdf55fca838b767afbc8be..9013b9ca5246c832c3c61fa6148df75be784d8cb 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -3,7 +3,7 @@
-### 1.0.9.25 Release Notes (2017-08-18)
+### 1.0.9.26 Release Notes (2017-08-18)
#### New features
diff --git a/NEWS.rmd b/NEWS.rmd
index 2ac0d484e5798a5fa410c81a8d96ffbccff2c744..46bab05f6228028090c1d2fdd4619edc3e00fe3b 100644
--- a/NEWS.rmd
+++ b/NEWS.rmd
@@ -8,7 +8,7 @@ output:
-### 1.0.9.25 Release Notes (2017-08-18)
+### 1.0.9.26 Release Notes (2017-08-18)
#### New features
diff --git a/man/CreateRunOptions.Rd b/man/CreateRunOptions.Rd
index ecb04eee5e3eee8f2168dff567249e443e953ba2..6e0e4eeb72fc8816f6009028087e3f16205c9464 100644
--- a/man/CreateRunOptions.Rd
+++ b/man/CreateRunOptions.Rd
@@ -87,7 +87,7 @@ The actual length of this warm-up might be shorter depending on data availabilit
\itemize{
\item \code{IndPeriod_WarmUp} can be used to specify the indices of the warm-up period (within the time series prepared in InputsModel). \cr
- remark 1: for most common cases, indices corresponding to one or several years preceding \code{IndPeriod_Run} are used (e.g. \code{IndPeriod_WarmUp = 1000:1365} and \code{IndPeriod_Run = 1366:5000)}. \cr
-However, it is also possible to perform a long-term initialisation if other indices than the warm-up ones are set in \code{IndPeriod_WarmUp} (e.g. \code{IndPeriod_WarmUp <- c(1:5000, 1:5000, 1:5000, 1000:1365)}). \cr
+However, it is also possible to perform a long-term initialisation if other indices than the warm-up ones are set in \code{IndPeriod_WarmUp} (e.g. \code{IndPeriod_WarmUp = c(1:5000, 1:5000, 1:5000, 1000:1365)}). \cr
- remark 2: it is also possible to completely disable the warm-up period when using \code{IndPeriod_WarmUp = 0L}. This is necessary if you want \code{IniStates} and / or \code{IniResLevels} to be the actual initial values of the model variables from your simulation (e.g. to perform a forecast form a given initial state).
\item \code{IniStates} and \code{IniResLevels} can be used to specify the initial model states. \cr
@@ -95,7 +95,7 @@ However, it is also possible to perform a long-term initialisation if other indi
- remark 2: if \code{IniStates} is used, two possibilities are offered:
- \code{IniStates} can be set to the \code{$StateEnd} output of a previous \code{RunModel} call, as \code{$StateEnd} already respects the correct format; \cr
- \code{IniStates} can be created with the \code{\link{CreateIniStates}} function.
-- remark 3: in addition to \code{IniStates}, \code{IniResLevels} allows to set the filling rate of the production and routing stores for the GR models. For instance for GR4J and , GR5J: \code{IniResLevels <- c(0.3, 0.5)} should be used to obtain initial fillings of 30\% and 50\% for the production and routing stores, respectively. For GR6J, \code{IniResLevels <- c(0.3, 0.5, 0)} shold be use to obtain initial fillings of 30\% and 50\% for the production, routing stores and 0 mm for the exponential store, respectively. \code{IniResLevels} is optional and can only be used if \code{IniStates} is also defined (the state values corresponding to these two other stores in \code{IniStates} are not used in such case). \cr \cr
+- remark 3: in addition to \code{IniStates}, \code{IniResLevels} allows to set the filling rate of the production and routing stores for the GR models. For instance for GR4J and , GR5J: \code{IniResLevels = c(0.3, 0.5)} should be used to obtain initial fillings of 30 \% and 50 \% for the production and routing stores, respectively. For GR6J, \code{IniResLevels = c(0.3, 0.5, 0)} shold be use to obtain initial fillings of 30 \% and 50 \% for the production, routing stores and 0 mm for the exponential store, respectively. \code{IniResLevels} is optional and can only be used if \code{IniStates} is also defined (the state values corresponding to these two other stores in \code{IniStates} are not used in such case). \cr \cr
}
}
diff --git a/man/DataAltiExtrapolation_Valery.Rd b/man/DataAltiExtrapolation_Valery.Rd
index 63f4f75e94656153374bb90a6879520f31055c8e..c4c77cf9a06e133f8498de121b143bec94bc0339 100644
--- a/man/DataAltiExtrapolation_Valery.Rd
+++ b/man/DataAltiExtrapolation_Valery.Rd
@@ -55,11 +55,11 @@ Function which extrapolates the precipitation and air temperature series for dif
\details{
-Elevation layers of equal surface are created the 101 elevation quantiles (\emph{HypsoData})
-and the number requested elevation layers (\emph{NLayers}). \cr
+Elevation layers of equal surface are created the 101 elevation quantiles (\code{HypsoData})
+and the number requested elevation layers (\code{NLayers}). \cr
Forcing data (precipitation and air temperature) are extrapolated using gradients from Valery (2010).
-(e.g. gradP=0.0004 [m-1] for France and gradT=0.434 [°C/100m] for January, 1st). \cr
-This function is used by the \emph{CreateInputsModel} function.
+(e.g. gradP = 0.0004 [m-1] for France and gradT = 0.434 [°C/100m] for January, 1st). \cr
+This function is used by the \code{CreateInputsModel} function.
}
diff --git a/man/ErrorCrit_KGE.Rd b/man/ErrorCrit_KGE.Rd
index 248c51eb8527f26723b9deef26a20f8adcd2c6bd..8e2892599bddf9ce44f98b8a3dabc6aec73a2476 100644
--- a/man/ErrorCrit_KGE.Rd
+++ b/man/ErrorCrit_KGE.Rd
@@ -33,7 +33,7 @@ ErrorCrit_KGE(InputsCrit, OutputsModel, warnings = TRUE, verbose = TRUE)
\emph{$SubCritNames } \tab [character] names of the components of the criterion \cr
\emph{$CritBestValue } \tab [numeric] theoretical best criterion value \cr
\emph{$Multiplier } \tab [numeric] integer indicating whether the criterion is indeed an error (+1) or an efficiency (-1) \cr
- \emph{$Ind_notcomputed} \tab [numeric] indices of the time steps where InputsCrit$BoolCrit=FALSE or no data is available \cr
+ \emph{$Ind_notcomputed} \tab [numeric] indices of the time steps where \emph{InputsCrit$BoolCrit} = \code{FALSE} or no data is available \cr
}
}
diff --git a/man/ErrorCrit_KGE2.Rd b/man/ErrorCrit_KGE2.Rd
index 233d01e2e231552be029f195495740d3821bcafd..3af1dba457aceac875a7ddeabe3d25434ce17980 100644
--- a/man/ErrorCrit_KGE2.Rd
+++ b/man/ErrorCrit_KGE2.Rd
@@ -33,7 +33,7 @@ ErrorCrit_KGE2(InputsCrit, OutputsModel, warnings = TRUE, verbose = TRUE)
\emph{$SubCritNames } \tab [character] names of the components of the criterion \cr
\emph{$CritBestValue } \tab [numeric] theoretical best criterion value \cr
\emph{$Multiplier } \tab [numeric] integer indicating whether the criterion is indeed an error (+1) or an efficiency (-1) \cr
- \emph{$Ind_notcomputed} \tab [numeric] indices of the time steps where InputsCrit$BoolCrit = FALSE or no data is available \cr
+ \emph{$Ind_notcomputed} \tab [numeric] indices of the time steps where \emph{InputsCrit$BoolCrit} = \code{FALSE} or no data is available \cr
}
}
diff --git a/man/ErrorCrit_NSE.Rd b/man/ErrorCrit_NSE.Rd
index 71007dd0c30add937984bcfe56e445b885b6de84..25cba8f47829c123234bfb5de69dae66109d4f24 100644
--- a/man/ErrorCrit_NSE.Rd
+++ b/man/ErrorCrit_NSE.Rd
@@ -31,7 +31,7 @@ ErrorCrit_NSE(InputsCrit, OutputsModel, warnings = TRUE, verbose = TRUE)
\emph{$CritName } \tab [character] name of the criterion \cr
\emph{$CritBestValue } \tab [numeric] theoretical best criterion value \cr
\emph{$Multiplier } \tab [numeric] integer indicating whether the criterion is indeed an error (+1) or an efficiency (-1) \cr
- \emph{$Ind_notcomputed} \tab [numeric] indices of the time steps where InputsCrit$BoolCrit=FALSE or no data is available \cr
+ \emph{$Ind_notcomputed} \tab [numeric] indices of the time steps where \emph{InputsCrit$BoolCrit} = \code{FALSE} or no data is available \cr
}
}
@@ -43,7 +43,7 @@ Function which computes an error criterion based on the NSE formula proposed by
\details{
In addition to the criterion value, the function outputs include a multiplier (-1 or +1) which allows
-the use of the function for model calibration: the product CritValue*Multiplier is the criterion to be minimised
+the use of the function for model calibration: the product CritValue * Multiplier is the criterion to be minimised
(Multiplier = -1 for NSE).
}
diff --git a/man/ErrorCrit_RMSE.Rd b/man/ErrorCrit_RMSE.Rd
index 60349a11036a19ff26ffd186efe31ff3d8a2b38f..81a147ed394b9c57cf58c7b85e17eca90cf131d9 100644
--- a/man/ErrorCrit_RMSE.Rd
+++ b/man/ErrorCrit_RMSE.Rd
@@ -29,7 +29,7 @@ ErrorCrit_RMSE(InputsCrit, OutputsModel, warnings = TRUE, verbose = TRUE)
\emph{$CritName } \tab [character] name of the criterion \cr
\emph{$CritBestValue } \tab [numeric] theoretical best criterion value \cr
\emph{$Multiplier } \tab [numeric] integer indicating whether the criterion is indeed an error (+1) or an efficiency (-1) \cr
- \emph{$Ind_notcomputed} \tab [numeric] indices of the time steps where InputsCrit$BoolCrit=FALSE or no data is available \cr
+ \emph{$Ind_notcomputed} \tab [numeric] indices of the time steps where \emph{InputsCrit$BoolCrit} = \code{FALSE} or no data is available \cr
}
}
@@ -41,7 +41,7 @@ Function which computes an error criterion based on the root mean square error (
\details{
In addition to the criterion value, the function outputs include a multiplier (-1 or +1) which allows
-the use of the function for model calibration: the product CritValue*Multiplier is the criterion to be minimised
+the use of the function for model calibration: the product CritValue * Multiplier is the criterion to be minimised
(Multiplier = +1 for RMSE).
}
diff --git a/man/RunModel.Rd b/man/RunModel.Rd
index 90819c4a4b4432baf5388a5f67e170f61ed20a54..e4986e9846dcc62cacbe22f299f40fc3a4cb4121 100644
--- a/man/RunModel.Rd
+++ b/man/RunModel.Rd
@@ -18,7 +18,7 @@ RunModel(InputsModel, RunOptions, Param, FUN_MOD)
\item{Param}{[numeric] vector of model parameters}
-\item{FUN_MOD}{[function] hydrological model function (e.g. RunModel_GR4J, RunModel_CemaNeigeGR4J)}
+\item{FUN_MOD}{[function] hydrological model function (e.g. \code{\link{RunModel_GR4J}}, \code{\link{RunModel_CemaNeigeGR4J}})}
}
diff --git a/man/TransfoParam.Rd b/man/TransfoParam.Rd
index 61cbd21f2ff9ebfc5ec6db3b1f2c3cb619e6e79d..b0ad9738255f9dac47e5b7ee9686e9050983fc56 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_CemaNeigeGR4J}})}
}
\value{
\emph{ParamOut} [numeric] matrix of parameter sets (sets in line, parameter values in column)
@@ -34,18 +34,18 @@ Function which transforms model parameters using the provided function (from raw
library(airGR)
## 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)
+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
- 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),
- ncol = 4, byrow = TRUE)
- Xraw <- TransfoParam(ParamIn = Xtran, Direction = "TR", FUN_TRANSFO = TransfoParam_GR4J)
+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),
+ ncol = 4, byrow = TRUE)
+Xraw <- TransfoParam(ParamIn = Xtran, Direction = "TR", FUN_TRANSFO = TransfoParam_GR4J)
}