diff options
| author | Johannes Ranke <jranke@uni-bremen.de> | 2016-12-12 21:24:24 +0100 |
|---|---|---|
| committer | Johannes Ranke <jranke@uni-bremen.de> | 2016-12-12 21:24:24 +0100 |
| commit | e51e063564bffcb75dbb6ab7a364704c8d8e992e (patch) | |
| tree | 971e30cab2ceb7a85e9fbe8957527a8c851cbd91 | |
| parent | 9124e0f7d673c65584c1b2f838a3b944ea89c31d (diff) | |
Fix reading .out for acronyms containing numbers
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | DESCRIPTION | 4 | ||||
| -rw-r--r-- | R/TOXSWA_cwa.R | 2 | ||||
| -rw-r--r-- | man/PEC_sw_drift.Rd | 2 | ||||
| -rw-r--r-- | man/PEC_sw_sed.Rd | 2 |
5 files changed, 17 insertions, 5 deletions
@@ -1,3 +1,15 @@ +commit 9124e0f7d673c65584c1b2f838a3b944ea89c31d +Author: Johannes Ranke <jranke@uni-bremen.de> +Date: 2016-10-13 17:49:18 +0200 + + Add drat target, remove unmaintained usage hints + +commit 12a31f4c130c551f82232d9ef7dfb608bd52c53f +Author: Johannes Ranke <jranke@uni-bremen.de> +Date: 2016-09-27 23:00:48 +0200 + + Reorganise repository using standard package layout + commit 0d958ab6f84b569b5437f231c56004890c4ae23b Author: Johannes Ranke <jranke@uni-bremen.de> Date: 2016-09-27 17:50:34 +0200 diff --git a/DESCRIPTION b/DESCRIPTION index fc76480..5c3d779 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Package: pfm Type: Package Title: Utilities for Pesticide Fate Modelling -Version: 0.3-8 -Date: 2016-09-27 +Version: 0.3-9 +Date: 2016-12-12 Authors@R: person("Johannes Ranke", email = "jranke@uni-bremen.de", role = c("aut", "cre", "cph")) Description: Utilities for simple calculations of predicted environmental diff --git a/R/TOXSWA_cwa.R b/R/TOXSWA_cwa.R index c5ddce9..45189f8 100644 --- a/R/TOXSWA_cwa.R +++ b/R/TOXSWA_cwa.R @@ -236,7 +236,7 @@ TOXSWA_cwa <- R6Class("TOXSWA_cwa", } else { # Get the substance name(s) sub_lines <- grep(".*0.000.*ConLiqWatLayCur_", outfile[1:50], value = TRUE) - substances <- gsub(".*ConLiqWatLayCur_(.*?) *[0-9].*", "\\1", sub_lines) + substances <- gsub(".*ConLiqWatLayCur_(.*?) +[0-9].*", "\\1", sub_lines) if (!substance %in% c("parent", substances)) { stop("No data for substance ", substance, " present in the .out file.") } diff --git a/man/PEC_sw_drift.Rd b/man/PEC_sw_drift.Rd index 20fa921..ae27e82 100644 --- a/man/PEC_sw_drift.Rd +++ b/man/PEC_sw_drift.Rd @@ -6,7 +6,7 @@ \usage{ PEC_sw_drift(rate, applications = 1, water_depth = 30, drift_percentages = NULL, drift_data = "JKI", crop = "Ackerbau", - distances = c(1, 5, 10, 20), rate_units = "g/ha", PEC_units = "µg/L") + distances = c(1, 5, 10, 20), rate_units = "g/ha", PEC_units = "<U+00B5>g/L") } \arguments{ \item{rate}{Application rate in units specified below} diff --git a/man/PEC_sw_sed.Rd b/man/PEC_sw_sed.Rd index 3140eb0..d0e2ec6 100644 --- a/man/PEC_sw_sed.Rd +++ b/man/PEC_sw_sed.Rd @@ -7,7 +7,7 @@ water concentrations} \usage{ PEC_sw_sed(PEC_sw, percentage = 100, method = "percentage", sediment_depth = 5, water_depth = 30, sediment_density = 1.3, - PEC_sed_units = c("µg/kg", "mg/kg")) + PEC_sed_units = c("<U+00B5>g/kg", "mg/kg")) } \arguments{ \item{PEC_sw}{Numeric vector or matrix of surface water concentrations in µg/L for |