diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2020-10-02 19:40:42 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2020-10-03 10:29:15 -0700 |
| commit | 34730b898b41b19476eaa61f20273e267d63b7e8 (patch) | |
| tree | 6471cd066bc29097e9ba58082d5d63da35491f6f | |
| parent | cd22b86bf8cf6c5f521bc9244b4a21537b5fea44 (diff) | |
| download | subsurface-34730b898b41b19476eaa61f20273e267d63b7e8.tar.gz | |
core: make gas type enum globally available
The deco-routines used an enum to pass around the inert gas
type. Make that globally available and make it include O2.
This will be used in a future commit to generalize access
of gas fractions.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
| -rw-r--r-- | core/deco.c | 3 | ||||
| -rw-r--r-- | core/gas.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/core/deco.c b/core/deco.c index c649c4227..650376c60 100644 --- a/core/deco.c +++ b/core/deco.c @@ -30,7 +30,6 @@ #include "planner.h" #include "qthelper.h" -enum inertgas { N2, HE }; #define cube(x) (x * x * x) // Subsurface until v4.6.2 appeared to produce marginally less conservative plans than our benchmarks. @@ -293,7 +292,7 @@ double tissue_tolerance_calc(struct deco_state *ds, const struct dive *dive, dou /* * Return Buehlmann factor for a particular period and tissue index. */ -static double factor(int period_in_seconds, int ci, enum inertgas gas) +static double factor(int period_in_seconds, int ci, enum gas_component gas) { if (period_in_seconds == 1) { if (gas == N2) diff --git a/core/gas.h b/core/gas.h index f5d948da0..316f4d3de 100644 --- a/core/gas.h +++ b/core/gas.h @@ -10,6 +10,8 @@ extern "C" { #include <stdbool.h> #endif +enum gas_component { N2, HE, O2 }; + // o2 == 0 && he == 0 -> air // o2 < 0 -> invalid struct gasmix { |