diff options
| author |  Robert C. Helling <helling@atdotde.de> | 2020-10-04 12:18:43 +0200 |
|---|---|---|
| committer |  bstoeger <32835590+bstoeger@users.noreply.github.com> | 2020-10-05 10:17:29 +0200 |
| commit | 4b4a117f966c16824e6980ecc835e30e4cb4db42 (patch) | |
| tree | 8b2c970aca058aee2a60ed106e66ce83f042be89 /core | |
| parent | 61f8b8c00282519db18614c1a85036be769ee15c (diff) | |
| download | subsurface-4b4a117f966c16824e6980ecc835e30e4cb4db42.tar.gz | |
Use get_n2 helper function
Now, that we have this helper function that should have been
introduced long ago, we can make some more expressions
more idiomatic.
Signed-off-by: Robert C. Helling <helling@atdotde.de>
Diffstat (limited to 'core')
| -rw-r--r-- | core/gas.c | 2 | ||||
| -rw-r--r-- | core/statistics.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/gas.c b/core/gas.c index 040f938f6..757f912b0 100644 --- a/core/gas.c +++ b/core/gas.c @@ -16,7 +16,7 @@ bool isobaric_counterdiffusion(struct gasmix oldgasmix, struct gasmix newgasmix, { if (!prefs.show_icd) return false; - results->dN2 = get_he(oldgasmix) + get_o2(oldgasmix) - get_he(newgasmix) - get_o2(newgasmix); + results->dN2 = get_n2(newgasmix) - get_n2(oldgasmix); results->dHe = get_he(newgasmix) - get_he(oldgasmix); return get_he(oldgasmix) > 0 && results->dN2 > 0 && results->dHe < 0 && get_he(oldgasmix) && results->dN2 > 0 && 5 * results->dN2 > -results->dHe; } diff --git a/core/statistics.c b/core/statistics.c index eeb45e1ae..8ebd4a4e0 100644 --- a/core/statistics.c +++ b/core/statistics.c @@ -397,7 +397,7 @@ static void get_gas_parts(struct gasmix mix, volume_t vol, int o2_in_topup, volu return; } - air.mliter = lrint(((double)vol.mliter * (1000 - get_he(mix) - get_o2(mix))) / (1000 - o2_in_topup)); + air.mliter = lrint(((double)vol.mliter * get_n2(mix)) / (1000 - o2_in_topup)); he->mliter = lrint(((double)vol.mliter * get_he(mix)) / 1000.0); o2->mliter += vol.mliter - he->mliter - air.mliter; } |