Commit c36321b0 authored by Thomas Witkowski's avatar Thomas Witkowski
Browse files

And go back to juropa

parent 92a640fa
...@@ -63,7 +63,7 @@ namespace AMDiS { ...@@ -63,7 +63,7 @@ namespace AMDiS {
for (map<int, ElementObjectData>::iterator it = objData.begin(); for (map<int, ElementObjectData>::iterator it = objData.begin();
it != objData.end(); ++it) { it != objData.end(); ++it) {
if (it->first != globalMpiRank && levelRanks.count(it->first)) { if (it->first != globalMpiRank && levelRanks.count(it->first)) {
boundaryWithinMpiGroup == true; boundaryWithinMpiGroup = true;
break; break;
} }
} }
......
...@@ -1470,7 +1470,6 @@ namespace AMDiS { ...@@ -1470,7 +1470,6 @@ namespace AMDiS {
ParallelDebug::testDoubleDofs(mesh); ParallelDebug::testDoubleDofs(mesh);
ParallelDebug::testInteriorBoundary(*this); ParallelDebug::testInteriorBoundary(*this);
ParallelDebug::testPeriodicBoundary(*this); ParallelDebug::testPeriodicBoundary(*this);
ParallelDebug::printBoundaryInfo(*this);
MSG("Debug mode tests finished!\n"); MSG("Debug mode tests finished!\n");
#endif #endif
...@@ -1514,13 +1513,16 @@ namespace AMDiS { ...@@ -1514,13 +1513,16 @@ namespace AMDiS {
elObjDb.updateRankData(); elObjDb.updateRankData();
intBoundary.create(levelData, 0, elObjDb); 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); intBoundarySd.create(levelData, 1, elObjDb);
#if (DEBUG != 0) #if (DEBUG != 0)
ParallelDebug::printBoundaryInfo(*this); ParallelDebug::printBoundaryInfo(intBoundarySd, 0, true);
#endif #endif
}
} }
......
...@@ -715,7 +715,7 @@ namespace AMDiS { ...@@ -715,7 +715,7 @@ namespace AMDiS {
} }
void ParallelDebug::printBoundaryInfo(MeshDistributor &pdb, void ParallelDebug::printBoundaryInfo(InteriorBoundary &intBoundary,
int level, int level,
bool force) bool force)
{ {
...@@ -728,7 +728,7 @@ namespace AMDiS { ...@@ -728,7 +728,7 @@ namespace AMDiS {
MSG("Interior boundary info:\n"); MSG("Interior boundary info:\n");
for (InteriorBoundary::iterator it(pdb.intBoundary.own, level); for (InteriorBoundary::iterator it(intBoundary.own, level);
!it.end(); ++it) { !it.end(); ++it) {
MSG("Rank owned boundary with rank %d: \n", it.getRank()); MSG("Rank owned boundary with rank %d: \n", it.getRank());
MSG(" ranks obj-ind: %d sub-obj: %d ith-obj: %d\n", MSG(" ranks obj-ind: %d sub-obj: %d ith-obj: %d\n",
...@@ -737,7 +737,7 @@ namespace AMDiS { ...@@ -737,7 +737,7 @@ namespace AMDiS {
it->neighObj.elIndex, it->neighObj.subObj, it->neighObj.ithObj); 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) { !it.end(); ++it) {
MSG("Other owned boundary with rank %d: \n", it.getRank()); MSG("Other owned boundary with rank %d: \n", it.getRank());
MSG(" ranks obj-ind: %d sub-obj: %d ith-obj: %d\n", MSG(" ranks obj-ind: %d sub-obj: %d ith-obj: %d\n",
...@@ -746,7 +746,7 @@ namespace AMDiS { ...@@ -746,7 +746,7 @@ namespace AMDiS {
it->neighObj.elIndex, it->neighObj.subObj, it->neighObj.ithObj); 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) { !it.end(); ++it) {
MSG("Periodic boundary (ID %d) with rank %d: \n", MSG("Periodic boundary (ID %d) with rank %d: \n",
it->type, it.getRank()); it->type, it.getRank());
......
...@@ -141,7 +141,7 @@ namespace AMDiS { ...@@ -141,7 +141,7 @@ namespace AMDiS {
* This functions prints all information about all interior boundaries on * This functions prints all information about all interior boundaries on
* all ranks. * 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 * \param[in] level Mesh level number for which the boundary should
* be printed. * be printed.
* \param[in] force If true, the information is always printed to * \param[in] force If true, the information is always printed to
...@@ -150,7 +150,7 @@ namespace AMDiS { ...@@ -150,7 +150,7 @@ namespace AMDiS {
* parameter "parallel->debug->print boundary info" * parameter "parallel->debug->print boundary info"
* is set. * is set.
*/ */
static void printBoundaryInfo(MeshDistributor &pdb, static void printBoundaryInfo(InteriorBoundary &intBoundary,
int level = 0, int level = 0,
bool force = false); bool force = false);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment