aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Ranke <jranke@uni-bremen.de>2019-04-25 11:50:35 +0200
committerJohannes Ranke <jranke@uni-bremen.de>2019-04-25 11:50:35 +0200
commit451b332c8888bac8279340b086abb3b714ac3ae1 (patch)
tree9704ae10e8670ff7ec750e612d223739ebafa316
parent3bb842b93107dd6207610de1fe5b44be66779e4d (diff)
Add more drift data, especially 3 m field crop data
To support Agroscope in doing lots of PEC calculations for Switzerland
-rw-r--r--ChangeLog20
-rw-r--r--DESCRIPTION4
-rw-r--r--build.log2
-rw-r--r--data/drift_data_JKI.RDatabin966 -> 1947 bytes
-rw-r--r--docs/authors.html4
-rw-r--r--docs/index.html14
-rw-r--r--docs/pkgdown.yml2
-rw-r--r--docs/reference/FOCUS_GW_scenarios_2012.html4
-rw-r--r--docs/reference/FOCUS_Step_12_scenarios.html4
-rw-r--r--docs/reference/FOMC_actual_twa.html4
-rw-r--r--docs/reference/GUS.html4
-rw-r--r--docs/reference/PEC_FOMC_accu_rel.html4
-rw-r--r--docs/reference/PEC_soil.html4
-rw-r--r--docs/reference/PEC_soil_mets.html4
-rw-r--r--docs/reference/PEC_sw_drainage_UK.html4
-rw-r--r--docs/reference/PEC_sw_drift.html4
-rw-r--r--docs/reference/PEC_sw_exposit_drainage.html4
-rw-r--r--docs/reference/PEC_sw_exposit_runoff.html4
-rw-r--r--docs/reference/PEC_sw_focus.html4
-rw-r--r--docs/reference/PEC_sw_sed.html4
-rw-r--r--docs/reference/SFO_actual_twa.html4
-rw-r--r--docs/reference/SSLRC_mobility_classification.html4
-rw-r--r--docs/reference/TOXSWA_cwa.html4
-rw-r--r--docs/reference/chent_focus_sw.html4
-rw-r--r--docs/reference/drift_data_JKI.html340
-rw-r--r--docs/reference/endpoint.html4
-rw-r--r--docs/reference/geomean.html4
-rw-r--r--docs/reference/get_vertex.html4
-rw-r--r--docs/reference/index.html4
-rw-r--r--docs/reference/max_twa.html4
-rw-r--r--docs/reference/one_box-2.pngbin15306 -> 15306 bytes
-rw-r--r--docs/reference/one_box-3.pngbin30090 -> 30098 bytes
-rw-r--r--docs/reference/one_box.html7
-rw-r--r--docs/reference/perc_runoff_exposit.html4
-rw-r--r--docs/reference/perc_runoff_reduction_exposit.html4
-rw-r--r--docs/reference/pfm_degradation.html4
-rw-r--r--docs/reference/plot.TOXSWA_cwa.html4
-rw-r--r--docs/reference/plot.one_box-3.pngbin37318 -> 37317 bytes
-rw-r--r--docs/reference/plot.one_box.html7
-rw-r--r--docs/reference/read.TOXSWA_cwa.html4
-rw-r--r--docs/reference/sawtooth-2.pngbin37318 -> 37317 bytes
-rw-r--r--docs/reference/sawtooth.html7
-rw-r--r--docs/reference/soil_scenario_data_EFSA_2015.html4
-rw-r--r--docs/reference/soil_scenario_data_EFSA_2017.html4
-rw-r--r--docs/reference/twa.html4
-rw-r--r--test.log6
46 files changed, 363 insertions, 170 deletions
diff --git a/ChangeLog b/ChangeLog
index eeb3fe4..16aa30a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+commit 3bb842b93107dd6207610de1fe5b44be66779e4d
+Author: Johannes Ranke <jranke@uni-bremen.de>
+Date: 2019-04-25 10:25:56 +0200
+
+ Remove leftover docs from earlier version
+
+ Docs now live in docs/
+
+commit 77f63efa62b6530fbe2accdacc866e34626fe4e3
+Author: Johannes Ranke <jranke@uni-bremen.de>
+Date: 2019-02-21 16:01:38 +0100
+
+ Update docs
+
+commit 5086e2b87eaec90a02b4744d1321c6949d0b8982
+Author: Johannes Ranke <jranke@uni-bremen.de>
+Date: 2019-02-21 15:59:22 +0100
+
+ Use codecov
+
commit e21ec96873bf60072414369bc96e4c076a450235
Author: Johannes Ranke <jranke@uni-bremen.de>
Date: 2019-02-19 17:13:55 +0100
diff --git a/DESCRIPTION b/DESCRIPTION
index 35e9da9..34e1fc4 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,8 +1,8 @@
Package: pfm
Type: Package
Title: Utilities for Pesticide Fate Modelling
-Version: 0.5.3
-Date: 2019-02-21
+Version: 0.5.4
+Date: 2019-04-25
Authors@R: person("Johannes Ranke", email = "jranke@uni-bremen.de",
role = c("aut", "cre", "cph"),
comment = c(ORCID = "0000-0003-4371-6538"))
diff --git a/build.log b/build.log
index 60f9962..b721d36 100644
--- a/build.log
+++ b/build.log
@@ -7,5 +7,5 @@ Removed empty directory ‘pfm/inst/testdata/SwashProjects/Project_1/MACRO’
Removed empty directory ‘pfm/inst/testdata/SwashProjects/Project_1’
Removed empty directory ‘pfm/inst/testdata/SwashProjects’
* looking to see if a ‘data/datalist’ file should be added
-* building ‘pfm_0.5.3.tar.gz’
+* building ‘pfm_0.5.4.tar.gz’
diff --git a/data/drift_data_JKI.RData b/data/drift_data_JKI.RData
index 0a2f05e..7a21b24 100644
--- a/data/drift_data_JKI.RData
+++ b/data/drift_data_JKI.RData
Binary files differ
diff --git a/docs/authors.html b/docs/authors.html
index 977f810..066d25f 100644
--- a/docs/authors.html
+++ b/docs/authors.html
@@ -60,7 +60,7 @@
</button>
<span class="navbar-brand">
<a class="navbar-link" href="index.html">pfm</a>
- <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">0.5.3</span>
+ <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">0.5.4</span>
</span>
</div>
@@ -117,7 +117,7 @@
</div>
<div class="pkgdown">
- <p>Site built with <a href="https://pkgdown.r-lib.org/">pkgdown</a> 1.3.0.</p>
+ <p>Site built with <a href="https://pkgdown.r-lib.org/">pkgdown</a> 1.3.0.9000.</p>
</div>
</footer>
</div>
diff --git a/docs/index.html b/docs/index.html
index 4a41dde..0220e80 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -32,7 +32,7 @@
</button>
<span class="navbar-brand">
<a class="navbar-link" href="index.html">pfm</a>
- <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">0.5.3</span>
+ <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">0.5.4</span>
</span>
</div>
@@ -75,12 +75,12 @@
<h2 class="hasAnchor">
<a href="#installation" class="anchor"></a>Installation</h2>
<p>The easiest way to install the package is probably to use <a href="https://cran.r-project.org/package=drat">drat</a>:</p>
-<div class="sourceCode" id="cb1"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb1-1" data-line-number="1"><span class="kw"><a href="https://www.rdocumentation.org/packages/utils/topics/install.packages">install.packages</a></span>(<span class="st">"drat"</span>)</a>
-<a class="sourceLine" id="cb1-2" data-line-number="2">drat<span class="op">::</span><span class="kw"><a href="https://www.rdocumentation.org/packages/drat/topics/addRepo">addRepo</a></span>(<span class="st">"jranke"</span>)</a>
-<a class="sourceLine" id="cb1-3" data-line-number="3"><span class="kw"><a href="https://www.rdocumentation.org/packages/utils/topics/install.packages">install.packages</a></span>(<span class="st">"pfm"</span>)</a></code></pre></div>
+<div class="sourceCode" id="cb1"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb1-1" title="1"><span class="kw"><a href="https://www.rdocumentation.org/packages/utils/topics/install.packages">install.packages</a></span>(<span class="st">"drat"</span>)</a>
+<a class="sourceLine" id="cb1-2" title="2">drat<span class="op">::</span><span class="kw"><a href="https://www.rdocumentation.org/packages/drat/topics/addRepo">addRepo</a></span>(<span class="st">"jranke"</span>)</a>
+<a class="sourceLine" id="cb1-3" title="3"><span class="kw"><a href="https://www.rdocumentation.org/packages/utils/topics/install.packages">install.packages</a></span>(<span class="st">"pfm"</span>)</a></code></pre></div>
<p>Alternatively you can install the package using the <code>devtools</code> package. Using <code>quick = TRUE</code> skips docs, multiple-architecture builds, demos, and vignettes.</p>
-<div class="sourceCode" id="cb2"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb2-1" data-line-number="1"><span class="kw"><a href="https://www.rdocumentation.org/packages/base/topics/library">library</a></span>(devtools)</a>
-<a class="sourceLine" id="cb2-2" data-line-number="2"><span class="kw"><a href="https://www.rdocumentation.org/packages/devtools/topics/reexports">install_github</a></span>(<span class="st">"jranke/pfm"</span>, <span class="dt">quick =</span> <span class="ot">TRUE</span>)</a></code></pre></div>
+<div class="sourceCode" id="cb2"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb2-1" title="1"><span class="kw"><a href="https://www.rdocumentation.org/packages/base/topics/library">library</a></span>(devtools)</a>
+<a class="sourceLine" id="cb2-2" title="2"><span class="kw"><a href="https://www.rdocumentation.org/packages/devtools/topics/reexports">install_github</a></span>(<span class="st">"jranke/pfm"</span>, <span class="dt">quick =</span> <span class="ot">TRUE</span>)</a></code></pre></div>
</div>
<div id="use" class="section level2">
<h2 class="hasAnchor">
@@ -131,7 +131,7 @@
</div>
<div class="pkgdown">
- <p>Site built with <a href="https://pkgdown.r-lib.org/">pkgdown</a> 1.3.0.</p>
+ <p>Site built with <a href="https://pkgdown.r-lib.org/">pkgdown</a> 1.3.0.9000.</p>
</div>
</footer>
</div>
diff --git a/docs/pkgdown.yml b/docs/pkgdown.yml
index 1dc6ec1..354fdca 100644
--- a/docs/pkgdown.yml
+++ b/docs/pkgdown.yml
@@ -1,5 +1,5 @@
pandoc: 2.2.1
-pkgdown: 1.3.0
+pkgdown: 1.3.0.9000
pkgdown_sha: ~
articles: []
diff --git a/docs/reference/FOCUS_GW_scenarios_2012.html b/docs/reference/FOCUS_GW_scenarios_2012.html
index d60f44f..722971a 100644
--- a/docs/reference/FOCUS_GW_scenarios_2012.html
+++ b/docs/reference/FOCUS_GW_scenarios_2012.html
@@ -64,7 +64,7 @@ soil definitions are from page 46ff. from FOCUS (2012)." />
</button>
<span class="navbar-brand">
<a class="navbar-link" href="../index.html">pfm</a>
- <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">0.5.3</span>
+ <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">0.5.4</span>
</span>
</div>
@@ -207,7 +207,7 @@ soil definitions are from page 46ff. from FOCUS (2012).</p>
</div>
<div class="pkgdown">
- <p>Site built with <a href="https://pkgdown.r-lib.org/">pkgdown</a> 1.3.0.</p>
+ <p>Site built with <a href="https://pkgdown.r-lib.org/">pkgdown</a> 1.3.0.9000.</p>
</div>
</footer>
</div>
diff --git a/docs/reference/FOCUS_Step_12_scenarios.html b/docs/reference/FOCUS_Step_12_scenarios.html
index 2020899..53e0570 100644
--- a/docs/reference/FOCUS_Step_12_scenarios.html
+++ b/docs/reference/FOCUS_Step_12_scenarios.html
@@ -64,7 +64,7 @@ The text file is not included in the package as its licence is not clear." />
</button>
<span class="navbar-brand">
<a class="navbar-link" href="../index.html">pfm</a>
- <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">0.5.3</span>
+ <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">0.5.4</span>
</span>
</div>
@@ -310,7 +310,7 @@ The text file is not included in the package as its licence is not clear.</p>
</div>
<div class="pkgdown">
- <p>Site built with <a href="https://pkgdown.r-lib.org/">pkgdown</a> 1.3.0.</p>
+ <p>Site built with <a href="https://pkgdown.r-lib.org/">pkgdown</a> 1.3.0.9000.</p>
</div>
</footer>
</div>
diff --git a/docs/reference/FOMC_actual_twa.html b/docs/reference/FOMC_actual_twa.html
index 9963761..6826618 100644
--- a/docs/reference/FOMC_actual_twa.html
+++ b/docs/reference/FOMC_actual_twa.html
@@ -63,7 +63,7 @@
</button>
<span class="navbar-brand">
<a class="navbar-link" href="../index.html">pfm</a>
- <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">0.5.3</span>
+ <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">0.5.4</span>
</span>
</div>
@@ -172,7 +172,7 @@
</div>
<div class="pkgdown">
- <p>Site built with <a href="https://pkgdown.r-lib.org/">pkgdown</a> 1.3.0.</p>
+ <p>Site built with <a href="https://pkgdown.r-lib.org/">pkgdown</a> 1.3.0.9000.</p>
</div>
</footer>
</div>
diff --git a/docs/reference/GUS.html b/docs/reference/GUS.html
index 18f59be..1a5da20 100644
--- a/docs/reference/GUS.html
+++ b/docs/reference/GUS.html
@@ -65,7 +65,7 @@ $$GUS = \log_{10} DT50_{soil} (4 - \log_{10} K_{oc})$$" />
</button>
<span class="navbar-brand">
<a class="navbar-link" href="../index.html">pfm</a>
- <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">0.5.3</span>
+ <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">0.5.4</span>
</span>
</div>
@@ -234,7 +234,7 @@ toxicology and chemistry</em> <b>8</b>(4) 339–57.</p>
</div>
<div class="pkgdown">
- <p>Site built with <a href="https://pkgdown.r-lib.org/">pkgdown</a> 1.3.0.</p>
+ <p>Site built with <a href="https://pkgdown.r-lib.org/">pkgdown</a> 1.3.0.9000.</p>
</div>
</footer>
</div>
diff --git a/docs/reference/PEC_FOMC_accu_rel.html b/docs/reference/PEC_FOMC_accu_rel.html
index a81683d..2c3be54 100644
--- a/docs/reference/PEC_FOMC_accu_rel.html
+++ b/docs/reference/PEC_FOMC_accu_rel.html
@@ -63,7 +63,7 @@
</button>
<span class="navbar-brand">
<a class="navbar-link" href="../index.html">pfm</a>
- <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">0.5.3</span>
+ <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">0.5.4</span>
</span>
</div>
@@ -152,7 +152,7 @@
</div>
<div class="pkgdown">
- <p>Site built with <a href="https://pkgdown.r-lib.org/">pkgdown</a> 1.3.0.</p>
+ <p>Site built with <a href="https://pkgdown.r-lib.org/">pkgdown</a> 1.3.0.9000.</p>
</div>
</footer>
</div>
diff --git a/docs/reference/PEC_soil.html b/docs/reference/PEC_soil.html
index db09110..bef0f05 100644
--- a/docs/reference/PEC_soil.html
+++ b/docs/reference/PEC_soil.html
@@ -67,7 +67,7 @@ and in the EFSA guidance on PEC soil calculations (EFSA, 2015, 2017)." />
</button>
<span class="navbar-brand">
<a class="navbar-link" href="../index.html">pfm</a>
- <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">0.5.3</span>
+ <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">0.5.4</span>
</span>
</div>
@@ -358,7 +358,7 @@ from 2017 (p. 92).</p>
</div>
<div class="pkgdown">
- <p>Site built with <a href="https://pkgdown.r-lib.org/">pkgdown</a> 1.3.0.</p>
+ <p>Site built with <a href="https://pkgdown.r-lib.org/">pkgdown</a> 1.3.0.9000.</p>
</div>
</footer>
</div>
diff --git a/docs/reference/PEC_soil_mets.html b/docs/reference/PEC_soil_mets.html
index e60cc70..5ca7de4 100644
--- a/docs/reference/PEC_soil_mets.html
+++ b/docs/reference/PEC_soil_mets.html
@@ -63,7 +63,7 @@
</button>
<span class="navbar-brand">
<a class="navbar-link" href="../index.html">pfm</a>
- <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">0.5.3</span>
+ <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">0.5.4</span>
</span>
</div>
@@ -156,7 +156,7 @@ maximum occurrence in soil and their soil DT50</p></td>
</div>
<div class="pkgdown">
- <p>Site built with <a href="https://pkgdown.r-lib.org/">pkgdown</a> 1.3.0.</p>
+ <p>Site built with <a href="https://pkgdown.r-lib.org/">pkgdown</a> 1.3.0.9000.</p>
</div>
</footer>
</div>
diff --git a/docs/reference/PEC_sw_drainage_UK.html b/docs/reference/PEC_sw_drainage_UK.html
index b924c99..609a524 100644
--- a/docs/reference/PEC_sw_drainage_UK.html
+++ b/docs/reference/PEC_sw_drainage_UK.html
@@ -64,7 +64,7 @@ published on the CRC website" />
</button>
<span class="navbar-brand">
<a class="navbar-link" href="../index.html">pfm</a>
- <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">0.5.3</span>
+ <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">0.5.4</span>
</span>
</div>
@@ -179,7 +179,7 @@ published on the CRC website</p>
</div>
<div class="pkgdown">
- <p>Site built with <a href="https://pkgdown.r-lib.org/">pkgdown</a> 1.3.0.</p>
+ <p>Site built with <a href="https://pkgdown.r-lib.org/">pkgdown</a> 1.3.0.9000.</p>
</div>
</footer>
</div>
diff --git a/docs/reference/PEC_sw_drift.html b/docs/reference/PEC_sw_drift.html
index cb16371..829e949 100644
--- a/docs/reference/PEC_sw_drift.html
+++ b/docs/reference/PEC_sw_drift.html
@@ -65,7 +65,7 @@ with input via spray drift." />
</button>
<span class="navbar-brand">
<a class="navbar-link" href="../index.html">pfm</a>
- <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">0.5.3</span>
+ <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">0.5.4</span>
</span>
</div>
@@ -191,7 +191,7 @@ with input via spray drift.</p>
</div>
<div class="pkgdown">
- <p>Site built with <a href="https://pkgdown.r-lib.org/">pkgdown</a> 1.3.0.</p>
+ <p>Site built with <a href="https://pkgdown.r-lib.org/">pkgdown</a> 1.3.0.9000.</p>
</div>
</footer>
</div>
diff --git a/docs/reference/PEC_sw_exposit_drainage.html b/docs/reference/PEC_sw_exposit_drainage.html
index 62d83fa..d496268 100644
--- a/docs/reference/PEC_sw_exposit_drainage.html
+++ b/docs/reference/PEC_sw_exposit_drainage.html
@@ -69,7 +69,7 @@ details, see the discussion of the function arguments below." />
</button>
<span class="navbar-brand">
<a class="navbar-link" href="../index.html">pfm</a>
- <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">0.5.3</span>
+ <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">0.5.4</span>
</span>
</div>
@@ -227,7 +227,7 @@ autumn/winter/early spring.</p></td>
</div>
<div class="pkgdown">
- <p>Site built with <a href="https://pkgdown.r-lib.org/">pkgdown</a> 1.3.0.</p>
+ <p>Site built with <a href="https://pkgdown.r-lib.org/">pkgdown</a> 1.3.0.9000.</p>
</div>
</footer>
</div>
diff --git a/docs/reference/PEC_sw_exposit_runoff.html b/docs/reference/PEC_sw_exposit_runoff.html
index 3d7097a..c518de7 100644
--- a/docs/reference/PEC_sw_exposit_runoff.html
+++ b/docs/reference/PEC_sw_exposit_runoff.html
@@ -64,7 +64,7 @@ in the worksheet &quot;Konzept Runoff&quot;." />
</button>
<span class="navbar-brand">
<a class="navbar-link" href="../index.html">pfm</a>
- <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">0.5.3</span>
+ <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">0.5.4</span>
</span>
</div>
@@ -220,7 +220,7 @@ in the worksheet "Konzept Runoff".</p>
</div>
<div class="pkgdown">
- <p>Site built with <a href="https://pkgdown.r-lib.org/">pkgdown</a> 1.3.0.</p>
+ <p>Site built with <a href="https://pkgdown.r-lib.org/">pkgdown</a> 1.3.0.9000.</p>
</div>
</footer>
</div>
diff --git a/docs/reference/PEC_sw_focus.html b/docs/reference/PEC_sw_focus.html
index 138e223..1152559 100644
--- a/docs/reference/PEC_sw_focus.html
+++ b/docs/reference/PEC_sw_focus.html
@@ -69,7 +69,7 @@ to be used with the FOCUS calculator." />
</button>
<span class="navbar-brand">
<a class="navbar-link" href="../index.html">pfm</a>
- <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">0.5.3</span>
+ <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">0.5.4</span>
</span>
</div>
@@ -355,7 +355,7 @@ should be written</p></td>
</div>
<div class="pkgdown">
- <p>Site built with <a href="https://pkgdown.r-lib.org/">pkgdown</a> 1.3.0.</p>
+ <p>Site built with <a href="https://pkgdown.r-lib.org/">pkgdown</a> 1.3.0.9000.</p>
</div>
</footer>
</div>
diff --git a/docs/reference/PEC_sw_sed.html b/docs/reference/PEC_sw_sed.html
index 2e4fddc..679af8d 100644
--- a/docs/reference/PEC_sw_sed.html
+++ b/docs/reference/PEC_sw_sed.html
@@ -66,7 +66,7 @@ PEC calculator" />
</button>
<span class="navbar-brand">
<a class="navbar-link" href="../index.html">pfm</a>
- <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">0.5.3</span>
+ <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">0.5.4</span>
</span>
</div>
@@ -184,7 +184,7 @@ g/cm3)</p></td>
</div>
<div class="pkgdown">
- <p>Site built with <a href="https://pkgdown.r-lib.org/">pkgdown</a> 1.3.0.</p>
+ <p>Site built with <a href="https://pkgdown.r-lib.org/">pkgdown</a> 1.3.0.9000.</p>
</div>
</footer>
</div>
diff --git a/docs/reference/SFO_actual_twa.html b/docs/reference/SFO_actual_twa.html
index 1361ded..16da2f9 100644
--- a/docs/reference/SFO_actual_twa.html
+++ b/docs/reference/SFO_actual_twa.html
@@ -63,7 +63,7 @@
</button>
<span class="navbar-brand">
<a class="navbar-link" href="../index.html">pfm</a>
- <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">0.5.3</span>
+ <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">0.5.4</span>
</span>
</div>
@@ -168,7 +168,7 @@
</div>
<div class="pkgdown">
- <p>Site built with <a href="https://pkgdown.r-lib.org/">pkgdown</a> 1.3.0.</p>
+ <p>Site built with <a href="https://pkgdown.r-lib.org/">pkgdown</a> 1.3.0.9000.</p>
</div>
</footer>
</div>
diff --git a/docs/reference/SSLRC_mobility_classification.html b/docs/reference/SSLRC_mobility_classification.html
index 5c78362..6228b14 100644
--- a/docs/reference/SSLRC_mobility_classification.html
+++ b/docs/reference/SSLRC_mobility_classification.html
@@ -64,7 +64,7 @@ checked against the spreadsheet published on the CRC website" />
</button>
<span class="navbar-brand">
<a class="navbar-link" href="../index.html">pfm</a>
- <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">0.5.3</span>
+ <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">0.5.4</span>
</span>
</div>
@@ -158,7 +158,7 @@ checked against the spreadsheet published on the CRC website</p>
</div>
<div class="pkgdown">
- <p>Site built with <a href="https://pkgdown.r-lib.org/">pkgdown</a> 1.3.0.</p>
+ <p>Site built with <a href="https://pkgdown.r-lib.org/">pkgdown</a> 1.3.0.9000.</p>
</div>
</footer>
</div>
diff --git a/docs/reference/TOXSWA_cwa.html b/docs/reference/TOXSWA_cwa.html
index 357fb59..c6e0e64 100644
--- a/docs/reference/TOXSWA_cwa.html
+++ b/docs/reference/TOXSWA_cwa.html
@@ -64,7 +64,7 @@ Usually, an instance of this class will be generated by read.TOXSWA_cwa." />
</button>
<span class="navbar-brand">
<a class="navbar-link" href="../index.html">pfm</a>
- <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">0.5.3</span>
+ <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">0.5.4</span>
</span>
</div>
@@ -202,7 +202,7 @@ for the requested moving window sizes in days.</p></dd>
</div>
<div class="pkgdown">
- <p>Site built with <a href="https://pkgdown.r-lib.org/">pkgdown</a> 1.3.0.</p>
+ <p>Site built with <a href="https://pkgdown.r-lib.org/">pkgdown</a> 1.3.0.9000.</p>
</div>
</footer>
</div>
diff --git a/docs/reference/chent_focus_sw.html b/docs/reference/chent_focus_sw.html
index f4c2281..24745a4 100644
--- a/docs/reference/chent_focus_sw.html
+++ b/docs/reference/chent_focus_sw.html
@@ -63,7 +63,7 @@
</button>
<span class="navbar-brand">
<a class="navbar-link" href="../index.html">pfm</a>
- <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">0.5.3</span>
+ <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">0.5.4</span>
</span>
</div>
@@ -184,7 +184,7 @@ systems</p></td>
</div>
<div class="pkgdown">
- <p>Site built with <a href="https://pkgdown.r-lib.org/">pkgdown</a> 1.3.0.</p>
+ <p>Site built with <a href="https://pkgdown.r-lib.org/">pkgdown</a> 1.3.0.9000.</p>
</div>
</footer>
</div>
diff --git a/docs/reference/drift_data_JKI.html b/docs/reference/drift_data_JKI.html
index 1b44852..3e9e367 100644
--- a/docs/reference/drift_data_JKI.html
+++ b/docs/reference/drift_data_JKI.html
@@ -66,7 +66,7 @@ published by the German Julius-Kühn Institute (JKI)." />
</button>
<span class="navbar-brand">
<a class="navbar-link" href="../index.html">pfm</a>
- <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">0.5.3</span>
+ <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">0.5.4</span>
</span>
</div>
@@ -158,107 +158,283 @@ as its licence is not clear.</p>
<span class='co'># And this is the resulting data</span>
<span class='no'>drift_data_JKI</span></div><div class='output co'>#&gt; [[1]]
#&gt; crop
-#&gt; distance Ackerbau Obstbau frueh Obstbau spaet
-#&gt; 1 2.77 NA NA
-#&gt; 3 NA 29.20 15.73
-#&gt; 5 0.57 19.89 8.41
-#&gt; 10 0.29 11.81 3.60
-#&gt; 15 0.20 5.55 1.81
-#&gt; 20 0.15 2.77 1.09
-#&gt; 30 0.10 1.04 0.54
-#&gt; 40 0.07 0.52 0.32
-#&gt; 50 0.06 0.30 0.22
+#&gt; distance Ackerbau Obstbau frueh Obstbau spaet Weinbau Hopfenbau
+#&gt; 1 2.77 NA NA NA NA
+#&gt; 3 0.95 29.20 15.73 8.02 19.33
+#&gt; 5 0.57 19.89 8.41 3.62 11.57
+#&gt; 10 0.29 11.81 3.60 1.23 5.77
+#&gt; 15 0.20 5.55 1.81 0.65 3.84
+#&gt; 20 0.15 2.77 1.09 0.42 1.79
+#&gt; 30 0.10 1.04 0.54 0.22 0.56
+#&gt; 40 0.07 0.52 0.32 0.14 0.25
+#&gt; 50 0.06 0.30 0.22 0.10 0.13
+#&gt; crop
+#&gt; distance Flaechenkulturen &gt; 900 l/ha Tragbar &lt; 50 cm
+#&gt; 1 4.440 2.77
+#&gt; 3 NA NA
+#&gt; 5 0.180 0.57
+#&gt; 10 0.050 0.29
+#&gt; 15 0.020 0.20
+#&gt; 20 0.012 0.15
+#&gt; 30 0.005 0.10
+#&gt; 40 0.003 0.07
+#&gt; 50 0.002 0.06
+#&gt; crop
+#&gt; distance Tragbar &lt; 50 cm mit Spritzschirm Tragbar &gt; 50 cm Gleisanlagen
+#&gt; 1 0.039 NA NA
+#&gt; 3 NA 8.02 0.018721696
+#&gt; 5 0.005 3.62 0.014363896
+#&gt; 10 NA 1.23 0.010026007
+#&gt; 15 NA 0.65 0.008124366
+#&gt; 20 NA 0.42 0.006998158
+#&gt; 30 NA 0.22 0.005670811
+#&gt; 40 NA 0.14 NA
+#&gt; 50 NA 0.10 0.004350831
#&gt;
#&gt; [[2]]
#&gt; crop
-#&gt; distance Ackerbau Obstbau frueh Obstbau spaet
-#&gt; 1 2.38 NA NA
-#&gt; 3 NA 25.53 12.13
-#&gt; 5 0.47 16.87 6.81
-#&gt; 10 0.24 9.61 3.11
-#&gt; 15 0.16 5.61 1.58
-#&gt; 20 0.12 2.59 0.90
-#&gt; 30 0.08 0.87 0.40
-#&gt; 40 0.06 0.40 0.23
-#&gt; 50 0.05 0.22 0.15
+#&gt; distance Ackerbau Obstbau frueh Obstbau spaet Weinbau Hopfenbau
+#&gt; 1 2.38 NA NA NA NA
+#&gt; 3 0.79 25.53 12.13 7.23 17.73
+#&gt; 5 0.47 16.87 6.81 3.22 9.60
+#&gt; 10 0.24 9.61 3.11 1.07 4.18
+#&gt; 15 0.16 5.61 1.58 0.56 2.57
+#&gt; 20 0.12 2.59 0.90 0.36 1.21
+#&gt; 30 0.08 0.87 0.40 0.19 0.38
+#&gt; 40 0.06 0.40 0.23 0.12 0.17
+#&gt; 50 0.05 0.22 0.15 0.08 0.09
+#&gt; crop
+#&gt; distance Flaechenkulturen &gt; 900 l/ha Tragbar &lt; 50 cm
+#&gt; 1 3.780 2.38
+#&gt; 3 NA NA
+#&gt; 5 0.160 0.47
+#&gt; 10 0.040 0.24
+#&gt; 15 0.020 0.16
+#&gt; 20 0.011 0.12
+#&gt; 30 0.005 0.08
+#&gt; 40 0.003 0.06
+#&gt; 50 0.002 0.05
+#&gt; crop
+#&gt; distance Tragbar &lt; 50 cm mit Spritzschirm Tragbar &gt; 50 cm Gleisanlagen
+#&gt; 1 NA 0.1900 NA
+#&gt; 3 7.23 NA 2.120
+#&gt; 5 3.22 0.0100 0.470
+#&gt; 10 1.07 0.0030 0.060
+#&gt; 15 0.56 0.0010 0.020
+#&gt; 20 0.36 0.0008 0.008
+#&gt; 30 0.19 NA NA
+#&gt; 40 0.12 NA NA
+#&gt; 50 0.08 NA NA
#&gt;
#&gt; [[3]]
#&gt; crop
-#&gt; distance Ackerbau Obstbau frueh Obstbau spaet
-#&gt; 1 2.01 NA NA
-#&gt; 3 NA 23.96 11.01
-#&gt; 5 0.41 15.79 6.04
-#&gt; 10 0.20 8.96 2.67
-#&gt; 15 0.14 4.24 1.39
-#&gt; 20 0.10 2.01 0.80
-#&gt; 30 0.07 0.70 0.36
-#&gt; 40 0.05 0.33 0.21
-#&gt; 50 0.04 0.19 0.13
+#&gt; distance Ackerbau Obstbau frueh Obstbau spaet Weinbau Hopfenbau
+#&gt; 1 2.01 NA NA NA NA
+#&gt; 3 0.68 23.96 11.01 6.90 15.93
+#&gt; 5 0.41 15.79 6.04 3.07 8.57
+#&gt; 10 0.20 8.96 2.67 1.02 3.70
+#&gt; 15 0.14 4.24 1.39 0.54 2.26
+#&gt; 20 0.10 2.01 0.80 0.34 1.05
+#&gt; 30 0.07 0.70 0.36 0.18 0.34
+#&gt; 40 0.05 0.33 0.21 0.11 0.15
+#&gt; 50 0.04 0.19 0.13 0.08 0.08
+#&gt; crop
+#&gt; distance Flaechenkulturen &gt; 900 l/ha Tragbar &lt; 50 cm
+#&gt; 1 3.420 2.01
+#&gt; 3 NA NA
+#&gt; 5 0.150 0.41
+#&gt; 10 0.040 0.20
+#&gt; 15 0.020 0.14
+#&gt; 20 0.010 0.10
+#&gt; 30 0.004 0.07
+#&gt; 40 0.003 0.05
+#&gt; 50 0.002 0.04
+#&gt; crop
+#&gt; distance Tragbar &lt; 50 cm mit Spritzschirm Tragbar &gt; 50 cm Gleisanlagen
+#&gt; 1 NA 0.1400 NA
+#&gt; 3 6.90 NA 1.590
+#&gt; 5 3.07 0.0100 0.360
+#&gt; 10 1.02 0.0020 0.050
+#&gt; 15 0.54 0.0010 0.010
+#&gt; 20 0.34 0.0006 0.006
+#&gt; 30 0.18 NA NA
+#&gt; 40 0.11 NA NA
+#&gt; 50 0.08 NA NA
#&gt;
#&gt; [[4]]
#&gt; crop
-#&gt; distance Ackerbau Obstbau frueh Obstbau spaet
-#&gt; 1 1.85 NA NA
-#&gt; 3 NA 23.61 10.12
-#&gt; 5 0.38 15.42 5.60
-#&gt; 10 0.19 8.66 2.50
-#&gt; 15 0.13 4.01 1.28
-#&gt; 20 0.10 1.89 0.75
-#&gt; 30 0.06 0.66 0.35
-#&gt; 40 0.05 0.31 0.20
-#&gt; 50 0.04 0.17 0.13
+#&gt; distance Ackerbau Obstbau frueh Obstbau spaet Weinbau Hopfenbau
+#&gt; 1 1.85 NA NA NA NA
+#&gt; 3 0.62 23.61 10.12 6.71 15.38
+#&gt; 5 0.38 15.42 5.60 2.99 8.26
+#&gt; 10 0.19 8.66 2.50 0.99 3.55
+#&gt; 15 0.13 4.01 1.28 0.52 2.17
+#&gt; 20 0.10 1.89 0.75 0.33 0.93
+#&gt; 30 0.06 0.66 0.35 0.17 0.31
+#&gt; 40 0.05 0.31 0.20 0.11 0.14
+#&gt; 50 0.04 0.17 0.13 0.08 0.08
+#&gt; crop
+#&gt; distance Flaechenkulturen &gt; 900 l/ha Tragbar &lt; 50 cm
+#&gt; 1 2.290 1.85
+#&gt; 3 NA NA
+#&gt; 5 0.120 0.38
+#&gt; 10 0.030 0.19
+#&gt; 15 0.020 0.13
+#&gt; 20 0.009 0.10
+#&gt; 30 0.004 0.06
+#&gt; 40 0.002 0.05
+#&gt; 50 0.002 0.04
+#&gt; crop
+#&gt; distance Tragbar &lt; 50 cm mit Spritzschirm Tragbar &gt; 50 cm Gleisanlagen
+#&gt; 1 NA 0.1300 NA
+#&gt; 3 6.71 NA 1.360
+#&gt; 5 2.99 0.0100 0.310
+#&gt; 10 0.99 0.0020 0.040
+#&gt; 15 0.52 0.0010 0.010
+#&gt; 20 0.33 0.0005 0.005
+#&gt; 30 0.17 NA NA
+#&gt; 40 0.11 NA NA
+#&gt; 50 0.08 NA NA
#&gt;
#&gt; [[5]]
#&gt; crop
-#&gt; distance Ackerbau Obstbau frueh Obstbau spaet
-#&gt; 1 1.75 NA NA
-#&gt; 3 NA 23.12 9.74
-#&gt; 5 0.36 15.06 5.41
-#&gt; 10 0.18 8.42 2.43
-#&gt; 15 0.12 3.83 1.24
-#&gt; 20 0.09 1.81 0.72
-#&gt; 30 0.06 0.63 0.34
-#&gt; 40 0.05 0.30 0.20
-#&gt; 50 0.04 0.17 0.13
+#&gt; distance Ackerbau Obstbau frueh Obstbau spaet Weinbau Hopfenbau
+#&gt; 1 1.75 NA NA NA NA
+#&gt; 3 0.59 23.12 9.74 6.59 15.12
+#&gt; 5 0.36 15.06 5.41 2.93 7.99
+#&gt; 10 0.18 8.42 2.43 0.98 3.36
+#&gt; 15 0.12 3.83 1.24 0.51 2.03
+#&gt; 20 0.09 1.81 0.72 0.33 0.88
+#&gt; 30 0.06 0.63 0.34 0.17 0.29
+#&gt; 40 0.05 0.30 0.20 0.11 0.14
+#&gt; 50 0.04 0.17 0.13 0.08 0.07
+#&gt; crop
+#&gt; distance Flaechenkulturen &gt; 900 l/ha Tragbar &lt; 50 cm
+#&gt; 1 2.120 1.75
+#&gt; 3 NA NA
+#&gt; 5 0.110 0.36
+#&gt; 10 0.030 0.18
+#&gt; 15 0.010 0.12
+#&gt; 20 0.008 0.09
+#&gt; 30 0.004 0.06
+#&gt; 40 0.002 0.05
+#&gt; 50 0.002 0.04
+#&gt; crop
+#&gt; distance Tragbar &lt; 50 cm mit Spritzschirm Tragbar &gt; 50 cm Gleisanlagen
+#&gt; 1 NA 0.1200 NA
+#&gt; 3 6.59 NA 1.190
+#&gt; 5 2.93 0.0100 0.270
+#&gt; 10 0.98 0.0020 0.040
+#&gt; 15 0.51 0.0010 0.010
+#&gt; 20 0.33 0.0005 0.005
+#&gt; 30 0.17 NA NA
+#&gt; 40 0.11 NA NA
+#&gt; 50 0.08 NA NA
#&gt;
#&gt; [[6]]
#&gt; crop
-#&gt; distance Ackerbau Obstbau frueh Obstbau spaet
-#&gt; 1 1.64 NA NA
-#&gt; 3 NA 22.76 9.21
-#&gt; 5 0.34 14.64 5.18
-#&gt; 10 0.17 8.04 2.38
-#&gt; 15 0.11 3.71 1.20
-#&gt; 20 0.09 1.75 0.68
-#&gt; 30 0.06 0.61 0.31
-#&gt; 40 0.04 0.29 0.17
-#&gt; 50 0.03 0.16 0.11
+#&gt; distance Ackerbau Obstbau frueh Obstbau spaet Weinbau Hopfenbau
+#&gt; 1 1.64 NA NA NA NA
+#&gt; 3 0.56 22.76 9.21 6.41 14.90
+#&gt; 5 0.34 14.64 5.18 2.85 7.79
+#&gt; 10 0.17 8.04 2.38 0.95 3.23
+#&gt; 15 0.11 3.71 1.20 0.50 1.93
+#&gt; 20 0.09 1.75 0.68 0.32 0.83
+#&gt; 30 0.06 0.61 0.31 0.17 0.28
+#&gt; 40 0.04 0.29 0.17 0.11 0.13
+#&gt; 50 0.03 0.16 0.11 0.07 0.07
+#&gt; crop
+#&gt; distance Flaechenkulturen &gt; 900 l/ha Tragbar &lt; 50 cm
+#&gt; 1 1.980 1.64
+#&gt; 3 NA NA
+#&gt; 5 0.100 0.34
+#&gt; 10 0.030 0.17
+#&gt; 15 0.010 0.11
+#&gt; 20 0.008 0.09
+#&gt; 30 0.004 0.06
+#&gt; 40 0.002 0.04
+#&gt; 50 0.001 0.03
+#&gt; crop
+#&gt; distance Tragbar &lt; 50 cm mit Spritzschirm Tragbar &gt; 50 cm Gleisanlagen
+#&gt; 1 NA 0.1100 NA
+#&gt; 3 6.41 NA 1.070
+#&gt; 5 2.85 0.0100 0.250
+#&gt; 10 0.95 0.0020 0.030
+#&gt; 15 0.50 0.0010 0.010
+#&gt; 20 0.32 0.0004 0.005
+#&gt; 30 0.17 NA NA
+#&gt; 40 0.11 NA NA
+#&gt; 50 0.07 NA NA
#&gt;
#&gt; [[7]]
#&gt; crop
-#&gt; distance Ackerbau Obstbau frueh Obstbau spaet
-#&gt; 1 1.61 NA NA
-#&gt; 3 NA 22.69 9.10
-#&gt; 5 0.33 14.45 5.11
-#&gt; 10 0.17 7.83 2.33
-#&gt; 15 0.11 3.62 1.20
-#&gt; 20 0.08 1.71 0.67
-#&gt; 30 0.06 0.60 0.30
-#&gt; 40 0.04 0.28 0.17
-#&gt; 50 0.03 0.16 0.11
+#&gt; distance Ackerbau Obstbau frueh Obstbau spaet Weinbau Hopfenbau
+#&gt; 1 1.61 NA NA NA NA
+#&gt; 3 0.55 22.69 9.10 6.33 14.63
+#&gt; 5 0.33 14.45 5.11 2.81 7.60
+#&gt; 10 0.17 7.83 2.33 0.94 3.13
+#&gt; 15 0.11 3.62 1.20 0.49 1.86
+#&gt; 20 0.08 1.71 0.67 0.31 0.81
+#&gt; 30 0.06 0.60 0.30 0.16 0.26
+#&gt; 40 0.04 0.28 0.17 0.10 0.12
+#&gt; 50 0.03 0.16 0.11 0.07 0.06
+#&gt; crop
+#&gt; distance Flaechenkulturen &gt; 900 l/ha Tragbar &lt; 50 cm
+#&gt; 1 1.930 1.61
+#&gt; 3 NA NA
+#&gt; 5 0.100 0.33
+#&gt; 10 0.030 0.17
+#&gt; 15 0.010 0.11
+#&gt; 20 0.008 0.08
+#&gt; 30 0.004 0.06
+#&gt; 40 0.002 0.04
+#&gt; 50 0.001 0.03
+#&gt; crop
+#&gt; distance Tragbar &lt; 50 cm mit Spritzschirm Tragbar &gt; 50 cm Gleisanlagen
+#&gt; 1 NA 0.1100 NA
+#&gt; 3 6.33 NA 0.960
+#&gt; 5 2.81 0.0100 0.230
+#&gt; 10 0.94 0.0020 0.030
+#&gt; 15 0.49 0.0010 0.010
+#&gt; 20 0.31 0.0004 0.004
+#&gt; 30 0.16 NA NA
+#&gt; 40 0.10 NA NA
+#&gt; 50 0.07 NA NA
#&gt;
#&gt; [[8]]
#&gt; crop
-#&gt; distance Ackerbau Obstbau frueh Obstbau spaet
-#&gt; 1 1.52 NA NA
-#&gt; 3 NA 22.24 8.66
-#&gt; 5 0.31 14.09 4.92
-#&gt; 10 0.16 7.58 2.29
-#&gt; 15 0.11 3.48 1.14
-#&gt; 20 0.08 1.65 0.65
-#&gt; 30 0.05 0.57 0.29
-#&gt; 40 0.04 0.27 0.16
-#&gt; 50 0.03 0.15 0.11
+#&gt; distance Ackerbau Obstbau frueh Obstbau spaet Weinbau Hopfenbau
+#&gt; 1 1.52 NA NA NA NA
+#&gt; 3 0.52 22.24 8.66 6.26 13.53
+#&gt; 5 0.31 14.09 4.92 2.78 7.15
+#&gt; 10 0.16 7.58 2.29 0.93 3.01
+#&gt; 15 0.11 3.48 1.14 0.49 1.82
+#&gt; 20 0.08 1.65 0.65 0.31 0.78
+#&gt; 30 0.05 0.57 0.29 0.16 0.25
+#&gt; 40 0.04 0.27 0.16 0.10 0.12
+#&gt; 50 0.03 0.15 0.11 0.07 0.06
+#&gt; crop
+#&gt; distance Flaechenkulturen &gt; 900 l/ha Tragbar &lt; 50 cm
+#&gt; 1 1.640 1.52
+#&gt; 3 NA NA
+#&gt; 5 0.090 0.31
+#&gt; 10 0.020 0.16
+#&gt; 15 0.010 0.11
+#&gt; 20 0.007 0.08
+#&gt; 30 0.003 0.05
+#&gt; 40 0.002 0.04
+#&gt; 50 0.001 0.03
+#&gt; crop
+#&gt; distance Tragbar &lt; 50 cm mit Spritzschirm Tragbar &gt; 50 cm Gleisanlagen
+#&gt; 1 NA 1e-01 NA
+#&gt; 3 6.26 NA 0.890
+#&gt; 5 2.78 1e-02 0.210
+#&gt; 10 0.93 1e-03 0.030
+#&gt; 15 0.49 1e-03 0.010
+#&gt; 20 0.31 4e-04 0.004
+#&gt; 30 0.16 NA NA
+#&gt; 40 0.10 NA NA
+#&gt; 50 0.07 NA NA
#&gt; </div></pre>
</div>
<div class="col-md-3 hidden-xs hidden-sm" id="sidebar">
@@ -283,7 +459,7 @@ as its licence is not clear.</p>
</div>
<div class="pkgdown">
- <p>Site built with <a href="https://pkgdown.r-lib.org/">pkgdown</a> 1.3.0.</p>
+ <p>Site built with <a href="https://pkgdown.r-lib.org/">pkgdown</a> 1.3.0.9000.</p>
</div>
</footer>
</div>
diff --git a/docs/reference/endpoint.html b/docs/reference/endpoint.html
index b4e4516..d80194b 100644
--- a/docs/reference/endpoint.html
+++ b/docs/reference/endpoint.html
@@ -66,7 +66,7 @@ this function." />
</button>
<span class="navbar-brand">
<a class="navbar-link" href="../index.html">pfm</a>
- <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">0.5.3</span>
+ <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">0.5.4</span>
</span>
</div>
@@ -223,7 +223,7 @@ exponent is often called 1/n.</p>
</div>
<div class="pkgdown">
- <p>Site built with <a href="https://pkgdown.r-lib.org/">pkgdown</a> 1.3.0.</p>
+ <p>Site built with <a href="https://pkgdown.r-lib.org/">pkgdown</a> 1.3.0.9000.</p>
</div>
</footer>
</div>
diff --git a/docs/reference/geomean.html b/docs/reference/geomean.html
index 80684b5..f08009b 100644
--- a/docs/reference/geomean.html
+++ b/docs/reference/geomean.html
@@ -66,7 +66,7 @@ returns 0 if at least one element of the vector is 0." />
</button>
<span class="navbar-brand">
<a class="navbar-link" href="../index.html">pfm</a>
- <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">0.5.3</span>
+ <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">0.5.4</span>
</span>
</div>
@@ -162,7 +162,7 @@ returns 0 if at least one element of the vector is 0.</p>
</div>
<div class="pkgdown">
- <p>Site built with <a href="https://pkgdown.r-lib.org/">pkgdown</a> 1.3.0.</p>
+ <p>Site built with <a href="https://pkgdown.r-lib.org/">pkgdown</a> 1.3.0.9000.</p>
</div>
</footer>
</div>
diff --git a/docs/reference/get_vertex.html b/docs/reference/get_vertex.html
index 1e123f1..3aeccf4 100644
--- a/docs/reference/get_vertex.html
+++ b/docs/reference/get_vertex.html
@@ -64,7 +64,7 @@ https://stackoverflow.com/a/717791" />
</button>
<span class="navbar-brand">
<a class="navbar-link" href="../index.html">pfm</a>
- <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">0.5.3</span>
+ <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">0.5.4</span>
</span>
</div>
@@ -144,7 +144,7 @@ https://stackoverflow.com/a/717791</p>
</div>
<div class="pkgdown">
- <p>Site built with <a href="https://pkgdown.r-lib.org/">pkgdown</a> 1.3.0.</p>
+ <p>Site built with <a href="https://pkgdown.r-lib.org/">pkgdown</a> 1.3.0.9000.</p>
</div>
</footer>
</div>
diff --git a/docs/reference/index.html b/docs/reference/index.html
index dd8d213..ea17397 100644
--- a/docs/reference/index.html
+++ b/docs/reference/index.html
@@ -60,7 +60,7 @@
</button>
<span class="navbar-brand">
<a class="navbar-link" href="../index.html">pfm</a>
- <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">0.5.3</span>
+ <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">0.5.4</span>
</span>
</div>
@@ -366,7 +366,7 @@ water concentrations</p></td>
</div>
<div class="pkgdown">
- <p>Site built with <a href="https://pkgdown.r-lib.org/">pkgdown</a> 1.3.0.</p>
+ <p>Site built with <a href="https://pkgdown.r-lib.org/">pkgdown</a> 1.3.0.9000.</p>
</div>
</footer>
</div>
diff --git a/docs/reference/max_twa.html b/docs/reference/max_twa.html
index d38e382..b5b4444 100644
--- a/docs/reference/max_twa.html
+++ b/docs/reference/max_twa.html
@@ -67,7 +67,7 @@ max_twa." />
</button>
<span class="navbar-brand">
<a class="navbar-link" href="../index.html">pfm</a>
- <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">0.5.3</span>
+ <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">0.5.4</span>
</span>
</div>
@@ -193,7 +193,7 @@ SFO, FOMC and DFOP models and to the parent compound</p>
</div>
<div class="pkgdown">
- <p>Site built with <a href="https://pkgdown.r-lib.org/">pkgdown</a> 1.3.0.</p>
+ <p>Site built with <a href="https://pkgdown.r-lib.org/">pkgdown</a> 1.3.0.9000.</p>
</div>
</footer>
</div>
diff --git a/docs/reference/one_box-2.png b/docs/reference/one_box-2.png
index eb60bd6..0da7911 100644
--- a/docs/reference/one_box-2.png
+++ b/docs/reference/one_box-2.png
Binary files differ
diff --git a/docs/reference/one_box-3.png b/docs/reference/one_box-3.png
index fcb308b..c770252 100644
--- a/docs/reference/one_box-3.png
+++ b/docs/reference/one_box-3.png
Binary files differ
diff --git a/docs/reference/one_box.html b/docs/reference/one_box.html
index 799ca6c..42f4541 100644
--- a/docs/reference/one_box.html
+++ b/docs/reference/one_box.html
@@ -63,7 +63,7 @@
</button>
<span class="navbar-brand">
<a class="navbar-link" href="../index.html">pfm</a>
- <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">0.5.3</span>
+ <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">0.5.4</span>
</span>
</div>
@@ -175,8 +175,7 @@ all observed variables.</p></td>
<span class='no'>pred_1</span> <span class='kw'>&lt;-</span> <span class='fu'>one_box</span>(<span class='no'>fit</span>)
<span class='fu'><a href='https://www.rdocumentation.org/packages/graphics/topics/plot'>plot</a></span>(<span class='no'>pred_1</span>)</div><div class='img'><img src='one_box-2.png' alt='' width='700' height='433' /></div><div class='input'>
<span class='co'># Use a model with more than one observed variable</span>
-<span class='no'>m_2</span> <span class='kw'>&lt;-</span> <span class='fu'><a href='https://www.rdocumentation.org/packages/mkin/topics/mkinmod'>mkinmod</a></span>(<span class='kw'>parent</span> <span class='kw'>=</span> <span class='fu'><a href='https://www.rdocumentation.org/packages/mkin/topics/mkinsub'>mkinsub</a></span>(<span class='st'>"SFO"</span>, <span class='st'>"m1"</span>), <span class='kw'>m1</span> <span class='kw'>=</span> <span class='fu'><a href='https://www.rdocumentation.org/packages/mkin/topics/mkinsub'>mkinsub</a></span>(<span class='st'>"SFO"</span>))</div><div class='output co'>#&gt; <span class='message'>Successfully compiled differential equation model from auto-generated C code.</span></div><div class='input'><span class='no'>fit_2</span> <span class='kw'>&lt;-</span> <span class='fu'><a href='https://www.rdocumentation.org/packages/mkin/topics/mkinfit'>mkinfit</a></span>(<span class='no'>m_2</span>, <span class='no'>FOCUS_2006_D</span>, <span class='kw'>quiet</span> <span class='kw'>=</span> <span class='fl'>TRUE</span>)
-<span class='no'>pred_2</span> <span class='kw'>&lt;-</span> <span class='fu'>one_box</span>(<span class='no'>fit_2</span>, <span class='kw'>ini</span> <span class='kw'>=</span> <span class='st'>"model"</span>)
+<span class='no'>m_2</span> <span class='kw'>&lt;-</span> <span class='fu'><a href='https://www.rdocumentation.org/packages/mkin/topics/mkinmod'>mkinmod</a></span>(<span class='kw'>parent</span> <span class='kw'>=</span> <span class='fu'><a href='https://www.rdocumentation.org/packages/mkin/topics/mkinsub'>mkinsub</a></span>(<span class='st'>"SFO"</span>, <span class='st'>"m1"</span>), <span class='kw'>m1</span> <span class='kw'>=</span> <span class='fu'><a href='https://www.rdocumentation.org/packages/mkin/topics/mkinsub'>mkinsub</a></span>(<span class='st'>"SFO"</span>))</div><div class='output co'>#&gt; <span class='message'>Successfully compiled differential equation model from auto-generated C code.</span></div><div class='input'><span class='no'>fit_2</span> <span class='kw'>&lt;-</span> <span class='fu'><a href='https://www.rdocumentation.org/packages/mkin/topics/mkinfit'>mkinfit</a></span>(<span class='no'>m_2</span>, <span class='no'>FOCUS_2006_D</span>, <span class='kw'>quiet</span> <span class='kw'>=</span> <span class='fl'>TRUE</span>)</div><div class='output co'>#&gt; <span class='warning'>Warning: Observations with value of zero were removed from the data</span></div><div class='input'><span class='no'>pred_2</span> <span class='kw'>&lt;-</span> <span class='fu'>one_box</span>(<span class='no'>fit_2</span>, <span class='kw'>ini</span> <span class='kw'>=</span> <span class='st'>"model"</span>)
<span class='fu'><a href='https://www.rdocumentation.org/packages/graphics/topics/plot'>plot</a></span>(<span class='no'>pred_2</span>)</div><div class='img'><img src='one_box-3.png' alt='' width='700' height='433' /></div></pre>
</div>
<div class="col-md-3 hidden-xs hidden-sm" id="sidebar">
@@ -198,7 +197,7 @@ all observed variables.</p></td>
</div>
<div class="pkgdown">
- <p>Site built with <a href="https://pkgdown.r-lib.org/">pkgdown</a> 1.3.0.</p>
+ <p>Site built with <a href="https://pkgdown.r-lib.org/">pkgdown</a> 1.3.0.9000.</p>
</div>
</footer>
</div>
diff --git a/docs/reference/perc_runoff_exposit.html b/docs/reference/perc_runoff_exposit.html
index 737dbb5..38e61cc 100644
--- a/docs/reference/perc_runoff_exposit.html
+++ b/docs/reference/perc_runoff_exposit.html
@@ -63,7 +63,7 @@
</button>
<span class="navbar-brand">
<a class="navbar-link" href="../index.html">pfm</a>
- <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">0.5.3</span>
+ <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">0.5.4</span>
</span>
</div>
@@ -163,7 +163,7 @@
</div>
<div class="pkgdown">
- <p>Site built with <a href="https://pkgdown.r-lib.org/">pkgdown</a> 1.3.0.</p>
+ <p>Site built with <a href="https://pkgdown.r-lib.org/">pkgdown</a> 1.3.0.9000.</p>
</div>
</footer>
</div>
diff --git a/docs/reference/perc_runoff_reduction_exposit.html b/docs/reference/perc_runoff_reduction_exposit.html
index 818e2be..56ccca8 100644
--- a/docs/reference/perc_runoff_reduction_exposit.html
+++ b/docs/reference/perc_runoff_reduction_exposit.html
@@ -63,7 +63,7 @@
</button>
<span class="navbar-brand">
<a class="navbar-link" href="../index.html">pfm</a>
- <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">0.5.3</span>
+ <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">0.5.4</span>
</span>
</div>
@@ -162,7 +162,7 @@ from which the values were taken.</p><dl class='dl-horizontal'>
</div>
<div class="pkgdown">
- <p>Site built with <a href="https://pkgdown.r-lib.org/">pkgdown</a> 1.3.0.</p>
+ <p>Site built with <a href="https://pkgdown.r-lib.org/">pkgdown</a> 1.3.0.9000.</p>
</div>
</footer>
</div>
diff --git a/docs/reference/pfm_degradation.html b/docs/reference/pfm_degradation.html
index a9c94fb..9c62bf7 100644
--- a/docs/reference/pfm_degradation.html
+++ b/docs/reference/pfm_degradation.html
@@ -63,7 +63,7 @@
</button>
<span class="navbar-brand">
<a class="navbar-link" href="../index.html">pfm</a>
- <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">0.5.3</span>
+ <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">0.5.4</span>
</span>
</div>
@@ -174,7 +174,7 @@ is calculated (SFO model).</p></td>
</div>
<div class="pkgdown">
- <p>Site built with <a href="https://pkgdown.r-lib.org/">pkgdown</a> 1.3.0.</p>
+ <p>Site built with <a href="https://pkgdown.r-lib.org/">pkgdown</a> 1.3.0.9000.</p>
</div>
</footer>
</div>
diff --git a/docs/reference/plot.TOXSWA_cwa.html b/docs/reference/plot.TOXSWA_cwa.html
index 80a8095..31435e8 100644
--- a/docs/reference/plot.TOXSWA_cwa.html
+++ b/docs/reference/plot.TOXSWA_cwa.html
@@ -64,7 +64,7 @@ segment of a TOXSWA surface water body." />
</button>
<span class="navbar-brand">
<a class="navbar-link" href="../index.html">pfm</a>
- <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">0.5.3</span>
+ <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">0.5.4</span>
</span>
</div>
@@ -194,7 +194,7 @@ to suspended matter?</p></td>
</div>
<div class="pkgdown">
- <p>Site built with <a href="https://pkgdown.r-lib.org/">pkgdown</a> 1.3.0.</p>
+ <p>Site built with <a href="https://pkgdown.r-lib.org/">pkgdown</a> 1.3.0.9000.</p>
</div>
</footer>
</div>
diff --git a/docs/reference/plot.one_box-3.png b/docs/reference/plot.one_box-3.png
index 183035a..9767472 100644
--- a/docs/reference/plot.one_box-3.png
+++ b/docs/reference/plot.one_box-3.png
Binary files differ
diff --git a/docs/reference/plot.one_box.html b/docs/reference/plot.one_box.html
index bdbece5..5bc6847 100644
--- a/docs/reference/plot.one_box.html
+++ b/docs/reference/plot.one_box.html
@@ -63,7 +63,7 @@
</button>
<span class="navbar-brand">
<a class="navbar-link" href="../index.html">pfm</a>
- <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">0.5.3</span>
+ <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">0.5.4</span>
</span>
</div>
@@ -163,8 +163,7 @@ be shown if max_twa is not NULL.</p></td>
<pre class="examples"><div class='input'><span class='no'>dfop_pred</span> <span class='kw'>&lt;-</span> <span class='fu'><a href='one_box.html'>one_box</a></span>(<span class='st'>"DFOP"</span>, <span class='kw'>parms</span> <span class='kw'>=</span> <span class='fu'><a href='https://www.rdocumentation.org/packages/base/topics/c'>c</a></span>(<span class='kw'>k1</span> <span class='kw'>=</span> <span class='fl'>0.2</span>, <span class='kw'>k2</span> <span class='kw'>=</span> <span class='fl'>0.02</span>, <span class='kw'>g</span> <span class='kw'>=</span> <span class='fl'>0.7</span>))
<span class='fu'><a href='https://www.rdocumentation.org/packages/graphics/topics/plot'>plot</a></span>(<span class='no'>dfop_pred</span>)</div><div class='img'><img src='plot.one_box-1.png' alt='' width='700' height='433' /></div><div class='input'><span class='fu'><a href='https://www.rdocumentation.org/packages/graphics/topics/plot'>plot</a></span>(<span class='fu'><a href='sawtooth.html'>sawtooth</a></span>(<span class='no'>dfop_pred</span>, <span class='fl'>3</span>, <span class='fl'>7</span>), <span class='kw'>max_twa</span> <span class='kw'>=</span> <span class='fl'>21</span>)</div><div class='img'><img src='plot.one_box-2.png' alt='' width='700' height='433' /></div><div class='input'>
<span class='co'># Use a fitted mkinfit model</span>
-<span class='no'>m_2</span> <span class='kw'>&lt;-</span> <span class='fu'>mkinmod</span>(<span class='kw'>parent</span> <span class='kw'>=</span> <span class='fu'>mkinsub</span>(<span class='st'>"SFO"</span>, <span class='st'>"m1"</span>), <span class='kw'>m1</span> <span class='kw'>=</span> <span class='fu'>mkinsub</span>(<span class='st'>"SFO"</span>))</div><div class='output co'>#&gt; <span class='message'>Successfully compiled differential equation model from auto-generated C code.</span></div><div class='input'><span class='no'>fit_2</span> <span class='kw'>&lt;-</span> <span class='fu'>mkinfit</span>(<span class='no'>m_2</span>, <span class='no'>FOCUS_2006_D</span>, <span class='kw'>quiet</span> <span class='kw'>=</span> <span class='fl'>TRUE</span>)
-<span class='no'>pred_2</span> <span class='kw'>&lt;-</span> <span class='fu'><a href='one_box.html'>one_box</a></span>(<span class='no'>fit_2</span>, <span class='kw'>ini</span> <span class='kw'>=</span> <span class='fl'>1</span>)
+<span class='no'>m_2</span> <span class='kw'>&lt;-</span> <span class='fu'>mkinmod</span>(<span class='kw'>parent</span> <span class='kw'>=</span> <span class='fu'>mkinsub</span>(<span class='st'>"SFO"</span>, <span class='st'>"m1"</span>), <span class='kw'>m1</span> <span class='kw'>=</span> <span class='fu'>mkinsub</span>(<span class='st'>"SFO"</span>))</div><div class='output co'>#&gt; <span class='message'>Successfully compiled differential equation model from auto-generated C code.</span></div><div class='input'><span class='no'>fit_2</span> <span class='kw'>&lt;-</span> <span class='fu'>mkinfit</span>(<span class='no'>m_2</span>, <span class='no'>FOCUS_2006_D</span>, <span class='kw'>quiet</span> <span class='kw'>=</span> <span class='fl'>TRUE</span>)</div><div class='output co'>#&gt; <span class='warning'>Warning: Observations with value of zero were removed from the data</span></div><div class='input'><span class='no'>pred_2</span> <span class='kw'>&lt;-</span> <span class='fu'><a href='one_box.html'>one_box</a></span>(<span class='no'>fit_2</span>, <span class='kw'>ini</span> <span class='kw'>=</span> <span class='fl'>1</span>)
<span class='no'>pred_2_saw</span> <span class='kw'>&lt;-</span> <span class='fu'><a href='sawtooth.html'>sawtooth</a></span>(<span class='no'>pred_2</span>, <span class='fl'>2</span>, <span class='fl'>7</span>)
<span class='fu'><a href='https://www.rdocumentation.org/packages/graphics/topics/plot'>plot</a></span>(<span class='no'>pred_2_saw</span>, <span class='kw'>max_twa</span> <span class='kw'>=</span> <span class='fl'>21</span>, <span class='kw'>max_twa_var</span> <span class='kw'>=</span> <span class='st'>"m1"</span>)</div><div class='img'><img src='plot.one_box-3.png' alt='' width='700' height='433' /></div></pre>
</div>
@@ -187,7 +186,7 @@ be shown if max_twa is not NULL.</p></td>
</div>
<div class="pkgdown">
- <p>Site built with <a href="https://pkgdown.r-lib.org/">pkgdown</a> 1.3.0.</p>
+ <p>Site built with <a href="https://pkgdown.r-lib.org/">pkgdown</a> 1.3.0.9000.</p>
</div>
</footer>
</div>
diff --git a/docs/reference/read.TOXSWA_cwa.html b/docs/reference/read.TOXSWA_cwa.html
index 6a0ee74..881aa87 100644
--- a/docs/reference/read.TOXSWA_cwa.html
+++ b/docs/reference/read.TOXSWA_cwa.html
@@ -68,7 +68,7 @@ renamed to ConLiqWatLay in the out file." />
</button>
<span class="navbar-brand">
<a class="navbar-link" href="../index.html">pfm</a>
- <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">0.5.3</span>
+ <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">0.5.4</span>
</span>
</div>
@@ -202,7 +202,7 @@ generating event statistics.</p></td>
</div>
<div class="pkgdown">
- <p>Site built with <a href="https://pkgdown.r-lib.org/">pkgdown</a> 1.3.0.</p>
+ <p>Site built with <a href="https://pkgdown.r-lib.org/">pkgdown</a> 1.3.0.9000.</p>
</div>
</footer>
</div>
diff --git a/docs/reference/sawtooth-2.png b/docs/reference/sawtooth-2.png
index 183035a..9767472 100644
--- a/docs/reference/sawtooth-2.png
+++ b/docs/reference/sawtooth-2.png
Binary files differ
diff --git a/docs/reference/sawtooth.html b/docs/reference/sawtooth.html
index 638d290..39a2e99 100644
--- a/docs/reference/sawtooth.html
+++ b/docs/reference/sawtooth.html
@@ -65,7 +65,7 @@ times, with an interval i." />
</button>
<span class="navbar-brand">
<a class="navbar-link" href="../index.html">pfm</a>
- <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">0.5.3</span>
+ <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">0.5.4</span>
</span>
</div>
@@ -145,8 +145,7 @@ the corresponding amounts applied in the second column.</p></td>
<pre class="examples"><div class='input'><span class='no'>applications</span> <span class='kw'>=</span> <span class='fu'><a href='https://www.rdocumentation.org/packages/base/topics/data.frame'>data.frame</a></span>(<span class='kw'>time</span> <span class='kw'>=</span> <span class='fu'><a href='https://www.rdocumentation.org/packages/base/topics/seq'>seq</a></span>(<span class='fl'>0</span>, <span class='fl'>14</span>, <span class='kw'>by</span> <span class='kw'>=</span> <span class='fl'>7</span>), <span class='kw'>amount</span> <span class='kw'>=</span> <span class='fu'><a href='https://www.rdocumentation.org/packages/base/topics/c'>c</a></span>(<span class='fl'>1</span>, <span class='fl'>2</span>, <span class='fl'>3</span>))
<span class='no'>pred</span> <span class='kw'>&lt;-</span> <span class='fu'><a href='one_box.html'>one_box</a></span>(<span class='fl'>10</span>)
<span class='fu'><a href='https://www.rdocumentation.org/packages/graphics/topics/plot'>plot</a></span>(<span class='fu'>sawtooth</span>(<span class='no'>pred</span>, <span class='kw'>applications</span> <span class='kw'>=</span> <span class='no'>applications</span>))</div><div class='img'><img src='sawtooth-1.png' alt='' width='700' height='433' /></div><div class='input'>
-<span class='no'>m_2</span> <span class='kw'>&lt;-</span> <span class='fu'>mkinmod</span>(<span class='kw'>parent</span> <span class='kw'>=</span> <span class='fu'>mkinsub</span>(<span class='st'>"SFO"</span>, <span class='st'>"m1"</span>), <span class='kw'>m1</span> <span class='kw'>=</span> <span class='fu'>mkinsub</span>(<span class='st'>"SFO"</span>))</div><div class='output co'>#&gt; <span class='message'>Successfully compiled differential equation model from auto-generated C code.</span></div><div class='input'><span class='no'>fit_2</span> <span class='kw'>&lt;-</span> <span class='fu'>mkinfit</span>(<span class='no'>m_2</span>, <span class='no'>FOCUS_2006_D</span>, <span class='kw'>quiet</span> <span class='kw'>=</span> <span class='fl'>TRUE</span>)
-<span class='no'>pred_2</span> <span class='kw'>&lt;-</span> <span class='fu'><a href='one_box.html'>one_box</a></span>(<span class='no'>fit_2</span>, <span class='kw'>ini</span> <span class='kw'>=</span> <span class='fl'>1</span>)
+<span class='no'>m_2</span> <span class='kw'>&lt;-</span> <span class='fu'>mkinmod</span>(<span class='kw'>parent</span> <span class='kw'>=</span> <span class='fu'>mkinsub</span>(<span class='st'>"SFO"</span>, <span class='st'>"m1"</span>), <span class='kw'>m1</span> <span class='kw'>=</span> <span class='fu'>mkinsub</span>(<span class='st'>"SFO"</span>))</div><div class='output co'>#&gt; <span class='message'>Successfully compiled differential equation model from auto-generated C code.</span></div><div class='input'><span class='no'>fit_2</span> <span class='kw'>&lt;-</span> <span class='fu'>mkinfit</span>(<span class='no'>m_2</span>, <span class='no'>FOCUS_2006_D</span>, <span class='kw'>quiet</span> <span class='kw'>=</span> <span class='fl'>TRUE</span>)</div><div class='output co'>#&gt; <span class='warning'>Warning: Observations with value of zero were removed from the data</span></div><div class='input'><span class='no'>pred_2</span> <span class='kw'>&lt;-</span> <span class='fu'><a href='one_box.html'>one_box</a></span>(<span class='no'>fit_2</span>, <span class='kw'>ini</span> <span class='kw'>=</span> <span class='fl'>1</span>)
<span class='no'>pred_2_saw</span> <span class='kw'>&lt;-</span> <span class='fu'>sawtooth</span>(<span class='no'>pred_2</span>, <span class='fl'>2</span>, <span class='fl'>7</span>)
<span class='fu'><a href='https://www.rdocumentation.org/packages/graphics/topics/plot'>plot</a></span>(<span class='no'>pred_2_saw</span>, <span class='kw'>max_twa</span> <span class='kw'>=</span> <span class='fl'>21</span>, <span class='kw'>max_twa_var</span> <span class='kw'>=</span> <span class='st'>"m1"</span>)</div><div class='img'><img src='sawtooth-2.png' alt='' width='700' height='433' /></div><div class='input'>
<span class='fu'><a href='max_twa.html'>max_twa</a></span>(<span class='no'>pred_2_saw</span>)</div><div class='output co'>#&gt; $max
@@ -179,7 +178,7 @@ the corresponding amounts applied in the second column.</p></td>
</div>
<div class="pkgdown">
- <p>Site built with <a href="https://pkgdown.r-lib.org/">pkgdown</a> 1.3.0.</p>
+ <p>Site built with <a href="https://pkgdown.r-lib.org/">pkgdown</a> 1.3.0.9000.</p>
</div>
</footer>
</div>
diff --git a/docs/reference/soil_scenario_data_EFSA_2015.html b/docs/reference/soil_scenario_data_EFSA_2015.html
index 6051cc2..3a2f122 100644
--- a/docs/reference/soil_scenario_data_EFSA_2015.html
+++ b/docs/reference/soil_scenario_data_EFSA_2015.html
@@ -65,7 +65,7 @@ scenario and model adjustment factors from p. 15 and p. 17 are included." />
</button>
<span class="navbar-brand">
<a class="navbar-link" href="../index.html">pfm</a>
- <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">0.5.3</span>
+ <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">0.5.4</span>
</span>
</div>
@@ -185,7 +185,7 @@ scenario and model adjustment factors from p. 15 and p. 17 are included.</p>
</div>
<div class="pkgdown">
- <p>Site built with <a href="https://pkgdown.r-lib.org/">pkgdown</a> 1.3.0.</p>
+ <p>Site built with <a href="https://pkgdown.r-lib.org/">pkgdown</a> 1.3.0.9000.</p>
</div>
</footer>
</div>
diff --git a/docs/reference/soil_scenario_data_EFSA_2017.html b/docs/reference/soil_scenario_data_EFSA_2017.html
index 082fb7b..acbfceb 100644
--- a/docs/reference/soil_scenario_data_EFSA_2017.html
+++ b/docs/reference/soil_scenario_data_EFSA_2017.html
@@ -65,7 +65,7 @@ scenario and model adjustment factors from p. 16 and p. 18 are included." />
</button>
<span class="navbar-brand">
<a class="navbar-link" href="../index.html">pfm</a>
- <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">0.5.3</span>
+ <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">0.5.4</span>
</span>
</div>
@@ -166,7 +166,7 @@ scenario and model adjustment factors from p. 16 and p. 18 are included.</p>
</div>
<div class="pkgdown">
- <p>Site built with <a href="https://pkgdown.r-lib.org/">pkgdown</a> 1.3.0.</p>
+ <p>Site built with <a href="https://pkgdown.r-lib.org/">pkgdown</a> 1.3.0.9000.</p>
</div>
</footer>
</div>
diff --git a/docs/reference/twa.html b/docs/reference/twa.html
index 69efa7f..9fdcc5f 100644
--- a/docs/reference/twa.html
+++ b/docs/reference/twa.html
@@ -65,7 +65,7 @@ is after one window has passed." />
</button>
<span class="navbar-brand">
<a class="navbar-link" href="../index.html">pfm</a>
- <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">0.5.3</span>
+ <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">0.5.4</span>
</span>
</div>
@@ -172,7 +172,7 @@ is after one window has passed.</p>
</div>
<div class="pkgdown">
- <p>Site built with <a href="https://pkgdown.r-lib.org/">pkgdown</a> 1.3.0.</p>
+ <p>Site built with <a href="https://pkgdown.r-lib.org/">pkgdown</a> 1.3.0.9000.</p>
</div>
</footer>
</div>
diff --git a/test.log b/test.log
index abf4825..bd894ec 100644
--- a/test.log
+++ b/test.log
@@ -5,18 +5,18 @@ Testing pfm
✔ | OK F W S | Context
⠏ | 0 | Exposit calculations ⠋ | 1 | Exposit calculations ⠙ | 2 | Exposit calculations ⠹ | 3 | Exposit calculations ⠸ | 4 | Exposit calculations ⠼ | 5 | Exposit calculations ⠴ | 6 | Exposit calculations ⠦ | 7 | Exposit calculations ✔ | 7 | Exposit calculations
⠏ | 0 | Geometric mean calculation ⠋ | 1 | Geometric mean calculation ⠙ | 2 | Geometric mean calculation ⠹ | 3 | Geometric mean calculation ⠸ | 4 | Geometric mean calculation ⠼ | 5 | Geometric mean calculation ⠴ | 6 | Geometric mean calculation ✔ | 6 | Geometric mean calculation
- ⠏ | 0 | Check max_twa for parent mkinfit models against analytical solutions ⠋ | 1 | Check max_twa for parent mkinfit models against analytical solutions ✔ | 1 | Check max_twa for parent mkinfit models against analytical solutions [1.0 s]
+ ⠏ | 0 | Check max_twa for parent mkinfit models against analytical solutions ⠋ | 1 | Check max_twa for parent mkinfit models against analytical solutions ✔ | 1 | Check max_twa for parent mkinfit models against analytical solutions [2.0 s]
⠏ | 0 | Simple PEC sediment calculations ⠋ | 1 | Simple PEC sediment calculations ✔ | 1 | Simple PEC sediment calculations
⠏ | 0 | Simple PEC soil calculations ⠋ | 1 | Simple PEC soil calculations ⠙ | 2 | Simple PEC soil calculations ⠹ | 3 | Simple PEC soil calculations ⠸ | 4 | Simple PEC soil calculations ⠼ | 5 | Simple PEC soil calculations ⠴ | 6 | Simple PEC soil calculations ⠦ | 7 | Simple PEC soil calculations ⠧ | 8 | Simple PEC soil calculations ⠇ | 9 | Simple PEC soil calculations ⠏ | 10 | Simple PEC soil calculations ⠋ | 11 | Simple PEC soil calculations ⠙ | 12 | Simple PEC soil calculations ⠹ | 13 | Simple PEC soil calculations ⠸ | 14 | Simple PEC soil calculations ⠼ | 15 | Simple PEC soil calculations ⠴ | 16 | Simple PEC soil calculations ⠦ | 17 | Simple PEC soil calculations ✔ | 17 | Simple PEC soil calculations [0.2 s]
⠏ | 0 | Simple PEC surface water calculations with drift entry ⠋ | 1 | Simple PEC surface water calculations with drift entry ⠙ | 2 | Simple PEC surface water calculations with drift entry ✔ | 2 | Simple PEC surface water calculations with drift entry
⠏ | 0 | Actual and time weighted average concentrations for SFO kinetics ⠋ | 1 | Actual and time weighted average concentrations for SFO kinetics ✔ | 1 | Actual and time weighted average concentrations for SFO kinetics
⠏ | 0 | FOCUS Step 1 calculations ⠋ | 1 | FOCUS Step 1 calculations ⠙ | 2 | FOCUS Step 1 calculations ⠹ | 3 | FOCUS Step 1 calculations ⠸ | 4 | FOCUS Step 1 calculations ⠼ | 5 | FOCUS Step 1 calculations ⠴ | 6 | FOCUS Step 1 calculations ⠦ | 7 | FOCUS Step 1 calculations ⠧ | 8 | FOCUS Step 1 calculations ⠇ | 9 | FOCUS Step 1 calculations ✔ | 9 | FOCUS Step 1 calculations [0.1 s]
⠏ | 0 | FOCUS Steps 12 input files ⠋ | 1 | FOCUS Steps 12 input files ⠙ | 2 | FOCUS Steps 12 input files ⠹ | 3 | FOCUS Steps 12 input files ⠸ | 4 | FOCUS Steps 12 input files ⠼ | 5 | FOCUS Steps 12 input files ⠴ | 6 | FOCUS Steps 12 input files ⠦ | 7 | FOCUS Steps 12 input files ⠧ | 8 | FOCUS Steps 12 input files ✔ | 8 | FOCUS Steps 12 input files
- ⠏ | 0 | Read and analyse TOXSWA cwa files ⠋ | 1 | Read and analyse TOXSWA cwa files ⠙ | 2 | Read and analyse TOXSWA cwa files ⠹ | 3 | Read and analyse TOXSWA cwa files ⠸ | 4 | Read and analyse TOXSWA cwa files ⠼ | 5 | Read and analyse TOXSWA cwa files ⠴ | 6 | Read and analyse TOXSWA cwa files ⠦ | 7 | Read and analyse TOXSWA cwa files ✔ | 7 | Read and analyse TOXSWA cwa files [5.5 s]
+ ⠏ | 0 | Read and analyse TOXSWA cwa files ⠋ | 1 | Read and analyse TOXSWA cwa files ⠙ | 2 | Read and analyse TOXSWA cwa files ⠹ | 3 | Read and analyse TOXSWA cwa files ⠸ | 4 | Read and analyse TOXSWA cwa files ⠼ | 5 | Read and analyse TOXSWA cwa files ⠴ | 6 | Read and analyse TOXSWA cwa files ⠦ | 7 | Read and analyse TOXSWA cwa files ✔ | 7 | Read and analyse TOXSWA cwa files [5.6 s]
⠏ | 0 | UK drainage PEC calculations ⠋ | 1 | UK drainage PEC calculations ⠙ | 2 | UK drainage PEC calculations ⠹ | 3 | UK drainage PEC calculations ⠸ | 4 | UK drainage PEC calculations ⠼ | 5 | UK drainage PEC calculations ⠴ | 6 | UK drainage PEC calculations ⠦ | 7 | UK drainage PEC calculations ⠧ | 8 | UK drainage PEC calculations ⠇ | 9 | UK drainage PEC calculations ⠏ | 10 | UK drainage PEC calculations ⠋ | 11 | UK drainage PEC calculations ⠙ | 12 | UK drainage PEC calculations ✔ | 12 | UK drainage PEC calculations
══ Results ═════════════════════════════════════════════════════════════════════════════════════════
-Duration: 7.0 s
+Duration: 8.0 s
OK: 71
Failed: 0

Contact - Imprint