hwos_code: src/p2_deco.c comparison

comparison src/p2_deco.c @ 115:72259a79eac2

FIX: Gas volume computation when using several travel mix.

author	heinrichsweikamp
date	Mon, 23 Jun 2014 17:55:27 +0200
parents	109df032cc54
children	d076e9c02438

comparison

equal deleted inserted replaced

-:109df032cc54
+:72259a79eac2
 // 2012/09/10: [mH]  Fill char_O_deco_time_for_log for logbook write
 // 2012/10/05: [jDG] Better deco_gas_volumes accuracy (average depth, switch between stop).
 // 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/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:
 //
 // Literature:
 // Bühlmann, Albert: Tauchmedizin; 4. Auflage [2002];
 {
 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;
 assert(1 <= char_I_first_gas && char_I_first_gas <= NUM_GAS);
 gas = char_I_first_gas - 1;
-bottom_usage = (float) char_I_bottom_usage;
+bottom_usage = 20;      // In liter/minutes.
 if( char_I_const_ppO2 == 0 && bottom_usage > 0.0 )
 volumes[gas]
 = (char_I_bottom_depth*0.1 + 1.0)           // Use Psurface = 1.0 bar.
 * char_I_bottom_time                        // in minutes.
 * bottom_usage;                             // In liter/minutes.
 //---- Ascent usage ------------------------------------------------------
-deco_usage    = (float) char_I_deco_usage; // In liter/minutes.
+deepest_first = 0;
+deco_usage    = 20;     // In liter/minutes.
 depth = char_I_bottom_depth;
 for(i=0; i<NUM_STOPS; ++i)
 {
 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 > hwos_code

comparison src/p2_deco.c @ 115:72259a79eac2