Skip to content
GitLab
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
cb2326f0
Commit
cb2326f0
authored
Apr 08, 2010
by
Thomas Witkowski
Browse files
Merge between two AMDiS version, no real changes.
parent
4de3124c
Changes
1
Hide whitespace changes
Inline
Side-by-side
AMDiS/src/Assembler.cc
View file @
cb2326f0
...
...
@@ -120,23 +120,39 @@ namespace AMDiS {
}
if
(
firstOrderAssemblerGrdPsi
)
{
firstOrderAssemblerGrdPsi
->
calculateElementMatrix
(
smallElInfo
,
mat
);
if
(
largeElInfo
==
colElInfo
)
{
ERROR_EXIT
(
"123 Not yet implemented for first order assembler!
\n
"
);
}
else
{
firstOrderAssemblerGrdPsi
->
calculateElementMatrix
(
smallElInfo
,
mat
);
ElementMatrix
&
m
=
smallElInfo
->
getSubElemGradCoordsMat
(
rowFESpace
->
getBasisFcts
()
->
getDegree
());
tmpMat
=
m
*
mat
;
}
else
{
ElementMatrix
&
m
=
smallElInfo
->
getSubElemCoordsMat
(
rowFESpace
->
getBasisFcts
()
->
getDegree
());
tmpMat
=
mat
*
trans
(
m
);
mat
=
tmpMat
;
}
mat
=
tmpMat
;
}
if
(
firstOrderAssemblerGrdPhi
)
{
ERROR_EXIT
(
"Not yet implemented for first order assembler!
\n
"
);
firstOrderAssemblerGrdPhi
->
calculateElementMatrix
(
smallElInfo
,
mat
);
if
(
largeElInfo
==
rowElInfo
)
{
ElementMatrix
&
m
=
smallElInfo
->
getSubElemGradCoordsMat
(
rowFESpace
->
getBasisFcts
()
->
getDegree
());
tmpMat
=
mat
*
trans
(
m
);
}
else
{
ElementMatrix
&
m
=
smallElInfo
->
getSubElemCoordsMat
(
rowFESpace
->
getBasisFcts
()
->
getDegree
());
tmpMat
=
m
*
mat
;
}
mat
=
tmpMat
;
}
if
(
zeroOrderAssembler
)
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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