mk2: code_part1/OSTC_code_c_part2/p2

comparison code_part1/OSTC_code_c_part2/p2_deco.c @ 344:797e2ac42d24 ScreenDump

MERGE with 1.91 main trunk.

author	JeanDo
date	Sat, 21 May 2011 14:48:07 +0200
parents	ecbbbd423e86
children	b5b030c1ae7e

comparison

equal deleted inserted replaced

-:6bdf80d7276c
+:797e2ac42d24
 // 2011/04/10: [jDG] Use timer TMR3 to limit loops in calc_hauptroutine_calc_deco().
 // 2011/04/15: [jDG] Store low_depth in 32bits (w/o rounding), for a better stability.
 // 2011/04/25: [jDG] Added 1mn mode for CNS calculation, to allow it for decoplanning.
 // 2011/04/27: [jDG] Fixed char_O_gradient_factor calculation when model uses gradient-factor.
 // 2011/05/02: [jDG] Added "Future TTS" function (CF58).
+// 2011/05/17: [jDG] Various cleanups.
 //
 // TODO:
 //  + Allow to abort MD2 calculation (have to restart next time).
 //
 // Literature:
 static float			sim_lead_tissue_limit;      // Buhlmann tolerated pressure.
 // Real context: what we are doing now.
 static float			calc_lead_tissue_limit;     //
-static unsigned char	internal_deco_time[32];
+static unsigned char	internal_deco_time[NUM_STOPS];
-static unsigned char	internal_deco_depth[32];
+static unsigned char	internal_deco_depth[NUM_STOPS];
 static float cns_vault;
-static float pres_tissue_vault[32];
+static float pres_tissue_N2_vault[NUM_COMP];
+static float pres_tissue_He_vault[NUM_COMP];
 //---- Bank 5 parameters -----------------------------------------------------
 #pragma udata bank5=0x500
 static unsigned char	ci;
 static float 			var_He_a;       // Bühlmann a, for current He tissue.
 static float 			var_He_b;       // Bühlmann b, for current He tissue.
 static float  			var_N2_e;       // Exposition, for current N2 tissue.
 static float  			var_He_e;       // Exposition, for current He tissue.
-static float            pres_diluent;               // new in v.101
+static float            pres_diluent;                   // new in v.101
-static float            const_ppO2;                 // new in v.101
+static float            const_ppO2;                     // new in v.101
 static unsigned char    sim_gas_last_depth;             // Depth of last used gas, to detected a gas switch.
 static unsigned char    sim_gas_last_used;              // Number of last used gas, to detected a gas switch.
 static unsigned short   sim_gas_delay;                  // Time of gas-switch-stop ends [min on dive].
 static unsigned short   sim_dive_mins;                  // Simulated dive time.
 static float			calc_N2_ratio;                  // Simulated (switched) nitrogen ratio.
 static float			calc_He_ratio;                  // Simulated (switched) helium ratio.
 static float			CNS_fraction;			        // new in v.101
 static float			float_saturation_multiplier;    // new in v.101
 static float			float_desaturation_multiplier;  // new in v.101
-static float			float_deco_distance;	// new in v.101
+static float			float_deco_distance;            // new in v.101
-static char			    flag_in_divemode;		// new in v.108
+static char			    flag_in_divemode;		        // new in v.108
-static unsigned char    deco_gas_change[5];		// new in v.109
+static unsigned char    deco_gas_change[NUM_GAS];       // new in v.109
 //---- Bank 6 parameters -----------------------------------------------------
 #pragma udata bank6=0x600
-float  pres_tissue[32];
+float  pres_tissue_N2[NUM_COMP];
+float  pres_tissue_He[NUM_COMP];
 //---- Bank 7 parameters -----------------------------------------------------
 #pragma udata bank7=0x700
-float  sim_pres_tissue[32];                 // 32 floats = 128 bytes.
+float  sim_pres_tissue_N2[NUM_COMP];             // 32 floats = 128 bytes.
-static float  sim_pres_tissue_backup[32];
+float  sim_pres_tissue_He[NUM_COMP];             // 32 floats = 128 bytes.
+static float  sim_pres_tissue_backup_N2[NUM_COMP];
+static float  sim_pres_tissue_backup_He[NUM_COMP];
 //---- Bank 8 parameters -----------------------------------------------------
 #pragma udata bank8=0x800
 static char	  md_pi_subst[256];
 //---- Setup some error (?) conditions -----------------------------------
 	if(char_I_deco_model)
 		int_O_DBS_bitfield |= DBS_mode;
 	if(const_ppO2)
 		int_O_DBS_bitfield |= DBS_ppO2;
-	for(i = 16; i < 32; i++)
+	for(i = 0; i < NUM_COMP; i++)
-		if(pres_tissue[i])
+		if(pres_tissue_He[i])
 			int_O_DBS_bitfield |= DBS_HE_sat;
 	if(float_saturation_multiplier < 0.99)
 		int_O_DBS_bitfield |= DBS_SAT2l;
 	if(float_saturation_multiplier > 1.3)
 		int_O_DBS_bitfield |= DBS_SAT2h;
 		temp_DBS |= DBG_C_MODE;
 	if(DBG_pres_surface != pres_surface)
 		temp_DBS |= DBG_C_SURF;
 	if( !DBS_HE_sat && !He_ratio)
-		for(i = 16; i < 32; i++)
+		for(i = 0; i < NUM_COMP; i++)
-			if(pres_tissue[i])
+			if(pres_tissue_He[i])
 				temp_DBS |= DBG_HEwoHE;
 	if( DBG_deco_gas_change != deco_gas_change[0]
 	 || DBG_deco_N2_ratio != char_I_deco_N2_ratio[0]
 	 || DBG_deco_He_ratio != char_I_deco_He_ratio[0] )
 //////////////////////////////////////////////////////////////////////////////
 // read buhlmann tables A and B for compatriment ci
 //
 static void read_buhlmann_coefficients(void)
 {
 #ifndef CROSS_COMPILE
 // Note: we don't use far rom pointer, because the
-//       24 bits is to complex, hence we have to set
+//       24 bits is too complex, hence we have to set
 //       the UPPER page ourself...
 //       --> Set zero if tables are moved to lower pages !
 _asm
 movlw 1
 movwf TBLPTRU,0
 _endasm
 #endif
-assert( 0 <= ci && ci < 16 );
+assert( 0 <= ci && ci < NUM_COMP );
-var_N2_a = buhlmann_a[ci];
-var_N2_b = buhlmann_b[ci];
+// Use an interleaved array (AoS) to access coefficients with a
-var_He_a = (buhlmann_a+16)[ci];
+// single addressing.
-var_He_b = (buhlmann_b+16)[ci];
+{
+overlay rom const float* ptr = &buhlmann_ab[4*ci];
+var_N2_a = *ptr++;
+var_N2_b = *ptr++;
+var_He_a = *ptr++;
+var_He_b = *ptr++;
+}
 // Check reading consistency:
 	if(	(var_N2_a < 0.231)
 	 || (var_N2_a > 1.27)
 	 || (var_N2_b < 0.504)
 _asm
 movlw 1
 movwf TBLPTRU,0
 _endasm
 #endif
-assert( 0 <= ci && ci < 16 );
+assert( 0 <= ci && ci < NUM_COMP );
 // Integration intervals.
 switch(period)
 {
 case 0: //---- 2 sec -----------------------------------------------------
-var_N2_e = e2secs[ci];
+{
-var_He_e = (e2secs+16)[ci];
+overlay rom const float* ptr = &e2secs[2*ci];
+var_N2_e = *ptr++;
+var_He_e = *ptr++;
+}
 // Check reading consistency:
 	if(	(var_N2_e < 0.0000363)
 	 || (var_N2_e > 0.00577)
 	 || (var_He_e < 0.0000961)
 int_O_DBG_pre_bitfield |= DBG_ZH16ERR;
 break;
 case 1: //---- 1 min -----------------------------------------------------
-var_N2_e = e1min[ci];
+{
-var_He_e = (e1min+16)[ci];
+overlay rom const float* ptr = &e1min[2*ci];
+var_N2_e = *ptr++;
+var_He_e = *ptr++;
+}
 // Check reading consistency:
 	if(	(var_N2_e < 1.09E-3)
 	 || (var_N2_e > 0.1592)
 	 || (var_He_e < 0.00288)
 int_O_DBG_pre_bitfield |= DBG_ZH16ERR;
 break;
 case 2: //---- 10 min ----------------------------------------------------
-var_N2_e = e10min[ci];
+{
-var_He_e = (e10min+16)[ci];
+overlay rom const float* ptr = &e10min[2*ci];
+var_N2_e = *ptr++;
+var_He_e = *ptr++;
+}
 // Check reading consistency:
 	if(	(var_N2_e < 0.01085)
 	 || (var_N2_e > 0.82323)
 	 || (var_He_e < 0.02846)
 assert(0);  // Never go there...
 }
 }
 //////////////////////////////////////////////////////////////////////////////
-// calc_next_decodepth_GF
+// calc_nextdecodepth
 //
 // new in v.102
 //
 // INPUT, changing during dive:
 //      low_depth
 if( read_custom_function(54) & 1 ) //---- Should we reverse table ? ------
 {
 overlay unsigned char x, y;
 //---- First: search the first non-null depth
-for(x=31; x != 0; --x)
+for(x=(NUM_STOPS-1); x != 0; --x)
 if( internal_deco_depth[x] != 0 ) break;
 //---- Second: copy to output table (in reverse order)
-for(y=0; y<32; y++, --x)
+for(y=0; y<NUM_STOPS; y++, --x)
 {
 char_O_deco_depth[y] = internal_deco_depth[x];
 char_O_deco_time [y] = internal_deco_time [x];
 // Stop only once the last transfer is done.
 if( x == 0 ) break;
 }
 //---- Third: fill table end with null
-for(y++; y<32; y++)
+for(y++; y<NUM_STOPS; y++)
 {
 char_O_deco_time [y] = 0;
 char_O_deco_depth[y] = 0;
 }
 }
 else //---- Straight copy ------------------------------------------------
 {
 overlay unsigned char x;
-for(x=0; x<32; x++)
+for(x=0; x<NUM_STOPS; x++)
 {
 char_O_deco_depth[x] = internal_deco_depth[x];
 char_O_deco_time [x] = internal_deco_time [x];
 }
 }
 {
 overlay unsigned char j;
 overlay unsigned char N2 = (unsigned char)(N2_ratio * 100 + 0.5);
 overlay unsigned char He = (unsigned char)(He_ratio * 100 + 0.5);
-for(j=0; j<5; ++j)
+for(j=0; j<NUM_GAS; ++j)
 {
 // Make sure to detect if we are already breathing some gas in
 // the current list (happends when first gas do have a depth).
 if( N2 == char_I_deco_N2_ratio[j]
 && He == char_I_deco_He_ratio[j]
 assert( depth < 130 );
 // And if I'm above the last decostop (with the 3m margin) ?
 if( (sim_gas_last_depth-3) > depth )
 {
-for(j=0; j<5; ++j)
+for(j=0; j<NUM_GAS; ++j)
 {
 // And If I am in the range of a valide stop ?
 // (again, with the same 3m margin)
 if( char_I_deco_gas_change[j]
 && depth <= char_I_deco_gas_change[j]
 if (char_I_const_ppO2 == 0)
 {
 overlay unsigned char j;
 // Loop over all enabled gas, to find the deepest one,
-// above las gas, but below temp_depth_limit.
+// above last used gas, but below temp_depth_limit.
-for(j=0; j<5; ++j)
+for(j=0; j<NUM_GAS; ++j)
 {
 // Gas not (yet) allowed ? Skip !
 if( temp_depth_limit > deco_gas_change[j] )
 continue;
 //
 // Output: calc_N2_ratio, calc_He_ratio
 //
 static void gas_switch_set(void)
 {
-assert( 0 <= sim_gas_last_used && sim_gas_last_used <= 5 );
+assert( 0 <= sim_gas_last_used && sim_gas_last_used <= NUM_GAS );
 if( sim_gas_last_used == 0 )
 {
 calc_N2_ratio = N2_ratio;
 	    calc_He_ratio = He_ratio;
 // Kludge: the 0.0002 of 0.7902 are missing with standard air.
 N2_ratio = 0.7902;
 pres_respiration = int_I_pres_respiration * 0.001;
-for(ci=0; ci<16; ci++)
+for(ci=0; ci<NUM_COMP; ci++)
 {
 // cycle through the 16 Bühlmann tissues
 overlay float p = N2_ratio * (pres_respiration -  ppWater);
-pres_tissue[ci] = p;
+pres_tissue_N2[ci] = p;
 // cycle through the 16 Bühlmann tissues for Helium
-(pres_tissue+16)[ci] = 0.0;
+pres_tissue_He[ci] = 0.0;
-} // for 0 to 16
+} // for 0 to 15
 clear_deco_table();
 char_O_deco_status = 0;
 char_O_nullzeit = 0;
 int_O_ascenttime = 0;
 // Calc limit for surface, ie. GF_high.
 calc_limit();
 	int_O_gtissue_limit = (short)(calc_lead_tissue_limit * 1000);
-	int_O_gtissue_press = (short)((pres_tissue[char_O_gtissue_no] + (pres_tissue+16)[char_O_gtissue_no]) * 1000);
+	int_O_gtissue_press = (short)((pres_tissue_N2[char_O_gtissue_no] + pres_tissue_He[char_O_gtissue_no]) * 1000);
 // if guiding tissue can not be exposed to surface pressure immediately
 if( calc_lead_tissue_limit > pres_surface && char_O_deco_status == 0)
 	{
 		char_O_nullzeit = 0;    // deco necessary
 static void calc_tissue(PARAMETER unsigned char period)
 {
 assert( 0.00 <= ppN2 && ppN2 < 11.2 );  // 80% N2 at 130m
 assert( 0.00 <= ppHe && ppHe < 12.6 );  // 90% He at 130m
-for (ci=0;ci<16;ci++)
+for (ci=0;ci<NUM_COMP;ci++)
 {
 read_buhlmann_times(period);        // 2 sec or 1 min period.
 // N2
-temp_tissue = (ppN2 - pres_tissue[ci]) * var_N2_e;
+temp_tissue = (ppN2 - pres_tissue_N2[ci]) * var_N2_e;
 temp_tissue_safety();
-pres_tissue[ci] += temp_tissue;
+pres_tissue_N2[ci] += temp_tissue;
 // He
-temp_tissue = (ppHe - (pres_tissue+16)[ci]) * var_He_e;
+temp_tissue = (ppHe - pres_tissue_He[ci]) * var_He_e;
 temp_tissue_safety();
-(pres_tissue+16)[ci] += temp_tissue;
+pres_tissue_He[ci] += temp_tissue;
 }
 }
 //////////////////////////////////////////////////////////////////////////////
 // calc_limit
 static void calc_limit(void)
 {
 char_O_gtissue_no = 255;
 calc_lead_tissue_limit = 0.0;
-for(ci=0; ci<16;ci++)
+for(ci=0; ci<NUM_COMP;ci++)
 {
-overlay float N2 = pres_tissue[ci];
+overlay float N2 = pres_tissue_N2[ci];
-overlay float He = (pres_tissue+16)[ci];
+overlay float He = pres_tissue_He[ci];
 overlay float p = N2 + He;
 read_buhlmann_coefficients();
 var_N2_a = (var_N2_a * N2 + var_He_a * He) / p;
 var_N2_b = (var_N2_b * N2 + var_He_b * He) / p;
 char_O_gtissue_no = ci;
 calc_lead_tissue_limit = p;
 }
 }
-assert( char_O_gtissue_no < 16 );
+assert( char_O_gtissue_no < NUM_COMP );
 assert( 0.0 <= calc_lead_tissue_limit && calc_lead_tissue_limit <= 14.0);
 }
 //////////////////////////////////////////////////////////////////////////////
 // calc_nullzeit
 //
 void backup_sim_pres_tissue(void)
 {
 overlay unsigned char x;
-for(x = 0; x<32; x++)
+for(x=0; x<NUM_COMP; x++)
-sim_pres_tissue_backup[x] = sim_pres_tissue[x];
+{
+sim_pres_tissue_backup_N2[x] = sim_pres_tissue_N2[x];
+sim_pres_tissue_backup_He[x] = sim_pres_tissue_He[x];
+}
 }
 //////////////////////////////////////////////////////////////////////////////
 // restore_sim_pres_tissue
 //
 void restore_sim_pres_tissue(void)
 {
 overlay unsigned char x;
-for(x = 0; x<32; x++)
+for(x=0; x<NUM_COMP; x++)
-sim_pres_tissue[x] = sim_pres_tissue_backup[x];
+{
+sim_pres_tissue_N2[x] = sim_pres_tissue_backup_N2[x];
+sim_pres_tissue_He[x] = sim_pres_tissue_backup_He[x];
+}
 }
 //////////////////////////////////////////////////////////////////////////////
 // calc_ascenttime
 //
 overlay float ascent = pres_respiration - pres_surface + 0.7;
 if (ascent < 0.0)
 ascent = 0.0;
 sum = (unsigned short)(ascent + 0.99);
-for(x=0; x<32 && internal_deco_depth[x]; x++)
+for(x=0; x<NUM_STOPS && internal_deco_depth[x]; x++)
 sum += (unsigned short)internal_deco_time[x];
 if( char_O_deco_status == 1 )
 int_O_ascenttime = sum;
 else
 void update_startvalues(void)
 {
 overlay unsigned char x;
 // Start ascent simulation with current tissue partial pressures.
-	for (x = 0;x<16;x++)
+	for(x=0; x<NUM_COMP; x++)
 	{
-		sim_pres_tissue[x] = pres_tissue[x];
+		sim_pres_tissue_N2[x] = pres_tissue_N2[x];
-		(sim_pres_tissue+16)[x] = (pres_tissue+16)[x];
+		sim_pres_tissue_He[x] = pres_tissue_He[x];
 	}
 // No leading tissue (yet) for this ascent simulation.
 sim_lead_tissue_limit = 0.0;
 sim_lead_tissue_no = 255;
 static void sim_tissue(PARAMETER unsigned char period)
 {
 assert( 0.00 <= ppN2 && ppN2 < 11.2 );  // 80% N2 at 130m
 assert( 0.00 <= ppHe && ppHe < 12.6 );  // 90% He at 130m
-for(ci=0; ci<16; ci++)
+for(ci=0; ci<NUM_COMP; ci++)
 {
 read_buhlmann_times(period);        // 1 or 10 minute(s) interval
 // N2
-temp_tissue = (ppN2 - sim_pres_tissue[ci]) * var_N2_e;
+temp_tissue = (ppN2 - sim_pres_tissue_N2[ci]) * var_N2_e;
 temp_tissue_safety();
-sim_pres_tissue[ci] += temp_tissue;
+sim_pres_tissue_N2[ci] += temp_tissue;
 // He
-temp_tissue = (ppHe - (sim_pres_tissue+16)[ci]) * var_He_e;
+temp_tissue = (ppHe - sim_pres_tissue_He[ci]) * var_He_e;
 temp_tissue_safety();
-(sim_pres_tissue+16)[ci] += temp_tissue;
+sim_pres_tissue_He[ci] += temp_tissue;
 }
 }
 //////////////////////////////////////////////////////////////////////////////
 // sim_limit()
 assert( 0.0 < GF_current && GF_current <= 1.0f);
 sim_lead_tissue_limit = 0.0;
 sim_lead_tissue_no = 0;             // If no one is critic, keep first tissue.
-for(ci=0; ci<16; ci++)
+for(ci=0; ci<NUM_COMP; ci++)
 {
-overlay float N2 = sim_pres_tissue[ci];
+overlay float N2 = sim_pres_tissue_N2[ci];
-overlay float He = (sim_pres_tissue+16)[ci];
+overlay float He = sim_pres_tissue_He[ci];
 overlay float p = N2 + He;
 read_buhlmann_coefficients();
 var_N2_a = (var_N2_a * N2 + var_He_a * He) / p;
 var_N2_b = (var_N2_b * N2 + var_He_b * He) / p;
 sim_lead_tissue_no = ci;
 sim_lead_tissue_limit = p;
 }
 } // for ci
-assert( sim_lead_tissue_no < 16 );
+assert( sim_lead_tissue_no < NUM_COMP );
 assert( 0.0 <= sim_lead_tissue_limit && sim_lead_tissue_limit <= 14.0 );
 }
 //////////////////////////////////////////////////////////////////////////////
 // clear_deco_table
 //
 static void clear_deco_table(void)
 {
 overlay unsigned char x;
-for(x=0; x<32; ++x)
+for(x=0; x<NUM_STOPS; ++x)
 {
 internal_deco_time [x] = 0;
 internal_deco_depth[x] = 0;
 }
 }
 {
 overlay unsigned char x;
 assert( temp_depth_limit < 128 );   // Can't be negativ (overflown).
 assert( temp_depth_limit > 0 );     // No stop at surface...
-for(x=0; x<32; ++x)
+for(x=0; x<NUM_STOPS; ++x)
 {
 // Make sure deco-stops are recorded in order:
 assert( !internal_deco_depth[x] || temp_depth_limit <= (internal_deco_depth[x]& 0x7F) );
 if( (internal_deco_depth[x] & 0x7F) == temp_depth_limit )
 // new code in v.102
 //
 static void calc_gradient_factor(void)
 {
 overlay float gf;
-overlay float N2 = pres_tissue[char_O_gtissue_no];
+overlay float N2 = pres_tissue_N2[char_O_gtissue_no];
-overlay float He = (pres_tissue+16)[char_O_gtissue_no];
+overlay float He = pres_tissue_He[char_O_gtissue_no];
-assert( char_O_gtissue_no < 16 );
+assert( char_O_gtissue_no < NUM_COMP );
 assert( 0.800 <= pres_respiration && pres_respiration < 14.0 );
 	// tissue > respiration (currently off-gasing)
 	// GF =   0% when respiration == tissue, ie. bubbles are at equilibrium.
 	// GF = 100% when respiration == limit.
 // Inputs:  int_I_pres_surface, ppWater, char_I_desaturation_multiplier
 // Outputs: int_O_desaturation_time, char_O_tissue_saturation[0..31]
 //
 void deco_calc_desaturation_time(void)
 {
+overlay rom const float *ptr;
 RESET_C_STACK
 assert( 800 < int_I_pres_surface && int_I_pres_surface < 1100 );
 assert( 0 < char_I_desaturation_multiplier && char_I_desaturation_multiplier <= 100 );
 pres_surface = int_I_pres_surface * 0.001;
 ppN2 = N2_ratio * (pres_surface - ppWater);
 int_O_desaturation_time = 0;
 float_desaturation_multiplier = char_I_desaturation_multiplier / 142.0; // new in v.101	(70,42%/100.=142)
-for (ci=0;ci<16;ci++)
+ptr = &buhlmann_ht[0];
-{
+for(ci=0; ci<NUM_COMP; ci++)
+{
+overlay float var_N2_halftime = *ptr++;
+overlay float var_He_halftime = *ptr++;
 overlay unsigned short desat_time;    // For a particular compartiment, in min.
 overlay float temp1;
 overlay float temp2;
 overlay float temp3;
 overlay float temp4;
+assert( 4.0    <= var_N2_halftime && var_N2_halftime <= 635.0 );
+assert( 1.5099 <= var_He_halftime && var_He_halftime <= 240.03 );
 // saturation_time (for flight) and N2_saturation in multiples of halftime
 // version v.100: 1.1 = 10 percent distance to totally clean (totally clean is not possible, would take infinite time )
 // new in version v.101: 1.07 = 7 percent distance to totally clean (totally clean is not possible, would take infinite time )
 // changes in v.101: 1.05 = 5 percent dist to totally clean is new desaturation point for display and NoFly calculations
 // N2
-temp1 = 1.05 * ppN2 - pres_tissue[ci];
+temp1 = 1.05 * ppN2 - pres_tissue_N2[ci];
-temp2 = ppN2 - pres_tissue[ci];
+temp2 = ppN2 - pres_tissue_N2[ci];
 if (temp2 >= 0.0)
 {
 temp1 = 0.0;
 temp2 = 0.0;
 }
 else
 temp1 = temp1 / temp2;
 if( 0.0 < temp1 && temp1 < 1.0 )
 {
-overlay float var_N2_halftime = buhlmann_ht[ci];
-assert( 4.0 <= var_N2_halftime && var_N2_halftime <= 635.0 );
 // 0.6931 is ln(2), because the math function log() calculates with a base of e not 2 as requested.
 // minus because log is negative.
 temp1 = log(1.0 - temp1) / -0.6931; // temp1 is the multiples of half times necessary.
 temp2 = var_N2_halftime * temp1 / float_desaturation_multiplier; // time necessary (in minutes ) for complete desaturation (see comment about 5 percent) , new in v.101: float_desaturation_multiplier
 temp1 = 0.0;
 temp2 = 0.0;
 }
 // He
-temp3 = 0.1 - (pres_tissue+16)[ci];
+temp3 = 0.1 - pres_tissue_He[ci];
 if (temp3 >= 0.0)
 {
 temp3 = 0.0;
 temp4 = 0.0;
 }
 else
-temp3 = - temp3 / (pres_tissue+16)[ci];
+temp3 = - temp3 / pres_tissue_He[ci];
 if( 0.0 < temp3 && temp3 < 1.0 )
 	{
-overlay float var_He_halftime = (buhlmann_ht+16)[ci];
-assert( 1.5099 <= var_He_halftime && var_He_halftime <= 240.03 );
 	temp3 = log(1.0 - temp3) / -0.6931; // temp1 is the multiples of half times necessary.
 							 // 0.6931 is ln(2), because the math function log() calculates with a base of e  not 2 as requested.
 							 // minus because log is negative
 	temp4 = var_He_halftime * temp3 / float_desaturation_multiplier; // time necessary (in minutes ) for "complete" desaturation, new in v.101 float_desaturation_multiplier
 	}
 if(desat_time > int_O_desaturation_time)
 int_O_desaturation_time = desat_time;
 // N2 saturation in multiples of halftime for display purposes
-temp2 = temp1 * 20.0;  // 0 = 1/8, 120 = 0, 249 = 8
+temp2 = temp1 * 20.0;   // 0 = 1/8, 120 = 0, 249 = 8
-temp2 = temp2 + 80.0; // set center
+temp2 = temp2 + 80.0;   // set center
 if (temp2 < 0.0)
 temp2 = 0.0;
 if (temp2 > 255.0)
 temp2 = 255.0;
-char_O_tissue_saturation[ci] = (char)temp2;
+char_O_tissue_N2_saturation[ci] = (char)temp2;
 // He saturation in multiples of halftime for display purposes
-temp4 = temp3 * 20.0;  // 0 = 1/8, 120 = 0, 249 = 8
+temp4 = temp3 * 20.0;   // 0 = 1/8, 120 = 0, 249 = 8
-temp4 = temp4 + 80.0; // set center
+temp4 = temp4 + 80.0;   // set center
 if (temp4 < 0.0)
 temp4 = 0.0;
 if (temp4 > 255.0)
 temp4 = 255.0;
-(char_O_tissue_saturation+16)[ci] = (char)temp4;
+char_O_tissue_He_saturation[ci] = (char)temp4;
 } // for
 }
 //////////////////////////////////////////////////////////////////////////////
 // calc_wo_deco_step_1_min
 ppN2 = N2_ratio * (pres_respiration - ppWater);     // ppWater is the extra pressure in the body
 ppHe = 0.0;
 float_desaturation_multiplier = char_I_desaturation_multiplier / 142.0; // new in v.101	(70,42%/100.=142)
 float_saturation_multiplier   = char_I_saturation_multiplier   * 0.01;
-calc_tissue(1);  // update the pressure in the 32 tissues in accordance with the new ambient pressure
+calc_tissue(1);  // update the pressure in the tissues N2/He in accordance with the new ambient pressure
 clear_deco_table();
 char_O_deco_status = 3;     // surface new in v.102 : stays in surface state.
 char_O_nullzeit = 0;
 int_O_ascenttime = 0;
 //          CF#57 == deco deci-liters/minutes (0.5 .. 50.0) or bar/min.
 // Output:  int_O_gas_volumes[0..4] in litters * 0.1
 //
 void deco_gas_volumes(void)
 {
-overlay float volumes[5];
+overlay float volumes[NUM_GAS];
 overlay float bottom_usage, ascent_usage;
 overlay unsigned char i, deepest_first;
 overlay unsigned char gas;
 RESET_C_STACK
 //---- initialize with bottom consumption --------------------------------
-for(i=0; i<5; ++i)                              // Nothing yet...
+for(i=0; i<NUM_GAS; ++i)                            // Nothing yet...
 volumes[i] = 0.0;
-assert(1 <= char_I_first_gas && char_I_first_gas <= 5);
+assert(1 <= char_I_first_gas && char_I_first_gas <= NUM_GAS);
 gas = char_I_first_gas - 1;
 bottom_usage = read_custom_function(56) * 0.1;
 if( bottom_usage > 0.0 )
 volumes[gas]
 * (char_I_bottom_depth - char_O_first_deco_depth) * 0.1  // ascent time (min)
 * ascent_usage;                            // Consumption ( xxx / min @ 1 bar)
 else
 volumes[gas] = 65535.0;
-for(i=0; i<32; ++i)
+for(i=0; i<NUM_STOPS; ++i)
 {
 overlay unsigned char j;
 overlay unsigned char depth, time, ascent;
 // Manage stops in reverse order (CF#54)
 if( i < 31 )
 ascent -= char_O_deco_depth[30-i] & 0x7F;
 }
 // Gas switch depth ?
-for(j=0; j<5; ++j)
+for(j=0; j<NUM_GAS; ++j)
 {
 if( depth <= char_I_deco_gas_change[j] )
 if( !char_I_deco_gas_change[gas] || (char_I_deco_gas_change[gas] > char_I_deco_gas_change[j]) )
 gas = j;
 }
 else
 volumes[gas] = 65535.0;
 }
 //---- convert results for the ASM interface -----------------------------
-for(i=0; i<5; ++i)
+for(i=0; i<NUM_GAS; ++i)
 if( volumes[i] > 6553.4 )
 int_O_gas_volumes[i] = 65535;
 else
 int_O_gas_volumes[i] = (unsigned short)(volumes[i]*10.0 + 0.5);
 }
 {
 overlay unsigned char x;
 RESET_C_STACK
 	cns_vault = CNS_fraction;
-	for (x=0;x<32;x++)
+	for (x=0;x<NUM_COMP;x++)
-		pres_tissue_vault[x] = pres_tissue[x];
+{
+		pres_tissue_N2_vault[x] = pres_tissue_N2[x];
+		pres_tissue_He_vault[x] = pres_tissue_He[x];
+}
 }
 void deco_pull_tissues_from_vault(void)
 {
 overlay unsigned char x;
 RESET_C_STACK
-	for (x=0;x<32;x++)
+	for (x=0; x<NUM_COMP; x++)
-		pres_tissue[x] = pres_tissue_vault[x];
+{
+		pres_tissue_N2[x] = pres_tissue_N2_vault[x];
+		pres_tissue_He[x] = pres_tissue_He_vault[x];
+}
 // Restore both CNS variable, too.
 CNS_fraction = cns_vault;
 char_O_CNS_fraction = (char)(CNS_fraction * 100.0 + 0.5);
 }

Mercurial > public > mk2

comparison code_part1/OSTC_code_c_part2/p2_deco.c @ 344:797e2ac42d24 ScreenDump