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

Make Blackoil system amg / CPR (flow_ebos) DUNE 2.6 aware.

Browse Source
This commit is contained in:
Markus Blatt 2018-01-29 14:09:18 +01:00
parent c089a59cba
commit e6e18a3aa9
1 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
opm/autodiff/BlackoilAmg.hpp
View File

@ -261,6 +261,14 @@ private:
: amg_(op, crit,args, comm), op_(op), comm_(comm), first_(true) : amg_(op, crit,args, comm), op_(op), comm_(comm), first_(true)
{} {}
#if DUNE_VERSION_NEWER(DUNE_ISTL, 2, 6)
Dune::SolverCategory::Category category() const override
{
return std::is_same<Communication, Dune::Amg::SequentialInformation>::value ?
Dune::SolverCategory::sequential : Dune::SolverCategory::overlapping;
}
#endif
void apply(X& x, X& b, double reduction, Dune::InverseOperatorResult& res) void apply(X& x, X& b, double reduction, Dune::InverseOperatorResult& res)
{ {
DUNE_UNUSED_PARAMETER(reduction); DUNE_UNUSED_PARAMETER(reduction);
@ -274,11 +282,17 @@ private:
} }
amg_.apply(x,b); amg_.apply(x,b);
*/ */
#if DUNE_VERSION_NEWER(DUNE_ISTL, 2, 6)
auto sp = Dune::createScalarProduct<X,Communication>(comm_, op_.category());
#else
using Chooser = Dune::ScalarProductChooser<X,Communication,AMGType::category>; using Chooser = Dune::ScalarProductChooser<X,Communication,AMGType::category>;
auto sp = Chooser::construct(comm_); auto sp = Chooser::construct(comm_);
#endif
Dune::BiCGSTABSolver<X> solver(const_cast<typename AMGType::Operator&>(op_), *sp, amg_, 1e-2, 25, 0); Dune::BiCGSTABSolver<X> solver(const_cast<typename AMGType::Operator&>(op_), *sp, amg_, 1e-2, 25, 0);
solver.apply(x,b,res); solver.apply(x,b,res);
#if ! DUNE_VERSION_NEWER(DUNE_ISTL, 2, 6)
delete sp; delete sp;
#endif
} }
void apply(X& x, X& b, Dune::InverseOperatorResult& res) void apply(X& x, X& b, Dune::InverseOperatorResult& res)
@ -489,7 +503,12 @@ public:
void createCoarseLevelSystem(const Operator& fineOperator) void createCoarseLevelSystem(const Operator& fineOperator)
{ {
prolongDamp_ = 1; prolongDamp_ = 1;
#if DUNE_VERSION_NEWER(DUNE_ISTL, 2, 6)
typedef Dune::Amg::PropertiesGraphCreator<Operator,Communication> GraphCreator;
#else
typedef Dune::Amg::PropertiesGraphCreator<Operator> GraphCreator; typedef Dune::Amg::PropertiesGraphCreator<Operator> GraphCreator;
#endif
typedef typename GraphCreator::PropertiesGraph PropertiesGraph; typedef typename GraphCreator::PropertiesGraph PropertiesGraph;
typedef typename GraphCreator::GraphTuple GraphTuple; typedef typename GraphCreator::GraphTuple GraphTuple;
@ -663,11 +682,20 @@ protected:
CoarseSolverPolicy, CoarseSolverPolicy,
Smoother>; Smoother>;
public: public:
#if DUNE_VERSION_NEWER(DUNE_ISTL, 2, 6)
Dune::SolverCategory::Category category() const override
{
return std::is_same<Communication, Dune::Amg::SequentialInformation>::value ?
Dune::SolverCategory::sequential : Dune::SolverCategory::overlapping;
}
#else
// define the category // define the category
enum { enum {
//! \brief The category the precondtioner is part of. //! \brief The category the precondtioner is part of.
category = Operator::category category = Operator::category
}; };
#endif
BlackoilAmg(const Operator& fineOperator, const Criterion& criterion, BlackoilAmg(const Operator& fineOperator, const Criterion& criterion,
const SmootherArgs& smargs, const Communication& comm) const SmootherArgs& smargs, const Communication& comm)
: smoother_(Detail::constructSmoother<Smoother>(fineOperator,smargs,comm)), : smoother_(Detail::constructSmoother<Smoother>(fineOperator,smargs,comm)),