summaryrefslogtreecommitdiffstats
path: root/deco.c
diff options
context:
space:
mode:
authorGravatar Robert C. Helling <helling@atdotde.de>2015-08-17 13:52:14 +0200
committerGravatar Dirk Hohndel <dirk@hohndel.org>2015-08-17 21:58:09 -0700
commit075221b4efa1a6b33d82bf277e704f4e2f19cc9f (patch)
tree00ff31e996874a4d0c0835b221b528b8b8f538a4 /deco.c
parenta6ed36fb7368254d694a4f397d6d033326c37ef2 (diff)
downloadsubsurface-075221b4efa1a6b33d82bf277e704f4e2f19cc9f.tar.gz
Explicit names for initialization of deco constants
This patch is purely cosmetic except for the fact it changes the critical radii to the V-planner with Boyle compensation values. These values would have been set anyway by Jan's commit "VPM-B: Set radius constants to values reccomended by V-Planner" which will conflict with this anyway. This way, the last chunk of Jan's patch can just be discarded. Signed-off-by: Robert C. Helling <helling@atdotde.de> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'deco.c')
-rw-r--r--deco.c23
1 files changed, 21 insertions, 2 deletions
diff --git a/deco.c b/deco.c
index 1c428fb64..15c61d238 100644
--- a/deco.c
+++ b/deco.c
@@ -31,7 +31,16 @@ struct buehlmann_config {
double gf_low_position_min; //! gf_low_position below surface_min_shallow.
bool gf_low_at_maxdepth; //! if true, gf_low applies at max depth instead of at deepest ceiling.
};
-struct buehlmann_config buehlmann_config = { 1.0, 1.01, 0, 0.75, 0.35, 1.0, false };
+
+struct buehlmann_config buehlmann_config = {
+ .satmult = 1.0,
+ .desatmult = 1.01,
+ .last_deco_stop_in_mtr = 0,
+ .gf_high = 0.75,
+ .gf_low = 0.35,
+ .gf_low_position_min = 1.0,
+ .gf_low_at_maxdepth = false
+};
//! Option structure for VPM-B decompression.
struct vpmb_config {
@@ -44,7 +53,17 @@ struct vpmb_config {
double regeneration_time; //! Time needed for the bubble to regenerate to the start radius (min).
double other_gases_pressure; //! Always present pressure of other gasses in tissues (bar).
};
-struct vpmb_config vpmb_config = { 0.55, 0.45, 230.284, 8.2, 0.179, 2.57, 20160, 0.1359888 };
+
+struct vpmb_config vpmb_config = {
+ .crit_radius_N2 = 0.55,
+ .crit_radius_He = 0.45,
+ .crit_volume_lambda = 230.284,
+ .gradient_of_imperm = 8.2,
+ .surface_tension_gamma = 0.179,
+ .skin_compression_gammaC = 2.57,
+ .regeneration_time = 20160.0,
+ .other_gases_pressure = 0.1359888
+};
const double buehlmann_N2_a[] = { 1.1696, 1.0, 0.8618, 0.7562,
0.62, 0.5043, 0.441, 0.4,