hwos_code: src/p2_deco.c comparison

comparison src/p2_deco.c @ 287:f342853afcd9

FIX gas_volumes: shall take stops in forward order.

author	jdg@air
date	Fri, 29 May 2015 02:24:03 +0200
parents	d1117b99fd99
children	08986d479b94

comparison

equal deleted inserted replaced

-:729b01914098
+:f342853afcd9
 overlay unsigned char need_stop = 0;
 assert( depth >= -0.2 );        // Allow for 200mbar of weather change.
 //---- ZH-L16 + GRADIENT FACTOR model ------------------------------------
-	if( char_I_deco_model != 0 )
+if( char_I_deco_model != 0 )
-	{
+{
 overlay unsigned char first_stop = 0;
 overlay float p;
 sim_limit( GF_low );
 p = sim_lead_tissue_limit - pres_surface;
 // Just a check we are indeed above LOW ref.
 assert( next_stop < low_depth );
 // Total preassure at the new stop candidate:
 pres_stop =  next_stop * METER_TO_BAR
-	              + pres_surface;
++ pres_surface;
 // Keep GF_low until a first stop depth is found:
 sim_limit( GF_high - next_stop * locked_GF_step );
 // Check upper limit (lowest pressure tolerated):
 first_stop = next_stop;
 }
 assert( first_stop == 0 );
 no_deco_stop:
-		temp_depth_limit = min_depth;
+temp_depth_limit = min_depth;
 goto done;
 // next stop is the last validated depth found, aka first_stop
 deco_stop_found:
 need_stop = 1;                  // Hit.
 static void temp_tissue_safety(void)
 {
 assert( 0.0 <  float_desaturation_multiplier && float_desaturation_multiplier <= 1.0 );
 assert( 1.0 <= float_saturation_multiplier   && float_saturation_multiplier   <= 2.0 );
-	if( char_I_deco_model == 0 )
+if( char_I_deco_model == 0 )
-	{
+{
-		if( temp_tissue < 0.0 )
+if( temp_tissue < 0.0 )
-			temp_tissue *= float_desaturation_multiplier;
+temp_tissue *= float_desaturation_multiplier;
-		else
+else
-			temp_tissue *= float_saturation_multiplier;
+temp_tissue *= float_saturation_multiplier;
-	}
+}
 }
 //////////////////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////////////
 // ** THE JUMP-IN CODE **
 assert( sim_gas_last_used <= NUM_GAS );
 if( sim_gas_last_used == 0 )    // Gas6 = manualy set gas.
 {
 calc_N2_ratio = N2_ratio;
-	    calc_He_ratio = He_ratio;
+calc_He_ratio = He_ratio;
 }
 else
 {
 calc_N2_ratio = char_I_deco_N2_ratio[sim_gas_last_used-1] * 0.01;
-	    calc_He_ratio = char_I_deco_He_ratio[sim_gas_last_used-1] * 0.01;
+calc_He_ratio = char_I_deco_He_ratio[sim_gas_last_used-1] * 0.01;
 }
 assert( 0.0 <= calc_N2_ratio && calc_N2_ratio <= 0.95 );
 assert( 0.0 <= calc_He_ratio && calc_He_ratio <= 1.00 );
 assert( (calc_N2_ratio + calc_He_ratio) <= 1.00 );
 if( deco_diluent > pres_surface )
 deco_diluent += float_deco_distance;
 //---- CCR mode : deco gas switch ? --------------------------------------
 if( char_I_const_ppO2 != 0 )
-	{
+{
 // In CCR mode, use calc_XX_ratio instead of XX_ratio.
 // Note: PPO2 and ratios are known outside the lumbs, so there is no
 //       ppWater in the equations below:
 deco_diluent -= const_ppO2;
 deco_diluent /= calc_N2_ratio + calc_He_ratio;
 if (deco_diluent > temp_deco)
-	    deco_diluent = temp_deco;
+deco_diluent = temp_deco;
-	}
+}
 if( deco_diluent > ppWater )
 {
 ppN2 = calc_N2_ratio * (deco_diluent - ppWater);
 ppHe = calc_He_ratio * (deco_diluent - ppWater);
 //                deco stops
 //                and more deco stops (continue)
 switch( char_O_deco_status )
 {
 case 3: //---- At surface: start a new dive ------------------------------
-	clear_deco_table();
+clear_deco_table();
-	copy_deco_table();
+copy_deco_table();
-	int_O_ascenttime = 0;       // Reset DTR.
+int_O_ascenttime = 0;       // Reset DTR.
-	int_O_extra_ascenttime = 0;
+int_O_extra_ascenttime = 0;
-	char_O_nullzeit = 0;        // Reset bottom time.
+char_O_nullzeit = 0;        // Reset bottom time.
 char_O_deco_status = 0;     // Calc bottom-time/nullzeit next iteration.
 // Values that should be reset just once for the full real dive.
 // This is used to record the lowest stop for the whole dive,
 // Including ACCROSS all simulated ascent.
 case 0: //---- bottom time -----------------------------------------------
 default:
 gas_switch_find_current();              // Lookup for current gas & time.
 gas_switch_set();                       // setup calc_ratio's
-	calc_nullzeit();
+calc_nullzeit();
 if( char_O_nullzeit > 0 )               // Some NDL time left ?
 {
 char_O_deco_status = 0;             // YES: recalc ndl next time.
 clear_deco_table();                 // Also clear stops !
 copy_deco_table();
 char_O_deco_last_stop = 0;          // And last stop (OSTC menu anim)
 }
 else
 char_O_deco_status = 2;             // NO: calc ascent next time.
-	break;
+break;
 case 2: //---- Simulate ascent to first stop -----------------------------
 case 6: // @+5min variation
 // Check proposed gas at begin of ascent simulation
 sim_dive_mins = int_I_divemins;         // Init current time.
-	gas_switch_find_current();              // Lookup for current gas & time.
+gas_switch_find_current();              // Lookup for current gas & time.
 gas_switch_set();                       // setup calc_ratio's
 backup_gas_used  = sim_gas_last_used;   // And save for later simu steps.
 backup_gas_depth = sim_gas_last_depth;  // And save for later simu steps.
-	sim_ascent_to_first_stop();
+sim_ascent_to_first_stop();
 // Calc stops next time (deco or gas switch).
 char_O_deco_status = 1 | ( char_O_deco_status & 4 );
-	break;
+break;
 case 1: //---- Simulate stops --------------------------------------------
 case 5: // @+5 variation.
-	calc_hauptroutine_calc_deco();
+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 & 3) == 0 )
+if( (char_O_deco_status & 3) == 0 )
-	{
+{
 sim_gas_last_used  = backup_gas_used;
 sim_gas_last_depth = backup_gas_depth;
 }
-	break;
+break;
 }
 }
 //////////////////////////////////////////////////////////////////////////////
 // calc_hauptroutine_data_input
 for(g=0; g < NUM_GAS; ++g)
 {
 deco_gas_change[g] = 0;
 if(char_I_deco_gas_change[g])
 if( int_temp > 100 *(short)char_I_deco_gas_change[g] )
-	deco_gas_change[g] = char_I_deco_gas_change[g];
+deco_gas_change[g] = char_I_deco_gas_change[g];
 }
 const_ppO2 = char_I_const_ppO2 * 0.01;
 float_desaturation_multiplier = char_I_desaturation_multiplier * 0.01;
 float_saturation_multiplier   = char_I_saturation_multiplier   * 0.01;
 char_O_flush_ppO2 = (unsigned char)(flush_ppO2*100.0 + 0.5);
 }
 if( pres_diluent > ppWater )
 {
-	overlay float EAD, END;
+overlay float EAD, END;
 ppN2 = N2_ratio * (pres_diluent - ppWater);
 ppHe = He_ratio * (pres_diluent - ppWater);
 // EAD : Equivalent Air Dive. Equivalent depth for the same N2 level
 //       with plain air.
 //       ppN2 = 79% * (P_EAD - ppWater)
 overlay unsigned char loop;
 for(loop = 0; loop < 16; ++loop)
 {
 // Limit loops to 512ms, using timer 5:
-	if( tmr5() & (512*32) )
+if( tmr5() & (512*32) )
-	    break;
+break;
 if( calc_nextdecodepth() )
 {
 if( temp_depth_limit == 0 )
 goto Surface;
 temp3 = 0.0;
 else
 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
 temp4 = var_He_ht * temp3 / float_desaturation_multiplier; // time necessary (in minutes ) for "complete" desaturation, new in v.101 float_desaturation_multiplier
-	}
+}
 else
-	{
+{
-	temp3 = 0.0;
+temp3 = 0.0;
-	temp4 = 0.0;
+temp4 = 0.0;
-	}
+}
 // saturation_time (for flight)
 if (temp4 > temp2)
 desat_time = (unsigned short)temp4;
 else
 for(i=0; i<NUM_STOPS; ++i)
 {
 overlay unsigned char newDepth, time;
-time = char_O_deco_time[31-i];
+time = char_O_deco_time[i];
 if( time == 0 ) continue;       // not yet: still search table.
-newDepth = char_O_deco_depth[31-i];
+newDepth = char_O_deco_depth[i];
 //---- Gas switch during or before this stop --------------------------
 for(;;)
 {
 overlay unsigned char newGas = 0;

Mercurial > public > hwos_code

comparison src/p2_deco.c @ 287:f342853afcd9