Make initialization of the deco parameters more explicit by using names for members. For VPM critical radii, I changed the values to V-Planner ones, as a patch by Jan will do this later anyway and will conflict with this patch anyway. Conflict resolution will this way only involve discarding the last chunk of Jan’s patch.
Best Robert PS: I am still in the process of reviewing Jan’s last set of patches. In a first go, everything looked quite reasonable, except for the fact that apparently we don’t match plans computed with other software that claims to do the same.
From 02d74bd462d82f657357628af0643c808619835c Mon Sep 17 00:00:00 2001 From: "Robert C. Helling" <[email protected]> Date: Mon, 17 Aug 2015 13:52:14 +0200 Subject: [PATCH] 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 <[email protected]> --- deco.c | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/deco.c b/deco.c index 7b0aa54..a6f6917 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.8, 0.7, 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, -- 1.9.5 (Apple Git-50.3)
signature.asc
Description: Message signed with OpenPGP using GPGMail
_______________________________________________ subsurface mailing list [email protected] http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
