From f2b883865c78b2f9c28a93d50de97077b6b6d51c Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Tue, 18 Aug 2015 06:40:35 -0700 Subject: [PATCH] Revert "Pref. to ascent to next stop only when stop is below ceiling" This reverts commit a6ed36fb7368254d694a4f397d6d033326c37ef2. --- planner.c | 5 ----- pref.h | 1 - subsurfacestartup.c | 1 - 3 files changed, 7 deletions(-) diff --git a/planner.c b/planner.c index 42b096906..38bd22323 100644 --- a/planner.c +++ b/planner.c @@ -879,11 +879,6 @@ bool trial_ascent(int trial_depth, int stoplevel, int avg_depth, int bottom_time bool clear_to_ascend = true; char *trial_cache = NULL; - // Don't do a trail ascent but check if the ceiling is above the next stoplevel. - // This does not sound like a relevant question but it seems the original VPM-B implementation does that. - if (prefs.check_ceiling_before_ascent) - return (deco_allowed_depth(tissue_tolerance, surface_pressure, &displayed_dive, 1) <= stoplevel); - cache_deco_state(tissue_tolerance, &trial_cache); while (trial_depth > stoplevel) { int deltad = ascent_velocity(trial_depth, avg_depth, bottom_time) * TIMESTEP; diff --git a/pref.h b/pref.h index 953003a2d..e471add73 100644 --- a/pref.h +++ b/pref.h @@ -97,7 +97,6 @@ struct preferences { bool display_transitions; bool safetystop; bool switch_at_req_stop; - bool check_ceiling_before_ascent; int reserve_gas; int min_switch_duration; // seconds int bottomsac; diff --git a/subsurfacestartup.c b/subsurfacestartup.c index ba0969a10..18d00d374 100644 --- a/subsurfacestartup.c +++ b/subsurfacestartup.c @@ -48,7 +48,6 @@ struct preferences default_prefs = { .doo2breaks = false, .drop_stone_mode = false, .switch_at_req_stop = false, - .check_ceiling_before_ascent = false, .min_switch_duration = 60, .last_stop = false, .verbatim_plan = false,