Update docs and logs

5 files changed, 47 insertions, 24 deletions

diff --git a/ChangeLog b/ChangeLog
index 6767e33..23ac2c6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+commit 6e3917d814500d5af43702b4d4be1e44cefc00d4
+Author: Johannes Ranke <jranke@uni-bremen.de>
+Date:   2021-11-18 11:22:44 +0100
+
+    Update README after changing default branch to main
+
+commit e0029129aec8b92d58aea8552006002c5fe409f5
+Author: Johannes Ranke <jranke@uni-bremen.de>
+Date:   2021-02-10 09:29:33 +0100
+
+    Treat Kfoc = 0 like Exposit in runoff calcs
+
+commit c97a4f5a9fe30ffc3321681a97eea167cfc427b5
+Author: Johannes Ranke <jranke@uni-bremen.de>
+Date:   2020-07-23 12:22:25 +0200
+
+    PEC_sw_drift: Rautmann formula (1 app, Ackerbau)
+    
+    This makes it possible to calculate drift PECsw for other distances than
+    present in the JKI data or the Rautmann paper.
+
 commit 90fa42c86596c85168931148bf8d5fa014fa7794
 Author: Johannes Ranke <jranke@uni-bremen.de>
 Date:   2020-07-23 10:51:39 +0200
diff --git a/DESCRIPTION b/DESCRIPTION
index ef5c7a9..bb7e74d 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -2,7 +2,7 @@ Package: pfm
 Type: Package
 Title: Utilities for Pesticide Fate Modelling
 Version: 0.5.8
-Date: 2020-07-23
+Date: 2021-11-19
 Authors@R: person("Johannes Ranke", email = "jranke@uni-bremen.de",
                   role = c("aut", "cre", "cph"),
                   comment = c(ORCID = "0000-0003-4371-6538"))
@@ -32,4 +32,4 @@ LazyLoad: yes
 LazyData: yes
 Encoding: UTF-8
 URL: https://pkgdown.jrwb.de/pfm
-RoxygenNote: 7.1.1
+RoxygenNote: 7.1.2
diff --git a/build.log b/build.log
index 5dccfd7..7046cc0 100644
--- a/build.log
+++ b/build.log
@@ -7,6 +7,10 @@ Removed empty directory ‘pfm/inst/testdata/SwashProjects/Project_1/MACRO’
 Removed empty directory ‘pfm/inst/testdata/SwashProjects/Project_1’
 Removed empty directory ‘pfm/inst/testdata/SwashProjects’
   NB: this package now depends on R (>= 3.5.0)
-  WARNING: Added dependency on R >= 3.5.0 because serialized objects in  serialize/load version 3 cannot be read in older versions of R.  File(s) containing such objects:  ‘pfm/data/EFSA_GW_interception_2014.RData’  WARNING: Added dependency on R >= 3.5.0 because serialized objects in  serialize/load version 3 cannot be read in older versions of R.  File(s) containing such objects: ‘pfm/data/EFSA_washoff_2017.RData’
+  WARNING: Added dependency on R >= 3.5.0 because serialized objects in
+  serialize/load version 3 cannot be read in older versions of R.
+  File(s) containing such objects:
+    ‘pfm/data/EFSA_GW_interception_2014.RData’
+    ‘pfm/data/EFSA_washoff_2017.RData’
 * building ‘pfm_0.5.8.tar.gz’
 
diff --git a/man/perc_runoff_reduction_exposit.Rd b/man/perc_runoff_reduction_exposit.Rd
index 0aa50c1..93016b7 100644
--- a/man/perc_runoff_reduction_exposit.Rd
+++ b/man/perc_runoff_reduction_exposit.Rd
@@ -17,7 +17,7 @@ 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).
   The variant 3.01a2 was introduced for consistency with previous calculations performed by Agroscope for a 3 m buffer zone.
 }
diff --git a/test.log b/test.log
index 07617f9..3ee18e1 100644
--- a/test.log
+++ b/test.log
@@ -1,25 +1,23 @@
-Loading pfm
+ℹ Loading pfm
 Loading required package: R6
 Loading required package: mkin
-Testing pfm
-✔ |  OK F W S | Context
-✔ |   1       | Simple PEC sediment calculations
-✔ |  17       | Simple PEC soil calculations [0.2 s]
-✔ |   6       | Simple PEC surface water calculations with drift entry
-✔ |   1       | Actual and time weighted average concentrations for SFO kinetics
-✔ |   7       | Read and analyse TOXSWA cwa files [6.0 s]
-✔ |  12       | UK drainage PEC calculations
-✔ |   7       | Exposit calculations
-✔ |   6       | Geometric mean calculation
-✔ |   1       | Check max_twa for parent mkinfit models against analytical solutions [0.9 s]
-✔ |  11       | Processing of residue series
-✔ |   9       | FOCUS Step 1 calculations [0.1 s]
-✔ |   8       | FOCUS Steps 12 input files
+Loading required package: parallel
+ℹ Testing pfm
+✔ | F W S  OK | Context
+✔ |         7 | Exposit calculations [0.1s]
+✔ |         6 | Geometric mean calculation
+✔ |         1 | Check max_twa for parent mkinfit models against analytical solutions [0.8s]
+✔ |         1 | Simple PEC sediment calculations
+✔ |        17 | Simple PEC soil calculations [0.2s]
+✔ |         6 | Simple PEC surface water calculations with drift entry
+✔ |        11 | Processing of residue series
+✔ |         1 | Actual and time weighted average concentrations for SFO kinetics
+✔ |         9 | FOCUS Step 1 calculations [0.1s]
+✔ |         8 | FOCUS Steps 12 input files
+✔ |         7 | Read and analyse TOXSWA cwa files [5.8s]
+✔ |        12 | UK drainage PEC calculations
 
 ══ Results ═════════════════════════════════════════════════════════════════════════════════════════
-Duration: 7.5 s
+Duration: 7.3 s
 
-OK:       86
-Failed:   0
-Warnings: 0
-Skipped:  0
+[ FAIL 0 | WARN 0 | SKIP 0 | PASS 86 ]