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

Silence shadowing warnings.

Browse Source
This commit is contained in:
Atgeirr Flø Rasmussen 2017-04-12 10:31:53 +02:00
parent d5faef5aba
commit ada3e302b8
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/opm/output/eclipse/RestartIO.cpp
View File

@ -149,11 +149,12 @@ data::Wells restore_wells( const ecl_kw_type * opm_xwel,
const auto& sched_wells = es.getSchedule().getWells( restart_step );
const EclipseGrid& grid = es.getInputGrid( );
std::vector< rt > phases;
const auto& phase = es.runspec().phases();
if( phase.active( Phase::WATER ) ) phases.push_back( rt::wat );
if( phase.active( Phase::OIL ) ) phases.push_back( rt::oil );
if( phase.active( Phase::GAS ) ) phases.push_back( rt::gas );
{
const auto& phase = es.runspec().phases();
if( phase.active( Phase::WATER ) ) phases.push_back( rt::wat );
if( phase.active( Phase::OIL ) ) phases.push_back( rt::oil );
if( phase.active( Phase::GAS ) ) phases.push_back( rt::gas );
}
const auto well_size = [&]( size_t acc, const Well* w ) {
return acc

6
tests/test_Restart.cpp
View File

@ -556,14 +556,14 @@ BOOST_AUTO_TEST_CASE(ExtraData_content) {
{"NO" , {UnitSystem::measure::identity, false}}},
eclipseState, grid , {{"EXTRA", true}, {"EXTRA2", false}});
const auto pair = rst_value.extra.find( "EXTRA" );
const std::vector<double> extra = pair->second;
const std::vector<double> extraval = pair->second;
const std::vector<double> expected = {0,1,2,3};
BOOST_CHECK_EQUAL( rst_value.solution.has("SWAT") , true );
BOOST_CHECK_EQUAL( rst_value.solution.has("NO") , false );
BOOST_CHECK_EQUAL( rst_value.extra.size() , 1 );
BOOST_CHECK_EQUAL( extra.size() , 4 );
BOOST_CHECK_EQUAL_COLLECTIONS( extra.begin(), extra.end(), expected.begin() , expected.end());
BOOST_CHECK_EQUAL( extraval.size() , 4 );
BOOST_CHECK_EQUAL_COLLECTIONS( extraval.begin(), extraval.end(), expected.begin() , expected.end());
const auto missing = rst_value.extra.find( "EXTRA2");
BOOST_CHECK( missing == rst_value.extra.end() );