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

Simple merge between two AMDiS directories.

parent 55d33f24
...@@ -752,10 +752,9 @@ namespace AMDiS { ...@@ -752,10 +752,9 @@ namespace AMDiS {
TEST_EXIT_DBG(quad || quadFast)("neither quad nor quadFast defined\n"); TEST_EXIT_DBG(quad || quadFast)("neither quad nor quadFast defined\n");
if (quad && quadFast) { if (quad && quadFast)
TEST_EXIT_DBG(quad == quadFast->getQuadrature()) TEST_EXIT_DBG(quad == quadFast->getQuadrature())
("quad != quadFast->quadrature\n"); ("quad != quadFast->quadrature\n");
}
TEST_EXIT_DBG(!quadFast || quadFast->getBasisFunctions() == feSpace->getBasisFcts()) TEST_EXIT_DBG(!quadFast || quadFast->getBasisFunctions() == feSpace->getBasisFcts())
("invalid basis functions"); ("invalid basis functions");
......
...@@ -789,6 +789,8 @@ namespace AMDiS { ...@@ -789,6 +789,8 @@ namespace AMDiS {
assembleFlag); assembleFlag);
} }
// exit(0);
solverMatrix.setMatrix(*systemMatrix); solverMatrix.setMatrix(*systemMatrix);
createPrecon(); createPrecon();
...@@ -1201,12 +1203,10 @@ namespace AMDiS { ...@@ -1201,12 +1203,10 @@ namespace AMDiS {
&rowElInfo, &colElInfo, &rowElInfo, &colElInfo,
&smallElInfo, &largeElInfo); &smallElInfo, &largeElInfo);
while (cont) { while (cont) {
#if 0
std::cout << "ROW = " << rowElInfo->getElement()->getIndex() << " " std::cout << "ROW = " << rowElInfo->getElement()->getIndex() << " "
<< "COL = " << colElInfo->getElement()->getIndex() << " " << "COL = " << colElInfo->getElement()->getIndex() << " "
<< "SMA = " << smallElInfo->getElement()->getIndex() << " " << "SMA = " << smallElInfo->getElement()->getIndex() << " "
<< "LAR = " << largeElInfo->getElement()->getIndex() << std::endl; << "LAR = " << largeElInfo->getElement()->getIndex() << std::endl;
#endif
if (useGetBound) if (useGetBound)
basisFcts->getBound(rowElInfo, bound); basisFcts->getBound(rowElInfo, bound);
...@@ -1225,7 +1225,7 @@ namespace AMDiS { ...@@ -1225,7 +1225,7 @@ namespace AMDiS {
} }
if (matrix) if (matrix)
matrix->removeRowsWithDBC(matrix->getApplyDBCs()); matrix->removeRowsWithDBC(matrix->getApplyDBCs());
if (useGetBound) if (useGetBound)
delete [] bound; delete [] bound;
......
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