From 069824057caf8e57507852b858a7ecfd8e13e49a Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Tue, 14 May 2019 12:41:16 +0200 Subject: Version bump and doc update --- ChangeLog | 9 +++++++++ DESCRIPTION | 2 +- build.log | 2 +- docs/authors.html | 2 +- docs/index.html | 2 +- docs/reference/FOCUS_GW_scenarios_2012.html | 2 +- docs/reference/FOCUS_Step_12_scenarios.html | 2 +- docs/reference/FOMC_actual_twa.html | 2 +- docs/reference/GUS.html | 2 +- docs/reference/PEC_FOMC_accu_rel.html | 2 +- docs/reference/PEC_soil.html | 2 +- docs/reference/PEC_soil_mets.html | 2 +- docs/reference/PEC_sw_drainage_UK.html | 2 +- docs/reference/PEC_sw_drift.html | 2 +- docs/reference/PEC_sw_exposit_drainage.html | 2 +- docs/reference/PEC_sw_exposit_runoff.html | 2 +- docs/reference/PEC_sw_focus.html | 2 +- docs/reference/PEC_sw_sed.html | 2 +- docs/reference/SFO_actual_twa.html | 2 +- docs/reference/SSLRC_mobility_classification.html | 2 +- docs/reference/TOXSWA_cwa.html | 2 +- docs/reference/chent_focus_sw.html | 2 +- docs/reference/drift_data_JKI.html | 2 +- docs/reference/endpoint.html | 2 +- docs/reference/geomean.html | 2 +- docs/reference/get_vertex.html | 2 +- docs/reference/index.html | 2 +- docs/reference/max_twa.html | 2 +- docs/reference/one_box.html | 2 +- docs/reference/perc_runoff_exposit.html | 2 +- docs/reference/perc_runoff_reduction_exposit.html | 2 +- docs/reference/pfm_degradation.html | 2 +- docs/reference/plot.TOXSWA_cwa.html | 2 +- docs/reference/plot.one_box.html | 2 +- docs/reference/read.TOXSWA_cwa.html | 2 +- docs/reference/sawtooth.html | 2 +- docs/reference/soil_scenario_data_EFSA_2015.html | 2 +- docs/reference/soil_scenario_data_EFSA_2017.html | 2 +- docs/reference/twa.html | 2 +- 39 files changed, 47 insertions(+), 38 deletions(-) diff --git a/ChangeLog b/ChangeLog index e2942c0..c9594ed 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +commit 41f3c867008c24b69a9bb0e5c7c084969d46bebd +Author: Johannes Ranke +Date: 2019-05-14 12:33:21 +0200 + + Add Exposit version 3.01a2 for runoff calculations + + At the request of Muris Korkaric (Agroscope). This is for 3 m buffer + only and provides consistency with earlier calculations + commit 7b11b5d0da29447df026002af3ae5283510fdae9 Author: Johannes Ranke Date: 2019-04-29 13:03:00 +0200 diff --git a/DESCRIPTION b/DESCRIPTION index 5162c06..5fd0381 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: pfm Type: Package Title: Utilities for Pesticide Fate Modelling -Version: 0.5.5 +Version: 0.5.6 Date: 2019-05-14 Authors@R: person("Johannes Ranke", email = "jranke@uni-bremen.de", role = c("aut", "cre", "cph"), diff --git a/build.log b/build.log index b4db6d8..6f7f78c 100644 --- a/build.log +++ b/build.log @@ -7,5 +7,5 @@ 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’ * looking to see if a ‘data/datalist’ file should be added -* building ‘pfm_0.5.5.tar.gz’ +* building ‘pfm_0.5.6.tar.gz’ diff --git a/docs/authors.html b/docs/authors.html index c6b44d7..fbdd9e7 100644 --- a/docs/authors.html +++ b/docs/authors.html @@ -60,7 +60,7 @@ pfm - 0.5.5 + 0.5.6 diff --git a/docs/index.html b/docs/index.html index dc477c0..ee8a376 100644 --- a/docs/index.html +++ b/docs/index.html @@ -32,7 +32,7 @@ pfm - 0.5.5 + 0.5.6 diff --git a/docs/reference/FOCUS_GW_scenarios_2012.html b/docs/reference/FOCUS_GW_scenarios_2012.html index 43af2f5..4fbb601 100644 --- a/docs/reference/FOCUS_GW_scenarios_2012.html +++ b/docs/reference/FOCUS_GW_scenarios_2012.html @@ -64,7 +64,7 @@ soil definitions are from page 46ff. from FOCUS (2012)." /> pfm - 0.5.5 + 0.5.6 diff --git a/docs/reference/FOCUS_Step_12_scenarios.html b/docs/reference/FOCUS_Step_12_scenarios.html index 6eee86b..e9bc762 100644 --- a/docs/reference/FOCUS_Step_12_scenarios.html +++ b/docs/reference/FOCUS_Step_12_scenarios.html @@ -64,7 +64,7 @@ The text file is not included in the package as its licence is not clear." /> pfm - 0.5.5 + 0.5.6 diff --git a/docs/reference/FOMC_actual_twa.html b/docs/reference/FOMC_actual_twa.html index 6cf1d49..d0e9df8 100644 --- a/docs/reference/FOMC_actual_twa.html +++ b/docs/reference/FOMC_actual_twa.html @@ -63,7 +63,7 @@ pfm - 0.5.5 + 0.5.6 diff --git a/docs/reference/GUS.html b/docs/reference/GUS.html index 87a4ad6..b2691ec 100644 --- a/docs/reference/GUS.html +++ b/docs/reference/GUS.html @@ -65,7 +65,7 @@ $$GUS = \log_{10} DT50_{soil} (4 - \log_{10} K_{oc})$$" /> pfm - 0.5.5 + 0.5.6 diff --git a/docs/reference/PEC_FOMC_accu_rel.html b/docs/reference/PEC_FOMC_accu_rel.html index 86cc7b1..cce464c 100644 --- a/docs/reference/PEC_FOMC_accu_rel.html +++ b/docs/reference/PEC_FOMC_accu_rel.html @@ -63,7 +63,7 @@ pfm - 0.5.5 + 0.5.6 diff --git a/docs/reference/PEC_soil.html b/docs/reference/PEC_soil.html index 74f685b..13b2209 100644 --- a/docs/reference/PEC_soil.html +++ b/docs/reference/PEC_soil.html @@ -67,7 +67,7 @@ and in the EFSA guidance on PEC soil calculations (EFSA, 2015, 2017)." /> pfm - 0.5.5 + 0.5.6 diff --git a/docs/reference/PEC_soil_mets.html b/docs/reference/PEC_soil_mets.html index bb314b8..b83bb31 100644 --- a/docs/reference/PEC_soil_mets.html +++ b/docs/reference/PEC_soil_mets.html @@ -63,7 +63,7 @@ pfm - 0.5.5 + 0.5.6 diff --git a/docs/reference/PEC_sw_drainage_UK.html b/docs/reference/PEC_sw_drainage_UK.html index 204acbb..813ac59 100644 --- a/docs/reference/PEC_sw_drainage_UK.html +++ b/docs/reference/PEC_sw_drainage_UK.html @@ -64,7 +64,7 @@ published on the CRC website" /> pfm - 0.5.5 + 0.5.6 diff --git a/docs/reference/PEC_sw_drift.html b/docs/reference/PEC_sw_drift.html index 77a36f4..fd36cac 100644 --- a/docs/reference/PEC_sw_drift.html +++ b/docs/reference/PEC_sw_drift.html @@ -65,7 +65,7 @@ with input via spray drift." /> pfm - 0.5.5 + 0.5.6 diff --git a/docs/reference/PEC_sw_exposit_drainage.html b/docs/reference/PEC_sw_exposit_drainage.html index e24fd73..7e1ff1b 100644 --- a/docs/reference/PEC_sw_exposit_drainage.html +++ b/docs/reference/PEC_sw_exposit_drainage.html @@ -69,7 +69,7 @@ details, see the discussion of the function arguments below." /> pfm - 0.5.5 + 0.5.6 diff --git a/docs/reference/PEC_sw_exposit_runoff.html b/docs/reference/PEC_sw_exposit_runoff.html index 742c233..28e2f89 100644 --- a/docs/reference/PEC_sw_exposit_runoff.html +++ b/docs/reference/PEC_sw_exposit_runoff.html @@ -64,7 +64,7 @@ in the worksheet "Konzept Runoff"." /> pfm - 0.5.5 + 0.5.6 diff --git a/docs/reference/PEC_sw_focus.html b/docs/reference/PEC_sw_focus.html index 1f6172b..aba76e5 100644 --- a/docs/reference/PEC_sw_focus.html +++ b/docs/reference/PEC_sw_focus.html @@ -69,7 +69,7 @@ to be used with the FOCUS calculator." /> pfm - 0.5.5 + 0.5.6 diff --git a/docs/reference/PEC_sw_sed.html b/docs/reference/PEC_sw_sed.html index ee1e8d1..5c03e8f 100644 --- a/docs/reference/PEC_sw_sed.html +++ b/docs/reference/PEC_sw_sed.html @@ -66,7 +66,7 @@ PEC calculator" /> pfm - 0.5.5 + 0.5.6 diff --git a/docs/reference/SFO_actual_twa.html b/docs/reference/SFO_actual_twa.html index f293e2d..59e759b 100644 --- a/docs/reference/SFO_actual_twa.html +++ b/docs/reference/SFO_actual_twa.html @@ -63,7 +63,7 @@ pfm - 0.5.5 + 0.5.6 diff --git a/docs/reference/SSLRC_mobility_classification.html b/docs/reference/SSLRC_mobility_classification.html index fb5e139..a41b289 100644 --- a/docs/reference/SSLRC_mobility_classification.html +++ b/docs/reference/SSLRC_mobility_classification.html @@ -64,7 +64,7 @@ checked against the spreadsheet published on the CRC website" /> pfm - 0.5.5 + 0.5.6 diff --git a/docs/reference/TOXSWA_cwa.html b/docs/reference/TOXSWA_cwa.html index 45370f1..f430cba 100644 --- a/docs/reference/TOXSWA_cwa.html +++ b/docs/reference/TOXSWA_cwa.html @@ -64,7 +64,7 @@ Usually, an instance of this class will be generated by read.TOXSWA_cwa." /> pfm - 0.5.5 + 0.5.6 diff --git a/docs/reference/chent_focus_sw.html b/docs/reference/chent_focus_sw.html index 5348f54..0ba53be 100644 --- a/docs/reference/chent_focus_sw.html +++ b/docs/reference/chent_focus_sw.html @@ -63,7 +63,7 @@ pfm - 0.5.5 + 0.5.6 diff --git a/docs/reference/drift_data_JKI.html b/docs/reference/drift_data_JKI.html index 65edc2c..be24f42 100644 --- a/docs/reference/drift_data_JKI.html +++ b/docs/reference/drift_data_JKI.html @@ -66,7 +66,7 @@ published by the German Julius-Kühn Institute (JKI)." /> pfm - 0.5.5 + 0.5.6 diff --git a/docs/reference/endpoint.html b/docs/reference/endpoint.html index a789782..d55daeb 100644 --- a/docs/reference/endpoint.html +++ b/docs/reference/endpoint.html @@ -66,7 +66,7 @@ this function." /> pfm - 0.5.5 + 0.5.6 diff --git a/docs/reference/geomean.html b/docs/reference/geomean.html index 07d3825..1e106e0 100644 --- a/docs/reference/geomean.html +++ b/docs/reference/geomean.html @@ -66,7 +66,7 @@ returns 0 if at least one element of the vector is 0." /> pfm - 0.5.5 + 0.5.6 diff --git a/docs/reference/get_vertex.html b/docs/reference/get_vertex.html index c032778..10957ce 100644 --- a/docs/reference/get_vertex.html +++ b/docs/reference/get_vertex.html @@ -64,7 +64,7 @@ https://stackoverflow.com/a/717791" /> pfm - 0.5.5 + 0.5.6 diff --git a/docs/reference/index.html b/docs/reference/index.html index 21b75c7..556cb67 100644 --- a/docs/reference/index.html +++ b/docs/reference/index.html @@ -60,7 +60,7 @@ pfm - 0.5.5 + 0.5.6 diff --git a/docs/reference/max_twa.html b/docs/reference/max_twa.html index ceec7d1..07060af 100644 --- a/docs/reference/max_twa.html +++ b/docs/reference/max_twa.html @@ -67,7 +67,7 @@ max_twa." /> pfm - 0.5.5 + 0.5.6 diff --git a/docs/reference/one_box.html b/docs/reference/one_box.html index 61b8cc0..8fd10ba 100644 --- a/docs/reference/one_box.html +++ b/docs/reference/one_box.html @@ -63,7 +63,7 @@ pfm - 0.5.5 + 0.5.6 diff --git a/docs/reference/perc_runoff_exposit.html b/docs/reference/perc_runoff_exposit.html index 1baa088..8bb9c42 100644 --- a/docs/reference/perc_runoff_exposit.html +++ b/docs/reference/perc_runoff_exposit.html @@ -63,7 +63,7 @@ pfm - 0.5.5 + 0.5.6 diff --git a/docs/reference/perc_runoff_reduction_exposit.html b/docs/reference/perc_runoff_reduction_exposit.html index 314e793..a4f7857 100644 --- a/docs/reference/perc_runoff_reduction_exposit.html +++ b/docs/reference/perc_runoff_reduction_exposit.html @@ -63,7 +63,7 @@ pfm - 0.5.5 + 0.5.6 diff --git a/docs/reference/pfm_degradation.html b/docs/reference/pfm_degradation.html index 011afaa..9d3a2ac 100644 --- a/docs/reference/pfm_degradation.html +++ b/docs/reference/pfm_degradation.html @@ -63,7 +63,7 @@ pfm - 0.5.5 + 0.5.6 diff --git a/docs/reference/plot.TOXSWA_cwa.html b/docs/reference/plot.TOXSWA_cwa.html index f73f297..896080e 100644 --- a/docs/reference/plot.TOXSWA_cwa.html +++ b/docs/reference/plot.TOXSWA_cwa.html @@ -64,7 +64,7 @@ segment of a TOXSWA surface water body." /> pfm - 0.5.5 + 0.5.6 diff --git a/docs/reference/plot.one_box.html b/docs/reference/plot.one_box.html index ce5ec03..6fcec65 100644 --- a/docs/reference/plot.one_box.html +++ b/docs/reference/plot.one_box.html @@ -63,7 +63,7 @@ pfm - 0.5.5 + 0.5.6 diff --git a/docs/reference/read.TOXSWA_cwa.html b/docs/reference/read.TOXSWA_cwa.html index 30f8e01..d7bb0be 100644 --- a/docs/reference/read.TOXSWA_cwa.html +++ b/docs/reference/read.TOXSWA_cwa.html @@ -68,7 +68,7 @@ renamed to ConLiqWatLay in the out file." /> pfm - 0.5.5 + 0.5.6 diff --git a/docs/reference/sawtooth.html b/docs/reference/sawtooth.html index d4a02c3..93085e2 100644 --- a/docs/reference/sawtooth.html +++ b/docs/reference/sawtooth.html @@ -65,7 +65,7 @@ times, with an interval i." /> pfm - 0.5.5 + 0.5.6 diff --git a/docs/reference/soil_scenario_data_EFSA_2015.html b/docs/reference/soil_scenario_data_EFSA_2015.html index 34277c2..93d1a42 100644 --- a/docs/reference/soil_scenario_data_EFSA_2015.html +++ b/docs/reference/soil_scenario_data_EFSA_2015.html @@ -65,7 +65,7 @@ scenario and model adjustment factors from p. 15 and p. 17 are included." /> pfm - 0.5.5 + 0.5.6 diff --git a/docs/reference/soil_scenario_data_EFSA_2017.html b/docs/reference/soil_scenario_data_EFSA_2017.html index ce23654..e87663b 100644 --- a/docs/reference/soil_scenario_data_EFSA_2017.html +++ b/docs/reference/soil_scenario_data_EFSA_2017.html @@ -65,7 +65,7 @@ scenario and model adjustment factors from p. 16 and p. 18 are included." /> pfm - 0.5.5 + 0.5.6 diff --git a/docs/reference/twa.html b/docs/reference/twa.html index ed6deb4..1ca31c1 100644 --- a/docs/reference/twa.html +++ b/docs/reference/twa.html @@ -65,7 +65,7 @@ is after one window has passed." /> pfm - 0.5.5 + 0.5.6 -- cgit v1.2.1