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

Consider previous dives when calculating deco

Browse source 
This also initializes the N2 tissue saturations to correct numbers
(setting them to zero was clearly silly).

With this commit we walk back in the dive_table until we find a surface
intervall that's longer than 48h. Or a dive that comes after the last one
we looked at; that would indicate that this is a divelist that contains
dives from multiple divers or dives that for other reasons are not
ordered. In a sane environment one would assume that the dives that need
to be taken into account when doing deco calculations are organized as one
trip in the XML file and so this logic should work.

One major downside of the current implementation is that we recalculate
everything whenever the plot_info is recreated - which happens quite
frequently, for example when resizing the window or even when we go into
loup mode. While this isn't all that compute intensive, this is an utter
waste and we should at least cache the saturation inherited from previous
dives (and clear that number when the selected dive changes). We don't
want to cache all of it as the recreation of the plot_info may be
triggered by the user changing equipment (and most importantly, gasmix)
information. In that case the deco data for this dive does indeed have to
be recreated. But without changing the current dive the saturation after
the last surface intervall should stay the same.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2013-01-03 20:45:20 -08:00
parent 5ba250bd48
commit 2c33603256
5 changed files with 137 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

77
divelist.c
View file

@ -818,6 +818,83 @@ static int calculate_sac(struct dive *dive, struct divecomputer *dc)
return sac * 1000;
}
/* for now we do this based on the first divecomputer */
static void add_dive_to_deco(struct dive *dive)
{
struct divecomputer *dc = &dive->dc;
int i;
if (!dc)
return;
for (i = 1; i < dive->dc.samples; i++) {
struct sample *psample = dc->sample + i - 1;
struct sample *sample = dc->sample + i;
int t0 = psample->time.seconds;
int t1 = sample->time.seconds;
int j;
for (j = t0; j < t1; j++) {
int depth = 0.5 + psample->depth.mm + (j - t0) * (sample->depth.mm - psample->depth.mm) / (t1 - t0);
(void) add_segment(depth_to_mbar(depth, dive) / 1000.0, &dive->cylinder[sample->sensor].gasmix, 1);
}
}
}
static struct gasmix air = { .o2.permille = 209 };
/* take into account previous dives until there is a 48h gap between dives */
void init_decompression(struct dive *dive)
{
int i, divenr = -1;
timestamp_t when;
gboolean deco_init = FALSE;
if (!dive)
return;
while (++divenr < dive_table.nr && get_dive(divenr) != dive)
;
when = dive->when;
i = divenr;
while (--i) {
struct dive* pdive = get_dive(i);
if (!pdive || pdive->when > when || pdive->when + pdive->duration.seconds + 48 * 60 * 60 < when)
break;
when = pdive->when;
}
while (++i < divenr) {
struct dive* pdive = get_dive(i);
double surface_pressure = pdive->surface_pressure.mbar ? pdive->surface_pressure.mbar / 1000.0 : 1.013;
unsigned int surface_time = get_dive(i+1)->when - pdive->when - pdive->duration.seconds;
if (!deco_init) {
clear_deco(surface_pressure);
deco_init = TRUE;
#if DEBUG & 16
dump_tissues();
#endif
}
add_dive_to_deco(pdive);
#if DEBUG & 16
printf("added dive #%d\n", pdive->number);
dump_tissues();
#endif
add_segment(surface_pressure, &air, surface_time);
#if DEBUG & 16
printf("after surface intervall of %d:%02u\n", FRACTION(surface_time,60));
dump_tissues();
#endif
}
if (!deco_init) {
double surface_pressure = dive->surface_pressure.mbar ? dive->surface_pressure.mbar / 1000.0 : 1.013;
clear_deco(surface_pressure);
#if DEBUG & 16
printf("no previous dive\n");
dump_tissues();
#endif
}
}
void update_cylinder_related_info(struct dive *dive)
{
if (dive != NULL) {