diff code_part1/OSTC_code_c_part2/p2_tables.romdata @ 197:f15e804ff67f

Gas switch delay + New CF#55 for additional delay in decoplan for gas switch. + BUGFIX compute integration at full ascent, not half (or the formula is wrong). + BUGFIX minor typo in 2sec exposition factors.
author JeanDo
date Sun, 13 Feb 2011 17:27:43 +0100
parents cb055a7d75f3
children 1d98f30ed44e
line wrap: on
line diff
--- a/code_part1/OSTC_code_c_part2/p2_tables.romdata	Sun Feb 13 10:16:59 2011 +0100
+++ b/code_part1/OSTC_code_c_part2/p2_tables.romdata	Sun Feb 13 17:27:43 2011 +0100
@@ -16,53 +16,54 @@
 //    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 // HISTORY
-// 2011-01-20; jDG Cleanup addressing.
+// 2011-01-20: jDG Cleanup addressing.
+// 2011-02-13: jDG Correct some typos.
 //
 // **************************************************************
 
 rom const float buhlmann_a[32] =
-{	// ??? Data ZH-L16A, from Tauchmedizin 1995 ???
+{	// Data ZH-L16C, from Bühlmann Tauchmedizin 2002, option 1a (4mn)
 //---a for N2 ----------------------------------------------------------------
-	1.2599,		/// WARNING ZH-L16c-1990 gives different values: 1.3318
-	1.0000,		/// ... 1.0048
-	0.8618,		/// ... 0.8653
-	0.7562,		/// ... 0.7520
-	0.6200,		/// ... 0.6194
-	0.5043,		/// ... 0.5043
-	0.4410,		/// ... 0.4396
-	0.4000,		/// ... 0.3977
-	0.3750,		/// ... 0.3701
-	0.3500,		/// ... 0.3456
-	0.3295,		/// ... 0.3269
-	0.3065,		/// ... 0.3065
-	0.2835,		/// ... 0.2848
-	0.2610,		/// ... 0.2622
-	0.2480,		/// ... 0.2486
-	0.2327,		/// ... 0.2341
+	1.2599,
+	1.0000,
+	0.8618,
+	0.7562,
+	0.6200,
+	0.5043,
+	0.4410,
+	0.4000,
+	0.3750,
+	0.3500,
+	0.3295,
+	0.3065,
+	0.2835,
+	0.2610,
+	0.2480,
+	0.2327,
 //---- a of He ---------------------------------------------------------------
-	1.7424,		/// ... 1,7443
-	1.3830,		/// ... 1,3800
-	1.1919,		/// ... 1,1879
-	1.0458,		/// ... 1,0455
-	.9220,		/// ... 0,9211
-	.8205,		/// ... 0,8232
-	.7305,		/// ... 0,7321
-	.6502,		/// ... 0,6508
-	.5950,		/// ... 0,5981
-	.5545,		/// ... 0,5568
-	.5333,		/// ... 0,5285
-	.5189,		/// ... 0,5178
-	.5181,		/// ... 0,5137
-	.5176,		/// ... 0,5196
-	.5172,		/// ... 0,5150
-	.5119		/// ... 0,5109
+	1.7424,
+	1.3830,
+	1.1919,
+	1.0458,
+	.9220,
+	.8205,
+	.7305,
+	.6502,
+	.5950,
+	.5545,
+	.5333,
+	.5189,
+	.5181,
+	.5176,
+	.5172,
+	.5119
 };
 
 rom const float buhlmann_b[] =
 {
 //---- b for N2 --------------------------------------------------------------
-	0.5050, 	/// WARNING ZH-L16c gives a different value: 0.5241
-	0.6514,		/// All the other values matches ZH-L16c-1990
+	0.5050,
+	0.6514,
 	0.7222,
 	0.7825,
 	0.8126,
@@ -99,7 +100,7 @@
 rom const float buhlmann_ht[] =
 {
 //---- N2 --------------------------------------------------------------------
-	4,			// Compartiment length, in minute, for nitrogen.
+	4,			// Compartiment half-life, in minute, for nitrogen.
 	8,
 	12,
 	18,
@@ -137,77 +138,77 @@
 rom const float e2secs[] =
 { 
 //---- N2 --------------------------------------------------------------------
-	5.7596E-03,  // und zwar  1 - 2^(-2sec/HT)
-	2.8839E-03,
-	1.8467e-03,
-	1.2481e-03,
-	8.5537E-04,
-	6.0308E-04,
-	4.2541E-04, 
-	3.0002E-04,
-	2.1195E-04,
-	1.5824E-04,
-	1.2355E-04,
-	9.6669E-05,
-	7.5751E-05,
-	5.92E-05,
-	4.64E-05,
-	3.64E-05,
+	5.75958E-03,  // und zwar  1 - 2^(-1/(30sec*HT))
+	2.88395E-03,
+    1.92356E-03,
+    1.28278E-03,
+    8.55371E-04,
+    5.92258E-04,
+    4.20001E-04,
+    3.00019E-04,
+    2.11949E-04,
+    1.58240E-04,
+    1.23548E-04,
+    9.66686E-05,
+    7.57509E-05,
+    5.92416E-05,
+    4.63943E-05,
+    3.63850E-05,
 //---- He --------------------------------------------------------------------
-	0.01518479275,
-	0.007621439546,
-	0.004883145696,
-	0.003299965996,
-	0.002260409686,
-	0.00159437032,
-	0.001124788578,
-	0.0007933953673,
-	0.0005606414716,
-	0.0004185553604,
-	0.0003267948866,
-	0.0002557222899,
-	0.0002003867723,
-	0.0001567161546,
-	0.0001227342122,
-	9.625377675E-5
+	1.51848E-02,
+    7.62144E-03,
+    4.88315E-03,
+    3.29997E-03,
+    2.26041E-03,
+    1.59437E-03,
+    1.12479E-03,
+    7.93395E-04,
+    5.60641E-04,
+    4.18555E-04,
+    3.26795E-04,
+    2.55722E-04,
+    2.00387E-04,
+    1.56716E-04,
+    1.22734E-04,
+    9.62538E-05
 };
 
 rom const float e1min[] =
 {
 //---- N2 --------------------------------------------------------------------
-	0.1591036,			// Integration constant for 1 minute,
-	0.08299596,			// ie. 1 - 2^(-1/ht)
-	0.053942353,
-	0.036774196,
-	0.02534539,
-	0.017935055,
-	0.012684012,
-	8.961515534E-3,
-	6.338971845E-3,
-	4.73633146E-3,	
-	3.699808187E-3,
-	2.89599589E-3,
-	2.270033275E-3,
-	1.775722E-3,
-	1.390893611E-3,
-	1.090974815E-3,
+	1.59104E-01,     	// Integration constant for 1 minute,
+    8.29960E-02,        // Ie. 1- 2^(-1/HT)
+    5.61257E-02,
+    3.77762E-02,
+    2.53454E-02,
+    1.76160E-02,
+    1.25236E-02,
+    8.96152E-03,
+    6.33897E-03,
+    4.73633E-03,
+    3.69981E-03,
+    2.89600E-03,
+    2.27003E-03,
+    1.77572E-03,
+    1.39089E-03,
+    1.09097E-03,
 //---- e 1min He -------------------------------------------------------------
-	0.368108684,
-	0.2050840824,
-	0.1365792957,
-	0.09440463235,
-	0.06563586265,
-	0.04674161154,
-	0.03319905126,
-	0.02353005571,
-	0.0166832282,
-	0.01248075064,
-	0.009757532198,
-	0.007643290133,
-	0.005994168431,
-	0.004690816669,
-	0.003675481163,
-	0.002883586737
+	3.68109E-01,
+	2.05084E-01,
+    1.36579E-01,
+    9.44046E-02,
+    6.56359E-02,
+    4.67416E-02,
+    3.31991E-02,
+    2.35301E-02,
+    1.66832E-02,
+    1.24808E-02,
+    9.75753E-03,
+    7.64329E-03,
+    5.99417E-03,
+    4.69082E-03,
+    3.67548E-03,
+    2.88359E-03
 };
 
 rom const float e10min[] =
@@ -215,38 +216,38 @@
 //---- N2 --------------------------------------------------------------------
 // Die 10 min Werte in float Notation:
 //  und zwar 1 - 2^(-10/ht)
-	0.823223,			// 1 - 2^(-10/4.0)
-	0.579552,
-	0.425651,
-	0.312487,
-	0.226416,
-	0.165547,
-	0.11984,
-	0.0860863,
-	0.0616117,
-	0.0463665,
-	0.0363881,
-	0.0285855,
-	0.0224698,
-	0.017616,
-	0.0138222,
-	0.0108563,
+	8.23223E-01,			// 1 - 2^(-10/4.0)
+	5.79552E-01,
+    4.38769E-01,
+    3.19605E-01,
+    2.26416E-01,
+    1.62832E-01,
+    1.18409E-01,
+    8.60863E-02,
+    6.16117E-02,
+    4.63665E-02,
+    3.63881E-02,
+    2.85855E-02,
+    2.24698E-02,
+    1.76160E-02,
+    1.38222E-02,
+    1.08563E-02,
 //---- He --------------------------------------------------------------------
-	0.989851,
-	0.899258,
-	0.769737,
-	0.629027,
-	0.492821,
-	0.380407,
-	0.286538,
-	0.211886,
-	0.154849,
-	0.118026,
-	0.0934005,
-	0.0738569,
-	0.0583504,
-	0.0459303,
-	0.0361528,
-	0.0284646,
+	9.89851E-01,
+	8.99258E-01,
+    7.69737E-01,
+    6.29027E-01,
+    4.92821E-01,
+    3.80407E-01,
+    2.86538E-01,
+    2.11886E-01,
+    1.54849E-01,
+    1.18026E-01,
+    9.34005E-02,
+    7.38569E-02,
+    5.83504E-02,
+    4.59303E-02,
+    3.61528E-02,
+    2.84646E-02
 };