diff options
author | Johannes Ranke <jranke@uni-bremen.de> | 2024-08-26 17:11:43 +0200 |
---|---|---|
committer | Johannes Ranke <jranke@uni-bremen.de> | 2024-08-26 17:11:43 +0200 |
commit | 913c383880da2a5f4bdb71c8a82107afbad6ef13 (patch) | |
tree | 1c5a988748fc49fde4c279a96650deb26039b711 /log/test.log | |
parent | 9e62ed638e530a5cebebf491de055caca49a56ef (diff) | |
parent | 396ba6c42252426a132be56b9f417786a1f276e3 (diff) |
Merge branch 'main' into crop_group
Diffstat (limited to 'log/test.log')
-rw-r--r-- | log/test.log | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/log/test.log b/log/test.log index 8393cf9..919c91f 100644 --- a/log/test.log +++ b/log/test.log @@ -2,17 +2,29 @@ ✔ | 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 | Simple PEC sediment calculations ✔ | 17 | Simple PEC soil calculations -✔ | 7 | Simple PEC surface water calculations with drift entry +✔ | 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] ✔ | 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 -[ FAIL 0 | WARN 0 | SKIP 0 | PASS 76 ] +[ FAIL 0 | WARN 0 | SKIP 0 | PASS 77 ] |