Commit 2e10969e authored by Praetorius, Simon's avatar Praetorius, Simon
Browse files

MS Windows compatibility and Warnings removed

parent 3484b9be
...@@ -617,13 +617,13 @@ namespace AMDiS { ...@@ -617,13 +617,13 @@ namespace AMDiS {
} }
/// Returns \ref refineBisections /// Returns \ref refineBisections
inline const int getRefineBisections(int index) const inline int getRefineBisections(int index) const
{ {
return scalContents[index]->refineBisections; return scalContents[index]->refineBisections;
} }
/// Returns \ref coarseBisections /// Returns \ref coarseBisections
inline const int getCoarseBisections(int index) const inline int getCoarseBisections(int index) const
{ {
return scalContents[index]->coarseBisections; return scalContents[index]->coarseBisections;
} }
...@@ -679,7 +679,7 @@ namespace AMDiS { ...@@ -679,7 +679,7 @@ namespace AMDiS {
} }
/// Returns true, if the adaptive procedure was deserialized from a file. /// Returns true, if the adaptive procedure was deserialized from a file.
const bool isDeserialized() const bool isDeserialized() const
{ {
return deserialized; return deserialized;
} }
......
...@@ -83,7 +83,7 @@ namespace AMDiS { ...@@ -83,7 +83,7 @@ namespace AMDiS {
} }
/// Returns \ref strategy /// Returns \ref strategy
const int getStrategy() const int getStrategy() const
{ {
return strategy; return strategy;
} }
......
...@@ -125,19 +125,19 @@ namespace AMDiS { ...@@ -125,19 +125,19 @@ namespace AMDiS {
virtual void getBound(const ElInfo*, BoundaryType *) const {} virtual void getBound(const ElInfo*, BoundaryType *) const {}
/// Returns \ref degree of BasisFunction /// Returns \ref degree of BasisFunction
inline const int getDegree() const inline int getDegree() const
{ {
return degree; return degree;
} }
/// Returns \ref dim of BasisFunction /// Returns \ref dim of BasisFunction
inline const int getDim() const inline int getDim() const
{ {
return dim; return dim;
} }
/// Returns \ref nBasFcts which is the number of local basis functions /// Returns \ref nBasFcts which is the number of local basis functions
inline const int getNumber() const inline int getNumber() const
{ {
return nBasFcts; return nBasFcts;
} }
......
...@@ -121,25 +121,25 @@ namespace AMDiS { ...@@ -121,25 +121,25 @@ namespace AMDiS {
*/ */
/// Returns \ref sizeUsed. /// Returns \ref sizeUsed.
inline const int getUsedSize() const inline int getUsedSize() const
{ {
return sizeUsed; return sizeUsed;
} }
/// Returns \ref size /// Returns \ref size
inline const int getSize() const inline int getSize() const
{ {
return size; return size;
} }
/// Returns \ref usedCount /// Returns \ref usedCount
inline const int getUsedDofs() const inline int getUsedDofs() const
{ {
return usedCount; return usedCount;
} }
/// Returns \ref holeCount /// Returns \ref holeCount
inline const int getHoleCount() const inline int getHoleCount() const
{ {
return holeCount; return holeCount;
} }
...@@ -151,7 +151,7 @@ namespace AMDiS { ...@@ -151,7 +151,7 @@ namespace AMDiS {
} }
/// Returns \ref nDof[i], i.e., the number of DOFs for the position i. /// Returns \ref nDof[i], i.e., the number of DOFs for the position i.
inline const int getNumberOfDofs(int i) const inline int getNumberOfDofs(int i) const
{ {
return nDof[i]; return nDof[i];
} }
...@@ -163,7 +163,7 @@ namespace AMDiS { ...@@ -163,7 +163,7 @@ namespace AMDiS {
} }
/// Returns \ref nPreDof[i] /// Returns \ref nPreDof[i]
inline const int getNumberOfPreDofs(int i) const inline int getNumberOfPreDofs(int i) const
{ {
return nPreDof[i]; return nPreDof[i];
} }
...@@ -187,7 +187,7 @@ namespace AMDiS { ...@@ -187,7 +187,7 @@ namespace AMDiS {
} }
/// Returns if the given DOF is free. /// Returns if the given DOF is free.
inline const bool isDofFree(int i) const inline bool isDofFree(int i) const
{ {
return dofFree[i]; return dofFree[i];
} }
......
...@@ -154,33 +154,33 @@ namespace AMDiS { ...@@ -154,33 +154,33 @@ namespace AMDiS {
operatorEstFactor.push_back(estFactor); operatorEstFactor.push_back(estFactor);
} }
inline vector<double*>::iterator getOperatorFactorBegin() inline std::vector<double*>::iterator getOperatorFactorBegin()
{ {
return operatorFactor.begin(); return operatorFactor.begin();
} }
inline vector<double*>::iterator getOperatorFactorEnd() inline std::vector<double*>::iterator getOperatorFactorEnd()
{ {
return operatorFactor.end(); return operatorFactor.end();
} }
inline vector<double*>::iterator getOperatorEstFactorBegin() inline std::vector<double*>::iterator getOperatorEstFactorBegin()
{ {
return operatorEstFactor.begin(); return operatorEstFactor.begin();
} }
inline vector<double*>::iterator getOperatorEstFactorEnd() inline std::vector<double*>::iterator getOperatorEstFactorEnd()
{ {
return operatorEstFactor.end(); return operatorEstFactor.end();
} }
inline vector<Operator*>::iterator getOperatorsBegin() inline std::vector<Operator*>::iterator getOperatorsBegin()
{ {
return operators.begin(); return operators.begin();
} }
inline vector<Operator*>::iterator getOperatorsEnd() inline std::vector<Operator*>::iterator getOperatorsEnd()
{ {
return operators.end(); return operators.end();
} }
...@@ -193,17 +193,17 @@ namespace AMDiS { ...@@ -193,17 +193,17 @@ namespace AMDiS {
/// and \f$ m \f$ is the number of basis functions /// and \f$ m \f$ is the number of basis functions
T evalUh(const DimVec<double>& lambda, DegreeOfFreedom* ind); T evalUh(const DimVec<double>& lambda, DegreeOfFreedom* ind);
inline vector<Operator*>& getOperators() inline std::vector<Operator*>& getOperators()
{ {
return operators; return operators;
} }
inline vector<double*>& getOperatorFactor() inline std::vector<double*>& getOperatorFactor()
{ {
return operatorFactor; return operatorFactor;
} }
inline vector<double*>& getOperatorEstFactor() inline std::vector<double*>& getOperatorEstFactor()
{ {
return operatorEstFactor; return operatorEstFactor;
} }
...@@ -251,13 +251,13 @@ namespace AMDiS { ...@@ -251,13 +251,13 @@ namespace AMDiS {
ElementVector elementVector; ElementVector elementVector;
/// ///
vector<Operator*> operators; std::vector<Operator*> operators;
/// ///
vector<double*> operatorFactor; std::vector<double*> operatorFactor;
/// ///
vector<double*> operatorEstFactor; std::vector<double*> operatorEstFactor;
/// ///
BoundaryManager *boundaryManager; BoundaryManager *boundaryManager;
...@@ -345,7 +345,7 @@ namespace AMDiS { ...@@ -345,7 +345,7 @@ namespace AMDiS {
void init(const FiniteElemSpace* f, string n); void init(const FiniteElemSpace* f, string n);
/// Copy Constructor /// Copy Constructor
DOFVector(const DOFVector& rhs) DOFVector(const DOFVector& rhs) : DOFVectorBase<T>()
{ {
*this = rhs; *this = rhs;
this->name = rhs.name + "copy"; this->name = rhs.name + "copy";
...@@ -357,25 +357,25 @@ namespace AMDiS { ...@@ -357,25 +357,25 @@ namespace AMDiS {
virtual ~DOFVector(); virtual ~DOFVector();
/// Returns iterator to the begin of \ref vec /// Returns iterator to the begin of \ref vec
typename vector<T>::iterator begin() typename std::vector<T>::iterator begin()
{ {
return vec.begin(); return vec.begin();
} }
/// Returns iterator to the end of \ref vec /// Returns iterator to the end of \ref vec
typename vector<T>::iterator end() typename std::vector<T>::iterator end()
{ {
return vec.end(); return vec.end();
} }
/// Returns const_iterator to the begin of \ref vec /// Returns const_iterator to the begin of \ref vec
typename vector<T>::const_iterator begin() const typename std::vector<T>::const_iterator begin() const
{ {
return vec.begin(); return vec.begin();
} }
/// Returns const_iterator to the end of \ref vec /// Returns const_iterator to the end of \ref vec
typename vector<T>::const_iterator end() const typename std::vector<T>::const_iterator end() const
{ {
return vec.end(); return vec.end();
} }
...@@ -383,7 +383,7 @@ namespace AMDiS { ...@@ -383,7 +383,7 @@ namespace AMDiS {
/// Used by DOFAdmin to compress this DOFVector. Implementation of /// Used by DOFAdmin to compress this DOFVector. Implementation of
/// \ref DOFIndexedBase::compress() /// \ref DOFIndexedBase::compress()
virtual void compressDOFIndexed(int first, int last, virtual void compressDOFIndexed(int first, int last,
vector<DegreeOfFreedom> &newDof); std::vector<DegreeOfFreedom> &newDof);
/// Sets \ref coarsenOperation to op /// Sets \ref coarsenOperation to op
inline void setCoarsenOperation(CoarsenOperation op) inline void setCoarsenOperation(CoarsenOperation op)
...@@ -404,7 +404,7 @@ namespace AMDiS { ...@@ -404,7 +404,7 @@ namespace AMDiS {
inline void refineInterpol(RCNeighbourList&, int) {} inline void refineInterpol(RCNeighbourList&, int) {}
/// Returns \ref vec /// Returns \ref vec
vector<T>& getVector() std::vector<T>& getVector()
{ {
return vec; return vec;
} }
...@@ -597,7 +597,7 @@ namespace AMDiS { ...@@ -597,7 +597,7 @@ namespace AMDiS {
/// Determine the DegreeOfFreedom that has coords with minimal euclidean /// Determine the DegreeOfFreedom that has coords with minimal euclidean
/// distance to WorldVector p. return true if DOF is found, and false /// distance to WorldVector p. return true if DOF is found, and false
/// otherwise. /// otherwise.
const bool getDofIdxAtPoint(WorldVector<double> &p, bool getDofIdxAtPoint(WorldVector<double> &p,
DegreeOfFreedom &idx, DegreeOfFreedom &idx,
ElInfo *oldElInfo = NULL, ElInfo *oldElInfo = NULL,
bool useOldElInfo = false) const; bool useOldElInfo = false) const;
...@@ -630,7 +630,7 @@ namespace AMDiS { ...@@ -630,7 +630,7 @@ namespace AMDiS {
protected: protected:
/// Data container /// Data container
vector<T> vec; std::vector<T> vec;
/// Specifies what operation should be performed after coarsening /// Specifies what operation should be performed after coarsening
CoarsenOperation coarsenOperation; CoarsenOperation coarsenOperation;
...@@ -846,7 +846,7 @@ namespace AMDiS { ...@@ -846,7 +846,7 @@ namespace AMDiS {
} }
template<typename T> template<typename T>
inline void checkFeSpace(const FiniteElemSpace* feSpace, const vector<T>& vec) inline void checkFeSpace(const FiniteElemSpace* feSpace, const std::vector<T>& vec)
{ {
TEST_EXIT_DBG(feSpace)("feSpace is NULL\n"); TEST_EXIT_DBG(feSpace)("feSpace is NULL\n");
TEST_EXIT_DBG(feSpace->getAdmin())("admin is NULL\n"); TEST_EXIT_DBG(feSpace->getAdmin())("admin is NULL\n");
...@@ -859,8 +859,8 @@ namespace AMDiS { ...@@ -859,8 +859,8 @@ namespace AMDiS {
WorldVector<DOFVector<double>*> *result); WorldVector<DOFVector<double>*> *result);
template<typename T> template<typename T>
vector<DOFVector<double>*> *transform(DOFVector<typename GradientType<T>::type> *vec, std::vector<DOFVector<double>*> *transform(DOFVector<typename GradientType<T>::type> *vec,
vector<DOFVector<double>*> *res); std::vector<DOFVector<double>*> *res);
/// Computes the integral: \f$ \int f(\vec{x})\,\text{d}\vec{x}\f$ /// Computes the integral: \f$ \int f(\vec{x})\,\text{d}\vec{x}\f$
...@@ -931,14 +931,14 @@ namespace AMDiS { ...@@ -931,14 +931,14 @@ namespace AMDiS {
BinaryAbstractFunction<TOut, T, WorldVector<double> > *fct); BinaryAbstractFunction<TOut, T, WorldVector<double> > *fct);
/// Computes the integral: \f$ \int f(\{v_i(\vec{x})\}_i)\,\text{d}\vec{x}\f$ /// Computes the integral: \f$ \int f(\{v_i(\vec{x})\}_i)\,\text{d}\vec{x}\f$
double integrateGeneral(const vector<DOFVector<double>*> &vecs, double integrateGeneral(const std::vector<DOFVector<double>*> &vecs,
AbstractFunction<double, vector<double> > *fct); AbstractFunction<double, std::vector<double> > *fct);
/// Computes the integral: /// Computes the integral:
/// \f$ \int f(\{v_i(\vec{x})\}_i,\{\nabla w_i(\vec{x})\}_i)\,\text{d}\vec{x}\f$ /// \f$ \int f(\{v_i(\vec{x})\}_i,\{\nabla w_i(\vec{x})\}_i)\,\text{d}\vec{x}\f$
double integrateGeneralGradient(const vector<DOFVector<double>*> &vecs, double integrateGeneralGradient(const std::vector<DOFVector<double>*> &vecs,
const vector<DOFVector<double>*> &grds, const std::vector<DOFVector<double>*> &grds,
BinaryAbstractFunction<double, vector<double>, vector<WorldVector<double> > > *fct); BinaryAbstractFunction<double, std::vector<double>, std::vector<WorldVector<double> > > *fct);
} }
......
...@@ -947,7 +947,7 @@ namespace AMDiS { ...@@ -947,7 +947,7 @@ namespace AMDiS {
template<typename T> template<typename T>
const bool DOFVector<T>::getDofIdxAtPoint(WorldVector<double> &p, bool DOFVector<T>::getDofIdxAtPoint(WorldVector<double> &p,
DegreeOfFreedom &idx, DegreeOfFreedom &idx,
ElInfo *oldElInfo, ElInfo *oldElInfo,
bool useOldElInfo) const bool useOldElInfo) const
......
...@@ -385,7 +385,7 @@ namespace AMDiS { ...@@ -385,7 +385,7 @@ namespace AMDiS {
/// with respect to \ref element of a point with world coordinates world. /// with respect to \ref element of a point with world coordinates world.
/// The barycentric coordinates are stored in lambda. /// The barycentric coordinates are stored in lambda.
/// pure virtual => must be overriden in sub-class. /// pure virtual => must be overriden in sub-class.
virtual const int worldToCoord(const WorldVector<double>& world, virtual int worldToCoord(const WorldVector<double>& world,
DimVec<double>* lambda) const = 0; DimVec<double>* lambda) const = 0;
/// Fills this ElInfo with macro element information of mel. /// Fills this ElInfo with macro element information of mel.
......
...@@ -143,7 +143,7 @@ namespace AMDiS { ...@@ -143,7 +143,7 @@ namespace AMDiS {
return sqrt(adet2); return sqrt(adet2);
} }
const int ElInfo1d::worldToCoord(const WorldVector<double>& x, int ElInfo1d::worldToCoord(const WorldVector<double>& x,
DimVec<double>* lambda) const DimVec<double>* lambda) const
{ {
FUNCNAME("ElInfo1d::worldToCoord()"); FUNCNAME("ElInfo1d::worldToCoord()");
......
...@@ -47,7 +47,7 @@ namespace AMDiS { ...@@ -47,7 +47,7 @@ namespace AMDiS {
void fillMacroInfo(const MacroElement*); void fillMacroInfo(const MacroElement*);
/// 1-dimensional realisation of ElInfo's worldToCoord method. /// 1-dimensional realisation of ElInfo's worldToCoord method.
const int worldToCoord(const WorldVector<double>& w, DimVec<double>* l) const; int worldToCoord(const WorldVector<double>& w, DimVec<double>* l) const;
/// 1-dimensional realisation of ElInfo's calcGrdLambda method. /// 1-dimensional realisation of ElInfo's calcGrdLambda method.
double calcGrdLambda(DimVec<WorldVector<double> >& grd_lam); double calcGrdLambda(DimVec<WorldVector<double> >& grd_lam);
......
...@@ -661,7 +661,7 @@ namespace AMDiS { ...@@ -661,7 +661,7 @@ namespace AMDiS {
} }
const int ElInfo2d::worldToCoord(const WorldVector<double>& xy, int ElInfo2d::worldToCoord(const WorldVector<double>& xy,
DimVec<double>* lambda) const DimVec<double>* lambda) const
{ {
FUNCNAME("ElInfo::worldToCoord()"); FUNCNAME("ElInfo::worldToCoord()");
......
...@@ -48,7 +48,7 @@ namespace AMDiS { ...@@ -48,7 +48,7 @@ namespace AMDiS {
void fillMacroInfo(const MacroElement*); void fillMacroInfo(const MacroElement*);
/// 2-dimensional realisation of ElInfo's worldToCoord method. /// 2-dimensional realisation of ElInfo's worldToCoord method.
const int worldToCoord(const WorldVector<double>& w, DimVec<double>* l) const; int worldToCoord(const WorldVector<double>& w, DimVec<double>* l) const;
/// 2-dimensional realisation of ElInfo's calcGrdLambda method. /// 2-dimensional realisation of ElInfo's calcGrdLambda method.
double calcGrdLambda(DimVec<WorldVector<double> >& grd_lam); double calcGrdLambda(DimVec<WorldVector<double> >& grd_lam);
......
...@@ -318,7 +318,7 @@ namespace AMDiS { ...@@ -318,7 +318,7 @@ namespace AMDiS {
} }
const int ElInfo3d::worldToCoord(const WorldVector<double>& xy, int ElInfo3d::worldToCoord(const WorldVector<double>& xy,
DimVec<double>* lambda) const DimVec<double>* lambda) const
{ {
FUNCNAME("ElInfo::worldToCoord()"); FUNCNAME("ElInfo::worldToCoord()");
......
...@@ -60,7 +60,7 @@ namespace AMDiS { ...@@ -60,7 +60,7 @@ namespace AMDiS {
void fillMacroInfo(const MacroElement *); void fillMacroInfo(const MacroElement *);
/// 3-dimensional realisation of ElInfo's worldToCoord method. /// 3-dimensional realisation of ElInfo's worldToCoord method.
const int worldToCoord(const WorldVector<double>& w, DimVec<double>* l) const; int worldToCoord(const WorldVector<double>& w, DimVec<double>* l) const;
/// 3-dimensional realisation of ElInfo's calcGrdLambda method. /// 3-dimensional realisation of ElInfo's calcGrdLambda method.
double calcGrdLambda(DimVec<WorldVector<double> >& grd_lam); double calcGrdLambda(DimVec<WorldVector<double> >& grd_lam);
......
...@@ -111,7 +111,7 @@ namespace AMDiS { ...@@ -111,7 +111,7 @@ namespace AMDiS {
/// Returns true if Element is a leaf element (\ref child[0] == NULL), returns /// Returns true if Element is a leaf element (\ref child[0] == NULL), returns
/// false otherwise. /// false otherwise.
inline const bool isLeaf() const inline bool isLeaf() const
{ {
return (child[0] == NULL); return (child[0] == NULL);
} }
...@@ -204,7 +204,7 @@ namespace AMDiS { ...@@ -204,7 +204,7 @@ namespace AMDiS {
virtual int getGeo(GeoIndex i) const = 0; virtual int getGeo(GeoIndex i) const = 0;
/// Returns Element's \ref mark /// Returns Element's \ref mark
inline const int getMark() const inline int getMark() const
{ {
return mark; return mark;
} }
......
...@@ -86,7 +86,7 @@ namespace AMDiS { ...@@ -86,7 +86,7 @@ namespace AMDiS {
} }
/// Returns the id of element data type. /// Returns the id of element data type.
virtual const int getTypeID() const virtual int getTypeID() const
{ {
return 0; return 0;
} }
......