[PATCH] Fix up SAC calculations for ATM/bar confusion

[Linus Torvalds]

From: Linus Torvalds <torvalds at linux-foundation.org>
Date: Sun, 24 Feb 2013 10:01:18 -0800
Subject: [PATCH] Fix up SAC calculations for ATM/bar confusion

We even documented that we did SAC in bar*l/min, but the "S" in SAC
stands for "Surface".  So we should normalize SAC rate to surface
pressure, not one bar.

It's a tiny 1% difference, and doesn't actually matter in practice, but
it's noticeable when you want to explicitly test for SAC-rate by
creating a test-dive that averages exactly 10m.  Suddenly you don't get
the round numbers you expect.

[ Side note: 10m is not _exactly_ one extra atmosphere according to our
  calculations, but it's darn close in sea water: the standard salinity
  of 1.03 kg/l together with the standard acceleration of 9.81m/s^2
  gives an additional pressure of 1.01 bar, which is within a fraction
  of a percent of one ATM.

  Of course, divers have likely chosen that value exactly for the math
  to come out that way, since the true average salinity of seawater is
  actually slightly lower ]

So here's a few test-dives, along with the SAC rate fixup to make them
look right.

(There's also a one-liner to dive.c that makes the duration come out
right if the last sample has a non-zero depth, and the previous sample
did not: one of my original test-dives did the "average 10m depth" by
starting at 0 and ending at 20m, and dive.c got a tiny bit confused
about that ;)

[ The rationale for me testing our SAC rate calculations in the first 
  place was that on snorkkeli.net user "Poltsi" reported that our SAC rate 
  calculations differ from the ones that Suunto DM4 reports. So I wanted 
  to verify that we did things right.

  Note that Poltsi reported differences larger than the difference of 
  BAR/ATM, so this is not the cause. I'll continue to look at this. ]

Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
---


 dive.c             |  1 +
 divelist.c         |  4 ++--
 dives/sac-test.xml | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 53 insertions(+), 2 deletions(-)
 create mode 100644 dives/sac-test.xml

diff --git a/dive.c b/dive.c
index 1f3f5fd0b169..950948b59d8a 100644
--- a/dive.c
+++ b/dive.c
@@ -607,6 +607,7 @@ static void fixup_dive_dc(struct dive *dive, struct divecomputer *dc)
 			end = time;
 
 		if (depth > SURFACE_THRESHOLD) {
+			end = time;
 			if (start < 0)
 				start = lasttime;
 			if (depth > maxdepth)
diff --git a/divelist.c b/divelist.c
index 85fb535edbfb..143f4d43c8f4 100644
--- a/divelist.c
+++ b/divelist.c
@@ -749,8 +749,8 @@ static int calculate_sac(struct dive *dive)
 			}
 		}
 	}
-	/* Mean pressure in bar (SAC calculations are in bar*l/min) */
-	pressure = depth_to_mbar(dc->meandepth.mm, dive) / 1000.0;
+	/* Mean pressure in ATM (SAC calculations are in atm*l/min) */
+	pressure = (double) depth_to_mbar(dc->meandepth.mm, dive) / SURFACE_PRESSURE;
 	sac = airuse / pressure * 60 / duration;
 
 	/* milliliters per minute.. */
diff --git a/dives/sac-test.xml b/dives/sac-test.xml
new file mode 100644
index 000000000000..b5f0149bbe67
--- /dev/null
+++ b/dives/sac-test.xml
@@ -0,0 +1,50 @@
+<divelog program='subsurface' version='2'>
+<settings>
+</settings>
+<dives>
+<dive number='1' date='2013-02-24' time='09:26:04' duration='25:00 min'>
+  <location>SAC test dive 1</location>
+  <notes>SAC should be 20l/min (0.7063 cuft/min)
+We have exactly 100 ATM of gas in a 10l cylinder, average 10m for 25min</notes>
+  <cylinder size='10 l' description='10l' start='202.6 bar' end='101.3 bar' />
+  <divecomputer>
+  <depth max='10.0 m' mean='10.0 m' />
+  <sample time='0:00 min' depth='10.0 m' />
+  <sample time='5:00 min' depth='10.0 m' />
+  <sample time='10:00 min' depth='10.0 m' />
+  <sample time='15:00 min' depth='10.0 m' />
+  <sample time='20:00 min' depth='10.0 m' />
+  <sample time='25:00 min' depth='10.0 m' />
+  </divecomputer>
+</dive>
+<dive number='2' date='2013-02-24' time='10:26:04' duration='25:00 min'>
+  <location>SAC test dive 2</location>
+  <notes>SAC should be 20l/min (0.7063 cuft/min)
+We have exactly 100 ATM of gas in a 10l cylinder, average 10m for 25min</notes>
+  <cylinder size='10 l' description='10l' start='202.6 bar' end='101.3 bar' />
+  <divecomputer>
+  <depth max='20.0 m' mean='10.0 m' />
+  <sample time='0:00 min' depth='0.0 m' />
+  <sample time='12:30 min' depth='20.0 m' />
+  <sample time='25:00 min' depth='0.0 m' />
+  </divecomputer>
+</dive>
+<dive number='3' date='2013-02-24' time='11:26:04' duration='25:00 min'>
+  <location>SAC test dive 3</location>
+  <notes>SAC should be 20l/min (0.7063 cuft/min)
+We have exactly 100 ATM of gas in 15l of cylinder, average 20m for 25min</notes>
+  <cylinder size='10 l' description='10l' start='202.6 bar' end='101.3 bar' />
+  <cylinder size='5 l' description='10l' start='202.6 bar' end='101.3 bar' />
+  <divecomputer>
+  <event time='17:00 min' name='gaschange' />
+  <depth max='20.0 m' mean='10.0 m' />
+  <sample time='0:00 min' depth='0.0 m' />
+  <sample time='5:00 min' depth='20.0 m' />
+  <sample time='10:00 min' depth='40.0 m' />
+  <sample time='15:00 min' depth='0.0 m' />
+  <sample time='20:00 min' depth='40.0 m' />
+  <sample time='25:00 min' depth='0.0 m' />
+  </divecomputer>
+</dive>
+</dives>
+</divelog>
-- 
1.8.2.rc0.16.g20a599e