diff options
author | Dirk Hohndel <dirk@hohndel.org> | 2015-08-21 10:15:31 -0700 |
---|---|---|
committer | Dirk Hohndel <dirk@hohndel.org> | 2015-08-21 10:16:06 -0700 |
commit | c7d8e72607870fee24fd03df3b54877a80c55102 (patch) | |
tree | 939a839df7a5d8441edc278c32b6c1a4dbef9450 /deco.c | |
parent | 652f7e9864b5a28ba03bdaa641139230364dae0e (diff) | |
download | subsurface-c7d8e72607870fee24fd03df3b54877a80c55102.tar.gz |
Use our pressure type to avoid bar / mbar confusion
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'deco.c')
-rw-r--r-- | deco.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -23,7 +23,7 @@ extern bool in_planner(); -extern int first_stop_pressure; +extern pressure_t first_stop_pressure; //! Option structure for Buehlmann decompression. struct buehlmann_config { @@ -351,7 +351,7 @@ double update_gradient(double next_stop_pressure, double first_gradient) double first_radius = 2.0 * vpmb_config.surface_tension_gamma / first_gradient; double A = next_stop_pressure; double B = -2.0 * vpmb_config.surface_tension_gamma; - double C = (first_stop_pressure / 1000.0 + 2.0 * vpmb_config.surface_tension_gamma / first_radius) * cube(first_radius); + double C = (first_stop_pressure.mbar / 1000.0 + 2.0 * vpmb_config.surface_tension_gamma / first_radius) * cube(first_radius); double next_radius = solve_cubic(A, B, C); @@ -366,10 +366,10 @@ void boyles_law(double next_stop_pressure) return; // This should be a tautology but prevents a numerical instability. - if (IS_FP_SAME(next_stop_pressure, first_stop_pressure)) + if (IS_FP_SAME(next_stop_pressure, first_stop_pressure.mbar / 1000.0)) return; - if (!first_stop_pressure) + if (!first_stop_pressure.mbar) return; for (ci = 0; ci < 16; ++ci) { allowable_n2_gradient[ci] = update_gradient(next_stop_pressure, bottom_n2_gradient[ci]); |