diff options
| author | Johannes Ranke <jranke@uni-bremen.de> | 2020-12-16 19:26:08 +0100 |
|---|---|---|
| committer | Johannes Ranke <jranke@uni-bremen.de> | 2020-12-16 19:26:08 +0100 |
| commit | f158185b8a7970c22b1feb04f96aa5a23047dd3d (patch) | |
| tree | 31b4f5e41e0b47a94224b49292321925f47fd7cd | |
| parent | 22f21badb2733bc6b1d4e1d08ab1afc5ff383b07 (diff) | |
And add the second candidate model
| -rw-r--r-- | R/D24_2014.R | 4 | ||||
| -rw-r--r-- | docs/dev/pkgdown.yml | 2 | ||||
| -rw-r--r-- | docs/dev/reference/D24_2014.html | 21 | ||||
| -rw-r--r-- | man/D24_2014.Rd | 4 |
4 files changed, 30 insertions, 1 deletions
diff --git a/R/D24_2014.R b/R/D24_2014.R index 0175a7f3..0a111e1c 100644 --- a/R/D24_2014.R +++ b/R/D24_2014.R @@ -28,4 +28,8 @@ #' DCP = mkinsub("SFO", to = "DCA"), #' DCA = mkinsub("SFO")) #' print(m_D24) +#' m_D24_2 = mkinmod(D24 = mkinsub("DFOP", to = "DCP"), +#' DCP = mkinsub("SFO", to = "DCA"), +#' DCA = mkinsub("SFO")) +#' print(m_D24_2) "D24_2014" diff --git a/docs/dev/pkgdown.yml b/docs/dev/pkgdown.yml index afb417f7..4dd05c5b 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-16T18:19Z +last_built: 2020-12-16T18:25Z 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 c841b68c..8160316f 100644 --- a/docs/dev/reference/D24_2014.html +++ b/docs/dev/reference/D24_2014.html @@ -235,6 +235,27 @@ specific pieces of information in the comments.</p> #> Differential equations: #> d_D24/dt = - k_D24 * D24 #> d_DCP/dt = + f_D24_to_DCP * k_D24 * D24 - k_DCP * DCP +#> d_DCA/dt = + f_DCP_to_DCA * k_DCP * DCP - k_DCA * DCA</div><div class='input'><span class='va'>m_D24_2</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'>"DFOP"</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'>#> <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_2</span><span class='op'>)</span> +</div><div class='output co'>#> <mkinmod> model generated with +#> Use of formation fractions $use_of_ff: max +#> Specification $spec: +#> $D24 +#> $type: DFOP; $to: DCP; $sink: TRUE +#> $DCP +#> $type: SFO; $to: DCA; $sink: TRUE +#> $DCA +#> $type: SFO; $sink: TRUE +#> Compiled model $cf available +#> Differential equations: +#> d_D24/dt = - ((k1 * g * exp(-k1 * time) + k2 * (1 - g) * exp(-k2 * +#> time)) / (g * exp(-k1 * time) + (1 - g) * exp(-k2 * time))) +#> * D24 +#> d_DCP/dt = + f_D24_to_DCP * ((k1 * g * exp(-k1 * time) + k2 * (1 - g) * +#> exp(-k2 * time)) / (g * exp(-k1 * time) + (1 - g) * exp(-k2 +#> * time))) * D24 - k_DCP * DCP #> 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"> diff --git a/man/D24_2014.Rd b/man/D24_2014.Rd index d30666ac..8d0e632c 100644 --- a/man/D24_2014.Rd +++ b/man/D24_2014.Rd @@ -41,5 +41,9 @@ m_D24 = mkinmod(D24 = mkinsub("SFO", to = "DCP"), DCP = mkinsub("SFO", to = "DCA"), DCA = mkinsub("SFO")) print(m_D24) +m_D24_2 = mkinmod(D24 = mkinsub("DFOP", to = "DCP"), + DCP = mkinsub("SFO", to = "DCA"), + DCA = mkinsub("SFO")) +print(m_D24_2) } \keyword{datasets} |