diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-10-07 13:32:54 -0700 |
---|---|---|
committer | Dirk Hohndel <dirk@hohndel.org> | 2017-10-07 14:52:57 -0700 |
commit | d5a0184f71d64705f8f35cc42636b82542257e88 (patch) | |
tree | 5d030b7b709e2f70cd007dc8891ad8e036989889 | |
parent | 03b10383c9c0e48922fa8d8e419c9c75881dbecd (diff) | |
download | subsurface-d5a0184f71d64705f8f35cc42636b82542257e88.tar.gz |
Fix divinglog import temperature truncation
The code incorrectly divided the temperature by 10 as an integer,
causing unnecessary precision loss due to truncation.
Fix it, and update the test results for the now improved temperature
import.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
-rw-r--r-- | core/parse-xml.c | 2 | ||||
-rw-r--r-- | dives/test40-42.xml | 126 |
2 files changed, 64 insertions, 64 deletions
diff --git a/core/parse-xml.c b/core/parse-xml.c index 303f974ed..d69545550 100644 --- a/core/parse-xml.c +++ b/core/parse-xml.c @@ -3294,7 +3294,7 @@ extern int divinglog_profile(void *handle, int columns, char **data, char **colu int tank = atoi_n(ptr2+7, 1); int rbt = atoi_n(ptr2+8, 3) * 60; - cur_sample->temperature.mkelvin = C_to_mkelvin(temp / 10); + cur_sample->temperature.mkelvin = C_to_mkelvin(temp / 10.0f); cur_sample->pressure[0].mbar = pressure * 100; if (oldcyl != tank) { struct gasmix *mix = &cur_dive->cylinder[tank].gasmix; diff --git a/dives/test40-42.xml b/dives/test40-42.xml index 340d6a076..ef239fa3c 100644 --- a/dives/test40-42.xml +++ b/dives/test40-42.xml @@ -45,10 +45,10 @@ <cylinder o2='25.0%' he='26.0%' /> <cylinder o2='50.0%' he='6.0%' /> <cylinder o2='100.0%' /> - <divetemperature air='11.0 C'/> + <divetemperature air='11.0 C' water='5.0 C'/> <divecomputer model='OSTC'> <depth max='81.5 m' mean='22.379 m' /> - <temperature water='5.0 C' /> + <temperature water='5.1 C' /> <event time='0:00 min' type='25' value='393266' name='gaschange' cylinder='0' o2='50.0%' he='6.0%' /> <event time='10:30 min' type='25' value='3604496' name='gaschange' cylinder='1' o2='16.0%' he='55.0%' /> <event time='15:50 min' type='25' value='1703961' name='gaschange' cylinder='2' o2='25.0%' he='26.0%' /> @@ -56,7 +56,7 @@ <event time='40:10 min' type='25' value='1703961' name='gaschange' cylinder='2' o2='25.0%' he='26.0%' /> <event time='49:20 min' type='25' value='393266' name='gaschange' cylinder='0' o2='50.0%' he='6.0%' /> <event time='72:00 min' type='11' value='100' name='gaschange' cylinder='6' o2='100.0%' /> - <sample time='0:00 min' depth='2.68 m' temp='11.0 C' ndl='240:00 min' /> + <sample time='0:00 min' depth='2.68 m' temp='11.1 C' ndl='240:00 min' /> <sample time='0:10 min' depth='3.46 m' /> <sample time='0:20 min' depth='4.17 m' /> <sample time='0:30 min' depth='3.74 m' /> @@ -67,103 +67,103 @@ <sample time='1:20 min' depth='5.78 m' /> <sample time='1:30 min' depth='6.5 m' /> <sample time='1:40 min' depth='7.19 m' /> - <sample time='1:50 min' depth='7.66 m' temp='10.0 C' /> + <sample time='1:50 min' depth='7.66 m' temp='10.2 C' /> <sample time='2:00 min' depth='7.73 m' /> <sample time='2:10 min' depth='7.9 m' /> <sample time='2:20 min' depth='7.8 m' /> <sample time='2:30 min' depth='7.68 m' /> <sample time='2:40 min' depth='7.31 m' /> - <sample time='2:50 min' depth='7.35 m' temp='9.0 C' /> + <sample time='2:50 min' depth='7.35 m' temp='9.6 C' /> <sample time='3:00 min' depth='7.59 m' /> <sample time='3:10 min' depth='7.84 m' /> <sample time='3:20 min' depth='8.08 m' /> <sample time='3:30 min' depth='8.24 m' /> <sample time='3:40 min' depth='8.44 m' /> - <sample time='3:50 min' depth='8.51 m' cns='1%' /> + <sample time='3:50 min' depth='8.51 m' temp='9.2 C' cns='1%' /> <sample time='4:00 min' depth='8.71 m' /> <sample time='4:10 min' depth='9.23 m' /> <sample time='4:20 min' depth='9.57 m' /> <sample time='4:30 min' depth='9.95 m' /> <sample time='4:40 min' depth='9.96 m' /> - <sample time='4:50 min' depth='9.92 m' temp='8.0 C' /> + <sample time='4:50 min' depth='9.92 m' temp='8.9 C' /> <sample time='5:00 min' depth='10.0 m' /> <sample time='5:10 min' depth='10.35 m' /> <sample time='5:20 min' depth='10.43 m' /> <sample time='5:30 min' depth='10.57 m' /> <sample time='5:40 min' depth='10.76 m' /> - <sample time='5:50 min' depth='11.45 m' cns='2%' /> + <sample time='5:50 min' depth='11.45 m' temp='8.6 C' cns='2%' /> <sample time='6:00 min' depth='11.7 m' /> <sample time='6:10 min' depth='11.84 m' /> <sample time='6:20 min' depth='11.95 m' /> <sample time='6:30 min' depth='12.47 m' /> <sample time='6:40 min' depth='12.66 m' /> - <sample time='6:50 min' depth='13.01 m' /> + <sample time='6:50 min' depth='13.01 m' temp='8.2 C' /> <sample time='7:00 min' depth='13.09 m' /> <sample time='7:10 min' depth='13.52 m' /> <sample time='7:20 min' depth='14.08 m' /> <sample time='7:30 min' depth='14.32 m' /> <sample time='7:40 min' depth='15.0 m' /> - <sample time='7:50 min' depth='15.15 m' temp='7.0 C' /> + <sample time='7:50 min' depth='15.15 m' temp='7.7 C' /> <sample time='8:00 min' depth='15.7 m' /> <sample time='8:10 min' depth='15.47 m' /> <sample time='8:20 min' depth='16.18 m' /> <sample time='8:30 min' depth='16.61 m' /> <sample time='8:40 min' depth='17.09 m' /> - <sample time='8:50 min' depth='17.75 m' /> + <sample time='8:50 min' depth='17.75 m' temp='7.0 C' /> <sample time='9:00 min' depth='18.21 m' /> <sample time='9:10 min' depth='18.65 m' /> <sample time='9:20 min' depth='19.03 m' /> <sample time='9:30 min' depth='19.31 m' /> <sample time='9:40 min' depth='19.88 m' /> - <sample time='9:50 min' depth='19.84 m' temp='6.0 C' cns='4%' /> + <sample time='9:50 min' depth='19.84 m' temp='6.6 C' cns='4%' /> <sample time='10:00 min' depth='20.19 m' /> <sample time='10:10 min' depth='20.63 m' /> <sample time='10:20 min' depth='21.17 m' /> <sample time='10:30 min' depth='21.48 m' /> <sample time='10:40 min' depth='21.66 m' /> - <sample time='10:50 min' depth='21.87 m' ndl='10:00 min' /> + <sample time='10:50 min' depth='21.87 m' temp='6.3 C' ndl='10:00 min' /> <sample time='11:00 min' depth='22.01 m' /> <sample time='11:10 min' depth='22.06 m' /> <sample time='11:20 min' depth='21.9 m' /> <sample time='11:30 min' depth='22.16 m' /> <sample time='11:40 min' depth='22.26 m' /> - <sample time='11:50 min' depth='22.75 m' temp='5.0 C' ndl='9:00 min' /> + <sample time='11:50 min' depth='22.75 m' temp='5.9 C' ndl='9:00 min' /> <sample time='12:00 min' depth='22.41 m' /> <sample time='12:10 min' depth='22.4 m' /> <sample time='12:20 min' depth='22.41 m' /> <sample time='12:30 min' depth='22.2 m' /> <sample time='12:40 min' depth='22.4 m' /> - <sample time='12:50 min' depth='22.7 m' ndl='8:00 min' /> + <sample time='12:50 min' depth='22.7 m' temp='5.7 C' ndl='8:00 min' /> <sample time='13:00 min' depth='22.93 m' /> <sample time='13:10 min' depth='22.56 m' /> <sample time='13:20 min' depth='22.69 m' /> <sample time='13:30 min' depth='23.0 m' /> <sample time='13:40 min' depth='23.7 m' /> - <sample time='13:50 min' depth='23.51 m' ndl='6:00 min' cns='5%' /> + <sample time='13:50 min' depth='23.51 m' temp='5.6 C' ndl='6:00 min' cns='5%' /> <sample time='14:00 min' depth='23.1 m' /> <sample time='14:10 min' depth='23.33 m' /> <sample time='14:20 min' depth='22.58 m' /> <sample time='14:30 min' depth='22.04 m' /> <sample time='14:40 min' depth='22.36 m' /> - <sample time='14:50 min' depth='22.21 m' /> + <sample time='14:50 min' depth='22.21 m' temp='5.5 C' /> <sample time='15:00 min' depth='21.95 m' /> <sample time='15:10 min' depth='21.3 m' /> <sample time='15:20 min' depth='21.26 m' /> <sample time='15:30 min' depth='21.14 m' /> <sample time='15:40 min' depth='21.21 m' /> - <sample time='15:50 min' depth='21.66 m' ndl='18:00 min' /> + <sample time='15:50 min' depth='21.66 m' temp='5.4 C' ndl='18:00 min' /> <sample time='16:00 min' depth='22.33 m' /> <sample time='16:10 min' depth='22.39 m' /> <sample time='16:20 min' depth='22.62 m' /> <sample time='16:30 min' depth='22.96 m' /> <sample time='16:40 min' depth='23.97 m' /> - <sample time='16:50 min' depth='24.88 m' ndl='11:00 min' /> + <sample time='16:50 min' depth='24.88 m' temp='5.3 C' ndl='11:00 min' /> <sample time='17:00 min' depth='25.78 m' /> <sample time='17:10 min' depth='26.66 m' /> <sample time='17:20 min' depth='27.43 m' /> <sample time='17:30 min' depth='27.81 m' /> <sample time='17:40 min' depth='28.32 m' /> - <sample time='17:50 min' depth='29.01 m' ndl='6:00 min' /> + <sample time='17:50 min' depth='29.01 m' temp='5.2 C' ndl='6:00 min' /> <sample time='18:00 min' depth='29.63 m' /> <sample time='18:10 min' depth='30.61 m' /> <sample time='18:20 min' depth='31.92 m' /> @@ -187,7 +187,7 @@ <sample time='21:20 min' depth='58.94 m' /> <sample time='21:30 min' depth='61.03 m' /> <sample time='21:40 min' depth='62.84 m' /> - <sample time='21:50 min' depth='64.2 m' stopdepth='21.0 m' cns='7%' /> + <sample time='21:50 min' depth='64.2 m' temp='5.3 C' stopdepth='21.0 m' cns='7%' /> <sample time='22:00 min' depth='66.32 m' /> <sample time='22:10 min' depth='68.55 m' /> <sample time='22:20 min' depth='70.44 m' /> @@ -205,7 +205,7 @@ <sample time='24:20 min' depth='78.09 m' /> <sample time='24:30 min' depth='78.2 m' /> <sample time='24:40 min' depth='78.39 m' /> - <sample time='24:50 min' depth='78.66 m' stopdepth='30.0 m' /> + <sample time='24:50 min' depth='78.66 m' temp='5.2 C' stopdepth='30.0 m' /> <sample time='25:00 min' depth='78.75 m' /> <sample time='25:10 min' depth='78.92 m' /> <sample time='25:20 min' depth='78.73 m' /> @@ -229,25 +229,25 @@ <sample time='28:20 min' depth='78.35 m' /> <sample time='28:30 min' depth='78.45 m' /> <sample time='28:40 min' depth='78.18 m' /> - <sample time='28:50 min' depth='77.78 m' stopdepth='36.0 m' /> + <sample time='28:50 min' depth='77.78 m' temp='5.1 C' stopdepth='36.0 m' /> <sample time='29:00 min' depth='77.78 m' /> <sample time='29:10 min' depth='76.76 m' /> <sample time='29:20 min' depth='75.75 m' /> <sample time='29:30 min' depth='74.95 m' /> <sample time='29:40 min' depth='74.33 m' /> - <sample time='29:50 min' depth='74.1 m' cns='12%' /> + <sample time='29:50 min' depth='74.1 m' temp='5.2 C' cns='12%' /> <sample time='30:00 min' depth='73.76 m' /> <sample time='30:10 min' depth='73.1 m' /> <sample time='30:20 min' depth='71.91 m' /> <sample time='30:30 min' depth='70.79 m' /> <sample time='30:40 min' depth='69.68 m' /> - <sample time='30:50 min' depth='69.23 m' /> + <sample time='30:50 min' depth='69.23 m' temp='5.3 C' /> <sample time='31:00 min' depth='68.51 m' /> <sample time='31:10 min' depth='68.6 m' /> <sample time='31:20 min' depth='68.43 m' /> <sample time='31:30 min' depth='67.49 m' /> <sample time='31:40 min' depth='66.86 m' /> - <sample time='31:50 min' depth='65.99 m' cns='13%' /> + <sample time='31:50 min' depth='65.99 m' temp='5.4 C' cns='13%' /> <sample time='32:00 min' depth='65.48 m' /> <sample time='32:10 min' depth='65.02 m' /> <sample time='32:20 min' depth='64.73 m' /> @@ -259,7 +259,7 @@ <sample time='33:20 min' depth='60.05 m' /> <sample time='33:30 min' depth='58.42 m' /> <sample time='33:40 min' depth='58.14 m' /> - <sample time='33:50 min' depth='56.7 m' cns='14%' /> + <sample time='33:50 min' depth='56.7 m' temp='5.5 C' cns='14%' /> <sample time='34:00 min' depth='56.22 m' /> <sample time='34:10 min' depth='55.46 m' /> <sample time='34:20 min' depth='55.09 m' /> @@ -271,7 +271,7 @@ <sample time='35:20 min' depth='50.37 m' /> <sample time='35:30 min' depth='49.57 m' /> <sample time='35:40 min' depth='48.71 m' /> - <sample time='35:50 min' depth='47.76 m' /> + <sample time='35:50 min' depth='47.76 m' temp='5.6 C' /> <sample time='36:00 min' depth='47.4 m' /> <sample time='36:10 min' depth='47.14 m' /> <sample time='36:20 min' depth='46.89 m' /> @@ -307,7 +307,7 @@ <sample time='41:20 min' depth='27.86 m' /> <sample time='41:30 min' depth='27.68 m' /> <sample time='41:40 min' depth='27.38 m' /> - <sample time='41:50 min' depth='26.92 m' stopdepth='27.0 m' cns='16%' /> + <sample time='41:50 min' depth='26.92 m' temp='5.7 C' stopdepth='27.0 m' cns='16%' /> <sample time='42:00 min' depth='26.64 m' /> <sample time='42:10 min' depth='26.45 m' /> <sample time='42:20 min' depth='26.05 m' /> @@ -325,7 +325,7 @@ <sample time='44:20 min' depth='23.04 m' /> <sample time='44:30 min' depth='22.78 m' /> <sample time='44:40 min' depth='22.37 m' /> - <sample time='44:50 min' depth='22.51 m' stoptime='1:00 min' /> + <sample time='44:50 min' depth='22.51 m' temp='5.8 C' stoptime='1:00 min' /> <sample time='45:00 min' depth='22.71 m' /> <sample time='45:10 min' depth='22.43 m' /> <sample time='45:20 min' depth='22.59 m' /> @@ -367,7 +367,7 @@ <sample time='51:20 min' depth='20.2 m' /> <sample time='51:30 min' depth='20.27 m' /> <sample time='51:40 min' depth='20.22 m' /> - <sample time='51:50 min' depth='20.64 m' stoptime='1:00 min' cns='19%' /> + <sample time='51:50 min' depth='20.64 m' temp='5.7 C' stoptime='1:00 min' cns='19%' /> <sample time='52:00 min' depth='20.75 m' /> <sample time='52:10 min' depth='20.5 m' /> <sample time='52:20 min' depth='20.31 m' /> @@ -379,7 +379,7 @@ <sample time='53:20 min' depth='18.66 m' /> <sample time='53:30 min' depth='17.98 m' /> <sample time='53:40 min' depth='17.9 m' /> - <sample time='53:50 min' depth='17.35 m' stoptime='4:00 min' cns='21%' /> + <sample time='53:50 min' depth='17.35 m' temp='5.8 C' stoptime='4:00 min' cns='21%' /> <sample time='54:00 min' depth='17.29 m' /> <sample time='54:10 min' depth='16.96 m' /> <sample time='54:20 min' depth='15.98 m' /> @@ -391,7 +391,7 @@ <sample time='55:20 min' depth='15.54 m' /> <sample time='55:30 min' depth='14.99 m' /> <sample time='55:40 min' depth='14.76 m' /> - <sample time='55:50 min' depth='14.54 m' stoptime='2:00 min' cns='22%' /> + <sample time='55:50 min' depth='14.54 m' temp='5.9 C' stoptime='2:00 min' cns='22%' /> <sample time='56:00 min' depth='13.85 m' /> <sample time='56:10 min' depth='13.54 m' /> <sample time='56:20 min' depth='13.36 m' /> @@ -403,31 +403,31 @@ <sample time='57:20 min' depth='12.25 m' /> <sample time='57:30 min' depth='12.35 m' /> <sample time='57:40 min' depth='12.58 m' /> - <sample time='57:50 min' depth='12.91 m' stoptime='8:00 min' stopdepth='9.0 m' cns='23%' /> + <sample time='57:50 min' depth='12.91 m' temp='6.2 C' stoptime='8:00 min' stopdepth='9.0 m' cns='23%' /> <sample time='58:00 min' depth='12.96 m' /> <sample time='58:10 min' depth='12.64 m' /> <sample time='58:20 min' depth='12.76 m' /> <sample time='58:30 min' depth='12.73 m' /> <sample time='58:40 min' depth='12.59 m' /> - <sample time='58:50 min' depth='12.2 m' stoptime='7:00 min' /> + <sample time='58:50 min' depth='12.2 m' temp='6.4 C' stoptime='7:00 min' /> <sample time='59:00 min' depth='12.05 m' /> <sample time='59:10 min' depth='11.82 m' /> <sample time='59:20 min' depth='11.48 m' /> <sample time='59:30 min' depth='11.65 m' /> <sample time='59:40 min' depth='11.42 m' /> - <sample time='59:50 min' depth='11.57 m' stoptime='6:00 min' cns='24%' /> + <sample time='59:50 min' depth='11.57 m' temp='6.6 C' stoptime='6:00 min' cns='24%' /> <sample time='60:00 min' depth='11.47 m' /> <sample time='60:10 min' depth='11.14 m' /> <sample time='60:20 min' depth='10.78 m' /> <sample time='60:30 min' depth='10.56 m' /> <sample time='60:40 min' depth='10.3 m' /> - <sample time='60:50 min' depth='10.33 m' stoptime='5:00 min' /> + <sample time='60:50 min' depth='10.33 m' temp='6.7 C' stoptime='5:00 min' /> <sample time='61:00 min' depth='10.45 m' /> <sample time='61:10 min' depth='10.19 m' /> <sample time='61:20 min' depth='9.95 m' /> <sample time='61:30 min' depth='9.8 m' /> <sample time='61:40 min' depth='9.75 m' /> - <sample time='61:50 min' depth='9.49 m' stoptime='4:00 min' /> + <sample time='61:50 min' depth='9.49 m' temp='6.9 C' stoptime='4:00 min' /> <sample time='62:00 min' depth='9.61 m' /> <sample time='62:10 min' depth='9.44 m' /> <sample time='62:20 min' depth='9.3 m' /> @@ -439,7 +439,7 @@ <sample time='63:20 min' depth='9.55 m' /> <sample time='63:30 min' depth='9.51 m' /> <sample time='63:40 min' depth='9.45 m' /> - <sample time='63:50 min' depth='9.42 m' stoptime='2:00 min' cns='25%' /> + <sample time='63:50 min' depth='9.42 m' temp='7.1 C' stoptime='2:00 min' cns='25%' /> <sample time='64:00 min' depth='9.46 m' /> <sample time='64:10 min' depth='9.51 m' /> <sample time='64:20 min' depth='9.52 m' /> @@ -457,43 +457,43 @@ <sample time='66:20 min' depth='8.65 m' /> <sample time='66:30 min' depth='8.33 m' /> <sample time='66:40 min' depth='7.98 m' /> - <sample time='66:50 min' depth='7.87 m' stoptime='8:00 min' /> + <sample time='66:50 min' depth='7.87 m' temp='7.2 C' stoptime='8:00 min' /> <sample time='67:00 min' depth='7.63 m' /> <sample time='67:10 min' depth='7.88 m' /> <sample time='67:20 min' depth='7.78 m' /> <sample time='67:30 min' depth='7.39 m' /> <sample time='67:40 min' depth='7.3 m' /> - <sample time='67:50 min' depth='7.33 m' stoptime='7:00 min' /> + <sample time='67:50 min' depth='7.33 m' temp='7.3 C' stoptime='7:00 min' /> <sample time='68:00 min' depth='7.16 m' /> <sample time='68:10 min' depth='7.18 m' /> <sample time='68:20 min' depth='7.37 m' /> <sample time='68:30 min' depth='7.22 m' /> <sample time='68:40 min' depth='7.54 m' /> - <sample time='68:50 min' depth='7.23 m' /> + <sample time='68:50 min' depth='7.23 m' temp='7.4 C' /> <sample time='69:00 min' depth='7.24 m' /> <sample time='69:10 min' depth='7.26 m' /> <sample time='69:20 min' depth='7.06 m' /> <sample time='69:30 min' depth='7.3 m' /> <sample time='69:40 min' depth='6.95 m' /> - <sample time='69:50 min' depth='7.2 m' stoptime='6:00 min' cns='27%' /> + <sample time='69:50 min' depth='7.2 m' temp='7.5 C' stoptime='6:00 min' cns='27%' /> <sample time='70:00 min' depth='6.79 m' /> <sample time='70:10 min' depth='6.54 m' /> <sample time='70:20 min' depth='6.77 m' /> <sample time='70:30 min' depth='6.34 m' /> <sample time='70:40 min' depth='6.39 m' /> - <sample time='70:50 min' depth='6.26 m' stoptime='5:00 min' /> + <sample time='70:50 min' depth='6.26 m' temp='7.6 C' stoptime='5:00 min' /> <sample time='71:00 min' depth='6.28 m' /> <sample time='71:10 min' depth='6.27 m' /> <sample time='71:20 min' depth='6.29 m' /> <sample time='71:30 min' depth='5.92 m' /> <sample time='71:40 min' depth='5.7 m' /> - <sample time='71:50 min' depth='5.84 m' /> + <sample time='71:50 min' depth='5.84 m' temp='7.8 C' /> <sample time='72:00 min' depth='5.89 m' /> <sample time='72:10 min' depth='6.07 m' /> <sample time='72:20 min' depth='5.76 m' /> <sample time='72:30 min' depth='5.77 m' /> <sample time='72:40 min' depth='5.83 m' /> - <sample time='72:50 min' depth='5.87 m' stoptime='4:00 min' /> + <sample time='72:50 min' depth='5.87 m' temp='7.9 C' stoptime='4:00 min' /> <sample time='73:00 min' depth='5.88 m' /> <sample time='73:10 min' depth='5.84 m' /> <sample time='73:20 min' depth='5.73 m' /> @@ -511,13 +511,13 @@ <sample time='75:20 min' depth='6.16 m' /> <sample time='75:30 min' depth='6.12 m' /> <sample time='75:40 min' depth='6.21 m' /> - <sample time='75:50 min' depth='6.4 m' stoptime='1:00 min' cns='33%' /> + <sample time='75:50 min' depth='6.4 m' temp='8.1 C' stoptime='1:00 min' cns='33%' /> <sample time='76:00 min' depth='5.83 m' /> <sample time='76:10 min' depth='5.74 m' /> <sample time='76:20 min' depth='6.0 m' /> <sample time='76:30 min' depth='5.96 m' /> <sample time='76:40 min' depth='6.17 m' /> - <sample time='76:50 min' depth='5.99 m' stoptime='16:00 min' stopdepth='3.0 m' /> + <sample time='76:50 min' depth='5.99 m' temp='8.2 C' stoptime='16:00 min' stopdepth='3.0 m' /> <sample time='77:00 min' depth='6.0 m' /> <sample time='77:10 min' depth='6.17 m' /> <sample time='77:20 min' depth='5.92 m' /> @@ -535,13 +535,13 @@ <sample time='79:20 min' depth='4.51 m' /> <sample time='79:30 min' depth='4.61 m' /> <sample time='79:40 min' depth='4.73 m' /> - <sample time='79:50 min' depth='4.63 m' stoptime='13:00 min' cns='37%' /> + <sample time='79:50 min' depth='4.63 m' temp='8.3 C' stoptime='13:00 min' cns='37%' /> <sample time='80:00 min' depth='4.68 m' /> <sample time='80:10 min' depth='4.63 m' /> <sample time='80:20 min' depth='4.49 m' /> <sample time='80:30 min' depth='4.44 m' /> <sample time='80:40 min' depth='4.43 m' /> - <sample time='80:50 min' depth='4.53 m' stoptime='12:00 min' /> + <sample time='80:50 min' depth='4.53 m' temp='8.5 C' stoptime='12:00 min' /> <sample time='81:00 min' depth='4.69 m' /> <sample time='81:10 min' depth='4.55 m' /> <sample time='81:20 min' depth='4.6 m' /> @@ -553,19 +553,19 @@ <sample time='82:20 min' depth='4.12 m' /> <sample time='82:30 min' depth='4.03 m' /> <sample time='82:40 min' depth='3.72 m' /> - <sample time='82:50 min' depth='3.58 m' stoptime='10:00 min' /> + <sample time='82:50 min' depth='3.58 m' temp='8.6 C' stoptime='10:00 min' /> <sample time='83:00 min' depth='3.7 m' /> <sample time='83:10 min' depth='3.8 m' /> <sample time='83:20 min' depth='3.42 m' /> <sample time='83:30 min' depth='3.31 m' /> <sample time='83:40 min' depth='3.44 m' /> - <sample time='83:50 min' depth='3.79 m' stoptime='9:00 min' cns='40%' /> + <sample time='83:50 min' depth='3.79 m' temp='8.7 C' stoptime='9:00 min' cns='40%' /> <sample time='84:00 min' depth='3.89 m' /> <sample time='84:10 min' depth='3.82 m' /> <sample time='84:20 min' depth='3.62 m' /> <sample time='84:30 min' depth='3.7 m' /> <sample time='84:40 min' depth='3.48 m' /> - <sample time='84:50 min' depth='3.51 m' stoptime='8:00 min' /> + <sample time='84:50 min' depth='3.51 m' temp='8.8 C' stoptime='8:00 min' /> <sample time='85:00 min' depth='3.68 m' /> <sample time='85:10 min' depth='3.52 m' /> <sample time='85:20 min' depth='3.98 m' /> @@ -577,7 +577,7 @@ <sample time='86:20 min' depth='3.54 m' /> <sample time='86:30 min' depth='3.58 m' /> <sample time='86:40 min' depth='3.42 m' /> - <sample time='86:50 min' depth='3.94 m' stoptime='6:00 min' /> + <sample time='86:50 min' depth='3.94 m' temp='8.9 C' stoptime='6:00 min' /> <sample time='87:00 min' depth='4.09 m' /> <sample time='87:10 min' depth='4.14 m' /> <sample time='87:20 min' depth='4.01 m' /> @@ -631,7 +631,7 @@ <sample time='95:20 min' depth='4.14 m' /> <sample time='95:30 min' depth='3.99 m' /> <sample time='95:40 min' depth='3.8 m' /> - <sample time='95:50 min' depth='3.5 m' cns='48%' /> + <sample time='95:50 min' depth='3.5 m' temp='9.1 C' cns='48%' /> <sample time='96:00 min' depth='3.37 m' /> <sample time='96:10 min' depth='3.39 m' /> <sample time='96:20 min' depth='2.94 m' /> @@ -643,13 +643,13 @@ <sample time='97:20 min' depth='1.99 m' /> <sample time='97:30 min' depth='1.88 m' /> <sample time='97:40 min' depth='1.18 m' /> - <sample time='97:50 min' depth='1.47 m' cns='49%' /> + <sample time='97:50 min' depth='1.47 m' temp='9.2 C' cns='49%' /> <sample time='98:00 min' depth='1.12 m' /> <sample time='98:10 min' depth='1.17 m' /> <sample time='98:20 min' depth='1.04 m' /> <sample time='98:30 min' depth='0.85 m' /> <sample time='98:40 min' depth='0.48 m' /> - <sample time='98:50 min' depth='0.0 m' /> + <sample time='98:50 min' depth='0.0 m' temp='9.4 C' /> <sample time='99:00 min' depth='0.0 m' /> <sample time='99:10 min' depth='0.03 m' /> <sample time='99:20 min' depth='0.0 m' /> @@ -661,25 +661,25 @@ <sample time='100:20 min' depth='0.0 m' /> <sample time='100:30 min' depth='0.0 m' /> <sample time='100:40 min' depth='0.0 m' /> - <sample time='100:50 min' depth='0.0 m' /> + <sample time='100:50 min' depth='0.0 m' temp='10.2 C' /> <sample time='101:00 min' depth='0.0 m' /> <sample time='101:10 min' depth='0.0 m' /> <sample time='101:20 min' depth='0.0 m' /> <sample time='101:30 min' depth='0.0 m' /> <sample time='101:40 min' depth='0.0 m' /> - <sample time='101:50 min' depth='0.0 m' /> + <sample time='101:50 min' depth='0.0 m' temp='10.4 C' /> <sample time='102:00 min' depth='0.0 m' /> <sample time='102:10 min' depth='0.06 m' /> <sample time='102:20 min' depth='0.01 m' /> <sample time='102:30 min' depth='0.02 m' /> <sample time='102:40 min' depth='0.0 m' /> - <sample time='102:50 min' depth='0.1 m' /> + <sample time='102:50 min' depth='0.1 m' temp='10.6 C' /> <sample time='103:00 min' depth='0.17 m' /> <sample time='103:10 min' depth='0.02 m' /> <sample time='103:20 min' depth='0.09 m' /> <sample time='103:30 min' depth='0.02 m' /> <sample time='103:40 min' depth='0.4 m' /> - <sample time='103:50 min' depth='0.22 m' cns='51%' /> + <sample time='103:50 min' depth='0.22 m' temp='10.8 C' cns='51%' /> <sample time='104:00 min' depth='0.02 m' /> <sample time='104:10 min' depth='0.01 m' /> <sample time='104:20 min' depth='0.02 m' /> @@ -721,7 +721,7 @@ <sample time='110:20 min' depth='0.0 m' /> <sample time='110:30 min' depth='0.0 m' /> <sample time='110:40 min' depth='0.0 m' /> - <sample time='110:50 min' depth='0.0 m' /> + <sample time='110:50 min' depth='0.0 m' temp='10.9 C' /> <sample time='111:00 min' depth='0.0 m' /> <sample time='111:10 min' depth='0.0 m' /> <sample time='111:20 min' depth='0.0 m' /> @@ -733,7 +733,7 @@ <sample time='112:20 min' depth='0.0 m' /> <sample time='112:30 min' depth='0.0 m' /> <sample time='112:40 min' depth='0.0 m' /> - <sample time='112:50 min' depth='0.0 m' /> + <sample time='112:50 min' depth='0.0 m' temp='11.1 C' /> <sample time='113:00 min' depth='0.0 m' /> <sample time='113:10 min' depth='0.0 m' /> <sample time='113:20 min' depth='0.0 m' /> |