aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog15
-rw-r--r--DESCRIPTION2
-rw-r--r--R/PEC_sw_exposit_runoff.R14
-rw-r--r--man/PEC_sw_exposit_runoff.Rd6
-rw-r--r--man/perc_runoff_reduction_exposit.Rd2
5 files changed, 34 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index bc7597d..bd16f8c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+commit 67cd9e04caaf18a40231262c9033fb24e8bb2a66
+Author: Johannes Ranke <jranke@uni-bremen.de>
+Date: 2019-04-26 13:45:44 +0200
+
+ Formatting improvement for the online docs
+
+commit 45f540ef19fd2a2a80e3f3f72950933ed6396f0c
+Author: Johannes Ranke <jranke@uni-bremen.de>
+Date: 2019-04-26 13:33:27 +0200
+
+ Another take on completing the drift data
+
+ The R script I used yesterday got lost because I used the .Rd file
+ that got overwritten by roxygen later.
+
commit 451b332c8888bac8279340b086abb3b714ac3ae1
Author: Johannes Ranke <jranke@uni-bremen.de>
Date: 2019-04-25 11:50:35 +0200
diff --git a/DESCRIPTION b/DESCRIPTION
index 6272073..4747803 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -2,7 +2,7 @@ Package: pfm
Type: Package
Title: Utilities for Pesticide Fate Modelling
Version: 0.5.5
-Date: 2019-04-26
+Date: 2019-04-27
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/R/PEC_sw_exposit_runoff.R b/R/PEC_sw_exposit_runoff.R
index a9cbf07..22316bc 100644
--- a/R/PEC_sw_exposit_runoff.R
+++ b/R/PEC_sw_exposit_runoff.R
@@ -41,6 +41,8 @@ rownames(perc_runoff_exposit) <- Koc_classes
#' }
#' @source Excel 3.02 spreadsheet available from
#' \url{https://www.bvl.bund.de/EN/04_PlantProtectionProducts/03_Applicants/04_AuthorisationProcedure/08_Environment/ppp_environment_node.html}
+#'
+#' Agroscope version 3.01a with additional runoff factors for 3 m and 6 m buffer zones received from Muris Korkaric (not published)
#' @export
#' @examples
#' print(perc_runoff_reduction_exposit)
@@ -49,6 +51,11 @@ perc_runoff_reduction_exposit <- list(
dissolved = c(0, 40, 60, 80),
bound = c(0, 40, 85, 95),
row.names = c("No buffer", paste(c(5, 10, 20), "m"))),
+ "3.01a" = data.frame(
+ dissolved = c(0, 25, 40, 45, 60, 80),
+ bound = c(0, 7.1, 13.3, 15.9, 25.7, 48),
+ #bound = c(0, 30, 40, 55, 85, 95),
+ row.names = c("No buffer", paste(c(3, 5, 6, 10, 20), "m"))),
"2.0" = data.frame(
dissolved = c(0, 97.5),
bound = c(0, 97.5),
@@ -65,7 +72,9 @@ perc_runoff_reduction_exposit <- list(
#' @param Koc The sorption coefficient to soil organic carbon
#' @param DT50 The soil half-life in days
#' @param t_runoff The time between application and the runoff event, where degradation occurs, in days
-#' @param exposit_reduction_version The version of the reduction factors to be used
+#' @param exposit_reduction_version The version of the reduction factors to be used. "3.02" is the current
+#' version used in Germany, "3.01a" is the version with additional percentages for 3 m and 6 m buffer
+#' zones used in Switzerland.
#' @param V_ditch The volume of the ditch is assumed to be 1 m * 100 m * 30 cm = 30 m3
#' @param V_event The unreduced runoff volume, equivalent to 10 mm precipitation on 1 ha
#' @param dilution The dilution factor
@@ -82,8 +91,9 @@ perc_runoff_reduction_exposit <- list(
#' @seealso \code{\link{perc_runoff_exposit}} for runoff loss percentages and \code{\link{perc_runoff_reduction_exposit}} for runoff reduction percentages used
#' @examples
#' PEC_sw_exposit_runoff(500, Koc = 150)
+#' PEC_sw_exposit_runoff(600, Koc = 10000, DT50 = 195, exposit = "3.01a")
PEC_sw_exposit_runoff <- function(rate, interception = 0, Koc, DT50 = Inf, t_runoff = 3,
- exposit_reduction_version = c("3.02", "2.0"),
+ exposit_reduction_version = c("3.02", "3.01a", "2.0"),
V_ditch = 30, V_event = 100, dilution = 2)
{
k_deg <- log(2)/DT50
diff --git a/man/PEC_sw_exposit_runoff.Rd b/man/PEC_sw_exposit_runoff.Rd
index dee6bbf..13fae38 100644
--- a/man/PEC_sw_exposit_runoff.Rd
+++ b/man/PEC_sw_exposit_runoff.Rd
@@ -9,7 +9,7 @@ Excel 3.02 spreadsheet available from
}
\usage{
PEC_sw_exposit_runoff(rate, interception = 0, Koc, DT50 = Inf,
- t_runoff = 3, exposit_reduction_version = c("3.02", "2.0"),
+ t_runoff = 3, exposit_reduction_version = c("3.02", "3.01a", "2.0"),
V_ditch = 30, V_event = 100, dilution = 2)
}
\arguments{
@@ -23,7 +23,9 @@ PEC_sw_exposit_runoff(rate, interception = 0, Koc, DT50 = Inf,
\item{t_runoff}{The time between application and the runoff event, where degradation occurs, in days}
-\item{exposit_reduction_version}{The version of the reduction factors to be used}
+\item{exposit_reduction_version}{The version of the reduction factors to be used. "3.02" is the current
+version used in Germany, "3.01a" is the version with additional percentages for 3 m and 6 m buffer
+zones used in Switzerland.}
\item{V_ditch}{The volume of the ditch is assumed to be 1 m * 100 m * 30 cm = 30 m3}
diff --git a/man/perc_runoff_reduction_exposit.Rd b/man/perc_runoff_reduction_exposit.Rd
index 644653e..7cb8f23 100644
--- a/man/perc_runoff_reduction_exposit.Rd
+++ b/man/perc_runoff_reduction_exposit.Rd
@@ -15,6 +15,8 @@ from which the values were taken.
\source{
Excel 3.02 spreadsheet available from
\url{https://www.bvl.bund.de/EN/04_PlantProtectionProducts/03_Applicants/04_AuthorisationProcedure/08_Environment/ppp_environment_node.html}
+
+ Agroscope version 3.01a with additional runoff factors for 3 m and 6 m buffer zones received from Muris Korkaric (not published)
}
\usage{
perc_runoff_reduction_exposit

Contact - Imprint