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
iwr
amdis
Commits
eca32883
Commit
eca32883
authored
Jul 22, 2011
by
Praetorius, Simon
Browse files
new method addTerm(..) as replacement for add*OrderTerm(..)
parent
ad7522f1
Changes
4
Hide whitespace changes
Inline
Side-by-side
AMDiS/src/AdaptInstationary.cc
View file @
eca32883
...
...
@@ -273,8 +273,6 @@ namespace AMDiS {
{
FUNCNAME
(
"AdaptInstationary::oneTimestep()"
);
MSG
(
"ONE TIMESTEP!
\n
"
);
adaptInfo
->
setTimestepIteration
(
0
);
switch
(
strategy
)
{
...
...
AMDiS/src/Operator.cc
View file @
eca32883
...
...
@@ -195,4 +195,36 @@ namespace AMDiS {
static_cast
<
SecondOrderTerm
*>
(
*
termIt
)
->
weakEval
(
grdUhAtQP
,
result
);
}
void
Operator
::
addTerm
(
ZeroOrderTerm
*
term
)
{
zeroOrder
.
push_back
(
term
);
term
->
operat
=
this
;
for
(
std
::
set
<
const
FiniteElemSpace
*>::
iterator
it
=
term
->
getAuxFeSpaces
().
begin
();
it
!=
term
->
getAuxFeSpaces
().
end
();
++
it
)
auxFeSpaces
.
insert
(
*
it
);
}
void
Operator
::
addTerm
(
FirstOrderTerm
*
term
,
FirstOrderType
type
)
{
if
(
type
==
GRD_PSI
)
{
firstOrderGrdPsi
.
push_back
(
term
);
}
else
{
firstOrderGrdPhi
.
push_back
(
term
);
}
term
->
operat
=
this
;
for
(
std
::
set
<
const
FiniteElemSpace
*>::
iterator
it
=
term
->
getAuxFeSpaces
().
begin
();
it
!=
term
->
getAuxFeSpaces
().
end
();
++
it
)
auxFeSpaces
.
insert
(
*
it
);
}
void
Operator
::
addTerm
(
SecondOrderTerm
*
term
)
{
secondOrder
.
push_back
(
term
);
term
->
operat
=
this
;
for
(
std
::
set
<
const
FiniteElemSpace
*>::
iterator
it
=
term
->
getAuxFeSpaces
().
begin
();
it
!=
term
->
getAuxFeSpaces
().
end
();
++
it
)
auxFeSpaces
.
insert
(
*
it
);
}
}
AMDiS/src/Operator.h
View file @
eca32883
...
...
@@ -90,6 +90,10 @@ namespace AMDiS {
template
<
typename
T
>
void
addZeroOrderTerm
(
T
*
term
);
void
addTerm
(
ZeroOrderTerm
*
term
);
void
addTerm
(
FirstOrderTerm
*
term
,
FirstOrderType
type
);
void
addTerm
(
SecondOrderTerm
*
term
);
/** \brief
* Calculates the element matrix for this ElInfo and adds it multiplied by
...
...
AMDiS/src/RefinementManager3d.cc
View file @
eca32883
...
...
@@ -414,7 +414,9 @@ namespace AMDiS {
return
true
;
int
oppVertex
=
(
*
elInfo
)
->
getOppVertex
(
localNeighbour
);
#if DEBUG
int
testIndex
=
(
*
elInfo
)
->
getNeighbour
(
localNeighbour
)
->
getIndex
();
#endif
ElInfo
*
neighInfo
=
stack
->
traverseNeighbour3d
((
*
elInfo
),
localNeighbour
);
int
neighElType
=
neighInfo
->
getType
();
...
...
@@ -559,7 +561,10 @@ namespace AMDiS {
if
(
neighInfo
->
getNeighbour
(
i
))
{
oppVertex
=
neighInfo
->
getOppVertex
(
i
);
#if DEBUG
int
testIndex
=
neighInfo
->
getNeighbour
(
i
)
->
getIndex
();
#endif
neighInfo
=
stack
->
traverseNeighbour3d
(
neighInfo
,
i
);
...
...
@@ -591,7 +596,9 @@ namespace AMDiS {
(
"While looping back domains boundary was reached or i == 0
\n
"
);
oppVertex
=
refineList
.
getOppVertex
(
i
--
,
0
);
#if DEBUG
int
testIndex
=
neighInfo
->
getNeighbour
(
oppVertex
)
->
getIndex
();
#endif
neighInfo
=
stack
->
traverseNeighbour3d
(
neighInfo
,
oppVertex
);
int
edgeDof0
,
edgeDof1
;
...
...
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