mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Even more places with pressure and volume conversions

Browse source 
Amazing at how many spots we are re-implementing the wheel.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2011-11-01 21:12:21 -07:00
parent 5698057951
commit 485b02937d
5 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

12
dive.h
View file

@ -91,17 +91,12 @@ extern double get_depth_units(unsigned int mm, int *frac, const char **units);
extern double get_volume_units(unsigned int mm, int *frac, const char **units);
extern double get_temp_units(unsigned int mm, const char **units);
static inline double bar_to_atm(double bar)
{
return bar / 1.01325;
}
static inline double ml_to_cuft(int ml)
{
return ml / 28316.8466;
}
static inline double cuft_to_ml(double cuft)
static inline double cuft_to_l(double cuft)
{
return cuft * 28.3168466;
}
@ -156,6 +151,11 @@ static inline int to_PSI(pressure_t pressure)
return pressure.mbar * 0.0145037738 + 0.5;
}
static inline double bar_to_atm(double bar)
{
return bar / 1.01325;
}
static inline double to_ATM(pressure_t pressure)
{
return pressure.mbar / 1013.25;