From b34cd343fd658a931cbecdf58c9bff276885021a Mon Sep 17 00:00:00 2001
From: Thomas Witkowski <thomas.witkowski@gmx.de>
Date: Thu, 25 Feb 2010 07:32:57 +0000
Subject: [PATCH] Simple merge between two AMDiS directories.
---
AMDiS/src/DOFVector.cc | 3 +--
AMDiS/src/ProblemVec.cc | 6 +++---
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/AMDiS/src/DOFVector.cc b/AMDiS/src/DOFVector.cc
index 44a7a05a..2b41bfe3 100644
--- a/AMDiS/src/DOFVector.cc
+++ b/AMDiS/src/DOFVector.cc
@@ -752,10 +752,9 @@ namespace AMDiS {
TEST_EXIT_DBG(quad || quadFast)("neither quad nor quadFast defined\n");
- if (quad && quadFast) {
+ if (quad && quadFast)
TEST_EXIT_DBG(quad == quadFast->getQuadrature())
("quad != quadFast->quadrature\n");
- }
TEST_EXIT_DBG(!quadFast || quadFast->getBasisFunctions() == feSpace->getBasisFcts())
("invalid basis functions");
diff --git a/AMDiS/src/ProblemVec.cc b/AMDiS/src/ProblemVec.cc
index 4699b657..727a5767 100644
--- a/AMDiS/src/ProblemVec.cc
+++ b/AMDiS/src/ProblemVec.cc
@@ -789,6 +789,8 @@ namespace AMDiS {
assembleFlag);
}
+ // exit(0);
+
solverMatrix.setMatrix(*systemMatrix);
createPrecon();
@@ -1201,12 +1203,10 @@ namespace AMDiS {
&rowElInfo, &colElInfo,
&smallElInfo, &largeElInfo);
while (cont) {
-#if 0
std::cout << "ROW = " << rowElInfo->getElement()->getIndex() << " "
<< "COL = " << colElInfo->getElement()->getIndex() << " "
<< "SMA = " << smallElInfo->getElement()->getIndex() << " "
<< "LAR = " << largeElInfo->getElement()->getIndex() << std::endl;
-#endif
if (useGetBound)
basisFcts->getBound(rowElInfo, bound);
@@ -1225,7 +1225,7 @@ namespace AMDiS {
}
if (matrix)
- matrix->removeRowsWithDBC(matrix->getApplyDBCs());
+ matrix->removeRowsWithDBC(matrix->getApplyDBCs());
if (useGetBound)
delete [] bound;
--
GitLab