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

Spelling corrected

Browse source 
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-04-04 18:41:09 +02:00 • committed by Dirk Hohndel
parent e03c5ce8e9
commit 004fa9a26b
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
planner.c
View file

@ -781,7 +781,7 @@ static void add_plan_to_notes(struct diveplan *diveplan, struct dive *dive, bool
dive->notes = strdup(buffer); dive->notes = strdup(buffer);
} }
int ascend_velocity(int depth, int avg_depth, int bottom_time) int ascent_velocity(int depth, int avg_depth, int bottom_time)
{ {
/* We need to make this configurable */ /* We need to make this configurable */
@ -805,7 +805,7 @@ int ascend_velocity(int depth, int avg_depth, int bottom_time)
void track_ascent_gas(int depth, cylinder_t *cylinder, int avg_depth, int bottom_time) void track_ascent_gas(int depth, cylinder_t *cylinder, int avg_depth, int bottom_time)
{ {
while (depth > 0) { while (depth > 0) {
int deltad = ascend_velocity(depth, avg_depth, bottom_time) * TIMESTEP; int deltad = ascent_velocity(depth, avg_depth, bottom_time) * TIMESTEP;
if (deltad > depth) if (deltad > depth)
deltad = depth; deltad = depth;
update_cylinder_pressure(&displayed_dive, depth, depth - deltad, TIMESTEP, prefs.bottomsac, cylinder, true); update_cylinder_pressure(&displayed_dive, depth, depth - deltad, TIMESTEP, prefs.bottomsac, cylinder, true);
@ -821,7 +821,7 @@ bool trial_ascent(int trial_depth, int stoplevel, int avg_depth, int bottom_time
cache_deco_state(tissue_tolerance, &trial_cache); cache_deco_state(tissue_tolerance, &trial_cache);
while (trial_depth > stoplevel) { while (trial_depth > stoplevel) {
int deltad = ascend_velocity(trial_depth, avg_depth, bottom_time) * TIMESTEP; int deltad = ascent_velocity(trial_depth, avg_depth, bottom_time) * TIMESTEP;
if (deltad > trial_depth) /* don't test against depth above surface */ if (deltad > trial_depth) /* don't test against depth above surface */
deltad = trial_depth; deltad = trial_depth;
tissue_tolerance = add_segment(depth_to_mbar(trial_depth, &displayed_dive) / 1000.0, tissue_tolerance = add_segment(depth_to_mbar(trial_depth, &displayed_dive) / 1000.0,
@ -893,7 +893,7 @@ int plan(struct diveplan *diveplan, char **cached_datap, bool is_planner, bool s
} }
depth = displayed_dive.dc.sample[displayed_dive.dc.samples - 1].depth.mm; depth = displayed_dive.dc.sample[displayed_dive.dc.samples - 1].depth.mm;
average_max_depth(diveplan, &avg_depth, &max_depth); average_max_depth(diveplan, &avg_depth, &max_depth);
last_ascend_rate = ascend_velocity(depth, avg_depth, bottom_time); last_ascend_rate = ascent_velocity(depth, avg_depth, bottom_time);
/* if all we wanted was the dive just get us back to the surface */ /* if all we wanted was the dive just get us back to the surface */
if (!is_planner) { if (!is_planner) {
@ -949,11 +949,11 @@ int plan(struct diveplan *diveplan, char **cached_datap, bool is_planner, bool s
previous_point_time = clock; previous_point_time = clock;
do { do {
/* Ascend to surface */ /* Ascend to surface */
int deltad = ascend_velocity(depth, avg_depth, bottom_time) * TIMESTEP; int deltad = ascent_velocity(depth, avg_depth, bottom_time) * TIMESTEP;
if (ascend_velocity(depth, avg_depth, bottom_time) != last_ascend_rate) { if (ascent_velocity(depth, avg_depth, bottom_time) != last_ascend_rate) {
plan_add_segment(diveplan, clock - previous_point_time, depth, gas, po2, false); plan_add_segment(diveplan, clock - previous_point_time, depth, gas, po2, false);
previous_point_time = clock; previous_point_time = clock;
last_ascend_rate = ascend_velocity(depth, avg_depth, bottom_time); last_ascend_rate = ascent_velocity(depth, avg_depth, bottom_time);
} }
if (depth - deltad < 0) if (depth - deltad < 0)
deltad = depth; deltad = depth;
@ -998,12 +998,12 @@ int plan(struct diveplan *diveplan, char **cached_datap, bool is_planner, bool s
/* We will break out when we hit the surface */ /* We will break out when we hit the surface */
do { do {
/* Ascend to next stop depth */ /* Ascend to next stop depth */
int deltad = ascend_velocity(depth, avg_depth, bottom_time) * TIMESTEP; int deltad = ascent_velocity(depth, avg_depth, bottom_time) * TIMESTEP;
if (ascend_velocity(depth, avg_depth, bottom_time) != last_ascend_rate) { if (ascent_velocity(depth, avg_depth, bottom_time) != last_ascend_rate) {
plan_add_segment(diveplan, clock - previous_point_time, depth, gas, po2, false); plan_add_segment(diveplan, clock - previous_point_time, depth, gas, po2, false);
previous_point_time = clock; previous_point_time = clock;
stopping = false; stopping = false;
last_ascend_rate = ascend_velocity(depth, avg_depth, bottom_time); last_ascend_rate = ascent_velocity(depth, avg_depth, bottom_time);
} }
if (depth - deltad < stoplevels[stopidx]) if (depth - deltad < stoplevels[stopidx])
deltad = depth - stoplevels[stopidx]; deltad = depth - stoplevels[stopidx];