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

quell shadowing warnings

Browse Source
This commit is contained in:
Arne Morten Kvarving 2019-07-08 12:14:40 +02:00
parent 911727527b
commit b464896cc8
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
opm/simulators/linalg/ISTLSolverEbos.hpp
View File

@ -405,12 +405,12 @@ protected:
const MILU_VARIANT ilu_milu = parameters_.ilu_milu_;
if ( parameters_.use_cpr_ )
{
using Matrix = typename MatrixOperator::matrix_type;
using MatrixType = typename MatrixOperator::matrix_type;
using CouplingMetric = Opm::Amg::Element<pressureEqnIndex, pressureVarIndex>;
using CritBase = Dune::Amg::SymmetricCriterion<Matrix, CouplingMetric>;
using CritBase = Dune::Amg::SymmetricCriterion<MatrixType, CouplingMetric>;
using Criterion = Dune::Amg::CoarsenCriterion<CritBase>;
using AMG = typename ISTLUtility
::BlackoilAmgSelector< Matrix, Vector, Vector,POrComm, Criterion, pressureEqnIndex, pressureVarIndex >::AMG;
::BlackoilAmgSelector< MatrixType, Vector, Vector,POrComm, Criterion, pressureEqnIndex, pressureVarIndex >::AMG;
std::unique_ptr< AMG > amg;
// Construct preconditioner.
@ -650,8 +650,7 @@ protected:
void makeOverlapRowsInvalid(Matrix& ebosJacIgnoreOverlap) const
{
//value to set on diagonal
typedef Dune::FieldMatrix<Scalar, numEq, numEq > MatrixBlockType;
MatrixBlockType diag_block(0.0);
Dune::FieldMatrix<Scalar, numEq, numEq> diag_block(0.0);
for (int eq = 0; eq < numEq; ++eq)
diag_block[eq][eq] = 1.0e100;

6
opm/simulators/linalg/ISTLSolverEbosCpr.hpp
View File

@ -179,8 +179,8 @@ namespace Opm
opASerial_.reset(new OperatorSerial(*(this->matrix_), *(this->matrix_), wellModel));
}
using POrComm = Dune::Amg::SequentialInformation;
POrComm parallelInformation_arg;
using POrCommType = Dune::Amg::SequentialInformation;
POrCommType parallelInformation_arg;
typedef OperatorSerial LinearOperator;
#if DUNE_VERSION_NEWER(DUNE_ISTL, 2, 6)
@ -189,7 +189,7 @@ namespace Opm
sp_ = std::move(sp);
#else
constexpr int category = Dune::SolverCategory::sequential;
typedef Dune::ScalarProductChooser<Vector, POrComm, category> ScalarProductChooser;
typedef Dune::ScalarProductChooser<Vector, POrCommType, category> ScalarProductChooser;
typedef std::unique_ptr<typename ScalarProductChooser::ScalarProduct> SPPointer;
SPPointer sp(ScalarProductChooser::construct(parallelInformation_arg));
sp_ = std::move(sp);