mk2: code_part1/OSTC_code_c_part2/p2

comparison code_part1/OSTC_code_c_part2/p2_deco.c @ 783:e57e8045527d

FIX: Gas volume computation when using several travel mix.

author	JeanDo
date	Sun, 15 Jun 2014 17:49:22 +0200
parents	6f54104ea0ee
children	b0c96aaa86e4

comparison

equal deleted inserted replaced

-:6f54104ea0ee
+:e57e8045527d
 // 2013/03/05: [jDG] Should vault low_depth too.
 // 2013/03/05: [jDG] Wrobell remark: ascent_to_first_stop works better with finer steps (2sec).
 // 2013/05/08: [jDG] A. Salm remark: NOAA tables for CNS are in ATA, not bar.
 // 2013/10/22: [mH]  Remove CF55 stuff
 // 2013/12/21: [jDG] Fix CNS calculation in decoplan w/o marked gas switch
+// 2014/06/16: [jDG] Fix Helium diluant. Fix volumes with many travel mix.
 //
 // TODO:
 //  + Allow to abort MD2 calculation (have to restart next time).
 //
 // Literature:
 {
 overlay float volumes[NUM_GAS];
 overlay float bottom_usage, deco_usage;
 overlay unsigned char i, deepest_first;
 overlay unsigned char gas, depth;
+overlay unsigned char lastGasStop = 255;
 RESET_C_STACK
 //---- initialize with bottom consumption --------------------------------
 for(i=0; i<NUM_GAS; ++i)                            // Nothing yet...
 volumes[i] = 0.0;
 if( time == 0 ) continue;       // not yet: still search table.
 newDepth = char_O_deco_depth[31-i];
 }
-//---- Gas switch during this step -----------------------------------
+//---- Gas switch during or before this stop --------------------------
+for(;;)
 {
 overlay unsigned char newGas = 0;
 overlay unsigned char newStop = 0;  // NO CHANGE yet
 overlay unsigned char j;
 for(j=0; j<NUM_GAS; ++j)
 {
 // Skip gas without changing depth:
 if( ! char_I_deco_gas_change[j] )
 continue;
-// Select gas changed between [newDepth .. depth]
+// Select gas changed between [newDepth .. lastGasStop[
+// Note that <= means changing gas at BEGINNING of this stop.
+// Note that < means we cant use the same gas twice
 if( newDepth <= char_I_deco_gas_change[j]
-&& char_I_deco_gas_change[j] <= depth )
+&& char_I_deco_gas_change[j] < lastGasStop )
 {
 // Keep the DEEPEST gas in that range:
-// Note: that = means changing gas at BEGINNING of this stop.
 if( char_I_deco_gas_change[j] >= newStop )
 {
 newGas  = j;
 newStop = char_I_deco_gas_change[j];
 }
 }
 }
-if( newStop ) // Did we find something ?
+// Did we find something ?
-{
+if( !newStop )
-// usage BEFORE gas switch (if any), at 10m/min :
+break;
-if( deco_usage > 0.0 && depth > newStop )
-// Plus usage during ascent to the next stop, at 10m/min.
+//---- usage BEFORE gas switch (if any), at 10m/min :
-volumes[gas] += ((depth+newStop)*0.05 + 1.0)    // average depth --> bar.
+if( deco_usage > 0.0 && depth > newStop )
-* (depth-newStop)*0.1             // metre --> min
+// Plus usage during ascent to the next stop, at 10m/min.
-* deco_usage;
+volumes[gas] += ((depth+newStop)*0.05 + 1.0)    // average depth --> bar.
+* (depth-newStop)*0.1             // metre --> min
-// Do gas switch:
+* deco_usage;
-gas = newGas;
+//---- Do gas switch:
+gas = newGas;
+lastGasStop = newStop;          // Mark last used gas
+if( newStop < depth )           // ascent to gas switch,
 depth = newStop;
 }
-}
+//---- usage AFTER gas switch (if any), at 10m/min :
-// usage AFTER gas switch (if any), at 10m/min :
 if( depth > newDepth )
 volumes[gas] += ((depth+newDepth)*0.05 + 1.0)    // average depth --> bar.
 * (depth-newDepth)*0.1             // metre --> min
 * deco_usage;
-// Do stop:
+//---- Do stop:
 depth = newDepth;
 // Usage at stop:
 if( deco_usage > 0.0 )
 volumes[gas] += (depth*0.1 + 1.0)   // depth --> bar.

Mercurial > public > mk2

comparison code_part1/OSTC_code_c_part2/p2_deco.c @ 783:e57e8045527d