From 91d631060ba0be0c3554fc2fb4380063d3765177 Mon Sep 17 00:00:00 2001
From: Simon Praetorius <simon.praetorius@tu-dresden.de>
Date: Mon, 25 Jul 2011 06:21:57 +0000
Subject: [PATCH] some small style-guide changes
---
AMDiS/src/Operator.cc | 24 +++++-------------------
AMDiS/src/Operator.h | 13 +++++++++----
2 files changed, 14 insertions(+), 23 deletions(-)
diff --git a/AMDiS/src/Operator.cc b/AMDiS/src/Operator.cc
index 8e5ea6cd..946b8d4b 100644
--- a/AMDiS/src/Operator.cc
+++ b/AMDiS/src/Operator.cc
@@ -198,33 +198,19 @@ namespace AMDiS {
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);
+ addZeroOrderTerm(term);
}
+
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);
+ addFirstOrderTerm(term, type);
}
+
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);
+ addSecondOrderTerm(term);
}
}
diff --git a/AMDiS/src/Operator.h b/AMDiS/src/Operator.h
index 2f5badc5..1658e758 100644
--- a/AMDiS/src/Operator.h
+++ b/AMDiS/src/Operator.h
@@ -78,21 +78,26 @@ namespace AMDiS {
return optimized;
}
- /// Adds a SecondOrderTerm to the Operator
+ /// Adds a ZeroOrderTerm to the Operator
template <typename T>
- void addSecondOrderTerm(T *term);
+ void addZeroOrderTerm(T *term);
/// Adds a FirstOrderTerm to the Operator
template <typename T>
void addFirstOrderTerm(T *term, FirstOrderType type = GRD_PHI);
- /// Adds a ZeroOrderTerm to the Operator
+ /// Adds a SecondOrderTerm to the Operator
template <typename T>
- void addZeroOrderTerm(T *term);
+ void addSecondOrderTerm(T *term);
+ /// Adds a ZeroOrderTerm to the Operator
void addTerm(ZeroOrderTerm *term);
+
+ /// Adds a FirstOrderTerm to the Operator
void addTerm(FirstOrderTerm *term,
FirstOrderType type);
+
+ /// Adds a SecondOrderTerm to the Operator
void addTerm(SecondOrderTerm *term);
/** \brief
--
GitLab