diff --git a/AMDiS/src/parallel/MeshDistributor.cc b/AMDiS/src/parallel/MeshDistributor.cc index 18a3388df420a165b77f5567421a9f476a5908f6..9e8c07db801e0d00d627aeeff707fee5608982d0 100644 --- a/AMDiS/src/parallel/MeshDistributor.cc +++ b/AMDiS/src/parallel/MeshDistributor.cc @@ -796,7 +796,7 @@ namespace AMDiS { // important. Therefore, we add all boundaries to one boundary container. RankToBoundMap allBound; - for (InteriorBoundary::iterator it(myIntBoundary); !it.end(); ++it) + for (InteriorBoundary::iterator it(rankIntBoundary); !it.end(); ++it) if ((mesh->getDim() == 2 && it->rankObj.subObj == EDGE) || (mesh->getDim() == 3 && it->rankObj.subObj == FACE)) allBound[it.getRank()].push_back(*it); @@ -1460,7 +1460,7 @@ namespace AMDiS { // === Clear all relevant data structures. === - myIntBoundary.clear(); + rankIntBoundary.clear(); otherIntBoundary.clear(); periodicBoundary.clear(); @@ -1512,7 +1512,7 @@ namespace AMDiS { bound.type = INTERIOR; - AtomicBoundary& b = myIntBoundary.getNewAtomic(it2->first); + AtomicBoundary& b = rankIntBoundary.getNewAtomic(it2->first); b = bound; if (geoIndex == EDGE) b.neighObj.reverseMode = elObjects.getEdgeReverseMode(rankBoundEl, it2->second); @@ -1683,7 +1683,7 @@ namespace AMDiS { // === share the bounday. === StdMpi<vector<AtomicBoundary> > stdMpi(mpiComm); - stdMpi.send(myIntBoundary.boundary); + stdMpi.send(rankIntBoundary.boundary); stdMpi.recv(otherIntBoundary.boundary); stdMpi.startCommunication(); @@ -1807,7 +1807,7 @@ namespace AMDiS { // === Create send DOFs. === for (int geo = FACE; geo >= VERTEX; geo--) { - for (InteriorBoundary::iterator it(myIntBoundary); !it.end(); ++it) { + for (InteriorBoundary::iterator it(rankIntBoundary); !it.end(); ++it) { if (it->rankObj.subObj == geo) { DofContainer dofs; it->rankObj.el->getAllDofs(feSpace, it->rankObj, dofs); @@ -1837,7 +1837,7 @@ namespace AMDiS { } } } else { - for (InteriorBoundary::iterator it(myIntBoundary); !it.end(); ++it) + for (InteriorBoundary::iterator it(rankIntBoundary); !it.end(); ++it) it->rankObj.el->getAllDofs(feSpace, it->rankObj, sendDofs.getDofCont(it.getRank(), feSpace)); @@ -2248,7 +2248,7 @@ namespace AMDiS { elObjects.serialize(out); - myIntBoundary.serialize(out); + rankIntBoundary.serialize(out); otherIntBoundary.serialize(out); periodicBoundary.serialize(out); @@ -2318,7 +2318,7 @@ namespace AMDiS { elObjects.deserialize(in); - myIntBoundary.deserialize(in, elIndexMap); + rankIntBoundary.deserialize(in, elIndexMap); otherIntBoundary.deserialize(in, elIndexMap); periodicBoundary.deserialize(in, elIndexMap); diff --git a/AMDiS/src/parallel/MeshDistributor.h b/AMDiS/src/parallel/MeshDistributor.h index 0a028bda354ce414a9d1dd01f854800077e6fd20..4b180eb001cbf3a4a7d3671b3f7c5d7a9e0029d5 100644 --- a/AMDiS/src/parallel/MeshDistributor.h +++ b/AMDiS/src/parallel/MeshDistributor.h @@ -618,7 +618,7 @@ namespace AMDiS { * owned by the rank, i.e., the object gives for every neighbour rank i * the boundaries this rank owns and shares with rank i. */ - InteriorBoundary myIntBoundary; + InteriorBoundary rankIntBoundary; /** \brief * Defines the interior boundaries of the domain that result from diff --git a/AMDiS/src/parallel/ParallelDebug.cc b/AMDiS/src/parallel/ParallelDebug.cc index f8e03a9a00b9f8a7496c5270518ed5c77e53b518..54bf712e9e334f3d6cd107fb17d2916a6f1eec29 100644 --- a/AMDiS/src/parallel/ParallelDebug.cc +++ b/AMDiS/src/parallel/ParallelDebug.cc @@ -31,7 +31,7 @@ namespace AMDiS { vector<int*> sendBuffers, recvBuffers; - MPI::Request request[pdb.myIntBoundary.boundary.size() + + MPI::Request request[pdb.rankIntBoundary.boundary.size() + pdb.otherIntBoundary.boundary.size() + pdb.periodicBoundary.boundary.size() * 2]; int requestCounter = 0; @@ -39,8 +39,8 @@ namespace AMDiS { // === Send rank's boundary information. === - for (RankToBoundMap::iterator rankIt = pdb.myIntBoundary.boundary.begin(); - rankIt != pdb.myIntBoundary.boundary.end(); ++rankIt) { + for (RankToBoundMap::iterator rankIt = pdb.rankIntBoundary.boundary.begin(); + rankIt != pdb.rankIntBoundary.boundary.end(); ++rankIt) { int nSendInt = rankIt->second.size(); int* buffer = new int[nSendInt]; @@ -753,7 +753,7 @@ namespace AMDiS { if (tmp <= 0) return; - for (InteriorBoundary::iterator it(pdb.myIntBoundary); !it.end(); ++it) { + for (InteriorBoundary::iterator it(pdb.rankIntBoundary); !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", it->rankObj.elIndex, it->rankObj.subObj, it->rankObj.ithObj); @@ -898,7 +898,7 @@ namespace AMDiS { { FUNCNAME("ParallelDebug::followBoundary()"); - for (InteriorBoundary::iterator it(pdb.myIntBoundary); !it.end(); ++it) + for (InteriorBoundary::iterator it(pdb.rankIntBoundary); !it.end(); ++it) if (followThisBound(it->rankObj.elIndex, it->neighObj.elIndex)) debug::writeLocalElementDofs(pdb.mpiRank, it->rankObj.elIndex,