OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove magic numbers.

Browse Source 
Prefer named indices in the integer lists when they are used in favour
of mnemonics.
This commit is contained in:
Jørgen Kvalsvik
2016-06-06 09:00:52 +02:00
parent edb8cdc72d
commit dcb291fa4d
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
opm/parser/eclipse/EclipseState/IOConfig/IOConfig.cpp
View File

@@ -108,8 +108,11 @@ namespace Opm {
/* mnemonics, but without basic and freq. Effectively ignored */
if( !ints ) return {};
if( items.size() >= 1 )
basic = std::stoul( items[ 0 ] );
const int BASIC_index = 0;
const int FREQ_index = 5;
if( items.size() > BASIC_index )
basic = std::stoul( items[ BASIC_index ] );
// Peculiar special case in eclipse, - not documented
// This ignore of basic = 0 for the integer mnemonics case
@@ -118,8 +121,8 @@ namespace Opm {
// we are missing here.
if( 0 == basic ) return {};
if( items.size() >= 6 ) // if frequency is set
freq = std::stoul( items[ 5 ] );
if( items.size() > FREQ_index ) // if frequency is set
freq = std::stoul( items[ FREQ_index ] );
return restartConfig( step, basic, freq );
}
@@ -160,9 +163,11 @@ namespace Opm {
* mnemonics. Restart integer switch is integer control nr 7
*/
if( items.size() < 7 ) return {};
const int RESTART_index = 6;
return restartConfig( std::stoul( items[ 6 ] ) );
if( items.size() <= RESTART_index ) return {};
return restartConfig( std::stoul( items[ RESTART_index ] ) );
}
DynamicState< IOConfig::restartConfig > IOConfig::rstconf(