Small changed in parallel code.

AMDiS/src/Mesh.cc

@@ -1401,9 +1401,8 @@ namespace AMDiS {
 
     stringstream oss;
     oss << globalRefinements;
-    Parameters::addGlobalParameter(0, 
-				   name + "->global refinements", 
-				   oss.str().c_str());
+    string tmpStr = oss.str();
+    Parameters::add(name + "->global refinements", tmpStr);
 
 
     // === Print a note to the screen that another mesh file will be used. ===

AMDiS/src/parallel/CheckerPartitioner.cc

@@ -25,8 +25,6 @@ namespace AMDiS {
 
     int nElementsPerBlock = (mesh->getDim() == 2 ? 2 : 6);
 
-    MSG("ELS_PER_BLOCK = %d\n", nElementsPerBlock);
-
     TraverseStack stack;
     ElInfo *elInfo = stack.traverseFirst(mesh, 0, Mesh::CALL_EL_LEVEL);
     while (elInfo) {
@@ -35,12 +33,6 @@ namespace AMDiS {
       int elInRank = elIndex / nElementsPerBlock;
       TEST_EXIT_DBG(elInRank < mpiSize)("Should not happen!\n");
 
-      if (elInRank == mpiRank) {
-	MSG("EL %d IS MY!\n", elIndex);
-      } else {
-	MSG("EL %d IS IN RANK %d\n", elIndex, elInRank);
-      }
-
       elementInRank[elIndex] = (elInRank == mpiRank);
       partitionMap[elIndex] = elInRank;	
 	

AMDiS/src/parallel/PetscSolverFeti.cc

@@ -856,10 +856,6 @@ namespace AMDiS {
   {
     FUNCNAME("PetscSolverFeti::fillPetscMatrix()");   
 
-//     double vm, mem;
-//     processMemUsage(vm, mem);       
-//     MSG("MEM INFO 1 = %f\n", mem);
-
     nComponents = vec->getSize();
 
     // === Create all sets and indices. ===
@@ -917,9 +913,6 @@ namespace AMDiS {
 		      &mat_duals_interior);
     }
 
-//     processMemUsage(vm, mem);       
-//     MSG("MEM INFO 2 = %f\n", mem);
-
     
     // === Prepare traverse of sequentially created matrices. ===
 
@@ -1129,9 +1122,6 @@ namespace AMDiS {
       }
     }
 
-//     processMemUsage(vm, mem);       
-//     MSG("MEM INFO 3 = %f\n", mem);
-
     // === Start global assembly procedure. ===
 
     MatAssemblyBegin(mat_b_b, MAT_FINAL_ASSEMBLY);
@@ -1146,8 +1136,6 @@ namespace AMDiS {
     MatAssemblyBegin(mat_primal_b, MAT_FINAL_ASSEMBLY);
     MatAssemblyEnd(mat_primal_b, MAT_FINAL_ASSEMBLY);
 
-//     processMemUsage(vm, mem);       
-//     MSG("MEM INFO 4 = %f\n", mem);
 
     // === Start global assembly procedure for preconditioner matrices. ===
 
@@ -1168,9 +1156,6 @@ namespace AMDiS {
     }
 
 
-//     processMemUsage(vm, mem);       
-//     MSG("MEM INFO 5 = %f\n", mem);
-
     // === Create and fill PETSc's right hand side vectors. ===
 
     VecCreate(PETSC_COMM_WORLD, &f_b);
@@ -1210,31 +1195,20 @@ namespace AMDiS {
     VecAssemblyBegin(f_primal);
     VecAssemblyEnd(f_primal);
 
-//     processMemUsage(vm, mem);       
-//     MSG("MEM INFO 6 = %f\n", mem);
-
 
     // === Create and fill PETSc matrix for Lagrange constraints. ===
 
     createMatLagrange();
 
-//     processMemUsage(vm, mem);       
-//     MSG("MEM INFO 7 = %f\n", mem);
     
     // === Create PETSc solver for the Schur complement on primal variables. ===
     
     createSchurPrimalKsp();
 
-//     processMemUsage(vm, mem);       
-//     MSG("MEM INFO 8 = %f\n", mem);
-
 
     // === Create PETSc solver for the FETI-DP operator. ===
 
     createFetiKsp();
-
-//     processMemUsage(vm, mem);       
-//     MSG("MEM INFO 9 = %f\n", mem);
   }