Skip to content
Snippets Groups Projects
Commit 03862656 authored by Thomas Witkowski's avatar Thomas Witkowski
Browse files

Wenn ich nicht so dumm waere, muesste ich jetzt auch nicht updaten.

parent 4c225a62
No related branches found
No related tags found
No related merge requests found
......@@ -205,6 +205,8 @@ namespace AMDiS {
{
FUNCNAME("PeriodicBC::exitMatrix()");
ERROR_EXIT("Not yet implemented, if you have an idea how to do it, than make it!!!\n");
TEST_EXIT(matrix)("no matrix\n");
if (matrix == masterMatrix_) {
......@@ -215,6 +217,8 @@ namespace AMDiS {
using namespace mtl;
associated_->print();
// Compute reorder matrix (newRow and newCol yields transposed!!!)
matrix::traits::reorder<>::type R= matrix::reorder(*associated_);
DOFMatrix::base_matrix_type &A= matrix->getBaseMatrix(), B, D, E, TR;
......
......@@ -605,6 +605,7 @@ namespace AMDiS {
systemMatrix->removeRowsWithDBC(systemMatrix->getApplyDBCs());
// TODO: ExitMatrix should be called after finishInsertion!
if (systemMatrix->getBoundaryManager())
systemMatrix->getBoundaryManager()->exitMatrix(systemMatrix);
if (rhs->getBoundaryManager())
......@@ -612,9 +613,10 @@ namespace AMDiS {
if (solution->getBoundaryManager())
solution->getBoundaryManager()->exitVector(solution);
INFO(info, 8)("buildAfterCoarsen needed %.5f seconds\n", TIME_USED(first,clock()));
systemMatrix->finishInsertion();
INFO(info, 8)("buildAfterCoarsen needed %.5f seconds\n", TIME_USED(first,clock()));
#ifdef HAVE_PARALLEL_AMDIS
// PetscErrorCode ierr;
// Mat A;
......
......@@ -778,8 +778,9 @@ namespace AMDiS {
ERROR_EXIT("Not yet implemented!\n");
}
if (assembleMatrix && matrix->getBoundaryManager())
matrix->getBoundaryManager()->exitMatrix(matrix);
// TODO: ExitMatrix should be called after finishInsertion!
if (assembleMatrix && matrix->getBoundaryManager())
matrix->getBoundaryManager()->exitMatrix(matrix);
assembledMatrix[i][j] = true;
}
......@@ -794,13 +795,13 @@ namespace AMDiS {
// Finish insertion
for (int i = 0; i < nComponents; i++)
for (int j = 0; j < nComponents; j++)
if ((*systemMatrix)[i][j])
(*systemMatrix)[i][j]->finishInsertion();
if ((*systemMatrix)[i][j])
(*systemMatrix)[i][j]->finishInsertion();
// clock_t first1 = clock();
// solverMatrix.setMatrix(*systemMatrix);
solverMatrix.setMatrix(*systemMatrix);
// clock_t first2 = clock();
// createPrecon();
createPrecon();
// clock_t first3 = clock();
// std::cout << "T1 = " << TIME_USED(first1, first2) << std::endl;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment