OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1285 from akva2/quell_warnings

Browse Source 
Quell warnings
This commit is contained in:
Atgeirr Flø Rasmussen 2017-10-06 15:28:06 +02:00 committed by GitHub
commit 1dd86cfc61
3 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
opm/autodiff/CPRPreconditioner.hpp
View File

@ -376,7 +376,7 @@ createAMGPreconditionerPointer( Op& opA, const double relax, const P& comm, std:
//! \brief The type describing the parallel information //! \brief The type describing the parallel information
typedef P ParallelInformation; typedef P ParallelInformation;
//! \brief The matrix type the preconditioner is for. //! \brief The matrix type the preconditioner is for.
typedef typename Dune::remove_const<M>::type matrix_type; typedef typename std::remove_const<M>::type matrix_type;
//! \brief The domain type of the preconditioner. //! \brief The domain type of the preconditioner.
typedef X domain_type; typedef X domain_type;
//! \brief The range type of the preconditioner. //! \brief The range type of the preconditioner.

2
opm/autodiff/ParallelOverlappingILU0.hpp
View File

@ -168,7 +168,7 @@ class ParallelOverlappingILU0
public: public:
//! \brief The matrix type the preconditioner is for. //! \brief The matrix type the preconditioner is for.
typedef typename Dune::remove_const<Matrix>::type matrix_type; typedef typename std::remove_const<Matrix>::type matrix_type;
//! \brief The domain type of the preconditioner. //! \brief The domain type of the preconditioner.
typedef Domain domain_type; typedef Domain domain_type;
//! \brief The range type of the preconditioner. //! \brief The range type of the preconditioner.

5
opm/autodiff/StandardWell_impl.hpp
View File

@ -1043,10 +1043,6 @@ namespace Opm
rates[ Gas ] = xw.wellRates()[well_index*np + pu.phase_pos[ Gas ] ]; rates[ Gas ] = xw.wellRates()[well_index*np + pu.phase_pos[ Gas ] ];
} }
const int table_id = well_controls_iget_vfp(wc, current);
const double& thp = well_controls_iget_target(wc, current);
const double& alq = well_controls_iget_alq(wc, current);
xw.bhp()[well_index] = calculateBhpFromThp(rates, current); xw.bhp()[well_index] = calculateBhpFromThp(rates, current);
break; break;
} }
@ -1193,7 +1189,6 @@ namespace Opm
{ {
const int nperf = number_of_perforations_; const int nperf = number_of_perforations_;
// TODO: can make this a member? // TODO: can make this a member?
const int nw = xw.bhp().size();
const int numComp = numComponents(); const int numComp = numComponents();
const PhaseUsage& pu = *phase_usage_; const PhaseUsage& pu = *phase_usage_;
b_perf.resize(nperf*numComp); b_perf.resize(nperf*numComp);