mk2: code_part1/OSTC_code_c_part2/p2

comparison code_part1/OSTC_code_c_part2/p2_deco.c @ 334:4ccdc72ec0e5

BUGFIX minor error in gas-switch algo (spurious surface decostop rarely added).

author	JeanDo
date	Thu, 12 May 2011 13:59:13 +0200
parents	a7ed48daf597
children	b75564fb3d4b

comparison

equal deleted inserted replaced

-:8b347e0eae26
+:4ccdc72ec0e5
 // 2011/03/21: [jDG] Added gas consumption (CF56 & CF57) evaluation for OCR mode.
 // 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 @+5min variant.
+// 2011/05/02: [jDG] Added "Future TTS" function (CF58).
 //
 // TODO:
 //  + Allow to abort MD2 calculation (have to restart next time).
 //
 // Literature:
 // If there is no gas-switch-delay running ?
 if( sim_gas_delay <= sim_dive_mins)
 {
 // Compute current depth:
-overlay unsigned char depth = (unsigned char)((pres_respiration - pres_surface) * BAR_TO_METER);
+overlay unsigned char depth = (unsigned char)(0.5 + (pres_respiration - pres_surface) * BAR_TO_METER);
 assert( depth < 130 );
 // And if I'm above the last decostop (with the 3m margin) ?
 if( (sim_gas_last_depth-3) > depth )
 {
 //////////////////////////////////////////////////////////////////////////////
 // Compute stops.
 //
 // Note: because this can be very long, break on 16 iterations, and set state
 //       to 0 when finished, or to 1 when needing to continue.
-// Note: because this might be very long (~ 66 ms by iteration in 1.84beta),
+// Note: because each iteration might be very long too (~ 66 ms in 1.84beta),
 //       break the loop when total time > 512msec.
 //
 void calc_hauptroutine_calc_deco(void)
 {
 overlay unsigned char loop;
 		        return;
 }
 }
 }
 else
+{
+// Note: if loop==0, temp_depth_limit might not be already set here.
+temp_depth_limit = (int)(0.5 + (temp_deco - pres_surface) * BAR_TO_METER);
 update_deco_table();    // Just pass one minute.
+}
 //---- Then update tissue --------------------------------------------
 sim_dive_mins++;            // Advance simulated time by 1 minute.
 gas_switch_set();           // Apply any simulated gas change, once validated.
 sim_alveolar_presures();    // Updates ppN2 and ppHe.
 //
 // Note: because we ascent with a constant speed (10m/mn, ie. 1bar/mn),
 //       there is no need to break on more that 16 iterations
 //       (or we are already in deep shit).
 //
+// Input:  pres_respiration
+// Output: temp_deco
+//
 // if char_O_deco_status indicate @+5 variant, add extra time at current depth,
 // before ascent.
 void sim_ascent_to_first_stop(void)
 {
 update_startvalues();
 temp_deco = pres_surface;   // Yes: finished !
 break;
 }
 // Check for gas change below new depth ?
-temp_depth_limit = (temp_deco - pres_surface) * BAR_TO_METER;
+temp_depth_limit = (int)(0.5 + (temp_deco - pres_surface) * BAR_TO_METER);
+assert( temp_depth_limit > 0);
 if( gas_switch_deepest() )
 {
+assert( temp_depth_limit > 0);
 temp_deco = temp_depth_limit * METER_TO_BAR + pres_surface;
 break;
 }
 sim_dive_mins++;                // Advance simulated time by 1 minute.
 assert( temp_depth_limit > 0 );     // No stop at surface...
 for(x=0; x<32; ++x)
 {
 // Make sure deco-stops are recorded in order:
-assert( !internal_deco_depth[x] || temp_depth_limit <= internal_deco_depth[x] );
+assert( !internal_deco_depth[x] || temp_depth_limit <= (internal_deco_depth[x]& 0x7F) );
 if( (internal_deco_depth[x] & 0x7F) == temp_depth_limit )
 {
 // Do not overflow (max 255')
 	        if( internal_deco_time[x] < 255 )
 else
 temp3 = - temp3 / (pres_tissue+16)[ci];
 if( 0.0 < temp3 && temp3 < 1.0 )
 	{
 overlay float var_He_halftime = (buhlmann_ht+16)[ci];
-assert( 1.51 <= var_He_halftime && var_He_halftime <= 240.03 );
+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

Mercurial > public > mk2

comparison code_part1/OSTC_code_c_part2/p2_deco.c @ 334:4ccdc72ec0e5