Revert "VPM-B restore deco state before calculating next gradient"

This reverts commit 3d8e5b638a.

Calculating the next gradient should be based on the tissue loading at the end
of the previous iteration, so it was wrong to restore the deco state first.
This has a tiny affect on the calculated profile, and makes one of the tests
fail.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Rick Walsh 2015-10-04 14:42:53 +11:00 committed by Dirk Hohndel
parent b26e516e2a
commit 26cab60518

View file

@ -1140,11 +1140,11 @@ bool plan(struct diveplan *diveplan, char **cached_datap, bool is_planner, bool
//CVA //CVA
do { do {
is_final_plan = (prefs.deco_mode == BUEHLMANN) || (previous_deco_time - deco_time < 10); // CVA time converges is_final_plan = (prefs.deco_mode == BUEHLMANN) || (previous_deco_time - deco_time < 10); // CVA time converges
restore_deco_state(bottom_cache);
if (deco_time != 10000000) if (deco_time != 10000000)
vpmb_next_gradient(deco_time, diveplan->surface_pressure / 1000.0); vpmb_next_gradient(deco_time, diveplan->surface_pressure / 1000.0);
previous_deco_time = deco_time; previous_deco_time = deco_time;
restore_deco_state(bottom_cache);
depth = bottom_depth; depth = bottom_depth;
gi = bottom_gi; gi = bottom_gi;