mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-01-19 14:25:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use boyle_compensation in profile

Browse source 
otherwise VPM-B planned profiles seem to violate the ceiling. This needs
the first_stop_pressure to be available also in the profile, so I made
it global in planner.c

Important lesson: If you want to use deco_allowed_depth on a tissue_tolerance
that comes from a VPM-B planned dive, you have to call boyles_law() before
add_segment()!

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-08-19 23:14:00 +02:00 • committed by Dirk Hohndel
parent 2a50731139
commit 0bb65a17cb
4 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
deco.c
View file

@ -23,6 +23,8 @@
extern bool in_planner(); extern bool in_planner();
extern int first_stop_pressure;
//! Option structure for Buehlmann decompression. //! Option structure for Buehlmann decompression.
struct buehlmann_config { struct buehlmann_config {
double satmult; //! safety at inert gas accumulation as percentage of effect (more than 100). double satmult; //! safety at inert gas accumulation as percentage of effect (more than 100).
@ -344,24 +346,27 @@ double solve_cubic(double A, double B, double C)
} }
double update_gradient(double first_stop_pressure, double next_stop_pressure, double first_gradient) double update_gradient(double next_stop_pressure, double first_gradient)
{ {
double first_radius = 2.0 * vpmb_config.surface_tension_gamma / first_gradient; double first_radius = 2.0 * vpmb_config.surface_tension_gamma / first_gradient;
double A = next_stop_pressure; double A = next_stop_pressure;
double B = -2.0 * vpmb_config.surface_tension_gamma; double B = -2.0 * vpmb_config.surface_tension_gamma;
double C = (first_stop_pressure + 2.0 * vpmb_config.surface_tension_gamma / first_radius) * cube(first_radius); double C = (first_stop_pressure / 1000.0 + 2.0 * vpmb_config.surface_tension_gamma / first_radius) * cube(first_radius);
double next_radius = solve_cubic(A, B, C); double next_radius = solve_cubic(A, B, C);
return 2.0 * vpmb_config.surface_tension_gamma / next_radius; return 2.0 * vpmb_config.surface_tension_gamma / next_radius;
} }
void boyles_law(double first_stop_pressure, double next_stop_pressure) void boyles_law(double next_stop_pressure)
{ {
int ci; int ci;
if (!first_stop_pressure)
return;
for (ci = 0; ci < 16; ++ci) { for (ci = 0; ci < 16; ++ci) {
allowable_n2_gradient[ci] = update_gradient(first_stop_pressure, next_stop_pressure, bottom_n2_gradient[ci]); allowable_n2_gradient[ci] = update_gradient(next_stop_pressure, bottom_n2_gradient[ci]);
allowable_he_gradient[ci] = update_gradient(first_stop_pressure, next_stop_pressure, bottom_he_gradient[ci]); allowable_he_gradient[ci] = update_gradient(next_stop_pressure, bottom_he_gradient[ci]);
total_gradient[ci] = ((allowable_n2_gradient[ci] * tissue_n2_sat[ci]) + (allowable_he_gradient[ci] * tissue_he_sat[ci])) / (tissue_n2_sat[ci] + tissue_he_sat[ci]); total_gradient[ci] = ((allowable_n2_gradient[ci] * tissue_n2_sat[ci]) + (allowable_he_gradient[ci] * tissue_he_sat[ci])) / (tissue_n2_sat[ci] + tissue_he_sat[ci]);
} }

2
dive.h
View file

@ -801,7 +801,7 @@ extern double restore_deco_state(char *data);
extern void nuclear_regeneration(double time); extern void nuclear_regeneration(double time);
extern void vpmb_start_gradient(); extern void vpmb_start_gradient();
extern void vpmb_next_gradient(double deco_time, double surface_pressure); extern void vpmb_next_gradient(double deco_time, double surface_pressure);
extern void boyles_law(double first_stop_pressure, double next_stop_pressure); extern void boyles_law(double next_stop_pressure);
/* this should be converted to use our types */ /* this should be converted to use our types */
struct divedatapoint { struct divedatapoint {

8
planner.c
View file

@ -33,6 +33,8 @@ int decostoplevels_imperial[] = { 0, 3048, 6096, 9144, 12192, 15240, 18288, 2133
double plangflow, plangfhigh; double plangflow, plangfhigh;
bool plan_verbatim, plan_display_runtime, plan_display_duration, plan_display_transitions; bool plan_verbatim, plan_display_runtime, plan_display_duration, plan_display_transitions;
int first_stop_pressure;
const char *disclaimer; const char *disclaimer;
#if DEBUG_PLAN #if DEBUG_PLAN
@ -921,7 +923,6 @@ bool plan(struct diveplan *diveplan, char **cached_datap, bool is_planner, bool
int bottom_depth; int bottom_depth;
int bottom_gi; int bottom_gi;
int bottom_stopidx; int bottom_stopidx;
int first_stop_pressure;
bool is_final_plan = true; bool is_final_plan = true;
int deco_time; int deco_time;
int previous_deco_time; int previous_deco_time;
@ -996,6 +997,7 @@ bool plan(struct diveplan *diveplan, char **cached_datap, bool is_planner, bool
return(false); return(false);
} }
tissue_tolerance = tissue_at_end(&displayed_dive, cached_datap); tissue_tolerance = tissue_at_end(&displayed_dive, cached_datap);
displayed_dive.surface_pressure.mbar = diveplan->surface_pressure;
#if DEBUG_PLAN & 4 #if DEBUG_PLAN & 4
printf("gas %s\n", gasname(&gas)); printf("gas %s\n", gasname(&gas));
@ -1160,7 +1162,7 @@ bool plan(struct diveplan *diveplan, char **cached_datap, bool is_planner, bool
// Boyles Law compensation // Boyles Law compensation
if (first_stop_pressure == 0) if (first_stop_pressure == 0)
first_stop_pressure = depth_to_mbar(depth, &displayed_dive); first_stop_pressure = depth_to_mbar(depth, &displayed_dive);
boyles_law(first_stop_pressure / 1000.0, depth_to_mbar(stoplevels[stopidx], &displayed_dive) / 1000.0); boyles_law(depth_to_mbar(stoplevels[stopidx], &displayed_dive) / 1000.0);
/* Check we need to change cylinder. /* Check we need to change cylinder.
* We might not if the cylinder was chosen by the user * We might not if the cylinder was chosen by the user
@ -1215,7 +1217,7 @@ bool plan(struct diveplan *diveplan, char **cached_datap, bool is_planner, bool
// Boyles Law compensation // Boyles Law compensation
if (first_stop_pressure == 0) if (first_stop_pressure == 0)
first_stop_pressure = depth_to_mbar(depth, &displayed_dive); first_stop_pressure = depth_to_mbar(depth, &displayed_dive);
boyles_law(first_stop_pressure / 1000.0, depth_to_mbar(stoplevels[stopidx], &displayed_dive) / 1000.0); boyles_law(depth_to_mbar(stoplevels[stopidx], &displayed_dive) / 1000.0);
} }
/* Are we waiting to switch gas? /* Are we waiting to switch gas?

1
profile.c
View file

@ -853,6 +853,7 @@ void calculate_deco_information(struct dive *dive, struct divecomputer *dc, stru
time_stepsize = t1 - t0; time_stepsize = t1 - t0;
for (j = t0 + time_stepsize; j <= t1; j += time_stepsize) { for (j = t0 + time_stepsize; j <= t1; j += time_stepsize) {
int depth = interpolate(entry[-1].depth, entry[0].depth, j - t0, t1 - t0); int depth = interpolate(entry[-1].depth, entry[0].depth, j - t0, t1 - t0);
boyles_law(depth_to_mbar(entry->depth, &displayed_dive) / 1000.0);
double min_pressure = add_segment(depth_to_mbar(depth, dive) / 1000.0, double min_pressure = add_segment(depth_to_mbar(depth, dive) / 1000.0,
&dive->cylinder[entry->cylinderindex].gasmix, time_stepsize, entry->o2pressure.mbar, dive, entry->sac); &dive->cylinder[entry->cylinderindex].gasmix, time_stepsize, entry->o2pressure.mbar, dive, entry->sac);
tissue_tolerance = min_pressure; tissue_tolerance = min_pressure;