mk2: code_part1/OSTC_code_c_part2/p2

comparison code_part1/OSTC_code_c_part2/p2_deco.c @ 339:cb77d1fa4535

More cleanups in internal deco structures.

author	JeanDo
date	Wed, 18 May 2011 02:01:52 +0200
parents	b75564fb3d4b
children	ecbbbd423e86

comparison

equal deleted inserted replaced

-:b75564fb3d4b
+:cb77d1fa4535
 static unsigned char	internal_deco_time[NUM_STOPS];
 static unsigned char	internal_deco_depth[NUM_STOPS];
 static float cns_vault;
-static float pres_tissue_vault[2*NUM_COMP];
+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 unsigned char    deco_gas_change[NUM_GAS];       // new in v.109
 //---- Bank 6 parameters -----------------------------------------------------
 #pragma udata bank6=0x600
-float  pres_tissue[2*NUM_COMP];
+float  pres_tissue_N2[NUM_COMP];
+float  pres_tissue_He[NUM_COMP];
 //---- Bank 7 parameters -----------------------------------------------------
 #pragma udata bank7=0x700
-float  sim_pres_tissue[2*NUM_COMP];             // 32 floats = 128 bytes.
+float  sim_pres_tissue_N2[NUM_COMP];             // 32 floats = 128 bytes.
-static float  sim_pres_tissue_backup[2*NUM_COMP];
+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 = NUM_COMP; i < 2*NUM_COMP; 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 = NUM_COMP; i < 2*NUM_COMP; 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] )
 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<NUM_STOPS; y++, --x)
 {
 // Stop only once the last transfer is done.
 if( x == 0 ) break;
 }
 //---- Third: fill table end with null
-for(y++; y<2*NUM_COMP; 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<2*NUM_COMP; 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];
 }
 }
 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+NUM_COMP)[ci] = 0.0;
+pres_tissue_He[ci] = 0.0;
 } // for 0 to 15
 clear_deco_table();
 char_O_deco_status = 0;
 char_O_nullzeit = 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+NUM_COMP)[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
 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+NUM_COMP)[ci]) * var_He_e;
+temp_tissue = (ppHe - pres_tissue_He[ci]) * var_He_e;
 temp_tissue_safety();
-(pres_tissue+NUM_COMP)[ci] += temp_tissue;
+pres_tissue_He[ci] += temp_tissue;
 }
 }
 //////////////////////////////////////////////////////////////////////////////
 // calc_limit
 char_O_gtissue_no = 255;
 calc_lead_tissue_limit = 0.0;
 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+NUM_COMP)[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;
 //
 void backup_sim_pres_tissue(void)
 {
 overlay unsigned char x;
-for(x = 0; x<2*NUM_COMP; 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<2*NUM_COMP; 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
 //
 void update_startvalues(void)
 {
 overlay unsigned char x;
 // Start ascent simulation with current tissue partial pressures.
-	for (x = 0;x<NUM_COMP;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+NUM_COMP)[x] = (pres_tissue+NUM_COMP)[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;
 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+NUM_COMP)[ci]) * var_He_e;
+temp_tissue = (ppHe - sim_pres_tissue_He[ci]) * var_He_e;
 temp_tissue_safety();
-(sim_pres_tissue+NUM_COMP)[ci] += temp_tissue;
+sim_pres_tissue_He[ci] += temp_tissue;
 }
 }
 //////////////////////////////////////////////////////////////////////////////
 // sim_limit()
 sim_lead_tissue_limit = 0.0;
 sim_lead_tissue_no = 0;             // If no one is critic, keep first tissue.
 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+NUM_COMP)[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;
 // 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+NUM_COMP)[char_O_gtissue_no];
+overlay float He = pres_tissue_He[char_O_gtissue_no];
 assert( char_O_gtissue_no < NUM_COMP );
 assert( 0.800 <= pres_respiration && pres_respiration < 14.0 );
 	// tissue > respiration (currently off-gasing)
 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)
 ptr = &buhlmann_ht[0];
-for (ci=0;ci<NUM_COMP;ci++)
+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;
 // 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;
 }
 temp1 = 0.0;
 temp2 = 0.0;
 }
 // He
-temp3 = 0.1 - (pres_tissue+NUM_COMP)[ci];
+temp3 = 0.1 - pres_tissue_He[ci];
 if (temp3 >= 0.0)
 {
 temp3 = 0.0;
 temp4 = 0.0;
 }
 else
-temp3 = - temp3 / (pres_tissue+NUM_COMP)[ci];
+temp3 = - temp3 / pres_tissue_He[ci];
 if( 0.0 < temp3 && temp3 < 1.0 )
 	{
 	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
 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+NUM_COMP)[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 2*NUM_COMP 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;
 {
 overlay unsigned char x;
 RESET_C_STACK
 	cns_vault = CNS_fraction;
-	for (x=0;x<2*NUM_COMP;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<2*NUM_COMP;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 @ 339:cb77d1fa4535