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

Get rid of division by 0 by reshuffling EAD and EAN logic

Browse source 
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 2014-03-18 09:28:30 +01:00 • committed by Dirk Hohndel
parent 0cd9d09410
commit 374f99af18
1 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

19
profile.c
View file

@ -1130,16 +1130,19 @@ static void calculate_gas_information_new(struct dive *dive, struct plot_info *p
amb_pressure = depth_to_mbar(entry->depth, dive) / 1000.0; amb_pressure = depth_to_mbar(entry->depth, dive) / 1000.0;
fo2 = get_o2(&dive->cylinder[cylinderindex].gasmix); fo2 = get_o2(&dive->cylinder[cylinderindex].gasmix);
fhe = get_he(&dive->cylinder[cylinderindex].gasmix); fhe = get_he(&dive->cylinder[cylinderindex].gasmix);
double ratio = (fo2 == 1000) ? 0 : (double)fhe / (1000.0 - fo2);
if (entry->po2) { if (entry->po2) {
/* we have an O2 partial pressure in the sample - so this /* we have an O2 partial pressure in the sample - so this
* is likely a CC dive... use that instead of the value * is likely a CC dive... use that instead of the value
* from the cylinder info */ * from the cylinder info */
double po2 = entry->po2 > amb_pressure ? amb_pressure : entry->po2; if (entry->po2 >= amb_pressure || fo2 == 1000) {
entry->po2 = po2; entry->po2 = amb_pressure;
entry->phe = (amb_pressure - po2) * ratio; entry->phe = 0;
entry->pn2 = amb_pressure - po2 - entry->phe; entry->pn2 = 0;
} else {
entry->phe = (amb_pressure - entry->po2) * (double)fhe / (1000 - fo2);
entry->pn2 = amb_pressure - entry->po2 - entry->phe;
}
} else { } else {
entry->po2 = fo2 / 1000.0 * amb_pressure; entry->po2 = fo2 / 1000.0 * amb_pressure;
entry->phe = fhe / 1000.0 * amb_pressure; entry->phe = fhe / 1000.0 * amb_pressure;
@ -1151,10 +1154,8 @@ static void calculate_gas_information_new(struct dive *dive, struct plot_info *p
* EAD takes O2 + N2 (air) into account * EAD takes O2 + N2 (air) into account
* END just uses N2 */ * END just uses N2 */
entry->mod = (prefs.mod_ppO2 / fo2 * 1000 - 1) * 10000; entry->mod = (prefs.mod_ppO2 / fo2 * 1000 - 1) * 10000;
entry->ead = (entry->depth + 10000) * entry->ead = (entry->depth + 10000) * (1000 - fhe) / 1000.0 - 10000;
(entry->po2 + (amb_pressure - entry->po2) * (1 - ratio)) / amb_pressure - 10000; entry->end = (entry->depth + 10000) * (1000 - fo2 - fhe) / (double)N2_IN_AIR - 10000;
entry->end = (entry->depth + 10000) *
(amb_pressure - entry->po2) * (1 - ratio) / amb_pressure / N2_IN_AIR * 1000 - 10000;
entry->eadd = (entry->depth + 10000) * entry->eadd = (entry->depth + 10000) *
(entry->po2 / amb_pressure * O2_DENSITY + entry->pn2 / amb_pressure * (entry->po2 / amb_pressure * O2_DENSITY + entry->pn2 / amb_pressure *
N2_DENSITY + N2_DENSITY +