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

Allow for o2 breaks in binary search stop time finder

Browse source 
Signed-off-by: Robert C. Helling <helling@atdotde.de>
This commit is contained in:
Robert C. Helling 2017-08-25 00:08:14 +02:00 • committed by Dirk Hohndel
parent 33fa336be6
commit 515b7b5fea
1 changed files with 18 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

29
core/planner.c
View file

@ -674,6 +674,7 @@ bool plan(struct diveplan *diveplan, struct dive *dive, int timestep, struct dec
bool decodive = false; bool decodive = false;
int first_stop_depth = 0; int first_stop_depth = 0;
int laststoptime = timestep; int laststoptime = timestep;
bool o2breaking = false;
set_gf(diveplan->gflow, diveplan->gfhigh, prefs.gf_low_at_maxdepth); set_gf(diveplan->gflow, diveplan->gfhigh, prefs.gf_low_at_maxdepth);
set_vpmb_conservatism(diveplan->vpmb_conservatism); set_vpmb_conservatism(diveplan->vpmb_conservatism);
@ -974,38 +975,39 @@ bool plan(struct diveplan *diveplan, struct dive *dive, int timestep, struct dec
} }
int new_clock = wait_until(dive, clock, clock, laststoptime * 2, timestep, depth, stoplevels[stopidx], avg_depth, bottom_time, &dive->cylinder[current_cylinder].gasmix, po2, diveplan->surface_pressure / 1000.0); int new_clock = wait_until(dive, clock, clock, laststoptime * 2, timestep, depth, stoplevels[stopidx], avg_depth, bottom_time, &dive->cylinder[current_cylinder].gasmix, po2, diveplan->surface_pressure / 1000.0);
add_segment(depth_to_bar(depth, dive), &dive->cylinder[current_cylinder].gasmix,
new_clock - clock, po2, dive, prefs.decosac);
laststoptime = new_clock - clock; laststoptime = new_clock - clock;
clock = new_clock;
/* Finish infinite deco */ /* Finish infinite deco */
if (clock >= 48 * 3600 && depth >= 6000) { if (clock >= 48 * 3600 && depth >= 6000) {
error = LONGDECO; error = LONGDECO;
break; break;
} }
o2breaking = false;
if (prefs.doo2breaks) { if (prefs.doo2breaks) {
/* The backgas breaks option limits time on oxygen to 12 minutes, followed by 6 minutes on /* The backgas breaks option limits time on oxygen to 12 minutes, followed by 6 minutes on
* backgas (first defined gas). This could be customized if there were demand. * backgas (first defined gas). This could be customized if there were demand.
*/ */
if (get_o2(&dive->cylinder[current_cylinder].gasmix) == 1000) { if (get_o2(&dive->cylinder[current_cylinder].gasmix) == 1000) {
o2time += timestep; if (laststoptime >= 12 * 60) {
if (o2time >= 12 * 60) { laststoptime = 12 * 60;
o2breaking = true;
breaktime = 0; breaktime = 0;
breakcylinder = current_cylinder; breakcylinder = current_cylinder;
if (is_final_plan) if (is_final_plan)
plan_add_segment(diveplan, clock - previous_point_time, depth, current_cylinder, po2, false); plan_add_segment(diveplan, clock + laststoptime - previous_point_time, depth, current_cylinder, po2, false);
previous_point_time = clock; previous_point_time = clock + laststoptime;
current_cylinder = 0; current_cylinder = 0;
gas = dive->cylinder[current_cylinder].gasmix; gas = dive->cylinder[current_cylinder].gasmix;
} }
} else { } else {
if (breaktime >= 0) { if (breaktime >= 0) {
breaktime += timestep; if (laststoptime >= 6 * 60) {
if (breaktime >= 6 * 60) { laststoptime = 6 * 60;
o2breaking = true;
o2time = 0; o2time = 0;
if (is_final_plan) if (is_final_plan)
plan_add_segment(diveplan, clock - previous_point_time, depth, current_cylinder, po2, false); plan_add_segment(diveplan, clock + laststoptime - previous_point_time, depth, current_cylinder, po2, false);
previous_point_time = clock; previous_point_time = clock + laststoptime;
current_cylinder = breakcylinder; current_cylinder = breakcylinder;
gas = dive->cylinder[current_cylinder].gasmix; gas = dive->cylinder[current_cylinder].gasmix;
breaktime = -1; breaktime = -1;
@ -1013,6 +1015,11 @@ bool plan(struct diveplan *diveplan, struct dive *dive, int timestep, struct dec
} }
} }
} }
add_segment(depth_to_bar(depth, dive), &dive->cylinder[current_cylinder].gasmix,
laststoptime, po2, dive, prefs.decosac);
clock = new_clock;
if (!o2breaking)
break;
} }
if (stopping) { if (stopping) {
/* Next we will ascend again. Add a waypoint if we have spend deco time */ /* Next we will ascend again. Add a waypoint if we have spend deco time */