From 29045c0307cfbdc71da8903660c7bef8a7acaddb Mon Sep 17 00:00:00 2001
From: Thomas Witkowski <thomas.witkowski@gmx.de>
Date: Thu, 21 Apr 2011 08:53:41 +0000
Subject: [PATCH] Work on more general and faster parallelization.
---
AMDiS/src/RefinementManager3d.cc | 4 ----
AMDiS/src/parallel/MeshManipulation.cc | 1 -
AMDiS/src/parallel/PetscSolverGlobalMatrix.cc | 5 ++---
3 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/AMDiS/src/RefinementManager3d.cc b/AMDiS/src/RefinementManager3d.cc
index 7a34ab91..b14180c4 100644
--- a/AMDiS/src/RefinementManager3d.cc
+++ b/AMDiS/src/RefinementManager3d.cc
@@ -675,8 +675,6 @@ namespace AMDiS {
bool foundEdge = false;
while (elInfo2) {
- MSG("TRY TO FIND ON EL %d\n", elInfo2->getElement()->getIndex());
-
for (int i = 0; i < 6; i++) {
DofEdge edge2 = elInfo2->getElement()->getEdge(i);
if (edge2.first == *(edge[0]) &&
@@ -690,8 +688,6 @@ namespace AMDiS {
// must be refined at least once to get a refinement edge.
if (i == 0) {
- MSG("AND FOUND!\n");
-
// Edge is refinement edge, so add it to refine list.
refineList.setElType(n_neigh, elInfo2->getType());
diff --git a/AMDiS/src/parallel/MeshManipulation.cc b/AMDiS/src/parallel/MeshManipulation.cc
index b982e741..256cfa2f 100644
--- a/AMDiS/src/parallel/MeshManipulation.cc
+++ b/AMDiS/src/parallel/MeshManipulation.cc
@@ -396,7 +396,6 @@ namespace AMDiS {
// In this scenario, the element must be refined due to the structure
// code, but the refinement does not introduce new DOFs on the face,
// that should be adapted. Thus, we can ommit the refinement.
-
if (subObj == FACE) {
if (s0 != -1 && s1 == -1 || s0 == -1 && s1 != -1) {
if (ithObj <= 1 && code.lookAhead() == 0) {
diff --git a/AMDiS/src/parallel/PetscSolverGlobalMatrix.cc b/AMDiS/src/parallel/PetscSolverGlobalMatrix.cc
index 13608e10..602ef981 100644
--- a/AMDiS/src/parallel/PetscSolverGlobalMatrix.cc
+++ b/AMDiS/src/parallel/PetscSolverGlobalMatrix.cc
@@ -72,8 +72,8 @@ namespace AMDiS {
// === Create PETSc matrix with the computed nnz data structure. ===
MatCreateMPIAIJ(PETSC_COMM_WORLD, nRankRows, nRankRows, nOverallRows, nOverallRows,
- 0, d_nnz, 0, o_nnz, &petscMatrix);
-
+ 0, d_nnz, 0, o_nnz, &petscMatrix);
+
#if (DEBUG != 0)
MSG("Fill petsc matrix 1 needed %.5f seconds\n", MPI::Wtime() - wtime);
#endif
@@ -150,7 +150,6 @@ namespace AMDiS {
if (!zeroStartVector)
KSPSetInitialGuessNonzero(solver, PETSC_TRUE);
-
// PETSc.
KSPSolve(solver, petscRhsVec, petscSolVec);
--
GitLab