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

Move PreconditionerFactory into namespace Opm.

Browse Source 
This fixes name clashes with DUNE's own factory that is introduced
in DUNE 2.7. Hence it closes issue #2266.

BTW: Dune's factory has more template parameters than ours.
This commit is contained in:
Markus Blatt 2020-01-07 17:53:54 +01:00
parent e8e084e10f
commit 7e700c11e0
4 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
opm/simulators/linalg/FlexibleSolver.hpp
View File

@ -96,7 +96,7 @@ private:
auto linop = std::make_shared<ParOperatorType>(matrix, comm); auto linop = std::make_shared<ParOperatorType>(matrix, comm);
linearoperator_ = linop; linearoperator_ = linop;
preconditioner_ preconditioner_
= Dune::PreconditionerFactory<ParOperatorType, Comm>::create(*linop, prm.get_child("preconditioner"), comm); = Opm::PreconditionerFactory<ParOperatorType, Comm>::create(*linop, prm.get_child("preconditioner"), comm);
scalarproduct_ = Dune::createScalarProduct<VectorType, Comm>(comm, linearoperator_->category()); scalarproduct_ = Dune::createScalarProduct<VectorType, Comm>(comm, linearoperator_->category());
} }
@ -106,7 +106,7 @@ private:
using SeqOperatorType = Dune::MatrixAdapter<MatrixType, VectorType, VectorType>; using SeqOperatorType = Dune::MatrixAdapter<MatrixType, VectorType, VectorType>;
auto linop = std::make_shared<SeqOperatorType>(matrix); auto linop = std::make_shared<SeqOperatorType>(matrix);
linearoperator_ = linop; linearoperator_ = linop;
preconditioner_ = Dune::PreconditionerFactory<SeqOperatorType>::create(*linop, prm.get_child("preconditioner")); preconditioner_ = Opm::PreconditionerFactory<SeqOperatorType>::create(*linop, prm.get_child("preconditioner"));
scalarproduct_ = std::make_shared<Dune::SeqScalarProduct<VectorType>>(); scalarproduct_ = std::make_shared<Dune::SeqScalarProduct<VectorType>>();
} }

10
opm/simulators/linalg/OwningTwoLevelPreconditioner.hpp
View File

@ -35,14 +35,18 @@
#include <fstream> #include <fstream>
#include <type_traits> #include <type_traits>
namespace Dune
{
namespace Opm
{
// Circular dependency between PreconditionerFactory [which can make an OwningTwoLevelPreconditioner] // Circular dependency between PreconditionerFactory [which can make an OwningTwoLevelPreconditioner]
// and OwningTwoLevelPreconditioner [which uses PreconditionerFactory to choose the fine-level smoother] // and OwningTwoLevelPreconditioner [which uses PreconditionerFactory to choose the fine-level smoother]
// must be broken, accomplished by forward-declaration here. // must be broken, accomplished by forward-declaration here.
template <class Operator, class Comm = Dune::Amg::SequentialInformation> template <class Operator, class Comm = Dune::Amg::SequentialInformation>
class PreconditionerFactory; class PreconditionerFactory;
}
namespace Dune
{
// Must forward-declare FlexibleSolver as we want to use it as solver for the pressure system. // Must forward-declare FlexibleSolver as we want to use it as solver for the pressure system.
@ -63,7 +67,7 @@ class OwningTwoLevelPreconditioner : public Dune::PreconditionerWithUpdate<Vecto
public: public:
using pt = boost::property_tree::ptree; using pt = boost::property_tree::ptree;
using MatrixType = typename OperatorType::matrix_type; using MatrixType = typename OperatorType::matrix_type;
using PrecFactory = PreconditionerFactory<OperatorType, Communication>; using PrecFactory = Opm::PreconditionerFactory<OperatorType, Communication>;
OwningTwoLevelPreconditioner(const OperatorType& linearoperator, const pt& prm) OwningTwoLevelPreconditioner(const OperatorType& linearoperator, const pt& prm)
: linear_operator_(linearoperator) : linear_operator_(linearoperator)

2
opm/simulators/linalg/PreconditionerFactory.hpp
View File

@ -37,7 +37,7 @@
#include <map> #include <map>
#include <memory> #include <memory>
namespace Dune namespace Opm
{ {
/// This is an object factory for creating preconditioners. The /// This is an object factory for creating preconditioners. The

4
tests/test_preconditionerfactory.cpp
View File

@ -90,7 +90,7 @@ testPrec(const boost::property_tree::ptree& prm, const std::string& matrix_filen
} }
using Operator = Dune::MatrixAdapter<Matrix, Vector, Vector>; using Operator = Dune::MatrixAdapter<Matrix, Vector, Vector>;
Operator op(matrix); Operator op(matrix);
using PrecFactory = Dune::PreconditionerFactory<Operator>; using PrecFactory = Opm::PreconditionerFactory<Operator>;
auto prec = PrecFactory::create(op, prm.get_child("preconditioner")); auto prec = PrecFactory::create(op, prm.get_child("preconditioner"));
Dune::BiCGSTABSolver<Vector> solver(op, *prec, prm.get<double>("tol"), prm.get<int>("maxiter"), prm.get<int>("verbosity")); Dune::BiCGSTABSolver<Vector> solver(op, *prec, prm.get<double>("tol"), prm.get<int>("maxiter"), prm.get<int>("verbosity"));
Vector x(rhs.size()); Vector x(rhs.size());
@ -164,7 +164,7 @@ using V = Dune::BlockVector<Dune::FieldVector<double, bz>>;
template <int bz> template <int bz>
using O = Dune::MatrixAdapter<M<bz>, V<bz>, V<bz>>; using O = Dune::MatrixAdapter<M<bz>, V<bz>, V<bz>>;
template <int bz> template <int bz>
using PF = Dune::PreconditionerFactory<O<bz>>; using PF = Opm::PreconditionerFactory<O<bz>>;
BOOST_AUTO_TEST_CASE(TestAddingPreconditioner) BOOST_AUTO_TEST_CASE(TestAddingPreconditioner)