Simple merge between two AMDiS directories.

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");

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;