diff --git a/AMDiS/src/parallel/InteriorBoundary.cc b/AMDiS/src/parallel/InteriorBoundary.cc index 453678cf76567945e835a0679ca0da8f28e0a01c..3436156df0ae4403ffc1791fc9300895ee8426a8 100644 --- a/AMDiS/src/parallel/InteriorBoundary.cc +++ b/AMDiS/src/parallel/InteriorBoundary.cc @@ -63,7 +63,7 @@ namespace AMDiS { for (map<int, ElementObjectData>::iterator it = objData.begin(); it != objData.end(); ++it) { if (it->first != globalMpiRank && levelRanks.count(it->first)) { - boundaryWithinMpiGroup == true; + boundaryWithinMpiGroup = true; break; } } diff --git a/AMDiS/src/parallel/MeshDistributor.cc b/AMDiS/src/parallel/MeshDistributor.cc index 99d865796ccc18b195f6cb218f2380f8050c7401..da24936a307896873136b9958865afe1f6522d40 100644 --- a/AMDiS/src/parallel/MeshDistributor.cc +++ b/AMDiS/src/parallel/MeshDistributor.cc @@ -1470,7 +1470,6 @@ namespace AMDiS { ParallelDebug::testDoubleDofs(mesh); ParallelDebug::testInteriorBoundary(*this); ParallelDebug::testPeriodicBoundary(*this); - ParallelDebug::printBoundaryInfo(*this); MSG("Debug mode tests finished!\n"); #endif @@ -1514,13 +1513,16 @@ namespace AMDiS { elObjDb.updateRankData(); intBoundary.create(levelData, 0, elObjDb); +#if (DEBUG != 0) + ParallelDebug::printBoundaryInfo(intBoundary); +#endif - if (levelData.getLevelNumber() > 1) + if (levelData.getLevelNumber() > 1) { intBoundarySd.create(levelData, 1, elObjDb); - #if (DEBUG != 0) - ParallelDebug::printBoundaryInfo(*this); + ParallelDebug::printBoundaryInfo(intBoundarySd, 0, true); #endif + } } diff --git a/AMDiS/src/parallel/ParallelDebug.cc b/AMDiS/src/parallel/ParallelDebug.cc index c309e5c727c2d7e2d01c023f870102dfc5b9b51b..c8844a1d3a64fce1e3cd7396f0af452b90fb80d3 100644 --- a/AMDiS/src/parallel/ParallelDebug.cc +++ b/AMDiS/src/parallel/ParallelDebug.cc @@ -715,7 +715,7 @@ namespace AMDiS { } - void ParallelDebug::printBoundaryInfo(MeshDistributor &pdb, + void ParallelDebug::printBoundaryInfo(InteriorBoundary &intBoundary, int level, bool force) { @@ -728,7 +728,7 @@ namespace AMDiS { MSG("Interior boundary info:\n"); - for (InteriorBoundary::iterator it(pdb.intBoundary.own, level); + for (InteriorBoundary::iterator it(intBoundary.own, level); !it.end(); ++it) { MSG("Rank owned boundary with rank %d: \n", it.getRank()); MSG(" ranks obj-ind: %d sub-obj: %d ith-obj: %d\n", @@ -737,7 +737,7 @@ namespace AMDiS { it->neighObj.elIndex, it->neighObj.subObj, it->neighObj.ithObj); } - for (InteriorBoundary::iterator it(pdb.intBoundary.other, level); + for (InteriorBoundary::iterator it(intBoundary.other, level); !it.end(); ++it) { MSG("Other owned boundary with rank %d: \n", it.getRank()); MSG(" ranks obj-ind: %d sub-obj: %d ith-obj: %d\n", @@ -746,7 +746,7 @@ namespace AMDiS { it->neighObj.elIndex, it->neighObj.subObj, it->neighObj.ithObj); } - for (InteriorBoundary::iterator it(pdb.intBoundary.periodic, level); + for (InteriorBoundary::iterator it(intBoundary.periodic, level); !it.end(); ++it) { MSG("Periodic boundary (ID %d) with rank %d: \n", it->type, it.getRank()); diff --git a/AMDiS/src/parallel/ParallelDebug.h b/AMDiS/src/parallel/ParallelDebug.h index ee87bfc4b19ab993bcaf5308e8baba2b4603680a..ea39f13d85615ef3675df8efd246e86899825b7d 100644 --- a/AMDiS/src/parallel/ParallelDebug.h +++ b/AMDiS/src/parallel/ParallelDebug.h @@ -141,7 +141,7 @@ namespace AMDiS { * This functions prints all information about all interior boundaries on * all ranks. * - * \param[in] pdb Parallel problem definition used for debugging. + * \param[in] intBoundary The boundary object to be printed. * \param[in] level Mesh level number for which the boundary should * be printed. * \param[in] force If true, the information is always printed to @@ -150,7 +150,7 @@ namespace AMDiS { * parameter "parallel->debug->print boundary info" * is set. */ - static void printBoundaryInfo(MeshDistributor &pdb, + static void printBoundaryInfo(InteriorBoundary &intBoundary, int level = 0, bool force = false);