Commit eca32883 authored by Praetorius, Simon's avatar Praetorius, Simon
Browse files

new method addTerm(..) as replacement for add*OrderTerm(..)

parent ad7522f1
......@@ -273,8 +273,6 @@ namespace AMDiS {
{
FUNCNAME("AdaptInstationary::oneTimestep()");
MSG("ONE TIMESTEP!\n");
adaptInfo->setTimestepIteration(0);
switch (strategy) {
......
......@@ -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);
}
}
......@@ -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
......
......@@ -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;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment