Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
iwr
amdis
Commits
6f7099bc
Commit
6f7099bc
authored
Jul 31, 2012
by
Thomas Witkowski
Browse files
And one fix more.
parent
fdc6689c
Changes
3
Hide whitespace changes
Inline
Side-by-side
AMDiS/src/parallel/ElementObjectDatabase.cc
View file @
6f7099bc
...
...
@@ -461,12 +461,14 @@ namespace AMDiS {
{
FUNCNAME
(
"ElementObjectDatabase::updateRankData()"
);
TEST_EXIT
(
macroElementRankMap
)(
"Should not happen!
\n
"
);
vertexInRank
.
clear
();
for
(
map
<
DegreeOfFreedom
,
vector
<
ElementObjectData
>
>::
iterator
it
=
vertexElements
.
begin
();
it
!=
vertexElements
.
end
();
++
it
)
{
for
(
vector
<
ElementObjectData
>::
iterator
it2
=
it
->
second
.
begin
();
it2
!=
it
->
second
.
end
();
++
it2
)
{
int
elementInRank
=
(
*
macroElementRankMap
)[
it2
->
elIndex
];
int
elementInRank
=
(
*
macroElementRankMap
)[
it2
->
elIndex
];
if
(
it2
->
elIndex
>
vertexInRank
[
it
->
first
][
elementInRank
].
elIndex
)
vertexInRank
[
it
->
first
][
elementInRank
]
=
*
it2
;
}
...
...
AMDiS/src/parallel/ElementObjectDatabase.h
View file @
6f7099bc
...
...
@@ -415,6 +415,13 @@ namespace AMDiS {
return
macroElIndexTypeMap
[
index
];
}
void
setData
(
map
<
int
,
int
>
&
rankMap
,
MeshLevelData
&
ld
)
{
macroElementRankMap
=
&
rankMap
;
levelData
=
&
ld
;
}
/// Write the element database to disk.
void
serialize
(
ostream
&
out
);
...
...
AMDiS/src/parallel/MeshDistributor.cc
View file @
6f7099bc
...
...
@@ -163,6 +163,9 @@ namespace AMDiS {
elObjDb
.
setFeSpace
(
feSpaces
[
0
]);
// If required, create hierarchical mesh level structure.
createMeshLevelStructure
();
// If the problem has been already read from a file, we need only to set
// isRankDofs to all matrices and rhs vector and to remove periodic
// boundary conditions (if there are some).
...
...
@@ -179,6 +182,8 @@ namespace AMDiS {
setRankDofs
();
elObjDb
.
setData
(
partitionMap
,
levelData
);
#if (DEBUG != 0)
ParallelDebug
::
writeDebugFile
(
feSpaces
[
feSpaces
.
size
()
-
1
],
dofMap
,
debugOutputDir
+
"mpi-dbg"
,
"dat"
);
...
...
@@ -229,9 +234,6 @@ namespace AMDiS {
}
}
// If required, create hierarchical mesh level structure.
createMeshLevelStructure
();
// Create interior boundary information.
createInteriorBoundary
(
true
);
...
...
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