Mercurial > public > mk2

comparison code_part1/OSTC_code_c_part2/p2_deco.c @ 580:32448d5ca734

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
BUGFIX: GasVolume should not count bottom time/depth in CCR mode.
author JeanDo
date Tue, 24 Apr 2012 23:51:03 +0200
parents fff1d38625f0
children 855a00c21d0c
comparison
equal deleted inserted replaced
579:fff1d38625f0 580:32448d5ca734
2338 2338
2339 assert(1 <= char_I_first_gas && char_I_first_gas <= NUM_GAS); 2339 assert(1 <= char_I_first_gas && char_I_first_gas <= NUM_GAS);
2340 gas = char_I_first_gas - 1; 2340 gas = char_I_first_gas - 1;
2341 2341
2342 bottom_usage = (float) read_custom_function(56); 2342 bottom_usage = (float) read_custom_function(56);
2343 if( bottom_usage > 0.0 ) 2343 if( char_I_const_ppO2 == 0 && bottom_usage > 0.0 )
2344 volumes[gas] 2344 volumes[gas]
2345 = (char_I_bottom_depth*0.1 + 1.0) // Use Psurface = 1.0 bar. 2345 = (char_I_bottom_depth*0.1 + 1.0) // Use Psurface = 1.0 bar.
2346 * char_I_bottom_time // in minutes. 2346 * char_I_bottom_time // in minutes.
2347 * bottom_usage; // In liter/minutes. 2347 * bottom_usage; // In liter/minutes.
2348 2348