Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Backofen, Rainer
amdis
Commits
a28b315c
Commit
a28b315c
authored
Jun 17, 2015
by
Praetorius, Simon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
UMFPACK solver updated
parent
53f3e4ee
Changes
2
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
572 additions
and
5 deletions
+572
-5
AMDiS/src/solver/UmfPackSolver.h
AMDiS/src/solver/UmfPackSolver.h
+5
-5
AMDiS/src/solver/itl/umfpack2_solve.hpp
AMDiS/src/solver/itl/umfpack2_solve.hpp
+567
-0
No files found.
AMDiS/src/solver/UmfPackSolver.h
View file @
a28b315c
...
...
@@ -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
/umfpack
2
_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
::
umfpack
2
::
solver
<
MatrixType
>
(
fullMatrix
,
symmetric_strategy
,
alloc_init
);
}
catch
(
mtl
::
matrix
::
umfpack
2
::
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
::
umfpack
2
::
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
::
umfpack
2
::
solver
<
MatrixType
>
*
solver
;
int
store_symbolic
;
...
...
AMDiS/src/solver/itl/umfpack2_solve.hpp
0 → 100644
View file @
a28b315c
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment