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

Minor cleanup.

Browse Source
This commit is contained in:
Atgeirr Flø Rasmussen 2019-04-05 18:23:09 +02:00 committed by Markus Blatt
parent 3d9c776384
commit 0e5a5c5266
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
opm/autodiff/ISTLSolverEbosCpr.hpp
View File

@ -48,7 +48,7 @@ namespace Opm
template <class TypeTag> template <class TypeTag>
class ISTLSolverEbosCpr : public ISTLSolverEbos<TypeTag> class ISTLSolverEbosCpr : public ISTLSolverEbos<TypeTag>
{ {
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView; typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar; typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, SparseMatrixAdapter) SparseMatrixAdapter; typedef typename GET_PROP_TYPE(TypeTag, SparseMatrixAdapter) SparseMatrixAdapter;
typedef typename GET_PROP_TYPE(TypeTag, GlobalEqVector) Vector; typedef typename GET_PROP_TYPE(TypeTag, GlobalEqVector) Vector;
@ -65,15 +65,15 @@ namespace Opm
//typedef typename GridView::template Codim<0>::Entity Element; //typedef typename GridView::template Codim<0>::Entity Element;
//typedef typename GET_PROP_TYPE(TypeTag, ElementContext) ElementContext; //typedef typename GET_PROP_TYPE(TypeTag, ElementContext) ElementContext;
enum { pressureEqnIndex = BlackOilDefaultIndexTraits::waterCompIdx }; enum { pressureEqnIndex = BlackOilDefaultIndexTraits::waterCompIdx };
enum { pressureVarIndex = Indices::pressureSwitchIdx }; enum { pressureVarIndex = Indices::pressureSwitchIdx };
static const int numEq = Indices::numEq; static const int numEq = Indices::numEq;
typedef WellModelMatrixAdapter< Matrix, Vector, Vector, WellModel, false> OperatorSerial; typedef WellModelMatrixAdapter< Matrix, Vector, Vector, WellModel, false> OperatorSerial;
typedef ISTLSolverEbos<TypeTag> SuperClass; typedef ISTLSolverEbos<TypeTag> SuperClass;
typedef Dune::Amg::SequentialInformation POrComm; typedef Dune::Amg::SequentialInformation POrComm;
//typedef ISTLUtility::CPRSelector< Matrix, Vector, Vector, POrComm> CPRSelectorType; //typedef ISTLUtility::CPRSelector< Matrix, Vector, Vector, POrComm> CPRSelectorType;
typedef Dune::MatrixAdapter<Matrix,Vector, Vector> MatrixAdapter; typedef Dune::MatrixAdapter<Matrix,Vector, Vector> MatrixAdapter;
#if DUNE_VERSION_NEWER(DUNE_ISTL, 2, 6) #if DUNE_VERSION_NEWER(DUNE_ISTL, 2, 6)
@ -89,7 +89,7 @@ namespace Opm
using CouplingMetric = Opm::Amg::Element<pressureEqnIndex,pressureVarIndex>; using CouplingMetric = Opm::Amg::Element<pressureEqnIndex,pressureVarIndex>;
using CritBase = Dune::Amg::SymmetricCriterion<Matrix, CouplingMetric>; using CritBase = Dune::Amg::SymmetricCriterion<Matrix, CouplingMetric>;
using Criterion = Dune::Amg::CoarsenCriterion<CritBase>; using Criterion = Dune::Amg::CoarsenCriterion<CritBase>;
typedef BlackoilAmgCpr<MatrixAdapter,CprSmootherFine, CprSmootherCoarse, Criterion, POrComm, pressureEqnIndex, pressureVarIndex> BLACKOILAMG; typedef BlackoilAmgCpr<MatrixAdapter,CprSmootherFine, CprSmootherCoarse, Criterion, POrComm, pressureEqnIndex, pressureVarIndex> BlackoilAmgType;
public: public:
@ -232,8 +232,8 @@ namespace Opm
//criterion.setGamma(1); // //1 V cycle 2 WW //criterion.setGamma(1); // //1 V cycle 2 WW
// Since DUNE 2.2 we also need to pass the smoother args instead of steps directly // Since DUNE 2.2 we also need to pass the smoother args instead of steps directly
typedef typename BLACKOILAMG::Smoother Smoother; typedef typename BlackoilAmgType::Smoother Smoother;
typedef typename BLACKOILAMG::Smoother Smoother; typedef typename BlackoilAmgType::Smoother Smoother;
typedef typename Dune::Amg::SmootherTraits<Smoother>::Arguments SmootherArgs; typedef typename Dune::Amg::SmootherTraits<Smoother>::Arguments SmootherArgs;
SmootherArgs smootherArgs; SmootherArgs smootherArgs;
smootherArgs.iterations = 1; smootherArgs.iterations = 1;
@ -263,7 +263,7 @@ namespace Opm
} }
if( update_preconditioner or (amg_== 0) ){ if( update_preconditioner or (amg_== 0) ){
amg_.reset( new BLACKOILAMG( params, this->weights_, opARef, criterion, smootherArgs, comm ) ); amg_.reset( new BlackoilAmgType( params, this->weights_, opARef, criterion, smootherArgs, comm ) );
}else{ }else{
if(this->parameters_.cpr_solver_verbose_){ if(this->parameters_.cpr_solver_verbose_){
std::cout << " Only update amg solver " << std::endl; std::cout << " Only update amg solver " << std::endl;
@ -340,8 +340,8 @@ namespace Opm
#endif #endif
std::unique_ptr< MatrixAdapter > opA_; std::unique_ptr< MatrixAdapter > opA_;
std::unique_ptr< OperatorSerial > opASerial_; std::unique_ptr< OperatorSerial > opASerial_;
std::unique_ptr< BLACKOILAMG > amg_; std::unique_ptr< BlackoilAmgType > amg_;
SPPointer sp_; SPPointer sp_;
std::shared_ptr< Dune::BiCGSTABSolver<Vector> > linsolve_; std::shared_ptr< Dune::BiCGSTABSolver<Vector> > linsolve_;
//std::shared_ptr< Dune::LinearOperator<Vector,Vector> > op_; //std::shared_ptr< Dune::LinearOperator<Vector,Vector> > op_;
//std::shared_ptr< Dune::Preconditioner<Vector,Vector> > prec_; //std::shared_ptr< Dune::Preconditioner<Vector,Vector> > prec_;