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
Backofen, Rainer
amdis
Commits
8e323a3f
Commit
8e323a3f
authored
Apr 29, 2009
by
Thomas Witkowski
Browse files
Removed bug for assembling matrices in vectorial problems.
parent
9c259dfb
Changes
1
Hide whitespace changes
Inline
Side-by-side
AMDiS/src/ProblemVec.cc
View file @
8e323a3f
...
...
@@ -678,7 +678,7 @@ namespace AMDiS {
componentSpaces
[
j
]
->
getAdmin
()
->
getUsedSize
());
// Reuse old sparsity information (if available) or default
dof_matrix
->
startInsertion
(
nnz_per_row
);
//
dof_matrix->startInsertion(nnz_per_row);
}
}
}
...
...
@@ -800,8 +800,8 @@ namespace AMDiS {
// Finish insertion
for
(
int
i
=
0
;
i
<
nComponents
;
i
++
)
for
(
int
j
=
0
;
j
<
nComponents
;
j
++
)
if
((
*
systemMatrix
)[
i
][
j
])
(
*
systemMatrix
)[
i
][
j
]
->
finishInsertion
();
if
((
*
systemMatrix
)[
i
][
j
])
(
*
systemMatrix
)[
i
][
j
]
->
finishInsertion
();
solverMatrix
.
setMatrix
(
*
systemMatrix
);
createPrecon
();
...
...
@@ -1080,13 +1080,29 @@ namespace AMDiS {
#ifdef _OPENMP
#pragma omp critical
#endif
{
matrix
->
getBaseMatrix
()
+=
tmpMatrix
->
getBaseMatrix
();
matrix
->
getBaseMatrix
()
+=
tmpMatrix
->
getBaseMatrix
();
}
// Remove rows corresponding to DOFs on a Dirichlet boundary.
matrix
->
removeRowsWithDBC
(
tmpMatrix
->
getApplyDBCs
());
#ifdef _OPENMP
#pragma omp barrier
#endif
#ifdef _OPENMP
#pragma omp master
#endif
{
if
(
matrix
)
{
matrix
->
startInsertion
();
}
}
if
(
matrix
)
{
// Remove rows corresponding to DOFs on a Dirichlet boundary.
#ifdef _OPENMP
#pragma omp critical
#endif
matrix
->
removeRowsWithDBC
(
tmpMatrix
->
getApplyDBCs
());
DELETE
tmpMatrix
;
}
...
...
Write
Preview
Supports
Markdown
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