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
26f42781
Commit
26f42781
authored
Feb 01, 2012
by
Thomas Witkowski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename interior boundary object in mesh distributor.
parent
7c4c35f6
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
14 deletions
+14
-14
AMDiS/src/parallel/MeshDistributor.cc
AMDiS/src/parallel/MeshDistributor.cc
+8
-8
AMDiS/src/parallel/MeshDistributor.h
AMDiS/src/parallel/MeshDistributor.h
+1
-1
AMDiS/src/parallel/ParallelDebug.cc
AMDiS/src/parallel/ParallelDebug.cc
+5
-5
No files found.
AMDiS/src/parallel/MeshDistributor.cc
View file @
26f42781
...
...
@@ -796,7 +796,7 @@ namespace AMDiS {
// important. Therefore, we add all boundaries to one boundary container.
RankToBoundMap
allBound
;
for
(
InteriorBoundary
::
iterator
it
(
my
IntBoundary
);
!
it
.
end
();
++
it
)
for
(
InteriorBoundary
::
iterator
it
(
rank
IntBoundary
);
!
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. ===
my
IntBoundary
.
clear
();
rank
IntBoundary
.
clear
();
otherIntBoundary
.
clear
();
periodicBoundary
.
clear
();
...
...
@@ -1512,7 +1512,7 @@ namespace AMDiS {
bound
.
type
=
INTERIOR
;
AtomicBoundary
&
b
=
my
IntBoundary
.
getNewAtomic
(
it2
->
first
);
AtomicBoundary
&
b
=
rank
IntBoundary
.
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
(
my
IntBoundary
.
boundary
);
stdMpi
.
send
(
rank
IntBoundary
.
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
(
my
IntBoundary
);
!
it
.
end
();
++
it
)
{
for
(
InteriorBoundary
::
iterator
it
(
rank
IntBoundary
);
!
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
(
my
IntBoundary
);
!
it
.
end
();
++
it
)
for
(
InteriorBoundary
::
iterator
it
(
rank
IntBoundary
);
!
it
.
end
();
++
it
)
it
->
rankObj
.
el
->
getAllDofs
(
feSpace
,
it
->
rankObj
,
sendDofs
.
getDofCont
(
it
.
getRank
(),
feSpace
));
...
...
@@ -2248,7 +2248,7 @@ namespace AMDiS {
elObjects
.
serialize
(
out
);
my
IntBoundary
.
serialize
(
out
);
rank
IntBoundary
.
serialize
(
out
);
otherIntBoundary
.
serialize
(
out
);
periodicBoundary
.
serialize
(
out
);
...
...
@@ -2318,7 +2318,7 @@ namespace AMDiS {
elObjects
.
deserialize
(
in
);
my
IntBoundary
.
deserialize
(
in
,
elIndexMap
);
rank
IntBoundary
.
deserialize
(
in
,
elIndexMap
);
otherIntBoundary
.
deserialize
(
in
,
elIndexMap
);
periodicBoundary
.
deserialize
(
in
,
elIndexMap
);
...
...
AMDiS/src/parallel/MeshDistributor.h
View file @
26f42781
...
...
@@ -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
my
IntBoundary
;
InteriorBoundary
rank
IntBoundary
;
/** \brief
* Defines the interior boundaries of the domain that result from
...
...
AMDiS/src/parallel/ParallelDebug.cc
View file @
26f42781
...
...
@@ -31,7 +31,7 @@ namespace AMDiS {
vector
<
int
*>
sendBuffers
,
recvBuffers
;
MPI
::
Request
request
[
pdb
.
my
IntBoundary
.
boundary
.
size
()
+
MPI
::
Request
request
[
pdb
.
rank
IntBoundary
.
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
.
my
IntBoundary
.
boundary
.
begin
();
rankIt
!=
pdb
.
my
IntBoundary
.
boundary
.
end
();
++
rankIt
)
{
for
(
RankToBoundMap
::
iterator
rankIt
=
pdb
.
rank
IntBoundary
.
boundary
.
begin
();
rankIt
!=
pdb
.
rank
IntBoundary
.
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
.
my
IntBoundary
);
!
it
.
end
();
++
it
)
{
for
(
InteriorBoundary
::
iterator
it
(
pdb
.
rank
IntBoundary
);
!
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
.
my
IntBoundary
);
!
it
.
end
();
++
it
)
for
(
InteriorBoundary
::
iterator
it
(
pdb
.
rank
IntBoundary
);
!
it
.
end
();
++
it
)
if
(
followThisBound
(
it
->
rankObj
.
elIndex
,
it
->
neighObj
.
elIndex
))
debug
::
writeLocalElementDofs
(
pdb
.
mpiRank
,
it
->
rankObj
.
elIndex
,
...
...
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