Commit a28b315c authored by Praetorius, Simon's avatar Praetorius, Simon

UMFPACK solver updated

parent 53f3e4ee
......@@ -28,7 +28,7 @@
#include <iostream>
#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"
namespace AMDiS {
......@@ -60,8 +60,8 @@ namespace AMDiS {
}
try {
solver = new mtl::matrix::umfpack::solver<MatrixType>(fullMatrix, symmetric_strategy, alloc_init);
} catch (mtl::matrix::umfpack::error& e) {
solver = new mtl::matrix::umfpack2::solver<MatrixType>(fullMatrix, symmetric_strategy, alloc_init);
} catch (mtl::matrix::umfpack2::error& e) {
ERROR_EXIT("UMFPACK_ERROR(factorize, %d) = %s\n", e.code, e.what());
}
}
......@@ -75,7 +75,7 @@ namespace AMDiS {
int code = 0;
try {
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());
}
......@@ -103,7 +103,7 @@ namespace AMDiS {
LinearSolverInterface& oem;
private:
mtl::matrix::umfpack::solver<MatrixType> *solver;
mtl::matrix::umfpack2::solver<MatrixType> *solver;
int store_symbolic;
......
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment