From db9ae6a0c9cecb92048fde6f06af1da183c09b5f Mon Sep 17 00:00:00 2001
From: Johannes Ranke
Date: Thu, 19 Nov 2020 15:41:24 +0100
Subject: Depend on parallel, doc improvements
By depending on parallel instead of importing it, functions to set up
and stop a cluster are always available when mkin is loaded.
The use of multicore processing in mmkin on Windows is now documented in
the help file, which brings mkin closer to a version 1.0 #9.
---
docs/dev/reference/experimental_data_for_UBA.html | 85 ++++++++++++-----------
1 file changed, 45 insertions(+), 40 deletions(-)
(limited to 'docs/dev/reference/experimental_data_for_UBA.html')
diff --git a/docs/dev/reference/experimental_data_for_UBA.html b/docs/dev/reference/experimental_data_for_UBA.html
index d49924c7..cd098b7d 100644
--- a/docs/dev/reference/experimental_data_for_UBA.html
+++ b/docs/dev/reference/experimental_data_for_UBA.html
@@ -60,11 +60,11 @@ Datasets 3 and 4 are from the Renewal Assessment Report (RAR) for isofetamid
Dataset 5 is from the Renewal Assessment Report (RAR) for ethofumesate
(Austria, 2015, p. 16).
Datasets 6 to 10 are from the Renewal Assessment Report (RAR) for glyphosate
- (Germany, 2013a, pages 8, 28, 50, 51). For the initial sampling,
+ (Germany, 2013, pages 8, 28, 50, 51). For the initial sampling,
the residues given for the metabolite were added to the parent
value, following the recommendation of the FOCUS kinetics workgroup.
Dataset 11 is from the Renewal Assessment Report (RAR) for 2,4-D
- (Germany, 2013b, p. 644). Values reported as zero were set to NA, with
+ (Hellas, 2013, p. 644). Values reported as zero were set to NA, with
the exception of the day three sampling of metabolite A2, which was set
to one half of the LOD reported to be 1% AR.
Dataset 12 is from the Renewal Assessment Report (RAR) for thifensulfuron-methyl
@@ -100,7 +100,7 @@ Dataset 12 is from the Renewal Assessment Report (RAR) for thifensulfuron-methyl
mkin
- 0.9.50.3
+ 0.9.50.4
@@ -148,7 +148,7 @@ Dataset 12 is from the Renewal Assessment Report (RAR) for thifensulfuron-methyl
-
-
+
@@ -192,24 +192,24 @@ Dataset 12 is from the Renewal Assessment Report (RAR) for thifensulfuron-methyl
Dataset 5 is from the Renewal Assessment Report (RAR) for ethofumesate
(Austria, 2015, p. 16).
Datasets 6 to 10 are from the Renewal Assessment Report (RAR) for glyphosate
- (Germany, 2013a, pages 8, 28, 50, 51). For the initial sampling,
+ (Germany, 2013, pages 8, 28, 50, 51). For the initial sampling,
the residues given for the metabolite were added to the parent
value, following the recommendation of the FOCUS kinetics workgroup.
Dataset 11 is from the Renewal Assessment Report (RAR) for 2,4-D
- (Germany, 2013b, p. 644). Values reported as zero were set to NA, with
+ (Hellas, 2013, p. 644). Values reported as zero were set to NA, with
the exception of the day three sampling of metabolite A2, which was set
to one half of the LOD reported to be 1% AR.
Dataset 12 is from the Renewal Assessment Report (RAR) for thifensulfuron-methyl
(United Kingdom, 2014, p. 81).
- experimental_data_for_UBA_2019
+ experimental_data_for_UBA_2019
A list containing twelve datasets as an R6 class defined by mkinds
,
- each containing, among others, the following components
+ each containing, among others, the following components
title
The name of the dataset, e.g. Soil 1
data
A data frame with the data in the form expected by mkinfit
@@ -227,9 +227,9 @@ Dataset 12 is from the Renewal Assessment Report (RAR) for thifensulfuron-methyl
Registration” Report of the FOCUS Work Group on Degradation Kinetics,
Version 1.1, 18 December 2014
http://esdac.jrc.ec.europa.eu/projects/degradation-kinetics
-Germany (2013a). Renewal Assessment Report Glyphosate Volume 3 Annex B.8: Environmental Fate
+
Germany (2013). Renewal Assessment Report Glyphosate Volume 3 Annex B.8: Environmental Fate
and Behaviour
-Germany (2013b). Renewal Assessment Report 2,4-D Volume 3 Annex B.8: Fate and behaviour in the
+
Hellas (2013). Renewal Assessment Report 2,4-D Volume 3 Annex B.8: Fate and behaviour in the
environment
Ranke (2019) Documentation of results obtained for the error model expertise
written for the German Umweltbundesamt.
@@ -241,35 +241,40 @@ Dataset 12 is from the Renewal Assessment Report (RAR) for thifensulfuron-methyl
#> Successfully compiled differential equation model from auto-generated C code.
#> Successfully compiled differential equation model from auto-generated C code.
#> Successfully compiled differential equation model from auto-generated C code.
#> Successfully compiled differential equation model from auto-generated C code.
-# }
+sfo_sfo <- mkinmod(
+ parent = mkinsub("SFO", to = "A1"),
+ A1 = mkinsub("SFO"),
+ use_of_ff = "max"
+)
+#> Successfully compiled differential equation model from auto-generated C code.
#> Successfully compiled differential equation model from auto-generated C code.
#> Successfully compiled differential equation model from auto-generated C code.
#> Successfully compiled differential equation model from auto-generated C code.
+# }
--
cgit v1.2.1