Commit 26f42781 authored by Thomas Witkowski's avatar Thomas Witkowski
Browse files

Rename interior boundary object in mesh distributor.

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