Even more places with pressure and volume conversions

[ext/subsurface.git] / dive.h

diff --git a/dive.h b/dive.h
index fe4515ee6a26ea5b20a6b0572a823ed864a0d80f..b5a42d3e2f84b3eb36c695be93b4ea861488a86a 100644 (file)
--- a/dive.h
+++ b/dive.h
@@ -93,7 +93,12 @@ extern double get_temp_units(unsigned int mm, const char **units);
 
 static inline double ml_to_cuft(int ml)
 {
-       return ml / 28317.0;
+       return ml / 28316.8466;
+}
+
+static inline double cuft_to_l(double cuft)
+{
+       return cuft * 28.3168466;
 }
 
 static inline double mm_to_feet(int mm)
@@ -137,11 +142,20 @@ static inline int to_K(temperature_t temp)
        return (temp.mkelvin + 499)/1000;
 }
 
+static inline double psi_to_bar(double psi)
+{
+       return psi / 14.5037738;
+}
 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;