Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

TrilinosWrappers::SolverDirect: adjust interface #16727

Merged
merged 1 commit into from
Mar 13, 2024
Merged

TrilinosWrappers::SolverDirect: adjust interface #16727

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
47 changes: 42 additions & 5 deletions include/deal.II/lac/trilinos_solver.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -480,7 +480,7 @@ namespace TrilinosWrappers
*
* @ingroup TrilinosWrappers
*/
class SolverDirect
class SolverDirect : public Subscriptor
{
public:
/**
Expand Down Expand Up @@ -522,6 +522,11 @@ namespace TrilinosWrappers
std::string solver_type;
};

/**
* Constructor. Creates the solver without solver control object.
*/
explicit SolverDirect(const AdditionalData &data = AdditionalData());

/**
* Constructor. Takes the solver control object and creates the solver.
*/
Expand All @@ -542,23 +547,50 @@ namespace TrilinosWrappers
void
initialize(const SparseMatrix &A);

/**
* Initializes the direct solver for the matrix <tt>A</tt> and creates a
* factorization for it with the package chosen from the additional
* data structure. Note that there is no need for a preconditioner
* here and solve() is not called. Furthermore, @p data replaces the
* data stored in this instance.
*/
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@p data replaces the data stored in this instance.

void
initialize(const SparseMatrix &A, const AdditionalData &data);

/**
* Solve the linear system <tt>Ax=b</tt> based on the
* package set in initialize(). Note the matrix is not refactorized during
* this call.
* package set in the constructor on initialize(). Note the matrix is not
* refactored during this call.
*/
void
solve(MPI::Vector &x, const MPI::Vector &b);

/**
* Solve the linear system <tt>Ax=b</tt> based on the package set in
* initialize() for deal.II's own parallel vectors. Note the matrix is not
* refactorized during this call.
* refactored during this call.
*/
void
solve(dealii::LinearAlgebra::distributed::Vector<double> &x,
const dealii::LinearAlgebra::distributed::Vector<double> &b);

/**
* Solve the linear system <tt>Ax=b</tt> based on the
* package set in the constructor or initialize(). Note the matrix is not
* refactored during this call.
*/
void
vmult(MPI::Vector &x, const MPI::Vector &b) const;

/**
* Solve the linear system <tt>Ax=b</tt> based on the package set in
* initialize() for deal.II's own parallel vectors. Note the matrix is not
* refactored during this call.
*/
void
vmult(dealii::LinearAlgebra::distributed::Vector<double> &x,
const dealii::LinearAlgebra::distributed::Vector<double> &b) const;

/**
* Solve the linear system <tt>Ax=b</tt>. Creates a factorization of the
* matrix with the package chosen from the additional data structure and
Expand Down Expand Up @@ -613,6 +645,11 @@ namespace TrilinosWrappers
void
do_solve();

/**
* Local dummy solver control object.
*/
SolverControl solver_control_own;

/**
* Reference to the object that controls convergence of the iterative
* solver. In fact, for these Trilinos wrappers, Trilinos does so itself,
Expand All @@ -637,7 +674,7 @@ namespace TrilinosWrappers
/**
* Store a copy of the flags for this particular solver.
*/
const AdditionalData additional_data;
AdditionalData additional_data;
};


Expand Down
38 changes: 36 additions & 2 deletions source/lac/trilinos_solver.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -636,6 +636,13 @@ namespace TrilinosWrappers



SolverDirect::SolverDirect(const AdditionalData &data)
: solver_control(solver_control_own)
, additional_data(data.output_solver_details, data.solver_type)
{}



SolverDirect::SolverDirect(SolverControl &cn, const AdditionalData &data)
: solver_control(cn)
, additional_data(data.output_solver_details, data.solver_type)
Expand Down Expand Up @@ -696,8 +703,35 @@ namespace TrilinosWrappers
}



void
SolverDirect::initialize(const SparseMatrix &A, const AdditionalData &data)
{
this->additional_data = data;

this->initialize(A);
}


void
SolverDirect::solve(MPI::Vector &x, const MPI::Vector &b)
{
this->vmult(x, b);
}



void
SolverDirect::solve(
dealii::LinearAlgebra::distributed::Vector<double> &x,
const dealii::LinearAlgebra::distributed::Vector<double> &b)
{
this->vmult(x, b);
}


void
SolverDirect::vmult(MPI::Vector &x, const MPI::Vector &b) const
{
// Assign the empty LHS vector to the Epetra_LinearProblem object
linear_problem->SetLHS(&x.trilinos_vector());
Expand Down Expand Up @@ -725,9 +759,9 @@ namespace TrilinosWrappers


void
SolverDirect::solve(
SolverDirect::vmult(
dealii::LinearAlgebra::distributed::Vector<double> &x,
const dealii::LinearAlgebra::distributed::Vector<double> &b)
const dealii::LinearAlgebra::distributed::Vector<double> &b) const
{
Epetra_Vector ep_x(View,
linear_problem->GetOperator()->OperatorDomainMap(),
Expand Down