Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Backofen, Rainer
amdis
Commits
11896692
Commit
11896692
authored
Jul 30, 2010
by
Thomas Witkowski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removed unnecessary debug output.
parent
9bb9b920
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
87 deletions
+1
-87
AMDiS/src/parallel/MeshDistributor.cc
AMDiS/src/parallel/MeshDistributor.cc
+1
-87
No files found.
AMDiS/src/parallel/MeshDistributor.cc
View file @
11896692
...
...
@@ -552,8 +552,6 @@ namespace AMDiS {
for
(
RankToBoundMap
::
iterator
it
=
allBound
.
begin
();
it
!=
allBound
.
end
();
++
it
)
{
// MSG("HAVE %d BOUNDARIES WITH RANK %d!\n", it->second.size(), it->first);
for
(
std
::
vector
<
AtomicBoundary
>::
iterator
boundIt
=
it
->
second
.
begin
();
boundIt
!=
it
->
second
.
end
();
++
boundIt
)
{
MeshStructure
elCode
;
...
...
@@ -571,15 +569,6 @@ namespace AMDiS {
bool
meshFitTogether
=
true
;
// if (mpiRank == 0) {
// debug::highlightElementIndexMesh(mesh, 139, "rank0_139.vtu");
// debug::highlightElementIndexMesh(mesh, 161, "rank0_161.vtu");
// debug::printElementHierarchie(mesh, 139);
// } else {
// debug::highlightElementIndexMesh(mesh, 137, "rank1_137.vtu");
// debug::highlightElementIndexMesh(mesh, 163, "rank1_163.vtu");
// }
for
(
RankToBoundMap
::
iterator
it
=
allBound
.
begin
();
it
!=
allBound
.
end
();
++
it
)
{
MeshCodeVec
&
recvCodes
=
stdMpi
.
getRecvData
()[
it
->
first
];
...
...
@@ -589,31 +578,11 @@ namespace AMDiS {
boundIt
!=
it
->
second
.
end
();
++
boundIt
)
{
MeshStructure
elCode
;
// if (i == 13)
// elCode.setDebugMode(true);
elCode
.
init
(
boundIt
->
rankObj
);
if
(
elCode
.
getCode
()
!=
recvCodes
[
i
].
getCode
())
{
TEST_EXIT_DBG
(
refineManager
)(
"Refinement manager is not set correctly!
\n
"
);
/*
MSG("----------------------------------------------------------------\n");
MSG("CODE %d: MESH SUB OBJ = %d INDEX = %d ITH = %d REVERSE = %d\n",
i,
boundIt->rankObj.subObj,
boundIt->rankObj.el->getIndex(),
boundIt->rankObj.ithObj,
boundIt->rankObj.reverseMode);
MSG("RANK CODE: \n");
elCode.print();
elCode.reset();
MSG("OTHER CODE: \n");
recvCodes[i].print();
recvCodes[i].reset();
*/
bool
b
=
fitElementToMeshCode
(
recvCodes
[
i
],
boundIt
->
rankObj
.
el
,
boundIt
->
rankObj
.
subObj
,
...
...
@@ -621,25 +590,10 @@ namespace AMDiS {
boundIt
->
rankObj
.
elType
,
boundIt
->
neighObj
.
reverseMode
);
// MSG("Mesh changed in bound from %d to %d: %d\n", mpiRank, it->first, b);
if
(
b
)
meshFitTogether
=
false
;
}
else
{
/*
MSG("----------------------------------------------------------------\n");
MSG("CODE %d is equal!\n", i);
MSG("RANK CODE: \n");
elCode.print();
elCode.reset();
MSG("OTHER CODE: \n");
recvCodes[i].print();
recvCodes[i].reset();
*/
}
i
++
;
}
}
...
...
@@ -662,13 +616,6 @@ namespace AMDiS {
if
(
code
.
empty
())
return
false
;
// MSG("FIT EL %d!\n", el->getIndex());
// if (mpiRank == 0) {
// debug::highlightElementIndexMesh(mesh, 139, "test.vtu");
// }
// MSG("REVERSE MODE = %d\n", reverseMode);
int
s1
=
el
->
getSubObjOfChild
(
0
,
subObj
,
ithObj
,
elType
);
int
s2
=
el
->
getSubObjOfChild
(
1
,
subObj
,
ithObj
,
elType
);
...
...
@@ -683,10 +630,7 @@ namespace AMDiS {
traverseFlag
|=
Mesh
::
CALL_REVERSE_MODE
;
}
// MSG("SUB-OBJ (SWAPED): %d %d\n", s1, s2);
if
(
s1
!=
-
1
&&
s2
!=
-
1
)
{
// MSG("GO TO FIT 1\n");
TraverseStack
stack
;
ElInfo
*
elInfo
=
stack
.
traverseFirst
(
el
->
getMesh
(),
-
1
,
traverseFlag
);
while
(
elInfo
&&
elInfo
->
getElement
()
!=
el
)
...
...
@@ -694,8 +638,6 @@ namespace AMDiS {
TEST_EXIT_DBG
(
elInfo
->
getElement
()
==
el
)(
"This should not happen!
\n
"
);
// MSG("START WITH EL = %d\n", elInfo->getElement()->getIndex());
meshChanged
=
fitElementToMeshCode2
(
code
,
stack
,
subObj
,
ithObj
,
elType
,
reverseMode
);
return
meshChanged
;
}
...
...
@@ -704,8 +646,6 @@ namespace AMDiS {
if
(
code
.
getNumElements
()
==
1
&&
code
.
isLeafElement
())
return
false
;
// MSG("GO TO FIT 2\n");
meshChanged
=
true
;
TraverseStack
stack
;
...
...
@@ -729,8 +669,6 @@ namespace AMDiS {
std
::
swap
(
child0
,
child1
);
if
(
s1
!=
-
1
)
{
// MSG("GO TO FIT 3\n");
TraverseStack
stack
;
ElInfo
*
elInfo
=
stack
.
traverseFirst
(
el
->
getMesh
(),
-
1
,
traverseFlag
);
...
...
@@ -741,8 +679,6 @@ namespace AMDiS {
meshChanged
|=
fitElementToMeshCode2
(
code
,
stack
,
subObj
,
s1
,
el
->
getChildType
(
elType
),
reverseMode
);
}
else
{
// MSG("GO TO FIT 4\n");
TraverseStack
stack
;
ElInfo
*
elInfo
=
stack
.
traverseFirst
(
el
->
getMesh
(),
-
1
,
traverseFlag
);
...
...
@@ -768,12 +704,6 @@ namespace AMDiS {
FUNCNAME
(
"MeshDistributor::fitElementToMeshCode2()"
);
ElInfo
*
elInfo
=
stack
.
getElInfo
();
// MSG("IN %d\n", elInfo->getElement()->getIndex());
// MeshStructure c = code;
// c.print(false);
bool
value
=
false
;
if
(
!
elInfo
)
return
value
;
...
...
@@ -781,19 +711,12 @@ namespace AMDiS {
Element
*
el
=
elInfo
->
getElement
();
if
(
code
.
isLeafElement
())
{
// MSG("HERE 1\n");
int
level
=
elInfo
->
getLevel
();
do
{
elInfo
=
stack
.
traverseNext
(
elInfo
);
}
while
(
elInfo
&&
elInfo
->
getLevel
()
>
level
);
// if (elInfo) {
// MSG("NEXT ELEMENT IS: %d\n", elInfo->getElement()->getIndex());
// } else {
// MSG("NO NEXT ELEMENT!\n");
// }
return
value
;
}
...
...
@@ -801,10 +724,6 @@ namespace AMDiS {
return
value
;
if
(
el
->
isLeaf
())
{
// MSG("HERE 2: %d\n", el->getIndex());
// if (mpiRank == 0) {
// debug::highlightElementIndexMesh(mesh, 1592, "test_1592.vtu");
// }
el
->
setMark
(
1
);
refineManager
->
setMesh
(
el
->
getMesh
());
refineManager
->
setStack
(
&
stack
);
...
...
@@ -822,27 +741,22 @@ namespace AMDiS {
}
if
(
s1
!=
-
1
)
{
// MSG("HERE 3\n");
stack
.
traverseNext
(
elInfo
);
code
.
nextElement
();
value
|=
fitElementToMeshCode2
(
code
,
stack
,
subObj
,
s1
,
el
->
getChildType
(
elType
),
reverseMode
);
elInfo
=
stack
.
getElInfo
();
}
else
{
// MSG("HERE 4\n");
do
{
elInfo
=
stack
.
traverseNext
(
elInfo
);
}
while
(
elInfo
&&
elInfo
->
getElement
()
!=
child1
);
// MSG("S1 == -1 -> SWITCHED TO EL: %d\n", elInfo->getElement()->getIndex());
}
TEST_EXIT_DBG
(
elInfo
->
getElement
()
==
child1
)(
"This should not happen!
\n
"
);
if
(
s2
!=
-
1
)
{
// MSG("HERE 5\n");
code
.
nextElement
();
value
|=
fitElementToMeshCode2
(
code
,
stack
,
subObj
,
s2
,
el
->
getChildType
(
elType
),
reverseMode
);
}
else
{
// MSG("HERE 6\n");
int
level
=
elInfo
->
getLevel
();
do
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment