Skip to content
Snippets Groups Projects
Commit a28b315c authored by Praetorius, Simon's avatar Praetorius, Simon
Browse files

UMFPACK solver updated

parent 53f3e4ee
No related branches found
No related tags found
No related merge requests found
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
#include <iostream> #include <iostream>
#include <boost/numeric/mtl/operation/two_norm.hpp> #include <boost/numeric/mtl/operation/two_norm.hpp>
#include <boost/numeric/mtl/interface/umfpack_solve.hpp> #include "solver/itl/umfpack2_solve.hpp"
#include "solver/LinearSolver.h" #include "solver/LinearSolver.h"
namespace AMDiS { namespace AMDiS {
...@@ -60,8 +60,8 @@ namespace AMDiS { ...@@ -60,8 +60,8 @@ namespace AMDiS {
} }
try { try {
solver = new mtl::matrix::umfpack::solver<MatrixType>(fullMatrix, symmetric_strategy, alloc_init); solver = new mtl::matrix::umfpack2::solver<MatrixType>(fullMatrix, symmetric_strategy, alloc_init);
} catch (mtl::matrix::umfpack::error& e) { } catch (mtl::matrix::umfpack2::error& e) {
ERROR_EXIT("UMFPACK_ERROR(factorize, %d) = %s\n", e.code, e.what()); ERROR_EXIT("UMFPACK_ERROR(factorize, %d) = %s\n", e.code, e.what());
} }
} }
...@@ -75,7 +75,7 @@ namespace AMDiS { ...@@ -75,7 +75,7 @@ namespace AMDiS {
int code = 0; int code = 0;
try { try {
code = (*solver)(x, b); code = (*solver)(x, b);
} catch (mtl::matrix::umfpack::error& e) { } catch (mtl::matrix::umfpack2::error& e) {
ERROR_EXIT("UMFPACK_ERROR(solve, %d) = %s\n", e.code, e.what()); ERROR_EXIT("UMFPACK_ERROR(solve, %d) = %s\n", e.code, e.what());
} }
...@@ -103,7 +103,7 @@ namespace AMDiS { ...@@ -103,7 +103,7 @@ namespace AMDiS {
LinearSolverInterface& oem; LinearSolverInterface& oem;
private: private:
mtl::matrix::umfpack::solver<MatrixType> *solver; mtl::matrix::umfpack2::solver<MatrixType> *solver;
int store_symbolic; int store_symbolic;
......
This diff is collapsed.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment