diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org> | 2016-02-24 11:08:50 -0800 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2016-02-25 00:45:35 +0100 |
| commit | 82c003c914de17101ee8999ab3775e516cc76064 (patch) | |
| tree | cf0eed71d41166b17f77cbdf339a269a2af0bdfe /subsurface-core/dive.c | |
| parent | 7564c89360d4739df106c1184131df1add1721d3 (diff) | |
| download | subsurface-82c003c914de17101ee8999ab3775e516cc76064.tar.gz | |
gas pressures: do some initial cleanup
This marks "surface_volume_multiplier()" static in preparation for
changing it to use an actual honest-to-goodness compressibility
estimation. Without that, it wasn't obvious that the function wasn't
used in other random places.
Also, remove the "wet_volume()" function. It was unused, but more
importantly, it was wrong. Yes, it was the inverse of "gas_volume()",
but when you calculate wet volumes from the imperial sizes, you don't
actually use the "real" gas volume, you use the idealized one.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'subsurface-core/dive.c')
| -rw-r--r-- | subsurface-core/dive.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/subsurface-core/dive.c b/subsurface-core/dive.c index 85ad3f597..b7beadce5 100644 --- a/subsurface-core/dive.c +++ b/subsurface-core/dive.c @@ -856,7 +856,7 @@ static void update_min_max_temperatures(struct dive *dive, temperature_t tempera * THIS IS A ROUGH APPROXIMATION! The real numbers will * depend on the exact gas mix and temperature. */ -double surface_volume_multiplier(pressure_t pressure) +static double surface_volume_multiplier(pressure_t pressure) { double bar = pressure.mbar / 1000.0; @@ -870,11 +870,6 @@ int gas_volume(cylinder_t *cyl, pressure_t p) return cyl->type.size.mliter * surface_volume_multiplier(p); } -int wet_volume(double cuft, pressure_t p) -{ - return cuft_to_l(cuft) * 1000 / surface_volume_multiplier(p); -} - /* * If the cylinder tank pressures are within half a bar * (about 8 PSI) of the sample pressures, we consider it |