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

Silence various warnings.

Browse Source
This commit is contained in:
Atgeirr Flø Rasmussen 2016-12-29 13:51:07 +01:00
parent 4b25b7c82f
commit 91879da04e
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/opm/output/eclipse/EclipseWriter.cpp
View File

@ -589,15 +589,15 @@ void EclipseWriter::writeInitial( data::Solution simProps, const NNC& nnc) {
std::vector< double > serialize_XWEL( const data::Wells& wells,
int report_step,
const std::vector< const Well* > sched_wells,
const Phases& phase,
const Phases& phase_spec,
const EclipseGrid& grid ) {
using rt = data::Rates::opt;
std::vector< rt > 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 );
if( phase_spec.active( Phase::WATER ) ) phases.push_back( rt::wat );
if( phase_spec.active( Phase::OIL ) ) phases.push_back( rt::oil );
if( phase_spec.active( Phase::GAS ) ) phases.push_back( rt::gas );
std::vector< double > xwel;
for( const auto* sched_well : sched_wells ) {

12
src/opm/output/eclipse/Summary.cpp
View File

@ -767,22 +767,22 @@ class Summary::keyword_handlers {
Summary::Summary( const EclipseState& st,
const SummaryConfig& sum ,
const EclipseGrid& grid) :
Summary( st, sum, grid, st.getIOConfig().fullBasePath().c_str() )
const EclipseGrid& grid_arg) :
Summary( st, sum, grid_arg, st.getIOConfig().fullBasePath().c_str() )
{}
Summary::Summary( const EclipseState& st,
const SummaryConfig& sum,
const EclipseGrid& grid,
const EclipseGrid& grid_arg,
const std::string& basename ) :
Summary( st, sum, grid, basename.c_str() )
Summary( st, sum, grid_arg, basename.c_str() )
{}
Summary::Summary( const EclipseState& st,
const SummaryConfig& sum,
const EclipseGrid& grid_,
const EclipseGrid& grid_arg,
const char* basename ) :
grid( grid_ ),
grid( grid_arg ),
ecl_sum(
ecl_sum_alloc_writer(
basename,

4
tests/test_Tables.cpp
View File

@ -56,7 +56,7 @@ struct setup {
EclipseState es;
ERT::TestArea ta;
setup( const std::string& name, const std::string& path , const ParseContext& parseContext = ParseContext( )) :
setup( const std::string& path , const ParseContext& parseContext = ParseContext( )) :
deck( Parser().parseFile( path, parseContext ) ),
es( deck, ParseContext() ),
ta( ERT::TestArea("test_tables") )
@ -69,7 +69,7 @@ struct setup {
BOOST_AUTO_TEST_CASE(Test_PVTX) {
setup cfg( "PVTO" , "table_deck.DATA");
setup cfg( "table_deck.DATA");
Tables tables( cfg.es.getUnits() );
tables.addPVTO( cfg.es.getTableManager().getPvtoTables() );

6
tests/test_Wells.cpp
View File

@ -107,14 +107,14 @@ BOOST_AUTO_TEST_CASE(get_completions) {
* the completion keys (active indices) and well names correspond to the
* input deck. All other entries in the well structures are arbitrary.
*/
w1.completions.push_back( { 88, rc1, 30.45 } );
w1.completions.push_back( { 288, rc2, 33.19 } );
w1.completions.push_back( { 88, rc1, 30.45, 123.45 } );
w1.completions.push_back( { 288, rc2, 33.19, 67.89 } );
w2.rates = r2;
w2.bhp = 2.34;
w2.temperature = 4.56;
w2.control = 2;
w2.completions.push_back( { 188, rc3, 36.22 } );
w2.completions.push_back( { 188, rc3, 36.22, 19.28 } );
data::Wells wellRates;