Mercurial > public > mk2

changeset 365:6ea83f22b48b 64kByte Logbook

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged B?hlmann half-times.
author JeanDo
date Thu, 09 Jun 2011 17:09:49 +0200
parents 93a64a19728e (current diff) bdcc5a5aa8d5 (diff)
children ca3d15e6240e
files
diffstat 1 files changed, 33 insertions(+), 33 deletions(-) [+]
line wrap: on
line diff
--- a/code_part1/OSTC_code_c_part2/p2_tables.romdata	Wed Jun 08 19:55:16 2011 +0200
+++ b/code_part1/OSTC_code_c_part2/p2_tables.romdata	Thu Jun 09 17:09:49 2011 +0200
@@ -22,7 +22,7 @@
 //
 // **************************************************************
 
-rom const float buhlmann_ab[] = {
+rom const float buhlmann_ab[4*16] = {
 // Data ZH-L16C, from Bühlmann Tauchmedizin 2002, option 1a (4mn)
 // a for N2    b for N2     a of He     b for He
 	1.2599,     0.5050,     1.7424,     0.4245,
@@ -43,37 +43,37 @@
 	0.2327,     0.9653,     0.5119,     0.9267
 };
 
-rom const float buhlmann_ht[] = {
+rom const float buhlmann_ht[2*16] = {
 // Compartiment half-life, in minute
 //-- N2 ---- He ---------------------------------------------------------------------
-	4,	    1.51,
-	8,      3.02,
-	12,     4.72,
-	18,     6.99,
-	27,    10.21,
-	39,    14.48,
-	55,    20.53,
-	77,    29.11,
-	109,   41.20,
-	146,   55.19,
-	187,   70.69,
-	239,   90.34,
-	305,  115.29,
-	390,  147.42,
-	498,  188.24,
-	635,  240.03
+	  4.0,    1.51,
+	  8.0,    3.02,
+	 12.5,    4.72,
+	 18.5,    6.99,
+	 27.0,   10.21,
+	 38.3,   14.48,
+	 54.3,   20.53,
+	 77.0,   29.11,
+	109.0,   41.20,
+	146.0,   55.19,
+	187.0,   70.69,
+	239.0,   90.34,
+	305.0,  115.29,
+	390.0,  147.42,
+	498.0,  188.24,
+	635.0,  240.03
 };
 
-rom const float e2secs[] = {
+rom const float e2secs[2*16] = {
 // result of  1 - 2^(-1/(30sec*HT))
 //---- N2 ------------- He ------------
 	5.75958E-03,    1.51848E-02,  
 	2.88395E-03,    7.62144E-03,
-	1.92356E-03,    4.88315E-03,
-    1.28278E-03,    3.29997E-03,
+	1.84669E-03,    4.88315E-03,
+    1.24813E-03,    3.29997E-03,
     8.55371E-04,    2.26041E-03,
-    5.92258E-04,    1.59437E-03,
-    4.20001E-04,    1.12479E-03,
+    6.03079E-04,    1.59437E-03,
+    4.25414E-04,    1.12479E-03,
     3.00019E-04,    7.93395E-04,
     2.11949E-04,    5.60641E-04,
     1.58240E-04,    4.18555E-04,
@@ -86,17 +86,17 @@
 //-------------------------------------
 };
 
-rom const float e1min[] = {
+rom const float e1min[2*16] = {
 // Integration constant for 1 minute,
 // Ie. 1- 2^(-1/HT)
 //----- N2 --------- e 1min He --------
 	1.59104E-01,    3.68109E-01,  	
     8.29960E-02,   	2.05084E-01,     
-    5.61257E-02,    1.36579E-01,
-    3.77762E-02,    9.44046E-02,
+    5.39424E-02,    1.36579E-01,
+    3.67742E-02,    9.44046E-02,
     2.53454E-02,    6.56359E-02,
-    1.76160E-02,    4.67416E-02,
-    1.25236E-02,    3.31991E-02,
+    1.79351E-02,    4.67416E-02,
+    1.26840E-02,    3.31991E-02,
     8.96152E-03,    2.35301E-02,
     6.33897E-03,    1.66832E-02,
     4.73633E-03,    1.24808E-02,
@@ -109,17 +109,17 @@
 //-------------------------------------
 };
 
-rom const float e10min[] = {
+rom const float e10min[2*16] = {
 // The 10 min Value in float notation:
 //  result of 1 - 2^(-10/ht)
 //---- N2 -------------- He -----------
 	8.23223E-01,    9.89851E-01,  
 	5.79552E-01,  	8.99258E-01,
-    4.38769E-01,    7.69737E-01,
-    3.19605E-01,    6.29027E-01,
+    4.25651E-01,    7.69737E-01,
+    3.12487E-01,    6.29027E-01,
     2.26416E-01,    4.92821E-01,
-    1.62832E-01,    3.80407E-01,
-    1.18409E-01,    2.86538E-01,
+    1.65547E-01,    3.80407E-01,
+    1.19840E-01,    2.86538E-01,
     8.60863E-02,    2.11886E-01,
     6.16117E-02,    1.54849E-01,
     4.63665E-02,    1.18026E-01,