aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Ranke <jranke@uni-bremen.de>2020-12-16 19:19:16 +0100
committerJohannes Ranke <jranke@uni-bremen.de>2020-12-16 19:19:16 +0100
commit22f21badb2733bc6b1d4e1d08ab1afc5ff383b07 (patch)
tree24d5e291036b099c003fbd34ebcad80523faa75d
parent490b11e36ad5ccbb549d664d385b01dd8b328fef (diff)
and update docs
-rw-r--r--docs/dev/pkgdown.yml2
-rw-r--r--docs/dev/reference/D24_2014.html37
-rw-r--r--docs/dev/reference/Rplot001.pngbin19395 -> 1011 bytes
-rw-r--r--man/D24_2014.Rd2
4 files changed, 19 insertions, 22 deletions
diff --git a/docs/dev/pkgdown.yml b/docs/dev/pkgdown.yml
index a106449f..afb417f7 100644
--- a/docs/dev/pkgdown.yml
+++ b/docs/dev/pkgdown.yml
@@ -10,7 +10,7 @@ articles:
web_only/NAFTA_examples: NAFTA_examples.html
web_only/benchmarks: benchmarks.html
web_only/compiled_models: compiled_models.html
-last_built: 2020-12-16T17:28Z
+last_built: 2020-12-16T18:19Z
urls:
reference: https://pkgdown.jrwb.de/mkin/reference
article: https://pkgdown.jrwb.de/mkin/articles
diff --git a/docs/dev/reference/D24_2014.html b/docs/dev/reference/D24_2014.html
index 5ebf664e..c841b68c 100644
--- a/docs/dev/reference/D24_2014.html
+++ b/docs/dev/reference/D24_2014.html
@@ -126,7 +126,7 @@ constrained by data protection regulations." />
<ul class="nav navbar-nav navbar-right">
<li>
<a href="https://github.com/jranke/mkin/">
- <span class="fab fa fab fa-github fa-lg"></span>
+ <span class="fab fa-github fa-lg"></span>
</a>
</li>
@@ -220,25 +220,22 @@ specific pieces of information in the comments.</p>
#&gt; 13 365 6.3</div><div class='input'><span class='va'>m_D24</span> <span class='op'>=</span> <span class='fu'><a href='mkinmod.html'>mkinmod</a></span><span class='op'>(</span>D24 <span class='op'>=</span> <span class='fu'><a href='mkinmod.html'>mkinsub</a></span><span class='op'>(</span><span class='st'>"SFO"</span>, to <span class='op'>=</span> <span class='st'>"DCP"</span><span class='op'>)</span>,
DCP <span class='op'>=</span> <span class='fu'><a href='mkinmod.html'>mkinsub</a></span><span class='op'>(</span><span class='st'>"SFO"</span>, to <span class='op'>=</span> <span class='st'>"DCA"</span><span class='op'>)</span>,
DCA <span class='op'>=</span> <span class='fu'><a href='mkinmod.html'>mkinsub</a></span><span class='op'>(</span><span class='st'>"SFO"</span><span class='op'>)</span><span class='op'>)</span>
-</div><div class='output co'>#&gt; <span class='message'>Temporary DLL for differentials generated and loaded</span></div><div class='input'><span class='fu'><a href='https://rdrr.io/r/base/print.html'>print</a></span><span class='op'>(</span><span class='va'>D24_2014</span><span class='op'>)</span>
-</div><div class='output co'>#&gt; &lt;mkindsg&gt; holding 5 mkinds objects
-#&gt; Title $title: Aerobic soil degradation data on 2,4-D from the EU assessment in 2014
-#&gt; Occurrene of observed compounds $observed_n:
-#&gt; D24 DCP DCA
-#&gt; 5 4 4
-#&gt; Meta information $meta:
-#&gt; study usda_soil_type study_moisture_ref_type rel_moisture
-#&gt; 1 Cohen 1991 Silt loam &lt;NA&gt; NA
-#&gt; 2 Liu and Adelfinskaya 2011 Silt loam pF1 0.5
-#&gt; 3 Liu and Adelfinskaya 2011 Loam pF1 0.5
-#&gt; 4 Liu and Adelfinskaya 2011 Loam pF1 0.5
-#&gt; 5 Liu and Adelfinskaya 2011 Loamy sand pF1 0.5
-#&gt; temperature
-#&gt; 1 25
-#&gt; 2 20
-#&gt; 3 20
-#&gt; 4 20
-#&gt; 5 20</div></pre>
+</div><div class='output co'>#&gt; <span class='message'>Temporary DLL for differentials generated and loaded</span></div><div class='input'><span class='fu'><a href='https://rdrr.io/r/base/print.html'>print</a></span><span class='op'>(</span><span class='va'>m_D24</span><span class='op'>)</span>
+</div><div class='output co'>#&gt; &lt;mkinmod&gt; model generated with
+#&gt; Use of formation fractions $use_of_ff: max
+#&gt; Specification $spec:
+#&gt; $D24
+#&gt; $type: SFO; $to: DCP; $sink: TRUE
+#&gt; $DCP
+#&gt; $type: SFO; $to: DCA; $sink: TRUE
+#&gt; $DCA
+#&gt; $type: SFO; $sink: TRUE
+#&gt; Coefficient matrix $coefmat available
+#&gt; Compiled model $cf available
+#&gt; Differential equations:
+#&gt; d_D24/dt = - k_D24 * D24
+#&gt; d_DCP/dt = + f_D24_to_DCP * k_D24 * D24 - k_DCP * DCP
+#&gt; d_DCA/dt = + f_DCP_to_DCA * k_DCP * DCP - k_DCA * DCA</div></pre>
</div>
<div class="col-md-3 hidden-xs hidden-sm" id="pkgdown-sidebar">
<nav id="toc" data-toggle="toc" class="sticky-top">
diff --git a/docs/dev/reference/Rplot001.png b/docs/dev/reference/Rplot001.png
index bca41e2c..17a35806 100644
--- a/docs/dev/reference/Rplot001.png
+++ b/docs/dev/reference/Rplot001.png
Binary files differ
diff --git a/man/D24_2014.Rd b/man/D24_2014.Rd
index 90fde27b..d30666ac 100644
--- a/man/D24_2014.Rd
+++ b/man/D24_2014.Rd
@@ -40,6 +40,6 @@ print(D24_2014$ds[[1]], data = TRUE)
m_D24 = mkinmod(D24 = mkinsub("SFO", to = "DCP"),
DCP = mkinsub("SFO", to = "DCA"),
DCA = mkinsub("SFO"))
-print(D24_2014)
+print(m_D24)
}
\keyword{datasets}

Contact - Imprint