Work in Dirichlet preconditioner for FETI-DP.

AMDiS/src/parallel/PetscSolverFeti.cc

@@ -144,7 +144,15 @@ namespace AMDiS {
       const FiniteElemSpace *feSpace = dofMat->getRowFeSpace();
       std::set<DegreeOfFreedom>& dRows = dofMat->getDirichletRows();
       if (dirichletRows.count(feSpace)) {
-	WARNING("Implement test that for all components dirichlet rows are equal!\n");
+	// === Run test if Dirichlet rows are all the same in all components ===
+	// === of one FE space.                                              ===
+	TEST_EXIT(dirichletRows[feSpace].size() == dRows.size())
+	  ("Wrong number of dirichlet rows!\n");
+	
+	for (std::set<DegreeOfFreedom>::iterator it0 = dirichletRows[feSpace].begin(),
+	       it1 = dRows.begin(); it1 != dRows.end(); ++it0, ++it1) {
+	  TEST_EXIT(*it0 == *it1)("Wrong DOFs %d %d!\n", *it0, *it1);
+	}
       } else {
 	dirichletRows[feSpace] = dRows;
       }
@@ -673,8 +681,6 @@ namespace AMDiS {
     VecAssemblyBegin(vec_scale_lagrange);
     VecAssemblyEnd(vec_scale_lagrange);
 
-    VecView(vec_scale_lagrange, PETSC_VIEWER_STDOUT_WORLD);
-
     if (fetiPreconditioner != FETI_NONE || stokesMode) {
       MatDuplicate(mat_lagrange, MAT_COPY_VALUES, &mat_lagrange_scaled);
       MatDiagonalScale(mat_lagrange_scaled, vec_scale_lagrange, PETSC_NULL);
@@ -1592,7 +1598,7 @@ namespace AMDiS {
 
     createFetiData();
 
-    dirichletRows.clear();
+    //    dirichletRows.clear();
 
    
     // === Create matrices for the FETI-DP method. ===
@@ -1728,9 +1734,11 @@ namespace AMDiS {
 	for (cursor_type cursor = begin<row>(dofMat->getBaseMatrix()), 
 	       cend = end<row>(dofMat->getBaseMatrix()); cursor != cend; ++cursor) {
 
-	  if (isPrimal(rowFeSpace, *cursor))
+	  if (dirichletRows[rowFeSpace].count(*cursor))
 	    continue;
 
+	  if (isPrimal(rowFeSpace, *cursor))
+	    continue;
 
 	  switch (fetiPreconditioner) {
 	  case FETI_DIRICHLET:
@@ -1743,6 +1751,9 @@ namespace AMDiS {
 	    for (icursor_type icursor = begin<nz>(cursor), icend = end<nz>(cursor); 
 		 icursor != icend; ++icursor) {
 
+	      if (dirichletRows[colFeSpace].count(col(*icursor)))
+		continue;
+	      
 	      if (isPrimal(colFeSpace, col(*icursor)))
 		continue;
 	      
@@ -1805,6 +1816,9 @@ namespace AMDiS {
 	    // Traverse all columns.
 	    for (icursor_type icursor = begin<nz>(cursor), icend = end<nz>(cursor); 
 		 icursor != icend; ++icursor) {
+	      if (dirichletRows[colFeSpace].count(col(*icursor)))
+		continue;
+
 	      if (!isDual(colFeSpace, col(*icursor)))
 		continue;