From 39d83533ccc28a8a550701e8c495cbc7c731369c Mon Sep 17 00:00:00 2001
From: Felix Schindler <felix.schindler@wwu.de>
Date: Wed, 22 Nov 2017 18:31:41 +0100
Subject: [PATCH] [eigen-solver] allow to specify "matrix-inverter" options
---
dune/xt/la/eigen-solver.hh | 2 +-
dune/xt/la/eigen-solver/internal/base.hh | 16 ++++++++++++++--
2 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/dune/xt/la/eigen-solver.hh b/dune/xt/la/eigen-solver.hh
index eea8c829d..bf9ab3587 100644
--- a/dune/xt/la/eigen-solver.hh
+++ b/dune/xt/la/eigen-solver.hh
@@ -29,7 +29,7 @@ namespace LA {
/**
* \brief A means to obtain available options at compile time.
- * \note This class needs to bespecialized for each MatrixType, the purpose of this class is merely to document the
+ * \note This class needs to be specialized for each MatrixType, the purpose of this variant is merely to document the
* expected functionality.
*/
template <class MatrixType>
diff --git a/dune/xt/la/eigen-solver/internal/base.hh b/dune/xt/la/eigen-solver/internal/base.hh
index 9a45891bf..31ef4e2ac 100644
--- a/dune/xt/la/eigen-solver/internal/base.hh
+++ b/dune/xt/la/eigen-solver/internal/base.hh
@@ -64,6 +64,10 @@ static Common::Configuration default_eigen_solver_options()
} // ... default_eigen_solver_options(...)
+/**
+ * \sa default_eigen_solver_options()
+ * \note If the provided options contain a subtree "matrix-inverter" that one is forwarded on eigenvector inversion.
+ */
template <class MatrixImp, class FieldImp, class RealMatrixImp, class ComplexMatrixImp>
class EigenSolverBase
{
@@ -511,7 +515,11 @@ protected:
{
assert(eigenvectors_ && "This must not happen when you call this function!");
try {
- eigenvectors_inverse_ = std::make_unique<ComplexMatrixType>(invert_matrix(*eigenvectors_));
+ if (options_.has_sub("matrix-inverter")) {
+ eigenvectors_inverse_ =
+ std::make_unique<ComplexMatrixType>(invert_matrix(*eigenvectors_, options_.sub("matrix-inverter")));
+ } else
+ eigenvectors_inverse_ = std::make_unique<ComplexMatrixType>(invert_matrix(*eigenvectors_));
} catch (const Exceptions::matrix_invert_failed& ee) {
DUNE_THROW(Exceptions::eigen_solver_failed,
"The computed matrix of eigenvectors is not invertible!"
@@ -532,7 +540,11 @@ protected:
{
assert(real_eigenvectors_ && "This must not happen when you call this function!");
try {
- real_eigenvectors_inverse_ = std::make_unique<MatrixType>(invert_matrix(*real_eigenvectors_));
+ if (options_.has_sub("matrix-inverter")) {
+ real_eigenvectors_inverse_ =
+ std::make_unique<MatrixType>(invert_matrix(*real_eigenvectors_, options_.sub("matrix-inverter")));
+ } else
+ real_eigenvectors_inverse_ = std::make_unique<MatrixType>(invert_matrix(*real_eigenvectors_));
} catch (const Exceptions::matrix_invert_failed& ee) {
DUNE_THROW(Exceptions::eigen_solver_failed,
"The computed matrix of eigenvectors is not invertible!"
--
GitLab