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

Be more consistent in partial pressure naming

Browse source 
Lets just use pO₂ instead of PO2, ppO2, ppO₂, PO₂.
They all mean the same, but it's better to be
consistent

Signed-off-by: Henrik Brautaset Aronsen <subsurface@henrik.synth.no>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Henrik Brautaset Aronsen 2014-06-22 16:41:44 +02:00 • committed by Dirk Hohndel
parent 21916d67de
commit 630ec88dd4
19 changed files with 59 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

10
profile.c
View file

@ -1141,7 +1141,7 @@ static void calculate_gas_information_new(struct dive *dive, struct plot_info *p
fhe = get_he(&dive->cylinder[cylinderindex].gasmix);
if (entry->po2) {
/* we have an O2 partial pressure in the sample - so this
/* we have an O₂ partial pressure in the sample - so this
* is likely a CC dive... use that instead of the value
* from the cylinder info */
if (entry->po2 >= amb_pressure || fo2 == 1000) {
@ -1160,10 +1160,10 @@ static void calculate_gas_information_new(struct dive *dive, struct plot_info *p
/* Calculate MOD, EAD, END and EADD based on partial pressures calculated before
* so there is no difference in calculating between OC and CC
* END takes O2 + N2 (air) into account ("Narcotic" for trimix dives)
* EAD just uses N2 ("Air" for nitrox dives) */
pressure_t modppO2 = { .mbar = (int) (prefs.modppO2 * 1000) };
entry->mod = (double) gas_mod(&dive->cylinder[cylinderindex].gasmix, modppO2).mm;
* END takes O₂ + N₂ (air) into account ("Narcotic" for trimix dives)
* EAD just uses N₂ ("Air" for nitrox dives) */
pressure_t modpO2 = { .mbar = (int) (prefs.modpO2 * 1000) };
entry->mod = (double) gas_mod(&dive->cylinder[cylinderindex].gasmix, modpO2).mm;
entry->end = (entry->depth + 10000) * (1000 - fhe) / 1000.0 - 10000;
entry->ead = (entry->depth + 10000) * (1000 - fo2 - fhe) / (double)N2_IN_AIR - 10000;
entry->eadd = (entry->depth + 10000) *