Use units in PEC_sw_exposit_drainage. Closes #3

3 files changed, 14 insertions, 43 deletions

diff --git a/log/build.log b/log/build.log
index b92f348..d5832bf 100644
--- a/log/build.log
+++ b/log/build.log
@@ -3,9 +3,6 @@
 * checking DESCRIPTION meta-information ... OK
 * checking for LF line-endings in source and make files and shell scripts
 * checking for empty or unneeded directories
-<<<<<<< HEAD
-=======
 * re-saving image files
->>>>>>> main
 * building ‘pfm_0.6.3.tar.gz’
 
diff --git a/log/check.log b/log/check.log
index 301028e..c4dbfac 100644
--- a/log/check.log
+++ b/log/check.log
@@ -1,37 +1,24 @@
-<<<<<<< HEAD
-* using log directory ‘/home/jranke/git/pfm/pfm.Rcheck’
-* using R version 4.3.3 (2024-02-29)
-* using platform: x86_64-pc-linux-gnu (64-bit)
-=======
 * using log directory ‘/home/agsad.admin.ch/f80868656/projects/pfm/pfm.Rcheck’
 * using R version 4.4.1 (2024-06-14)
 * using platform: x86_64-pc-linux-gnu
->>>>>>> main
 * R was compiled by
-    gcc (Debian 12.2.0-14) 12.2.0
-    GNU Fortran (Debian 12.2.0-14) 12.2.0
-* running under: Debian GNU/Linux 12 (bookworm)
+    gcc (Ubuntu 11.4.0-1ubuntu1~22.04) 11.4.0
+    GNU Fortran (Ubuntu 11.4.0-1ubuntu1~22.04) 11.4.0
+* running under: Ubuntu 22.04.5 LTS
 * using session charset: UTF-8
 * using options ‘--no-tests --as-cran’
 * checking for file ‘pfm/DESCRIPTION’ ... OK
 * checking extension type ... Package
 * this is package ‘pfm’ version ‘0.6.3’
 * package encoding: UTF-8
-<<<<<<< HEAD
-* checking CRAN incoming feasibility ... [1s/103s] NOTE
-Maintainer: ‘Johannes Ranke <johannes.ranke@agroscope.admin.ch>’
-
-Size of tarball: 8530180 bytes
-=======
 * checking CRAN incoming feasibility ... NOTE
 Maintainer: ‘Johannes Ranke <johannes.ranke@agroscope.admin.ch>’
 
-Size of tarball: 8531409 bytes
->>>>>>> main
+The Date field is over a month old.
+
+Size of tarball: 8532216 bytes
 * checking package namespace information ... OK
-* checking package dependencies ...Warning: unable to access index for repository https://cran.rstudio.com/src/contrib:
-  cannot open URL 'https://cran.rstudio.com/src/contrib/PACKAGES'
- OK
+* checking package dependencies ... OK
 * checking if this is a source package ... OK
 * checking if there is a namespace ... OK
 * checking for executable files ... OK
@@ -44,8 +31,7 @@ Size of tarball: 8531409 bytes
   sub-directories of 1Mb or more:
     testdata   9.9Mb
 * checking package directory ... OK
-* checking for future file timestamps ... NOTE
-unable to verify current time
+* checking for future file timestamps ... OK
 * checking DESCRIPTION meta-information ... OK
 * checking top-level files ... NOTE
 Files ‘README.md’ or ‘NEWS.md’ cannot be checked without ‘pandoc’ being installed.
@@ -65,7 +51,7 @@ Files ‘README.md’ or ‘NEWS.md’ cannot be checked without ‘pandoc’ be
 * checking S3 generic/method consistency ... OK
 * checking replacement functions ... OK
 * checking foreign function calls ... OK
-* checking R code for possible problems ... OK
+* checking R code for possible problems ... [16s/12s] OK
 * checking Rd files ... OK
 * checking Rd metadata ... OK
 * checking Rd line widths ... OK
@@ -79,7 +65,7 @@ Files ‘README.md’ or ‘NEWS.md’ cannot be checked without ‘pandoc’ be
 * checking data for non-ASCII characters ... OK
 * checking LazyData ... OK
 * checking data for ASCII and uncompressed saves ... OK
-* checking examples ... [21s/11s] OK
+* checking examples ... [17s/18s] OK
 * checking for unstated dependencies in ‘tests’ ... OK
 * checking tests ... SKIPPED
 * checking PDF version of manual ... OK
@@ -91,6 +77,6 @@ Skipping checking HTML validation: no command 'tidy' found
 
 Status: 4 NOTEs
 See
-  ‘/home/jranke/git/pfm/pfm.Rcheck/00check.log’
+  ‘/home/agsad.admin.ch/f80868656/projects/pfm/pfm.Rcheck/00check.log’
 for details.
 
diff --git a/log/test.log b/log/test.log
index 919c91f..5f60406 100644
--- a/log/test.log
+++ b/log/test.log
@@ -2,29 +2,17 @@
 ✔ | F W  S  OK | Context
 ✔ |          7 | Exposit calculations
 ✔ |          6 | Geometric mean calculation
-<<<<<<< HEAD
-✔ |          1 | Check max_twa for parent mkinfit models against analytical solutions
-=======
-✔ |          1 | Check max_twa for parent mkinfit models against analytical solutions [1.2s]
->>>>>>> main
+✔ |          1 | Check max_twa for parent mkinfit models against analytical solutions [2.0s]
 ✔ |          1 | Simple PEC sediment calculations
 ✔ |         17 | Simple PEC soil calculations
 ✔ |          8 | Simple PEC surface water calculations with drift entry
 ✔ |          1 | Actual and time weighted average concentrations for SFO kinetics
 ✔ |          9 | FOCUS Step 1 calculations
 ✔ |          8 | FOCUS Steps 12 input files
-<<<<<<< HEAD
-✔ |          7 | Read and analyse TOXSWA cwa files [4.2s]
+✔ |          7 | Read and analyse TOXSWA cwa files [6.3s]
 ✔ |         12 | UK drainage PEC calculations
 
 ══ Results ═════════════════════════════════════════════════════════════════════════════════════════
-Duration: 5.5 s
-=======
-✔ |          7 | Read and analyse TOXSWA cwa files [4.3s]
-✔ |         12 | UK drainage PEC calculations
-
-══ Results ═════════════════════════════════════════════════════════════════════════════════════════
-Duration: 6.3 s
->>>>>>> main
+Duration: 9.5 s
 
 [ FAIL 0 | WARN 0 | SKIP 0 | PASS 77 ]