diff options
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | R/PELMO_runs.R | 2 | ||||
| -rw-r--r-- | docs/reference/PELMO_runs.html | 4 | ||||
| -rw-r--r-- | man/PELMO_runs.Rd | 2 |
4 files changed, 16 insertions, 4 deletions
@@ -1,3 +1,15 @@ +commit 4e696997516543e29119e94d67283f513be4484d +Author: Johannes Ranke <jranke@uni-bremen.de> +Date: 2017-01-30 18:08:50 +0100 + + Regenerate static documentation + +commit 03bda75d343402dad99df2aad55611e11279b833 +Author: Johannes Ranke <jranke@uni-bremen.de> +Date: 2017-01-30 18:04:53 +0100 + + Correct psm file in the example with metabolites + commit 39d202b0a0f833c756bc98fb4961483de1b15353 Author: Johannes Ranke <jranke@uni-bremen.de> Date: 2017-01-30 16:14:15 +0100 diff --git a/R/PELMO_runs.R b/R/PELMO_runs.R index e5a78ff..0f134e0 100644 --- a/R/PELMO_runs.R +++ b/R/PELMO_runs.R @@ -25,7 +25,7 @@ #' @param execute Should PELMO be executed directly? #' @param cores The number of cores to execute PELMO runs in parallel #' @param evaluate Should the results be returned? -#' @param overwrite Should an existing run directories be overwritten +#' @param overwrite Should existing run directories be overwritten? #' @references PELMO.installeR \url{https://jranke.github.io/PELMO.installeR} #' #' Wine \url{https://winehq.org} diff --git a/docs/reference/PELMO_runs.html b/docs/reference/PELMO_runs.html index 1e2cc8e..23a7a30 100644 --- a/docs/reference/PELMO_runs.html +++ b/docs/reference/PELMO_runs.html @@ -109,7 +109,7 @@ as used in <code><a href='FOCUS_GW_scenarios_2012.html'>FOCUS_GW_scenarios_2012< <dt>evaluate</dt> <dd>Should the results be returned?</dd> <dt>overwrite</dt> - <dd>Should an existing run directories be overwritten</dd> + <dd>Should existing run directories be overwritten?</dd> </dl> <h2 class="hasAnchor" id="value"><a class="anchor" href="#value"></a>Value</h2> @@ -171,7 +171,7 @@ the period.plm file generated by the FOCUS PELMO GUI.</p> #> #> </div><div class='input'><span class='co'># We get exactly the same PECgw values (on Linux, calling PELMO using Wine).</span> <span class='fu'>print</span>(<span class='no'>time_1</span>)</div><div class='output co'>#> User System verstrichen -#> 231.948 0.568 56.887 </div><div class='input'> +#> 228.532 0.540 57.195 </div><div class='input'> <span class='co'># Demonstrate some results with metabolites.</span> <span class='no'>runs_2</span> <span class='kw'><-</span> <span class='fu'>list</span>(<span class='fu'>list</span>(<span class='kw'>psm</span> <span class='kw'>=</span> <span class='st'>'Pesticide_D_1_May_every_other_year_mets'</span>, <span class='kw'>win</span> <span class='kw'>=</span> <span class='fu'>c</span>(<span class='st'>"Cha"</span>, <span class='st'>"Ham"</span>, <span class='st'>"Kre"</span>))) diff --git a/man/PELMO_runs.Rd b/man/PELMO_runs.Rd index ce5c7af..aa02a89 100644 --- a/man/PELMO_runs.Rd +++ b/man/PELMO_runs.Rd @@ -34,7 +34,7 @@ as used in \code{\link{FOCUS_GW_scenarios_2012}}.} \item{evaluate}{Should the results be returned?} -\item{overwrite}{Should an existing run directories be overwritten} +\item{overwrite}{Should existing run directories be overwritten?} } \value{ If evaluate is TRUE, a list of lists of matrices holding the |