aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog21
-rw-r--r--DESCRIPTION2
-rw-r--r--build.log2
-rw-r--r--test.log6
-rw-r--r--tests/testthat/test_PELMO.R34
5 files changed, 42 insertions, 23 deletions
diff --git a/ChangeLog b/ChangeLog
index e9c2e8a..5e265c0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,30 @@
+commit 22b36c824fe5e1561868a649216fe079c6fbfb85
+Author: Johannes Ranke <jranke@uni-bremen.de>
+Date: 2018-07-10 18:06:29 +0200
+
+ Update static docs
+
+commit cb3695dd434b3a3273217fb22c5ffb86065ae96d
+Author: Johannes Ranke <jranke@uni-bremen.de>
+Date: 2018-07-10 17:57:33 +0200
+
+ EFSA PEC soil guidance from 2017
+
+ - Implement the new guidance as well as possible
+ - Maintenance work addressing CRAN checks
+
commit c4c3ca282c6aadca82e392692ae4100fec1dd834
Author: Johannes Ranke <jranke@uni-bremen.de>
Date: 2018-07-10 16:46:47 +0200
.out file from TOXSWA 5.5.3 for testing
+commit a736ecc357889107b6e93f14cdf0c1ea4587817f
+Author: Johannes Ranke <johannes.ranke@jrwb.de>
+Date: 2018-07-10 16:08:52 +0200
+
+ Adapt path to package on windows
+
commit 8989a484b9b2d23463c95e0a3927e307ec0a5e64
Author: Johannes Ranke <jranke@uni-bremen.de>
Date: 2018-07-04 10:59:47 +0200
diff --git a/DESCRIPTION b/DESCRIPTION
index c7ea8a9..e795eb1 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -2,7 +2,7 @@ Package: pfm
Type: Package
Title: Utilities for Pesticide Fate Modelling
Version: 0.5.1
-Date: 2018-07-10
+Date: 2018-07-11
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/build.log b/build.log
index e77bb21..c13de11 100644
--- a/build.log
+++ b/build.log
@@ -4,6 +4,8 @@
* checking for LF line-endings in source and make files and shell scripts
* checking for empty or unneeded directories
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.1.tar.gz’
diff --git a/test.log b/test.log
index f16336b..66f99f8 100644
--- a/test.log
+++ b/test.log
@@ -10,15 +10,15 @@ Testing pfm
⠏ | 0 | Simple PEC sediment calculations ⠋ | 1 | Simple PEC sediment calculations ✔ | 1 | Simple PEC sediment calculations
⠏ | 0 | Simple PEC soil calculations ⠋ | 1 | Simple PEC soil calculations ⠙ | 2 | Simple PEC soil calculations ⠹ | 3 | Simple PEC soil calculations ⠸ | 4 | Simple PEC soil calculations ⠼ | 5 | Simple PEC soil calculations ⠴ | 6 | Simple PEC soil calculations ⠦ | 7 | Simple PEC soil calculations ⠧ | 8 | Simple PEC soil calculations ⠇ | 9 | Simple PEC soil calculations ⠏ | 10 | Simple PEC soil calculations ⠋ | 11 | Simple PEC soil calculations ⠙ | 12 | Simple PEC soil calculations ⠹ | 13 | Simple PEC soil calculations ✔ | 13 | Simple PEC soil calculations
⠏ | 0 | Simple PEC surface water calculations with drift entry ⠋ | 1 | Simple PEC surface water calculations with drift entry ⠙ | 2 | Simple PEC surface water calculations with drift entry ✔ | 2 | Simple PEC surface water calculations with drift entry
- ⠏ | 0 | Create PELMO runs from psm files and execute them ⠋ | 1 | Create PELMO runs from psm files and execute them ⠙ | 2 | Create PELMO runs from psm files and execute them ⠹ | 3 | Create PELMO runs from psm files and execute them ⠸ | 4 | Create PELMO runs from psm files and execute them ⠼ | 5 | Create PELMO runs from psm files and execute them ⠴ | 6 | Create PELMO runs from psm files and execute them ⠦ | 7 | Create PELMO runs from psm files and execute them ⠧ | 8 | Create PELMO runs from psm files and execute them ⠇ | 9 | Create PELMO runs from psm files and execute them ⠏ | 10 | Create PELMO runs from psm files and execute them ⠋ | 11 | Create PELMO runs from psm files and execute them ⠙ | 12 | Create PELMO runs from psm files and execute them ⠹ | 13 | Create PELMO runs from psm files and execute them ⠸ | 14 | Create PELMO runs from psm files and execute them ⠼ | 15 | Create PELMO runs from psm files and execute them ⠴ | 16 | Create PELMO runs from psm files and execute them ⠦ | 17 | Create PELMO runs from psm files and execute them ⠧ | 18 | Create PELMO runs from psm files and execute them ⠇ | 19 | Create PELMO runs from psm files and execute them ⠏ | 20 | Create PELMO runs from psm files and execute them ⠋ | 21 | Create PELMO runs from psm files and execute them ⠙ | 22 | Create PELMO runs from psm files and execute them ⠹ | 23 | Create PELMO runs from psm files and execute them ⠸ | 24 | Create PELMO runs from psm files and execute them ⠼ | 25 | Create PELMO runs from psm files and execute them ⠴ | 26 | Create PELMO runs from psm files and execute them ⠦ | 27 | Create PELMO runs from psm files and execute them ⠧ | 28 | Create PELMO runs from psm files and execute them ⠇ | 29 | Create PELMO runs from psm files and execute them ⠏ | 30 | Create PELMO runs from psm files and execute them ⠋ | 31 | Create PELMO runs from psm files and execute them ⠙ | 32 | Create PELMO runs from psm files and execute them ⠹ | 33 | Create PELMO runs from psm files and execute them ⠸ | 34 | Create PELMO runs from psm files and execute them ⠼ | 35 | Create PELMO runs from psm files and execute them ⠴ | 36 | Create PELMO runs from psm files and execute them ⠦ | 37 | Create PELMO runs from psm files and execute them ⠧ | 38 | Create PELMO runs from psm files and execute them ⠇ | 39 | Create PELMO runs from psm files and execute them ⠏ | 40 | Create PELMO runs from psm files and execute them ⠋ | 41 | Create PELMO runs from psm files and execute them ⠙ | 42 | Create PELMO runs from psm files and execute them ⠹ | 43 | Create PELMO runs from psm files and execute them ⠸ | 44 | Create PELMO runs from psm files and execute them ⠼ | 45 | Create PELMO runs from psm files and execute them ⠴ | 46 | Create PELMO runs from psm files and execute them ⠦ | 47 | Create PELMO runs from psm files and execute them ⠧ | 48 | Create PELMO runs from psm files and execute them ⠇ | 49 | Create PELMO runs from psm files and execute them ⠏ | 50 | Create PELMO runs from psm files and execute them ⠋ | 51 | Create PELMO runs from psm files and execute them ⠙ | 52 | Create PELMO runs from psm files and execute them ⠹ | 53 | Create PELMO runs from psm files and execute them ⠸ | 54 | Create PELMO runs from psm files and execute them ⠼ | 55 | Create PELMO runs from psm files and execute them ⠴ | 56 | Create PELMO runs from psm files and execute them ⠦ | 57 | Create PELMO runs from psm files and execute them ⠧ | 58 | Create PELMO runs from psm files and execute them ⠇ | 59 | Create PELMO runs from psm files and execute them ⠏ | 60 | Create PELMO runs from psm files and execute them ⠋ | 61 | Create PELMO runs from psm files and execute them ⠙ | 62 | Create PELMO runs from psm files and execute them ⠹ | 63 | Create PELMO runs from psm files and execute them ⠸ | 64 | Create PELMO runs from psm files and execute them ⠼ | 65 | Create PELMO runs from psm files and execute them ⠴ | 66 | Create PELMO runs from psm files and execute them ⠦ | 67 | Create PELMO runs from psm files and execute them ⠧ | 68 | Create PELMO runs from psm files and execute them ⠇ | 69 | Create PELMO runs from psm files and execute them ⠏ | 70 | Create PELMO runs from psm files and execute them ⠋ | 71 | Create PELMO runs from psm files and execute them ⠙ | 72 | Create PELMO runs from psm files and execute them ⠹ | 73 | Create PELMO runs from psm files and execute them ⠸ | 74 | Create PELMO runs from psm files and execute them ⠼ | 75 | Create PELMO runs from psm files and execute them ⠴ | 76 | Create PELMO runs from psm files and execute them ⠦ | 77 | Create PELMO runs from psm files and execute them ⠧ | 78 | Create PELMO runs from psm files and execute them ⠇ | 79 | Create PELMO runs from psm files and execute them ⠏ | 80 | Create PELMO runs from psm files and execute them ⠋ | 81 | Create PELMO runs from psm files and execute them ⠙ | 82 | Create PELMO runs from psm files and execute them ⠹ | 83 | Create PELMO runs from psm files and execute them ⠸ | 84 | Create PELMO runs from psm files and execute them ⠼ | 85 | Create PELMO runs from psm files and execute them ⠴ | 86 | Create PELMO runs from psm files and execute them ⠦ | 87 | Create PELMO runs from psm files and execute them ⠧ | 88 | Create PELMO runs from psm files and execute them ⠇ | 89 | Create PELMO runs from psm files and execute them ⠏ | 90 | Create PELMO runs from psm files and execute them ⠋ | 91 | Create PELMO runs from psm files and execute them ⠙ | 92 | Create PELMO runs from psm files and execute them ⠹ | 93 | Create PELMO runs from psm files and execute them ⠸ | 94 | Create PELMO runs from psm files and execute them ⠼ | 95 | Create PELMO runs from psm files and execute them ⠴ | 96 | Create PELMO runs from psm files and execute them ⠦ | 97 | Create PELMO runs from psm files and execute them ⠧ | 98 | Create PELMO runs from psm files and execute them ⠇ | 99 | Create PELMO runs from psm files and execute them ⠏ | 100 | Create PELMO runs from psm files and execute them ⠋ | 101 | Create PELMO runs from psm files and execute them ⠙ | 102 | Create PELMO runs from psm files and execute them ⠹ | 103 | Create PELMO runs from psm files and execute them ⠸ | 104 | Create PELMO runs from psm files and execute them ⠼ | 105 | Create PELMO runs from psm files and execute them ⠴ | 106 | Create PELMO runs from psm files and execute them ⠦ | 107 | Create PELMO runs from psm files and execute them ⠧ | 108 | Create PELMO runs from psm files and execute them ⠇ | 109 | Create PELMO runs from psm files and execute them ⠏ | 110 | Create PELMO runs from psm files and execute them ⠋ | 111 | Create PELMO runs from psm files and execute them ⠙ | 112 | Create PELMO runs from psm files and execute them ⠹ | 113 | Create PELMO runs from psm files and execute them ⠸ | 114 | Create PELMO runs from psm files and execute them ⠼ | 115 | Create PELMO runs from psm files and execute them ⠴ | 116 | Create PELMO runs from psm files and execute them ⠦ | 117 | Create PELMO runs from psm files and execute them ⠧ | 118 | Create PELMO runs from psm files and execute them ⠇ | 119 | Create PELMO runs from psm files and execute them ⠏ | 120 | Create PELMO runs from psm files and execute them ⠋ | 121 | Create PELMO runs from psm files and execute them ⠙ | 122 | Create PELMO runs from psm files and execute them ⠹ | 123 | Create PELMO runs from psm files and execute them ⠸ | 124 | Create PELMO runs from psm files and execute them ⠼ | 125 | Create PELMO runs from psm files and execute them ⠴ | 126 | Create PELMO runs from psm files and execute them ⠦ | 127 | Create PELMO runs from psm files and execute them ⠧ | 128 | Create PELMO runs from psm files and execute them ⠇ | 129 | Create PELMO runs from psm files and execute them ⠏ | 130 | Create PELMO runs from psm files and execute them ⠋ | 131 | Create PELMO runs from psm files and execute them ⠙ | 132 | Create PELMO runs from psm files and execute them ⠹ | 133 | Create PELMO runs from psm files and execute them ⠸ | 134 | Create PELMO runs from psm files and execute them ⠼ | 135 | Create PELMO runs from psm files and execute them ⠴ | 136 | Create PELMO runs from psm files and execute them ⠦ | 137 | Create PELMO runs from psm files and execute them ⠧ | 138 | Create PELMO runs from psm files and execute them ⠇ | 139 | Create PELMO runs from psm files and execute them ⠏ | 140 | Create PELMO runs from psm files and execute them ⠋ | 141 | Create PELMO runs from psm files and execute them ⠙ | 142 | Create PELMO runs from psm files and execute them ⠹ | 143 | Create PELMO runs from psm files and execute them ⠸ | 144 | Create PELMO runs from psm files and execute them ⠼ | 145 | Create PELMO runs from psm files and execute them ⠴ | 146 | Create PELMO runs from psm files and execute them ⠦ | 147 | Create PELMO runs from psm files and execute them ⠧ | 148 | Create PELMO runs from psm files and execute them ⠇ | 149 | Create PELMO runs from psm files and execute them ⠏ | 150 | Create PELMO runs from psm files and execute them ⠋ | 151 | Create PELMO runs from psm files and execute them ⠙ | 152 | Create PELMO runs from psm files and execute them ⠹ | 153 | Create PELMO runs from psm files and execute them ⠸ | 154 | Create PELMO runs from psm files and execute them ⠼ | 155 | Create PELMO runs from psm files and execute them ⠴ | 156 | Create PELMO runs from psm files and execute them ⠦ | 157 | Create PELMO runs from psm files and execute them ⠧ | 158 | Create PELMO runs from psm files and execute them ⠇ | 159 | Create PELMO runs from psm files and execute them ⠏ | 160 | Create PELMO runs from psm files and execute them ⠋ | 161 | Create PELMO runs from psm files and execute them ⠙ | 162 | Create PELMO runs from psm files and execute them ⠹ | 163 | Create PELMO runs from psm files and execute them ⠸ | 164 | Create PELMO runs from psm files and execute them ⠼ | 165 | Create PELMO runs from psm files and execute them ⠴ | 166 | Create PELMO runs from psm files and execute them ⠦ | 167 | Create PELMO runs from psm files and execute them ⠧ | 168 | Create PELMO runs from psm files and execute them ⠇ | 169 | Create PELMO runs from psm files and execute them ⠏ | 170 | Create PELMO runs from psm files and execute them ⠋ | 171 | Create PELMO runs from psm files and execute them ⠙ | 172 | Create PELMO runs from psm files and execute them ⠹ | 173 | Create PELMO runs from psm files and execute them ⠸ | 174 | Create PELMO runs from psm files and execute them ⠼ | 175 | Create PELMO runs from psm files and execute them ⠴ | 176 | Create PELMO runs from psm files and execute them ⠦ | 177 | Create PELMO runs from psm files and execute them ⠧ | 178 | Create PELMO runs from psm files and execute them ⠇ | 179 | Create PELMO runs from psm files and execute them ⠏ | 180 | Create PELMO runs from psm files and execute them ⠋ | 181 | Create PELMO runs from psm files and execute them ⠙ | 182 | Create PELMO runs from psm files and execute them ⠹ | 183 | Create PELMO runs from psm files and execute them ⠸ | 184 | Create PELMO runs from psm files and execute them ⠼ | 185 | Create PELMO runs from psm files and execute them ⠴ | 186 | Create PELMO runs from psm files and execute them ⠦ | 187 | Create PELMO runs from psm files and execute them ⠧ | 188 | Create PELMO runs from psm files and execute them ⠇ | 189 | Create PELMO runs from psm files and execute them ⠏ | 190 | Create PELMO runs from psm files and execute them ⠋ | 191 | Create PELMO runs from psm files and execute them ⠙ | 192 | Create PELMO runs from psm files and execute them ⠹ | 193 | Create PELMO runs from psm files and execute them ⠸ | 194 | Create PELMO runs from psm files and execute them ⠼ | 195 | Create PELMO runs from psm files and execute them ⠴ | 196 | Create PELMO runs from psm files and execute them ⠦ | 197 | Create PELMO runs from psm files and execute them ⠧ | 198 | Create PELMO runs from psm files and execute them ⠇ | 199 | Create PELMO runs from psm files and execute them ⠏ | 200 | Create PELMO runs from psm files and execute them ⠋ | 201 | Create PELMO runs from psm files and execute them ⠙ | 202 | Create PELMO runs from psm files and execute them ⠹ | 203 | Create PELMO runs from psm files and execute them ⠸ | 204 | Create PELMO runs from psm files and execute them ⠼ | 205 | Create PELMO runs from psm files and execute them ⠴ | 206 | Create PELMO runs from psm files and execute them ⠦ | 207 | Create PELMO runs from psm files and execute them ⠧ | 208 | Create PELMO runs from psm files and execute them ⠇ | 209 | Create PELMO runs from psm files and execute them ⠏ | 210 | Create PELMO runs from psm files and execute them ⠋ | 211 | Create PELMO runs from psm files and execute them ⠙ | 212 | Create PELMO runs from psm files and execute them ⠹ | 213 | Create PELMO runs from psm files and execute them ⠸ | 214 | Create PELMO runs from psm files and execute them ⠼ | 215 | Create PELMO runs from psm files and execute them ⠴ | 216 | Create PELMO runs from psm files and execute them ⠦ | 217 | Create PELMO runs from psm files and execute them ⠧ | 218 | Create PELMO runs from psm files and execute them ⠇ | 219 | Create PELMO runs from psm files and execute them ✔ | 219 | Create PELMO runs from psm files and execute them [73.9 s]
+ ⠏ | 0 | Create PELMO runs from psm files and execute them ⠋ | 1 | Create PELMO runs from psm files and execute them ⠙ | 2 | Create PELMO runs from psm files and execute them ⠹ | 3 | Create PELMO runs from psm files and execute them ⠸ | 4 | Create PELMO runs from psm files and execute them ⠼ | 5 | Create PELMO runs from psm files and execute them ⠴ | 6 | Create PELMO runs from psm files and execute them ⠦ | 7 | Create PELMO runs from psm files and execute them ⠧ | 8 | Create PELMO runs from psm files and execute them ⠇ | 9 | Create PELMO runs from psm files and execute them ⠏ | 10 | Create PELMO runs from psm files and execute them ⠋ | 11 | Create PELMO runs from psm files and execute them ⠙ | 12 | Create PELMO runs from psm files and execute them ⠹ | 13 | Create PELMO runs from psm files and execute them ⠸ | 14 | Create PELMO runs from psm files and execute them ⠼ | 15 | Create PELMO runs from psm files and execute them ⠴ | 16 | Create PELMO runs from psm files and execute them ⠦ | 17 | Create PELMO runs from psm files and execute them ⠧ | 18 | Create PELMO runs from psm files and execute them ⠇ | 19 | Create PELMO runs from psm files and execute them ⠏ | 20 | Create PELMO runs from psm files and execute them ⠋ | 21 | Create PELMO runs from psm files and execute them ⠙ | 22 | Create PELMO runs from psm files and execute them ⠹ | 23 | Create PELMO runs from psm files and execute them ⠸ | 24 | Create PELMO runs from psm files and execute them ⠼ | 25 | Create PELMO runs from psm files and execute them ⠴ | 26 | Create PELMO runs from psm files and execute them ⠦ | 27 | Create PELMO runs from psm files and execute them ⠧ | 28 | Create PELMO runs from psm files and execute them ⠇ | 29 | Create PELMO runs from psm files and execute them ⠏ | 30 | Create PELMO runs from psm files and execute them ⠋ | 31 | Create PELMO runs from psm files and execute them ⠙ | 32 | Create PELMO runs from psm files and execute them ⠹ | 33 | Create PELMO runs from psm files and execute them ⠸ | 34 | Create PELMO runs from psm files and execute them ⠼ | 35 | Create PELMO runs from psm files and execute them ⠴ | 36 | Create PELMO runs from psm files and execute them ⠦ | 37 | Create PELMO runs from psm files and execute them ⠧ | 38 | Create PELMO runs from psm files and execute them ⠇ | 39 | Create PELMO runs from psm files and execute them ⠏ | 40 | Create PELMO runs from psm files and execute them ⠋ | 41 | Create PELMO runs from psm files and execute them ⠙ | 42 | Create PELMO runs from psm files and execute them ⠹ | 43 | Create PELMO runs from psm files and execute them ⠸ | 44 | Create PELMO runs from psm files and execute them ⠼ | 45 | Create PELMO runs from psm files and execute them ⠴ | 46 | Create PELMO runs from psm files and execute them ⠦ | 47 | Create PELMO runs from psm files and execute them ⠧ | 48 | Create PELMO runs from psm files and execute them ⠇ | 49 | Create PELMO runs from psm files and execute them ⠏ | 50 | Create PELMO runs from psm files and execute them ⠋ | 51 | Create PELMO runs from psm files and execute them ⠙ | 52 | Create PELMO runs from psm files and execute them ⠹ | 53 | Create PELMO runs from psm files and execute them ⠸ | 54 | Create PELMO runs from psm files and execute them ⠼ | 55 | Create PELMO runs from psm files and execute them ⠴ | 56 | Create PELMO runs from psm files and execute them ⠦ | 57 | Create PELMO runs from psm files and execute them ⠧ | 58 | Create PELMO runs from psm files and execute them ⠇ | 59 | Create PELMO runs from psm files and execute them ⠏ | 60 | Create PELMO runs from psm files and execute them ⠋ | 61 | Create PELMO runs from psm files and execute them ⠙ | 62 | Create PELMO runs from psm files and execute them ⠹ | 63 | Create PELMO runs from psm files and execute them ⠸ | 64 | Create PELMO runs from psm files and execute them ⠼ | 65 | Create PELMO runs from psm files and execute them ⠴ | 66 | Create PELMO runs from psm files and execute them ⠦ | 67 | Create PELMO runs from psm files and execute them ⠧ | 68 | Create PELMO runs from psm files and execute them ⠇ | 69 | Create PELMO runs from psm files and execute them ⠏ | 70 | Create PELMO runs from psm files and execute them ⠋ | 71 | Create PELMO runs from psm files and execute them ⠙ | 72 | Create PELMO runs from psm files and execute them ⠹ | 73 | Create PELMO runs from psm files and execute them ⠸ | 74 | Create PELMO runs from psm files and execute them ⠼ | 75 | Create PELMO runs from psm files and execute them ⠴ | 76 | Create PELMO runs from psm files and execute them ⠦ | 77 | Create PELMO runs from psm files and execute them ⠧ | 78 | Create PELMO runs from psm files and execute them ⠇ | 79 | Create PELMO runs from psm files and execute them ⠏ | 80 | Create PELMO runs from psm files and execute them ⠋ | 81 | Create PELMO runs from psm files and execute them ⠙ | 82 | Create PELMO runs from psm files and execute them ⠹ | 83 | Create PELMO runs from psm files and execute them ⠸ | 84 | Create PELMO runs from psm files and execute them ⠼ | 85 | Create PELMO runs from psm files and execute them ⠴ | 86 | Create PELMO runs from psm files and execute them ⠦ | 87 | Create PELMO runs from psm files and execute them ⠧ | 88 | Create PELMO runs from psm files and execute them ⠇ | 89 | Create PELMO runs from psm files and execute them ⠏ | 90 | Create PELMO runs from psm files and execute them ⠋ | 91 | Create PELMO runs from psm files and execute them ⠙ | 92 | Create PELMO runs from psm files and execute them ⠹ | 93 | Create PELMO runs from psm files and execute them ⠸ | 94 | Create PELMO runs from psm files and execute them ⠼ | 95 | Create PELMO runs from psm files and execute them ⠴ | 96 | Create PELMO runs from psm files and execute them ⠦ | 97 | Create PELMO runs from psm files and execute them ⠧ | 98 | Create PELMO runs from psm files and execute them ⠇ | 99 | Create PELMO runs from psm files and execute them ⠏ | 100 | Create PELMO runs from psm files and execute them ⠋ | 101 | Create PELMO runs from psm files and execute them ⠙ | 102 | Create PELMO runs from psm files and execute them ⠹ | 103 | Create PELMO runs from psm files and execute them ⠸ | 104 | Create PELMO runs from psm files and execute them ⠼ | 105 | Create PELMO runs from psm files and execute them ⠴ | 106 | Create PELMO runs from psm files and execute them ⠦ | 107 | Create PELMO runs from psm files and execute them ⠧ | 108 | Create PELMO runs from psm files and execute them ⠇ | 109 | Create PELMO runs from psm files and execute them ⠏ | 110 | Create PELMO runs from psm files and execute them ⠋ | 111 | Create PELMO runs from psm files and execute them ⠙ | 112 | Create PELMO runs from psm files and execute them ⠹ | 113 | Create PELMO runs from psm files and execute them ⠸ | 114 | Create PELMO runs from psm files and execute them ⠼ | 115 | Create PELMO runs from psm files and execute them ⠴ | 116 | Create PELMO runs from psm files and execute them ⠦ | 117 | Create PELMO runs from psm files and execute them ⠧ | 118 | Create PELMO runs from psm files and execute them ⠇ | 119 | Create PELMO runs from psm files and execute them ⠏ | 120 | Create PELMO runs from psm files and execute them ⠋ | 121 | Create PELMO runs from psm files and execute them ⠙ | 122 | Create PELMO runs from psm files and execute them ⠹ | 123 | Create PELMO runs from psm files and execute them ⠸ | 124 | Create PELMO runs from psm files and execute them ⠼ | 125 | Create PELMO runs from psm files and execute them ⠴ | 126 | Create PELMO runs from psm files and execute them ⠦ | 127 | Create PELMO runs from psm files and execute them ⠧ | 128 | Create PELMO runs from psm files and execute them ⠇ | 129 | Create PELMO runs from psm files and execute them ⠏ | 130 | Create PELMO runs from psm files and execute them ⠋ | 131 | Create PELMO runs from psm files and execute them ⠙ | 132 | Create PELMO runs from psm files and execute them ⠹ | 133 | Create PELMO runs from psm files and execute them ⠸ | 134 | Create PELMO runs from psm files and execute them ⠼ | 135 | Create PELMO runs from psm files and execute them ⠴ | 136 | Create PELMO runs from psm files and execute them ⠦ | 137 | Create PELMO runs from psm files and execute them ⠧ | 138 | Create PELMO runs from psm files and execute them ⠇ | 139 | Create PELMO runs from psm files and execute them ⠏ | 140 | Create PELMO runs from psm files and execute them ⠋ | 141 | Create PELMO runs from psm files and execute them ⠙ | 142 | Create PELMO runs from psm files and execute them ⠹ | 143 | Create PELMO runs from psm files and execute them ⠸ | 144 | Create PELMO runs from psm files and execute them ⠼ | 145 | Create PELMO runs from psm files and execute them ⠴ | 146 | Create PELMO runs from psm files and execute them ⠦ | 147 | Create PELMO runs from psm files and execute them ⠧ | 148 | Create PELMO runs from psm files and execute them ⠇ | 149 | Create PELMO runs from psm files and execute them ⠏ | 150 | Create PELMO runs from psm files and execute them ⠋ | 151 | Create PELMO runs from psm files and execute them ⠙ | 152 | Create PELMO runs from psm files and execute them ⠹ | 153 | Create PELMO runs from psm files and execute them ⠸ | 154 | Create PELMO runs from psm files and execute them ⠼ | 155 | Create PELMO runs from psm files and execute them ⠴ | 156 | Create PELMO runs from psm files and execute them ⠦ | 157 | Create PELMO runs from psm files and execute them ⠧ | 158 | Create PELMO runs from psm files and execute them ⠇ | 159 | Create PELMO runs from psm files and execute them ⠏ | 160 | Create PELMO runs from psm files and execute them ⠋ | 161 | Create PELMO runs from psm files and execute them ⠙ | 162 | Create PELMO runs from psm files and execute them ⠹ | 163 | Create PELMO runs from psm files and execute them ⠸ | 164 | Create PELMO runs from psm files and execute them ⠼ | 165 | Create PELMO runs from psm files and execute them ⠴ | 166 | Create PELMO runs from psm files and execute them ⠦ | 167 | Create PELMO runs from psm files and execute them ⠧ | 168 | Create PELMO runs from psm files and execute them ⠇ | 169 | Create PELMO runs from psm files and execute them ⠏ | 170 | Create PELMO runs from psm files and execute them ⠋ | 171 | Create PELMO runs from psm files and execute them ⠙ | 172 | Create PELMO runs from psm files and execute them ⠹ | 173 | Create PELMO runs from psm files and execute them ⠸ | 174 | Create PELMO runs from psm files and execute them ⠼ | 175 | Create PELMO runs from psm files and execute them ⠴ | 176 | Create PELMO runs from psm files and execute them ⠦ | 177 | Create PELMO runs from psm files and execute them ⠧ | 178 | Create PELMO runs from psm files and execute them ⠇ | 179 | Create PELMO runs from psm files and execute them ⠏ | 180 | Create PELMO runs from psm files and execute them ⠋ | 181 | Create PELMO runs from psm files and execute them ⠙ | 182 | Create PELMO runs from psm files and execute them ⠹ | 183 | Create PELMO runs from psm files and execute them ⠸ | 184 | Create PELMO runs from psm files and execute them ⠼ | 185 | Create PELMO runs from psm files and execute them ⠴ | 186 | Create PELMO runs from psm files and execute them ⠦ | 187 | Create PELMO runs from psm files and execute them ⠧ | 188 | Create PELMO runs from psm files and execute them ⠇ | 189 | Create PELMO runs from psm files and execute them ⠏ | 190 | Create PELMO runs from psm files and execute them ⠋ | 191 | Create PELMO runs from psm files and execute them ⠙ | 192 | Create PELMO runs from psm files and execute them ⠹ | 193 | Create PELMO runs from psm files and execute them ⠸ | 194 | Create PELMO runs from psm files and execute them ⠼ | 195 | Create PELMO runs from psm files and execute them ⠴ | 196 | Create PELMO runs from psm files and execute them ⠦ | 197 | Create PELMO runs from psm files and execute them ⠧ | 198 | Create PELMO runs from psm files and execute them ⠇ | 199 | Create PELMO runs from psm files and execute them ⠏ | 200 | Create PELMO runs from psm files and execute them ⠋ | 201 | Create PELMO runs from psm files and execute them ⠙ | 202 | Create PELMO runs from psm files and execute them ⠹ | 203 | Create PELMO runs from psm files and execute them ⠸ | 204 | Create PELMO runs from psm files and execute them ⠼ | 205 | Create PELMO runs from psm files and execute them ⠴ | 206 | Create PELMO runs from psm files and execute them ⠦ | 207 | Create PELMO runs from psm files and execute them ⠧ | 208 | Create PELMO runs from psm files and execute them ⠇ | 209 | Create PELMO runs from psm files and execute them ⠏ | 210 | Create PELMO runs from psm files and execute them ⠋ | 211 | Create PELMO runs from psm files and execute them ⠙ | 212 | Create PELMO runs from psm files and execute them ⠹ | 213 | Create PELMO runs from psm files and execute them ⠸ | 214 | Create PELMO runs from psm files and execute them ⠼ | 215 | Create PELMO runs from psm files and execute them ⠴ | 216 | Create PELMO runs from psm files and execute them ⠦ | 217 | Create PELMO runs from psm files and execute them ⠧ | 218 | Create PELMO runs from psm files and execute them ⠇ | 219 | Create PELMO runs from psm files and execute them ✔ | 219 | Create PELMO runs from psm files and execute them [76.0 s]
⠏ | 0 | Actual and time weighted average concentrations for SFO kinetics ⠋ | 1 | Actual and time weighted average concentrations for SFO kinetics ✔ | 1 | Actual and time weighted average concentrations for SFO kinetics
⠏ | 0 | FOCUS Step 1 calculations ⠋ | 1 | FOCUS Step 1 calculations ⠙ | 2 | FOCUS Step 1 calculations ⠹ | 3 | FOCUS Step 1 calculations ⠸ | 4 | FOCUS Step 1 calculations ⠼ | 5 | FOCUS Step 1 calculations ⠴ | 6 | FOCUS Step 1 calculations ⠦ | 7 | FOCUS Step 1 calculations ⠧ | 8 | FOCUS Step 1 calculations ⠇ | 9 | FOCUS Step 1 calculations ✔ | 9 | FOCUS Step 1 calculations [0.1 s]
⠏ | 0 | FOCUS Steps 12 input files ⠋ | 1 | FOCUS Steps 12 input files ⠙ | 2 | FOCUS Steps 12 input files ⠹ | 3 | FOCUS Steps 12 input files ⠸ | 4 | FOCUS Steps 12 input files ⠼ | 5 | FOCUS Steps 12 input files ⠴ | 6 | FOCUS Steps 12 input files ⠦ | 7 | FOCUS Steps 12 input files ⠧ | 8 | FOCUS Steps 12 input files ✔ | 8 | FOCUS Steps 12 input files
- ⠏ | 0 | Read and analyse TOXSWA cwa files ⠋ | 1 | Read and analyse TOXSWA cwa files ⠙ | 2 | Read and analyse TOXSWA cwa files ⠹ | 3 | Read and analyse TOXSWA cwa files ⠸ | 4 | Read and analyse TOXSWA cwa files ⠼ | 5 | Read and analyse TOXSWA cwa files ⠴ | 6 | Read and analyse TOXSWA cwa files ⠦ | 7 | Read and analyse TOXSWA cwa files ✔ | 7 | Read and analyse TOXSWA cwa files [3.6 s]
+ ⠏ | 0 | Read and analyse TOXSWA cwa files ⠋ | 1 | Read and analyse TOXSWA cwa files ⠙ | 2 | Read and analyse TOXSWA cwa files ⠹ | 3 | Read and analyse TOXSWA cwa files ⠸ | 4 | Read and analyse TOXSWA cwa files ⠼ | 5 | Read and analyse TOXSWA cwa files ⠴ | 6 | Read and analyse TOXSWA cwa files ⠦ | 7 | Read and analyse TOXSWA cwa files ✔ | 7 | Read and analyse TOXSWA cwa files [6.0 s]
⠏ | 0 | UK drainage PEC calculations ⠋ | 1 | UK drainage PEC calculations ⠙ | 2 | UK drainage PEC calculations ⠹ | 3 | UK drainage PEC calculations ⠸ | 4 | UK drainage PEC calculations ⠼ | 5 | UK drainage PEC calculations ⠴ | 6 | UK drainage PEC calculations ⠦ | 7 | UK drainage PEC calculations ⠧ | 8 | UK drainage PEC calculations ⠇ | 9 | UK drainage PEC calculations ⠏ | 10 | UK drainage PEC calculations ⠋ | 11 | UK drainage PEC calculations ⠙ | 12 | UK drainage PEC calculations ✔ | 12 | UK drainage PEC calculations
══ Results ═════════════════════════════════════════════════════════════════════════════════════════
-Duration: 78.9 s
+Duration: 83.5 s
OK: 282
Failed: 0
diff --git a/tests/testthat/test_PELMO.R b/tests/testthat/test_PELMO.R
index 49c03d3..ba6a04a 100644
--- a/tests/testthat/test_PELMO.R
+++ b/tests/testthat/test_PELMO.R
@@ -21,11 +21,12 @@ runs <- list(
# Check if we have wine on the path
wine_installed <- system('wine --version', ignore.stdout = TRUE) == 0
+skip_if_no_wine <- function() {
+ if (!wine_installed) skip("wine is not available")
+}
test_that("PELMO paths are correctly created", {
- if (!wine_installed) {
- skip("A wine installation is needed for this test")
- }
+ skip_if_no_wine()
psm_paths = c(
PELMO_path(runs[[1]]$psm, "fbe", "Por"),
PELMO_path(runs[[2]]$psm, "pot", "Ham"),
@@ -40,9 +41,7 @@ test_that("PELMO paths are correctly created", {
})
test_that("PELMO runs are correctly set up", {
- if (!wine_installed) {
- skip("A wine installation is needed for this test")
- }
+ skip_if_no_wine()
# Prepare runs in analogy to the test archive
skip_on_cran()
@@ -67,11 +66,9 @@ test_that("PELMO runs are correctly set up", {
})
test_that("PELMO runs can be run and give the expected result files", {
- if (!wine_installed) {
- skip("A wine installation is needed for this test")
- }
-
+ skip_if_no_wine()
skip_on_cran()
+
run_PELMO(runs, cores = 7)
plm_files <- c("CHEM.PLM", "ECHO.PLM",
@@ -104,14 +101,12 @@ test_that("PELMO runs can be run and give the expected result files", {
}
})
-pfm_PECgw <- evaluate_PELMO(runs)
-
test_that("PELMO runs are correctly evaluated", {
- if (!wine_installed) {
- skip("A wine installation is needed for this test")
- }
-
+ skip_if_no_wine()
skip_on_cran()
+
+ pfm_PECgw <- evaluate_PELMO(runs)
+
# Check that if output is the same as in the test archive
for (run in runs) {
psm <- run$psm
@@ -168,10 +163,11 @@ test_that("PELMO runs are correctly evaluated", {
})
test_that("PECgw from FOCUS summary files can be reproduced", {
- if (!wine_installed) {
- skip("A wine installation is needed for this test")
- }
+ skip_if_no_wine()
skip_on_cran()
+
+ pfm_PECgw <- evaluate_PELMO(runs)
+
focus_summary <- list()
for (run in runs) {

Contact - Imprint