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
Aland, Sebastian
amdis
Commits
b34cd343
Commit
b34cd343
authored
Feb 25, 2010
by
Thomas Witkowski
Browse files
Simple merge between two AMDiS directories.
parent
55d33f24
Changes
2
Hide whitespace changes
Inline
Side-by-side
AMDiS/src/DOFVector.cc
View file @
b34cd343
...
...
@@ -752,10 +752,9 @@ namespace AMDiS {
TEST_EXIT_DBG
(
quad
||
quadFast
)(
"neither quad nor quadFast defined
\n
"
);
if
(
quad
&&
quadFast
)
{
if
(
quad
&&
quadFast
)
TEST_EXIT_DBG
(
quad
==
quadFast
->
getQuadrature
())
(
"quad != quadFast->quadrature
\n
"
);
}
TEST_EXIT_DBG
(
!
quadFast
||
quadFast
->
getBasisFunctions
()
==
feSpace
->
getBasisFcts
())
(
"invalid basis functions"
);
...
...
AMDiS/src/ProblemVec.cc
View file @
b34cd343
...
...
@@ -789,6 +789,8 @@ namespace AMDiS {
assembleFlag
);
}
// exit(0);
solverMatrix
.
setMatrix
(
*
systemMatrix
);
createPrecon
();
...
...
@@ -1201,12 +1203,10 @@ namespace AMDiS {
&
rowElInfo
,
&
colElInfo
,
&
smallElInfo
,
&
largeElInfo
);
while
(
cont
)
{
#if 0
std
::
cout
<<
"ROW = "
<<
rowElInfo
->
getElement
()
->
getIndex
()
<<
" "
<<
"COL = "
<<
colElInfo
->
getElement
()
->
getIndex
()
<<
" "
<<
"SMA = "
<<
smallElInfo
->
getElement
()
->
getIndex
()
<<
" "
<<
"LAR = "
<<
largeElInfo
->
getElement
()
->
getIndex
()
<<
std
::
endl
;
#endif
if
(
useGetBound
)
basisFcts
->
getBound
(
rowElInfo
,
bound
);
...
...
@@ -1225,7 +1225,7 @@ namespace AMDiS {
}
if
(
matrix
)
matrix
->
removeRowsWithDBC
(
matrix
->
getApplyDBCs
());
matrix
->
removeRowsWithDBC
(
matrix
->
getApplyDBCs
());
if
(
useGetBound
)
delete
[]
bound
;
...
...
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