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

Merge pull request #571 from atgeirr/suppress-warnings

Browse Source 
Suppress warnings
This commit is contained in:
Bård Skaflestad 2014-04-15 21:47:20 +02:00
commit bcb4610bc4
6 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
opm/core/linalg/LinearSolverIstl.cpp
View File

@ -160,7 +160,7 @@ namespace Opm
if (maxit == 0) {
maxit = 5000;
}
#if HAVE_MPI
#if HAVE_MPI
if(comm.type()==typeid(ParallelISTLInformation))
{
typedef Dune::OwnerOverlapCopyCommunication<int,int> Comm;
@ -175,10 +175,11 @@ namespace Opm
else
#endif
{
(void) comm; // Avoid warning for unused argument if no MPI.
Dune::SeqScalarProduct<Vector> sp;
Dune::Amg::SequentialInformation comm;
Dune::Amg::SequentialInformation seq_comm;
Operator opA(A);
return solveSystem(opA, solution, rhs, sp, comm, maxit);
return solveSystem(opA, solution, rhs, sp, seq_comm, maxit);
}
}
@ -405,7 +406,7 @@ namespace Opm
#if defined(HAS_DUNE_FAST_AMG) || DUNE_VERSION_NEWER(DUNE_ISTL, 2, 3)
template<class O, class S, class C>
LinearSolverInterface::LinearSolverReport
solveKAMG(O& opA, Vector& x, Vector& b, S& sp, const C& comm, double tolerance, int maxit, int verbosity,
solveKAMG(O& opA, Vector& x, Vector& b, S& /* sp */, const C& /* comm */, double tolerance, int maxit, int verbosity,
double linsolver_prolongate_factor, int linsolver_smooth_steps)
{
// Solve with AMG solver.
@ -455,7 +456,7 @@ namespace Opm
template<class O, class S, class C>
LinearSolverInterface::LinearSolverReport
solveFastAMG(O& opA, Vector& x, Vector& b, S& sp, const C& comm, double tolerance, int maxit, int verbosity,
solveFastAMG(O& opA, Vector& x, Vector& b, S& /* sp */, const C& /* comm */, double tolerance, int maxit, int verbosity,
double linsolver_prolongate_factor)
{
// Solve with AMG solver.

2
opm/core/pressure/tpfa/TransTpfa_impl.hpp
View File

@ -22,7 +22,7 @@ double faceArea(const Dune::CpGrid&, int);
namespace
{
#ifdef HAVE_DUNE_CORNERPOINT
const double* multiplyFaceNormalWithArea(const Dune::CpGrid& grid, int face_index, const double* in)
inline const double* multiplyFaceNormalWithArea(const Dune::CpGrid& grid, int face_index, const double* in)
{
int d=Opm::UgGridHelpers::dimensions(grid);
double* out=new double[d];

2
opm/core/props/pvt/SinglePvtLiveGas.cpp
View File

@ -106,7 +106,7 @@ namespace Opm
// Bg -> 1/Bg
for (int i=0; i<sz; ++i) {
saturated_gas_table_[1][i] = 1.0/saturated_gas_table_[1][i];
for (int j=0; j<undersat_gas_tables_[i][1].size(); ++j) {
for (size_t j=0; j<undersat_gas_tables_[i][1].size(); ++j) {
undersat_gas_tables_[i][1][j] = 1.0/undersat_gas_tables_[i][1][j];
}
}

2
opm/core/simulator/EquilibrationHelpers.hpp
View File

@ -201,7 +201,7 @@ namespace Opm
double
operator()(const double /* depth */,
const double /* press */,
const double sat = 0.0) const
const double /* sat */ = 0.0) const
{
return 0.0;
}

6
opm/core/simulator/initStateEquil.hpp
View File

@ -525,7 +525,8 @@ namespace Opm
for (size_t i = 0; i < rec.size(); ++i) {
const int cell = *(eqlmap.cells(i).begin());
if (rec[i].live_oil_table_index > 0) {
if (newParserDeck->hasKeyword("RSVD") && rec[i].live_oil_table_index <= newParserDeck->getKeyword("RSVD")->size()) {
if (newParserDeck->hasKeyword("RSVD") &&
size_t(rec[i].live_oil_table_index) <= newParserDeck->getKeyword("RSVD")->size()) {
Opm::SimpleTable rsvd(newParserDeck->getKeyword("RSVD"),std::vector<std::string>{"vd", "rs"},rec[i].live_oil_table_index-1);
std::vector<double> vd(rsvd.getColumn("vd"));
std::vector<double> rs(rsvd.getColumn("rs"));
@ -555,7 +556,8 @@ namespace Opm
for (size_t i = 0; i < rec.size(); ++i) {
const int cell = *(eqlmap.cells(i).begin());
if (rec[i].wet_gas_table_index > 0) {
if (newParserDeck->hasKeyword("RVVD") && rec[i].wet_gas_table_index <= newParserDeck->getKeyword("RVVD")->size()) {
if (newParserDeck->hasKeyword("RVVD") &&
size_t(rec[i].wet_gas_table_index) <= newParserDeck->getKeyword("RVVD")->size()) {
Opm::SimpleTable rvvd(newParserDeck->getKeyword("RVVD"),std::vector<std::string>{"vd", "rv"},rec[i].wet_gas_table_index-1);
std::vector<double> vd(rvvd.getColumn("vd"));
std::vector<double> rv(rvvd.getColumn("rv"));

15
tests/test_equil.cpp
View File

@ -74,7 +74,8 @@ BOOST_AUTO_TEST_CASE (PhasePressure)
{
{ 0 , 1e5 } , // Datum depth, pressure
{ 5 , 0 } , // Zwoc , Pcow_woc
{ 0 , 0 } // Zgoc , Pcgo_goc
{ 0 , 0 } , // Zgoc , Pcgo_goc
0, 0, 0
};
Opm::Equil::EquilReg<RhoCalc>
@ -129,13 +130,15 @@ BOOST_AUTO_TEST_CASE (CellSubset)
{
{ 0 , 1e5 } , // Datum depth, pressure
{ 2.5 , -0.075e5 } , // Zwoc , Pcow_woc
{ 0 , 0 } // Zgoc , Pcgo_goc
{ 0 , 0 } , // Zgoc , Pcgo_goc
0, 0, 0
}
,
{
{ 5 , 1.35e5 } , // Datum depth, pressure
{ 7.5 , -0.225e5 } , // Zwoc , Pcow_woc
{ 5 , 0 } // Zgoc , Pcgo_goc
{ 5 , 0 } , // Zgoc , Pcgo_goc
0, 0, 0
}
};
@ -244,13 +247,15 @@ BOOST_AUTO_TEST_CASE (RegMapping)
{
{ 0 , 1e5 } , // Datum depth, pressure
{ 2.5 , -0.075e5 } , // Zwoc , Pcow_woc
{ 0 , 0 } // Zgoc , Pcgo_goc
{ 0 , 0 } , // Zgoc , Pcgo_goc
0, 0, 0
}
,
{
{ 5 , 1.35e5 } , // Datum depth, pressure
{ 7.5 , -0.225e5 } , // Zwoc , Pcow_woc
{ 5 , 0 } // Zgoc , Pcgo_goc
{ 5 , 0 } , // Zgoc , Pcgo_goc
0, 0, 0
}
};