diff options
| author |  Robert C. Helling <helling@atdotde.de> | 2021-03-11 23:27:13 +0100 |
|---|---|---|
| committer | Robert C. Helling <helling@atdotde.de> | 2021-03-12 22:24:23 +0100 |
| commit | 7c62f7541cce617d2c2651c0a93353ce03fee115 (patch) | |
| tree | 3eedcfaf65f8ba66b056566eb668591cbac57b2b /core/divelist.c | |
| parent | 41fc822d56e7d0866129ef6b68ccfb947300bffd (diff) | |
| download | subsurface-7c62f7541cce617d2c2651c0a93353ce03fee115.tar.gz | |
Use PSCR gas when computing O2 toxicity
Both the calculations for CNS and OTU did not take
into account the pO2 drop when using a PSCR. Furthermore,
there was some unit confusion due to not using internal
units.
Reported-by: arosl
Signed-off-by: Robert C. Helling <helling@atdotde.de>
Diffstat (limited to 'core/divelist.c')
| -rw-r--r-- | core/divelist.c | 26 |
1 files changed, 20 insertions, 6 deletions
diff --git a/core/divelist.c b/core/divelist.c index a6debfb20..379e33eea 100644 --- a/core/divelist.c +++ b/core/divelist.c @@ -114,9 +114,16 @@ static int calculate_otu(const struct dive *dive) po2f = MIN((int) sample->setpoint.mbar, depth_to_mbar(sample->depth.mm, dive)); } else { // For OC and rebreather without o2 sensor/setpoint - int o2 = active_o2(dive, dc, psample->time); // ... calculate po2 from depth and FiO2. - po2i = lrint(o2 * depth_to_bar(psample->depth.mm, dive)); // (initial) po2 at start of segment - po2f = lrint(o2 * depth_to_bar(sample->depth.mm, dive)); // (final) po2 at end of segment + double amb_presure = depth_to_bar(sample->depth.mm, dive); + double pamb_pressure = depth_to_bar(psample->depth.mm , dive); + if (dc->divemode == PSCR) { + po2i = pscr_o2(pamb_pressure, get_gasmix_at_time(dive, dc, psample->time)); + po2f = pscr_o2(amb_presure, get_gasmix_at_time(dive, dc, sample->time)); + } else { + int o2 = active_o2(dive, dc, psample->time); // ... calculate po2 from depth and FiO2. + po2i = lrint(o2 * pamb_pressure); // (initial) po2 at start of segment + po2f = lrint(o2 * amb_presure); // (final) po2 at end of segment + } } } if ((po2i > 500) || (po2f > 500)) { // If PO2 in segment is above 500 mbar then calculate otu @@ -173,9 +180,16 @@ static double calculate_cns_dive(const struct dive *dive) trueo2 = true; } if (!trueo2) { - int o2 = active_o2(dive, dc, psample->time); // For OC and rebreather without o2 sensor: - po2i = lrint(o2 * depth_to_bar(psample->depth.mm, dive)); // (initial) po2 at start of segment - po2f = lrint(o2 * depth_to_bar(sample->depth.mm, dive)); // (final) po2 at end of segment + double amb_presure = depth_to_bar(sample->depth.mm, dive); + double pamb_pressure = depth_to_bar(psample->depth.mm , dive); + if (dc->divemode == PSCR) { + po2i = pscr_o2(pamb_pressure, get_gasmix_at_time(dive, dc, psample->time)); + po2f = pscr_o2(amb_presure, get_gasmix_at_time(dive, dc, sample->time)); + } else { + int o2 = active_o2(dive, dc, psample->time); // ... calculate po2 from depth and FiO2. + po2i = lrint(o2 * pamb_pressure); // (initial) po2 at start of segment + po2f = lrint(o2 * amb_presure); // (final) po2 at end of segment + } } int po2avg = (po2i + po2f) / 2; // po2i now holds the mean po2 of initial and final po2 values of segment. /* Don't increase CNS when po2 below 500 matm */ |