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
Aland, Sebastian
amdis
Commits
1880b10d
Commit
1880b10d
authored
Apr 23, 2012
by
Thomas Witkowski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed some small bugs in multilevel FETI-DP.
parent
e81c50d2
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
28 additions
and
13 deletions
+28
-13
AMDiS/src/parallel/InteriorBoundary.h
AMDiS/src/parallel/InteriorBoundary.h
+3
-0
AMDiS/src/parallel/MeshDistributor.cc
AMDiS/src/parallel/MeshDistributor.cc
+6
-3
AMDiS/src/parallel/ParallelDofMapping.cc
AMDiS/src/parallel/ParallelDofMapping.cc
+4
-1
AMDiS/src/parallel/PetscSolverFeti.cc
AMDiS/src/parallel/PetscSolverFeti.cc
+15
-9
No files found.
AMDiS/src/parallel/InteriorBoundary.h
View file @
1880b10d
...
...
@@ -113,9 +113,12 @@ namespace AMDiS {
{
if
(
level
>
0
)
{
int
r
=
levelData
->
mapRank
(
mapIt
->
first
,
level
-
1
,
level
);
TEST_EXIT_DBG
(
r
>=
0
)
(
"Mapping rank %d from level % to level %d does not work!
\n
"
,
mapIt
->
first
,
level
-
1
,
level
);
return
r
;
}
return
mapIt
->
first
;
...
...
AMDiS/src/parallel/MeshDistributor.cc
View file @
1880b10d
...
...
@@ -1873,7 +1873,8 @@ namespace AMDiS {
}
void
MeshDistributor
::
createBoundaryDofs
(
const
FiniteElemSpace
*
feSpace
,
int
level
)
void
MeshDistributor
::
createBoundaryDofs
(
const
FiniteElemSpace
*
feSpace
,
int
level
)
{
FUNCNAME
(
"MeshDistributor::createBoundaryDofs()"
);
...
...
@@ -1893,7 +1894,8 @@ namespace AMDiS {
DofContainer
dofs
;
it
->
rankObj
.
el
->
getAllDofs
(
feSpace
,
it
->
rankObj
,
dofs
);
DofContainer
&
tmp
=
sendDofs
.
getDofContainer
(
it
.
getRank
(),
feSpace
,
level
);
DofContainer
&
tmp
=
sendDofs
.
getDofContainer
(
it
.
getRank
(),
feSpace
,
level
);
tmp
.
insert
(
tmp
.
end
(),
dofs
.
begin
(),
dofs
.
end
());
if
(
createBoundaryDofFlag
.
isSet
(
BOUNDARY_FILL_INFO_SEND_DOFS
))
...
...
@@ -1910,7 +1912,8 @@ namespace AMDiS {
DofContainer
dofs
;
it
->
rankObj
.
el
->
getAllDofs
(
feSpace
,
it
->
rankObj
,
dofs
);
DofContainer
&
tmp
=
recvDofs
.
getDofContainer
(
it
.
getRank
(),
feSpace
,
level
);
DofContainer
&
tmp
=
recvDofs
.
getDofContainer
(
it
.
getRank
(),
feSpace
,
level
);
tmp
.
insert
(
tmp
.
end
(),
dofs
.
begin
(),
dofs
.
end
());
if
(
createBoundaryDofFlag
.
isSet
(
BOUNDARY_FILL_INFO_RECV_DOFS
))
...
...
AMDiS/src/parallel/ParallelDofMapping.cc
View file @
1880b10d
...
...
@@ -87,6 +87,7 @@ namespace AMDiS {
// === other ranks that also include this DOF. ===
StdMpi
<
vector
<
int
>
>
stdMpi
(
levelData
->
getMpiComm
(
level
));
for
(
DofComm
::
Iterator
it
(
*
sendDofs
,
level
,
feSpace
);
!
it
.
end
();
it
.
nextRank
())
for
(;
!
it
.
endDofIter
();
it
.
nextDof
())
...
...
@@ -108,7 +109,7 @@ namespace AMDiS {
}
}
if
(
recvFromRank
)
if
(
recvFromRank
)
stdMpi
.
recv
(
it
.
getRank
());
}
...
...
@@ -159,6 +160,8 @@ namespace AMDiS {
{
FUNCNAME
(
"ParallelDofMapping::clear()"
);
TEST_EXIT_DBG
(
levelData
)(
"No mesh level data object defined!
\n
"
);
for
(
vector
<
const
FiniteElemSpace
*>::
iterator
it
=
feSpacesUnique
.
begin
();
it
!=
feSpacesUnique
.
end
();
++
it
)
data
[
*
it
].
clear
();
...
...
AMDiS/src/parallel/PetscSolverFeti.cc
View file @
1880b10d
...
...
@@ -284,29 +284,35 @@ namespace AMDiS {
dualDofMap
.
clear
();
lagrangeMap
.
clear
();
localDofMap
.
clear
();
interiorDofMap
.
clear
();
if
(
fetiPreconditioner
==
FETI_DIRICHLET
)
interiorDofMap
.
clear
();
primalDofMap
.
setDofComm
(
meshDistributor
->
getSendDofs
(),
meshDistributor
->
getRecvDofs
());
lagrangeMap
.
setDofComm
(
meshDistributor
->
getSendDofs
(),
meshDistributor
->
getRecvDofs
());
for
(
unsigned
int
i
=
0
;
i
<
meshDistributor
->
getFeSpaces
().
size
();
i
++
)
{
const
FiniteElemSpace
*
feSpace
=
meshDistributor
->
getFeSpace
(
i
);
createPrimals
(
feSpace
);
createDuals
(
feSpace
);
createLagrange
(
feSpace
);
createDuals
(
feSpace
);
createIndexB
(
feSpace
);
}
primalDofMap
.
setDofComm
(
meshDistributor
->
getSendDofs
(),
meshDistributor
->
getRecvDofs
());
lagrangeMap
.
setDofComm
(
meshDistributor
->
getSendDofs
(),
meshDistributor
->
getRecvDofs
());
primalDofMap
.
update
();
dualDofMap
.
update
();
lagrangeMap
.
update
();
localDofMap
.
update
();
if
(
fetiPreconditioner
!=
FETI_NONE
)
interiorDofMap
.
update
();
for
(
unsigned
int
i
=
0
;
i
<
meshDistributor
->
getFeSpaces
().
size
();
i
++
)
{
const
FiniteElemSpace
*
feSpace
=
meshDistributor
->
getFeSpace
(
i
);
createLagrange
(
feSpace
);
}
lagrangeMap
.
update
();
for
(
unsigned
int
i
=
0
;
i
<
meshDistributor
->
getFeSpaces
().
size
();
i
++
)
{
const
FiniteElemSpace
*
feSpace
=
meshDistributor
->
getFeSpace
(
i
);
MSG
(
"FETI-DP data for %d-ith FE space:
\n
"
,
i
);
...
...
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