From 4a727c64d9ac56e926eea43ee7be7685ef6d76ec Mon Sep 17 00:00:00 2001 From: Rick Walsh Date: Thu, 2 Nov 2017 19:34:45 +1100 Subject: VPMB: calculate deco_time assuming final ascent always takes the same time If we consider the actual time to ascend from the final stop when calculating deco_time, then slowing the final ascent can lead to the final stop being extended, which is completely nonsensical. For consistency with the original VPMB implementation, we can't ignore the final ascent time completely, but if we assume it is always the same (take default ascent rate of 9m/min) then slower the final ascent won't lead to a longer final stop. Signed-off-by: Rick Walsh --- core/profile.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'core/profile.c') diff --git a/core/profile.c b/core/profile.c index 1e717f318..83ff20055 100644 --- a/core/profile.c +++ b/core/profile.c @@ -1084,9 +1084,9 @@ void calculate_deco_information(struct dive *dive, struct divecomputer *dc, stru if (final_tts > 0) deco_time = pi->maxtime + final_tts - time_deep_ceiling; else if (time_clear_ceiling > 0) - /* Consistent with planner, deco_time ends after ascending (20-40s @9m/min from 3-6m) + /* Consistent with planner, deco_time ends after ascending (20s @9m/min from 3m) at end of whole minute after clearing ceiling */ - deco_time = ROUND_UP(time_clear_ceiling, 60) + 30 - time_deep_ceiling; + deco_time = ROUND_UP(time_clear_ceiling, 60) + 20 - time_deep_ceiling; vpmb_next_gradient(deco_time, surface_pressure / 1000.0); final_tts = 0; last_ndl_tts_calc_time = 0; -- cgit v1.2.3-70-g09d2