From 17755babc3a517f4c7cec1c04e3e1f32b7ffb5d9 Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Tue, 19 Feb 2019 14:27:03 +0100 Subject: Add another test for Exposit drainage to test overriding the mobility group derived from Koc --- ChangeLog | 20 ++++++++++++++++++++ test.log | 4 ++-- tests/testthat/test_exposit.R | 8 ++++++++ 3 files changed, 30 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index d019be0..c621093 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,23 @@ +commit b81b532583a9eaf989d09b6276be48b480fa2af6 +Author: Johannes Ranke +Date: 2019-02-19 14:27:03 +0100 + + Add another test for Exposit drainage + + to test overriding the mobility group derived from Koc + +commit 138638976f792684483520fe7837ded0a27938e4 +Author: Johannes Ranke +Date: 2019-02-19 12:35:19 +0100 + + Stop endless appending to pesticide.txt example + +commit 72c56f4246966c1bea627f601cf3cc457734f023 +Author: Johannes Ranke +Date: 2019-02-19 12:27:00 +0100 + + Add German drainage calculations using Exposit 3.02 + commit e5a077e28153f6494c99d6945b8b1bd239464609 Author: Johannes Ranke Date: 2019-02-08 15:25:19 +0100 diff --git a/test.log b/test.log index 8b2e67b..abf4825 100644 --- a/test.log +++ b/test.log @@ -3,7 +3,7 @@ Loading required package: R6 Loading required package: mkin Testing pfm ✔ | OK F W S | Context - ⠏ | 0 | Exposit calculations ⠋ | 1 | Exposit calculations ⠙ | 2 | Exposit calculations ⠹ | 3 | Exposit calculations ⠸ | 4 | Exposit calculations ⠼ | 5 | Exposit calculations ⠴ | 6 | Exposit calculations ✔ | 6 | Exposit calculations + ⠏ | 0 | Exposit calculations ⠋ | 1 | Exposit calculations ⠙ | 2 | Exposit calculations ⠹ | 3 | Exposit calculations ⠸ | 4 | Exposit calculations ⠼ | 5 | Exposit calculations ⠴ | 6 | Exposit calculations ⠦ | 7 | Exposit calculations ✔ | 7 | Exposit calculations ⠏ | 0 | Geometric mean calculation ⠋ | 1 | Geometric mean calculation ⠙ | 2 | Geometric mean calculation ⠹ | 3 | Geometric mean calculation ⠸ | 4 | Geometric mean calculation ⠼ | 5 | Geometric mean calculation ⠴ | 6 | Geometric mean calculation ✔ | 6 | Geometric mean calculation ⠏ | 0 | Check max_twa for parent mkinfit models against analytical solutions ⠋ | 1 | Check max_twa for parent mkinfit models against analytical solutions ✔ | 1 | Check max_twa for parent mkinfit models against analytical solutions [1.0 s] ⠏ | 0 | Simple PEC sediment calculations ⠋ | 1 | Simple PEC sediment calculations ✔ | 1 | Simple PEC sediment calculations @@ -18,7 +18,7 @@ Testing pfm ══ Results ═════════════════════════════════════════════════════════════════════════════════════════ Duration: 7.0 s -OK: 70 +OK: 71 Failed: 0 Warnings: 0 Skipped: 0 diff --git a/tests/testthat/test_exposit.R b/tests/testthat/test_exposit.R index f6a2de4..13371a6 100644 --- a/tests/testthat/test_exposit.R +++ b/tests/testthat/test_exposit.R @@ -72,4 +72,12 @@ test_that("Drainage PECsw are as in Exposit 3.02", { res_3 <- PEC_sw_exposit_drainage(200, Koc = 30, DT50 = 100) res_pfm_3 <- round(res_3$PEC_sw_drainage, 2) expect_equivalent(res_exposit_3, res_pfm_3) + + # 1000 g/ha, Koc = 545 L/kg, group = 1, DT50 = 20 days, 25% interception + res_exposit_4 <- c(spring = 0.11, autumn = 0.32) + + res_4 <- PEC_sw_exposit_drainage(1000, interception = 0.25, Koc = 545, DT50 = + 20, mobility = "low") + res_pfm_4 <- round(res_4$PEC_sw_drainage, 2) + expect_equivalent(res_exposit_4, res_pfm_4) }) -- cgit v1.2.1