mk2: code_part1/OSTC_code_c_part2/p2

comparison code_part1/OSTC_code_c_part2/p2_deco.c @ 186:57a654c199ae

BUGFIX Gradient Factor algo. + Fix calc_hauptroutine_update_tissues() crazzy calculation in GF mode for deco limit. + Backup lock/GF_step/deco_pointer during ascent simulation.

author	JeanDo
date	Wed, 02 Feb 2011 00:09:30 +0100
parents	ae3a83982ab2
children	c8816e4bc724

comparison

equal deleted inserted replaced

-:ae3a83982ab2
+:57a654c199ae
 		while(internal_deco_pointer > 0)
 {
 overlay unsigned char index;            // Next index (0..30)
 overlay unsigned char next_depth_limit; // Next depth (0m..90m)
 overlay float press_tol;                // Upper limit (lower pressure) tolerated.
-		overlay float GF_temp;                  // Changing Gradient-Factor value at next depth.
+		overlay float GF_current;               // Changing Gradient-Factor value at next depth.
 index = internal_deco_pointer - 1;                          // Index of next (upper) stop.
 if (index == 1)                                             // new in v104
 next_depth_limit = char_I_depth_last_deco;              // Use last 3m..6m instead.
 else
 	next_stop =  next_depth_limit * 0.09995                     // Meters to bar
 	          + pres_surface;
 // current GF is GF_high - alpha (GF_high - GF_low)
 // With alpha = currentStop / (totalStops-1), hence in [0..1]
-GF_temp = GF_high - (next_depth_limit/3) * locked_GF_step;
+GF_current = GF_high - (next_depth_limit/3) * locked_GF_step;
 // upper limit (lowest pressure tolerated):
-			press_tol = GF_temp * sim_pres_gtissue_diff + sim_pres_gtissue;
+			press_tol = GF_current * sim_pres_gtissue_diff + sim_pres_gtissue;
 if( press_tol > next_stop ) // check if ascent to next deco stop is ok
 break;
 // Else, validate that stop and loop...
 // | +------< not finished
 // +--------< finish
 //
 static void calc_hauptroutine(void)
 {
+	static float backup_GF_step;
+	static unsigned char backup_lock;
+	static unsigned char backup_pointer;
 	calc_hauptroutine_data_input();
 	if(!flag_in_divemode)
 	{
 		flag_in_divemode = 1;
 // toggle between calculation for nullzeit (bottom time),
 //                deco stops
 //                and more deco stops (continue)
 	switch( char_O_deco_status )
 	{
+case 3: //---- At surface: start a new dive ------------------------------
+	clear_deco_table();
+	copy_deco_table();
+	internal_deco_pointer = 0;
+	update_startvalues();
+	calc_nextdecodepth();
+	lock_GF_depth_list = 0;
+	char_O_deco_status = 0; // Calc bottom-time/nullzeit next iteration.
+	backup_lock = 255;      // backup is empty...
+	break;
 case 0: //---- bottom time -----------------------------------------------
 	update_startvalues();
 	calc_nullzeit();
 	check_ndl();
-	char_O_deco_status = 2; // calc ascent next time.
+	    char_O_deco_status = 2; // calc ascent next time.
 	break;
-case 1: //---- Simulate stops --------------------------------------------
-	calc_hauptroutine_calc_deco();
-	// Sets char_O_deco_status to 0 (buffered results, and restart nullzeit),
-	//                         or 1 (more stops to simulate).
-	break;
-case 3: //---- At surface: start a new dive ------------------------------
-	clear_deco_table();
-	copy_deco_table();
-	internal_deco_pointer = 0;
-	lock_GF_depth_list = 0;
-	update_startvalues();
-	calc_nextdecodepth();
-	char_O_deco_status = 0; // Calc nullzeit next time.
-	break;
 case 2: //---- Simulate ascent to first stop -----------------------------
+// Backup ascention state, ie if we already fixed the low GF reference,
+// and its value.
+	backup_GF_step = locked_GF_step;
+	backup_lock = lock_GF_depth_list;
+backup_pointer = internal_deco_pointer;
 	sim_ascent_to_first_stop();
 	char_O_deco_status = 1;     // Cacl stops next time.
 	break;
+case 1: //---- Simulate stops --------------------------------------------
+	calc_hauptroutine_calc_deco();
+// If simulation is finished, restore the GF low reference, so that
+// next ascent simulation is done from the current depth:
+	if( char_O_deco_status == 0 && backup_lock != 255)
+	{
+	locked_GF_step = backup_GF_step;
+	lock_GF_depth_list = backup_lock;
+	internal_deco_pointer = backup_pointer;
+	backup_lock = 255;
+}
+	break;
 	}
 	check_post_dbg();
 }
 deco_He_ratio3      = char_I_deco_He_ratio3 / 100.0;
 deco_N2_ratio4      = char_I_deco_N2_ratio4 / 100.0;
 deco_He_ratio4      = char_I_deco_He_ratio4 / 100.0;
 deco_N2_ratio5      = char_I_deco_N2_ratio5 / 100.0;
 deco_He_ratio5      = char_I_deco_He_ratio5 / 100.0;
-float_deco_distance = char_I_deco_distance / 100.0;     // Get offset is in mbar.
+float_deco_distance = char_I_deco_distance  / 100.0;     // Get offset is in mbar.
 // ____________________________________________________
 //
 // _____________ G A S _ C H A N G E S ________________
 // ____________________________________________________
 //////////////////////////////////////////////////////////////////////////////
 //
 //
 void calc_hauptroutine_update_tissues(void)
 {
+overlay float gtissue_press;
+overlay float gtissue_diff;
+overlay float gtissue_limit;
 	if (char_I_const_ppO2 == 0)													// new in v.101
 		pres_diluent = pres_respiration;										// new in v.101
-	else																		// new in v.101
+	else
+{
 		pres_diluent = ((pres_respiration - const_ppO2)/(N2_ratio + He_ratio));	// new in v.101
-	if (pres_diluent > pres_respiration)										// new in v.101
+	    if (pres_diluent > pres_respiration)									// new in v.101
-		pres_diluent = pres_respiration;										// new in v.101
+		    pres_diluent = pres_respiration;								    // new in v.101
+}
 	if (pres_diluent > 0.0627)													// new in v.101
 	{
 		temp_atem = N2_ratio * (pres_diluent - 0.0627);							// changed in v.101
 		temp2_atem = He_ratio * (pres_diluent - 0.0627);						// changed in v.101
 		char_O_diluent = (char)(pres_diluent/pres_respiration*100.0);
 	if(!char_I_step_is_1min)
 		calc_tissue_2_secs();
 	else
 		calc_tissue_1_min();
-	int_O_gtissue_limit = (int)(pres_tissue_limit[char_O_gtissue_no] * 1000);
+	gtissue_limit = pres_tissue_limit[char_O_gtissue_no];
-	int_O_gtissue_press = (int)((pres_tissue[char_O_gtissue_no] + (pres_tissue+16)[char_O_gtissue_no]) * 1000);
+	gtissue_press = pres_tissue[char_O_gtissue_no] + (pres_tissue+16)[char_O_gtissue_no];
-	if (char_I_deco_model == 1)
+gtissue_diff  = gtissue_limit - gtissue_press;
-	{
+	int_O_gtissue_limit = (int)(gtissue_limit * 1000);
-		temp1 = temp1 * GF_high;
+	int_O_gtissue_press = (int)(gtissue_press * 1000);
-	}
+if (char_I_deco_model == 1)
+// press_tol = GF_current * pres_gtissue_diff + pres_gtissue;
+// With : pres_gtissue = pres_tissue[char_O_gtissue_no] + (pres_tissue+16)[char_O_gtissue_no]
+// and    gtissue_diff = sim_pres_gtissue_limit - sim_pres_gtissue
+temp1 = GF_high * gtissue_diff + gtissue_press;
 	else
-	{
+temp1 = pres_gtissue_limit;
-temp1 = temp_surface;
-	}
+if( temp1 > temp_surface && char_O_deco_status == 0)  // if guiding tissue can not be exposed to surface pressure immediately
-	if (pres_gtissue_limit > temp1 && char_O_deco_status == 0)  // if guiding tissue can not be exposed to surface pressure immediately
 	{
 		char_O_nullzeit = 0;    // deco necessary
 		char_O_deco_status = 2; // calculate ascent on next iteration.
 	}
 }
 		char_O_deco_status = 0; // calc nullzeit next time.
 		return;
 	}
 //---- Else, continue simulating the stops ---------------------------
-check_gas_switch();
+check_gas_switch();         // Also updates ppN2 and ppHe.
 sim_tissue_1min();          // Simulate compartiments for 1 minute.
 update_deco_table();        // Add one minute stops.
 	}
 	// Surface not reached, need more stops...
 // Loop until first top or surface is reached.
 	for(;;)
 	{
 		temp_deco = temp_deco - 1.0;    // Ascent 1 min, at 10m/min. == 1bar/min.
+// TODO HERE TOO: WE MIGH HAVE STARTED ASCENT !
 		if ( char_I_deco_model == 1)
 			temp_limit = sim_pres_gtissue_limit_GF_low;
 		else
 			temp_limit = sim_pres_gtissue_limit;
 break;                      //Yes: finished !
 // Next stop is surface ?
 if( temp_deco <= pres_surface )
 break;                      // Yes: finished too.
-// The ascent is not done (already), so re-defined locked_GF_step:
-		lock_GF_depth_list = 0;
 //---- Simulat gas switches, at half the ascent
 		temp_deco += 0.5;           // Check gas change 5 meter below new depth.
 check_gas_switch();
 		temp_deco -= 0.5;           // Back to new depth.
 overlay unsigned char x;
 // Initialize data used to compute GF_low depth from current dive/simu
 	sim_gtissue_no = char_O_gtissue_no;
 	sim_pres_gtissue_limit = pres_gtissue_limit;
-	sim_pres_gtissue = pres_tissue[char_O_gtissue_no] + pres_tissue[char_O_gtissue_no+16];
+	sim_pres_gtissue = pres_tissue[char_O_gtissue_no] + (pres_tissue+16)[char_O_gtissue_no];
 	sim_pres_gtissue_diff = sim_pres_gtissue_limit - sim_pres_gtissue;						// negative number
 	sim_pres_gtissue_limit_GF_low = GF_low * sim_pres_gtissue_diff + sim_pres_gtissue;
 	sim_pres_gtissue_limit_GF_low_below_surface = sim_pres_gtissue_limit_GF_low - pres_surface;
 	if (sim_pres_gtissue_limit_GF_low_below_surface < 0)
 		sim_pres_gtissue_limit_GF_low_below_surface = 0;
 	{
 		temp1 = (float)temp_depth_GF_low_meter * 0.09995;
 		temp2 = pres_respiration - pres_surface;
 		if (temp2 <= 0)
 			temp1 = GF_high;
-		else
+		else if (temp2 >= temp1)
-		if (temp2 >= temp1)
 			temp1 = GF_low;
 		else
 			temp1 = GF_low + (temp1 - temp2)/temp1*GF_delta;
 		if (temp_depth_GF_low_meter == 0)
 			temp1 = GF_high;
 		temp2 = temp3 / temp1; // temp3 is already in percent
 		if (temp2 < 0)
 			temp2 = 0;
 		if (temp2 > 255)
 			temp2 = 255;
 		char_O_relative_gradient_GF  = (char)temp2;
 	}	// calc relative gradient factor
 	else
 	{
-			char_O_relative_gradient_GF = char_O_gradient_factor;
+char_O_relative_gradient_GF = char_O_gradient_factor;
 	}
 }
 //////////////////////////////////////////////////////////////////////////////
 // deco_calc_desaturation_time
 movff	TABLAT,md_temp
 _endasm
 } // else
 md_buffer[md_i]   = md_temp;
-md_state[md_i+16] = md_buffer[md_i];
+md_state[md_i+16] = md_temp;
-md_state[md_i+32] = (unsigned char)(md_buffer[md_i] ^ md_state[md_i]);
+md_state[md_i+32] = (unsigned char)(md_temp ^ md_state[md_i]);
 } // for md_i 16
 for (md_i=0;md_i<18;md_i++)
 {
 for (md_j=0;md_j<48;md_j++)

Mercurial > public > mk2

comparison code_part1/OSTC_code_c_part2/p2_deco.c @ 186:57a654c199ae