aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Ranke <jranke@uni-bremen.de>2017-11-03 11:18:10 +0100
committerJohannes Ranke <jranke@uni-bremen.de>2017-11-03 11:18:10 +0100
commiteb4465035dd44907eae3ea0340221316b7cfca12 (patch)
tree0bd9534b190cffd63fbf7a02f8dbe6b244cf6dfc
parent06b528f0c19ca9f7a311612c0e9ae80c0d0c1d3f (diff)
Also return runoff percentages
-rw-r--r--ChangeLog6
-rw-r--r--DESCRIPTION2
-rw-r--r--R/PEC_sw_exposit_runoff.R9
-rw-r--r--man/PEC_sw_exposit_runoff.Rd1
4 files changed, 13 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index c9c1ce8..e70d9ec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+commit 06b528f0c19ca9f7a311612c0e9ae80c0d0c1d3f
+Author: Johannes Ranke <jranke@uni-bremen.de>
+Date: 2017-10-27 18:15:29 +0200
+
+ Exposit runoff calculations for surface water
+
commit 2cd464455a22791c0450ada45a0e0128c637fade
Author: Johannes Ranke <jranke@uni-bremen.de>
Date: 2017-10-23 15:19:03 +0200
diff --git a/DESCRIPTION b/DESCRIPTION
index a7becb0..bf18091 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -2,7 +2,7 @@ Package: pfm
Type: Package
Title: Utilities for Pesticide Fate Modelling
Version: 0.4-5
-Date: 2017-10-27
+Date: 2017-10-28
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 618b532..3370088 100644
--- a/R/PEC_sw_exposit_runoff.R
+++ b/R/PEC_sw_exposit_runoff.R
@@ -69,6 +69,7 @@ perc_runoff_reduction_exposit <- list(
#' @param V_event The unreduced runoff volume, equivalent to 10 mm precipitation on 1 ha
#' @return A list containing the following components
#' \describe{
+#' \item{perc_runoff}{The runoff percentages for dissolved and bound substance}
#' \item{Input}{A matrix containing dissolved and bound input for the different distances}
#' \item{PEC_sw_runoff}{A matrix containing PEC values for dissolved and bound substance
#' for the different distances. If the rate was given in g/ha, the PECsw are in microg/L.}
@@ -111,9 +112,9 @@ PEC_sw_exposit_runoff <- function(rate, Koc, DT50 = Inf, t_runoff = 3,
PEC_sw_runoff <- 1000 * runoff_input / V_flowing_ditch_runoff
- result <- list(Rate = rate,
- Koc = Koc,
- Input = runoff_input,
- PEC_sw_runoff = PEC_sw_runoff)
+ result <- list(
+ perc_runoff = 100 * f_runoff,
+ runoff = runoff_input,
+ PEC_sw_runoff = PEC_sw_runoff)
return(result)
}
diff --git a/man/PEC_sw_exposit_runoff.Rd b/man/PEC_sw_exposit_runoff.Rd
index 7ed18b6..8405e34 100644
--- a/man/PEC_sw_exposit_runoff.Rd
+++ b/man/PEC_sw_exposit_runoff.Rd
@@ -30,6 +30,7 @@ PEC_sw_exposit_runoff(rate, Koc, DT50 = Inf, t_runoff = 3,
\value{
A list containing the following components
\describe{
+ \item{perc_runoff}{The runoff percentages for dissolved and bound substance}
\item{Input}{A matrix containing dissolved and bound input for the different distances}
\item{PEC_sw_runoff}{A matrix containing PEC values for dissolved and bound substance
for the different distances. If the rate was given in g/ha, the PECsw are in microg/L.}

Contact - Imprint