diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org> | 2014-02-11 13:08:29 -0800 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2014-02-11 14:05:54 -0800 |
| commit | e58f54cac1d050c090bfa5427991ae440bc78495 (patch) | |
| tree | d4379185e39721d46d61ca6136001941b980ef1a /qt-ui/maintab.cpp | |
| parent | 92bbed3304afeb8e7ef6593f48eae982d799b5f1 (diff) | |
| download | subsurface-e58f54cac1d050c090bfa5427991ae440bc78495.tar.gz | |
Fix ATM-vs-bar confusion
SAC should be calculated in relationship to surface pressure, not "1 bar".
I also realize that we have a few other cases where we do the same
mistake: the partial pressure calculations do things like
po2 = o2 / 1000.0 * depth_to_mbar(sample->depth.mm, dive);
which is wrong as well - the partial pressure is also relative to
standard atmospheric pressures.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'qt-ui/maintab.cpp')
| -rw-r--r-- | qt-ui/maintab.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qt-ui/maintab.cpp b/qt-ui/maintab.cpp index bdaddb827..85cf1b192 100644 --- a/qt-ui/maintab.cpp +++ b/qt-ui/maintab.cpp @@ -475,7 +475,7 @@ void MainTab::updateDiveInfo(int dive) volume_t sac; QString SACs; if (mean[0] && duration[0]) { - sac.mliter = gases[0].mliter * 1000.0 / (depth_to_mbar(mean[0], d) * duration[0] / 60.0); + sac.mliter = gases[0].mliter / (depth_to_atm(mean[0], d) * duration[0] / 60.0); SACs = get_volume_string(sac, true).append(tr("/min")); } else { SACs = QString(tr("unknown")); @@ -483,7 +483,7 @@ void MainTab::updateDiveInfo(int dive) for(int i=1; i < MAX_CYLINDERS && gases[i].mliter != 0; i++) { volumes.append("\n" + get_volume_string(gases[i], true)); if (duration[i]) { - sac.mliter = gases[i].mliter * 1000.0 / (depth_to_mbar(mean[i], d) * duration[i] / 60); + sac.mliter = gases[i].mliter / (depth_to_atm(mean[i], d) * duration[i] / 60); SACs.append("\n" + get_volume_string(sac, true).append(tr("/min"))); } else { SACs.append("\n"); |