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

Rename variable to better reflect what it does

Browse source 
The pressure for the Boyle compensation is of the first ceiling,
i.e. the ceiling seen from the bottom rather than the first
stop.

Signed-off-by: Robert C. Helling <helling@atdotde.de>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Robert C. Helling 2015-08-27 14:27:45 +02:00 • committed by Dirk Hohndel
parent fe00abc774
commit c5f92c7501
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
deco.c
View file

@ -23,7 +23,7 @@
extern bool in_planner();
extern pressure_t first_stop_pressure;
extern pressure_t first_ceiling_pressure;
//! Option structure for Buehlmann decompression.
struct buehlmann_config {
@ -367,7 +367,7 @@ double solve_cubic2(double B, double C)
double update_gradient(double next_stop_pressure, double first_gradient)
{
double B = cube(first_gradient) / (first_stop_pressure.mbar / 1000.0 + first_gradient);
double B = cube(first_gradient) / (first_ceiling_pressure.mbar / 1000.0 + first_gradient);
double C = next_stop_pressure * B;
double new_gradient = solve_cubic2(B, C);
@ -385,10 +385,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.mbar / 1000.0))
if (IS_FP_SAME(next_stop_pressure, first_ceiling_pressure.mbar / 1000.0))
return;
if (!first_stop_pressure.mbar)
if (!first_ceiling_pressure.mbar)
return;
for (ci = 0; ci < 16; ++ci) {
allowable_n2_gradient[ci] = update_gradient(next_stop_pressure, bottom_n2_gradient[ci]);

8
planner.c
View file

@ -33,7 +33,7 @@ int decostoplevels_imperial[] = { 0, 3048, 6096, 9144, 12192, 15240, 18288, 2133
double plangflow, plangfhigh;
bool plan_verbatim, plan_display_runtime, plan_display_duration, plan_display_transitions;
pressure_t first_stop_pressure;
pressure_t first_ceiling_pressure;
const char *disclaimer;
@ -1119,9 +1119,9 @@ bool plan(struct diveplan *diveplan, char **cached_datap, bool is_planner, bool
stopidx++;
vpmb_first_stop = stoplevels[stopidx];
}
first_stop_pressure.mbar = depth_to_mbar(vpmb_first_stop, &displayed_dive);
first_ceiling_pressure.mbar = depth_to_mbar(vpmb_first_stop, &displayed_dive);
} else {
first_stop_pressure.mbar = 0;
first_ceiling_pressure.mbar = 0;
}
//CVA
@ -1143,7 +1143,7 @@ bool plan(struct diveplan *diveplan, char **cached_datap, bool is_planner, bool
breaktime = -1;
breakcylinder = 0;
o2time = 0;
first_stop_pressure.mbar = depth_to_mbar(deco_allowed_depth(tissue_tolerance,
first_ceiling_pressure.mbar = depth_to_mbar(deco_allowed_depth(tissue_tolerance,
diveplan->surface_pressure / 1000.0,
&displayed_dive,
1),