Commit b1872344 authored by Thomas Witkowski's avatar Thomas Witkowski
Browse files

UMFPACK works now correctly for multiple right hand sides.

parent 7dbb864a
...@@ -165,7 +165,7 @@ namespace AMDiS { ...@@ -165,7 +165,7 @@ namespace AMDiS {
bool (*writeElem)(ElInfo*)) bool (*writeElem)(ElInfo*))
{ {
FUNCNAME("FileWriter::writeFiles()"); FUNCNAME("FileWriter::writeFiles()");
if ((adaptInfo->getTimestepNumber() % tsModulo != 0) && !force) if ((adaptInfo->getTimestepNumber() % tsModulo != 0) && !force)
return; return;
......
...@@ -763,11 +763,12 @@ namespace AMDiS { ...@@ -763,11 +763,12 @@ namespace AMDiS {
assembleFlag); assembleFlag);
} }
solverMatrix.setMatrix(*systemMatrix); if (asmMatrix) {
solverMatrix.setMatrix(*systemMatrix);
createPrecon(); createPrecon();
INFO(info, 8)("fillin of assembled matrix: %d\n", nnz); INFO(info, 8)("fillin of assembled matrix: %d\n", nnz);
}
#ifdef _OPENMP #ifdef _OPENMP
INFO(info, 8)("buildAfterCoarsen needed %.5f seconds system time / %.5f seconds wallclock time\n", INFO(info, 8)("buildAfterCoarsen needed %.5f seconds system time / %.5f seconds wallclock time\n",
......
...@@ -86,11 +86,11 @@ namespace AMDiS { ...@@ -86,11 +86,11 @@ namespace AMDiS {
else else
solver = new mtl::matrix::umfpack::solver<matrix_type>(A, UMFPACK_STRATEGY_SYMMETRIC); solver = new mtl::matrix::umfpack::solver<matrix_type>(A, UMFPACK_STRATEGY_SYMMETRIC);
} else { } else {
// if (!multipleRhs) if (!multipleRhs)
if (store_symbolic) if (store_symbolic)
solver->update_numeric(); solver->update_numeric();
else else
solver->update(); solver->update();
} }
int code= (*solver)(x, b); int code= (*solver)(x, b);
......
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