Liebe Gitlab-Nutzer, lieber Gitlab-Nutzer, es ist nun möglich sich mittels des ZIH-Logins/LDAP an unserem Dienst anzumelden. Ein Anmelden über dieses erzeugt ein neues Konto. Das alte Konto ist über den Reiter "Standard" erreichbar. Die Administratoren

Dear Gitlab user, it is now possible to log in to our service using the ZIH login/LDAP. Logging in via this will create a new account. The old account can be accessed via the "Standard" tab. The administrators

Commit ecd862d1 authored by Thomas Witkowski's avatar Thomas Witkowski
Browse files

Removed MemoryManager.

parent cd220992
......@@ -132,7 +132,6 @@ $(SOURCE_DIR)/UmfPackSolver.h \ $(SOURCE_DIR)/UmfPackSolver.hh \
$(SOURCE_DIR)/Lagrange.h $(SOURCE_DIR)/Line.h \
$(SOURCE_DIR)/MacroElement.h $(SOURCE_DIR)/MacroWriter.h \
$(SOURCE_DIR)/Markings.h $(SOURCE_DIR)/Markings.hh \
$(SOURCE_DIR)/MemoryManager.h \
$(SOURCE_DIR)/Mesh.h \
$(SOURCE_DIR)/Parameters.h \
$(SOURCE_DIR)/Parametric.h \
......@@ -189,8 +188,6 @@ $(SOURCE_DIR)/TraverseParallel.h $(SOURCE_DIR)/TraverseParallel.cc \
$(SOURCE_DIR)/Triangle.cc \
$(SOURCE_DIR)/TecPlotWriter.cc \
$(SOURCE_DIR)/ValueWriter.cc \
$(SOURCE_DIR)/MemoryPool.h $(SOURCE_DIR)/MemoryPool.cc \
$(SOURCE_DIR)/MemoryManager.cc \
$(SOURCE_DIR)/VtkWriter.h $(SOURCE_DIR)/VtkWriter.cc \
$(SOURCE_DIR)/PngWriter.h $(SOURCE_DIR)/PngWriter.cc \
$(SOURCE_DIR)/DataCollector.h $(SOURCE_DIR)/DataCollector.cc \
......
......@@ -162,10 +162,9 @@ am__libamdis_la_SOURCES_DIST = $(PARALLEL_DIR)/ConditionalEstimator.h \
$(SOURCE_DIR)/UmfPackSolver.hh $(SOURCE_DIR)/Lagrange.h \
$(SOURCE_DIR)/Line.h $(SOURCE_DIR)/MacroElement.h \
$(SOURCE_DIR)/MacroWriter.h $(SOURCE_DIR)/Markings.h \
$(SOURCE_DIR)/Markings.hh $(SOURCE_DIR)/MemoryManager.h \
$(SOURCE_DIR)/Mesh.h $(SOURCE_DIR)/Parameters.h \
$(SOURCE_DIR)/Parametric.h $(SOURCE_DIR)/Quadrature.h \
$(SOURCE_DIR)/RCNeighbourList.h \
$(SOURCE_DIR)/Markings.hh $(SOURCE_DIR)/Mesh.h \
$(SOURCE_DIR)/Parameters.h $(SOURCE_DIR)/Parametric.h \
$(SOURCE_DIR)/Quadrature.h $(SOURCE_DIR)/RCNeighbourList.h \
$(SOURCE_DIRe)/RefinementManager.h \
$(SOURCE_DIR)/RefinementManager1d.h \
$(SOURCE_DIR)/RefinementManager2d.h \
......@@ -203,13 +202,12 @@ am__libamdis_la_SOURCES_DIST = $(PARALLEL_DIR)/ConditionalEstimator.h \
$(SOURCE_DIR)/TraverseParallel.h \
$(SOURCE_DIR)/TraverseParallel.cc $(SOURCE_DIR)/Triangle.cc \
$(SOURCE_DIR)/TecPlotWriter.cc $(SOURCE_DIR)/ValueWriter.cc \
$(SOURCE_DIR)/MemoryPool.h $(SOURCE_DIR)/MemoryPool.cc \
$(SOURCE_DIR)/MemoryManager.cc $(SOURCE_DIR)/VtkWriter.h \
$(SOURCE_DIR)/VtkWriter.cc $(SOURCE_DIR)/PngWriter.h \
$(SOURCE_DIR)/PngWriter.cc $(SOURCE_DIR)/DataCollector.h \
$(SOURCE_DIR)/DataCollector.cc $(SOURCE_DIR)/ElementInfo.h \
$(SOURCE_DIR)/VertexInfo.h $(SOURCE_DIR)/PeriodicInfo.h \
$(SOURCE_DIR)/OpenMP.h $(SOURCE_DIR)/ScalableQuadrature.h \
$(SOURCE_DIR)/VtkWriter.h $(SOURCE_DIR)/VtkWriter.cc \
$(SOURCE_DIR)/PngWriter.h $(SOURCE_DIR)/PngWriter.cc \
$(SOURCE_DIR)/DataCollector.h $(SOURCE_DIR)/DataCollector.cc \
$(SOURCE_DIR)/ElementInfo.h $(SOURCE_DIR)/VertexInfo.h \
$(SOURCE_DIR)/PeriodicInfo.h $(SOURCE_DIR)/OpenMP.h \
$(SOURCE_DIR)/ScalableQuadrature.h \
$(SOURCE_DIR)/ScalableQuadrature.cc $(SOURCE_DIR)/SubElInfo.h \
$(SOURCE_DIR)/SubElInfo.cc $(SOURCE_DIR)/SolutionDataStorage.h \
$(SOURCE_DIR)/SolutionDataStorage.hh \
......@@ -269,8 +267,7 @@ am_libamdis_la_OBJECTS = $(am__objects_1) libamdis_la-DOFIndexed.lo \
libamdis_la-RefinementManager3d.lo libamdis_la-Tetrahedron.lo \
libamdis_la-Traverse.lo libamdis_la-TraverseParallel.lo \
libamdis_la-Triangle.lo libamdis_la-TecPlotWriter.lo \
libamdis_la-ValueWriter.lo libamdis_la-MemoryPool.lo \
libamdis_la-MemoryManager.lo libamdis_la-VtkWriter.lo \
libamdis_la-ValueWriter.lo libamdis_la-VtkWriter.lo \
libamdis_la-PngWriter.lo libamdis_la-DataCollector.lo \
libamdis_la-ScalableQuadrature.lo libamdis_la-SubElInfo.lo \
libamdis_la-InteriorBoundary.lo libamdis_la-AdaptParaReal.lo
......@@ -526,7 +523,6 @@ $(SOURCE_DIR)/UmfPackSolver.h \ $(SOURCE_DIR)/UmfPackSolver.hh \
$(SOURCE_DIR)/Lagrange.h $(SOURCE_DIR)/Line.h \
$(SOURCE_DIR)/MacroElement.h $(SOURCE_DIR)/MacroWriter.h \
$(SOURCE_DIR)/Markings.h $(SOURCE_DIR)/Markings.hh \
$(SOURCE_DIR)/MemoryManager.h \
$(SOURCE_DIR)/Mesh.h \
$(SOURCE_DIR)/Parameters.h \
$(SOURCE_DIR)/Parametric.h \
......@@ -583,8 +579,6 @@ $(SOURCE_DIR)/TraverseParallel.h $(SOURCE_DIR)/TraverseParallel.cc \
$(SOURCE_DIR)/Triangle.cc \
$(SOURCE_DIR)/TecPlotWriter.cc \
$(SOURCE_DIR)/ValueWriter.cc \
$(SOURCE_DIR)/MemoryPool.h $(SOURCE_DIR)/MemoryPool.cc \
$(SOURCE_DIR)/MemoryManager.cc \
$(SOURCE_DIR)/VtkWriter.h $(SOURCE_DIR)/VtkWriter.cc \
$(SOURCE_DIR)/PngWriter.h $(SOURCE_DIR)/PngWriter.cc \
$(SOURCE_DIR)/DataCollector.h $(SOURCE_DIR)/DataCollector.cc \
......@@ -738,8 +732,6 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libamdis_la-MacroReader.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libamdis_la-MacroWriter.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libamdis_la-Marker.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libamdis_la-MemoryManager.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libamdis_la-MemoryPool.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libamdis_la-Mesh.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libamdis_la-MeshStructure.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libamdis_la-NonLinUpdater.Plo@am__quote@
......@@ -1411,20 +1403,6 @@ libamdis_la-ValueWriter.lo: $(SOURCE_DIR)/ValueWriter.cc
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libamdis_la_CXXFLAGS) $(CXXFLAGS) -c -o libamdis_la-ValueWriter.lo `test -f '$(SOURCE_DIR)/ValueWriter.cc' || echo '$(srcdir)/'`$(SOURCE_DIR)/ValueWriter.cc
libamdis_la-MemoryPool.lo: $(SOURCE_DIR)/MemoryPool.cc
@am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libamdis_la_CXXFLAGS) $(CXXFLAGS) -MT libamdis_la-MemoryPool.lo -MD -MP -MF "$(DEPDIR)/libamdis_la-MemoryPool.Tpo" -c -o libamdis_la-MemoryPool.lo `test -f '$(SOURCE_DIR)/MemoryPool.cc' || echo '$(srcdir)/'`$(SOURCE_DIR)/MemoryPool.cc; \
@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libamdis_la-MemoryPool.Tpo" "$(DEPDIR)/libamdis_la-MemoryPool.Plo"; else rm -f "$(DEPDIR)/libamdis_la-MemoryPool.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(SOURCE_DIR)/MemoryPool.cc' object='libamdis_la-MemoryPool.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libamdis_la_CXXFLAGS) $(CXXFLAGS) -c -o libamdis_la-MemoryPool.lo `test -f '$(SOURCE_DIR)/MemoryPool.cc' || echo '$(srcdir)/'`$(SOURCE_DIR)/MemoryPool.cc
libamdis_la-MemoryManager.lo: $(SOURCE_DIR)/MemoryManager.cc
@am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libamdis_la_CXXFLAGS) $(CXXFLAGS) -MT libamdis_la-MemoryManager.lo -MD -MP -MF "$(DEPDIR)/libamdis_la-MemoryManager.Tpo" -c -o libamdis_la-MemoryManager.lo `test -f '$(SOURCE_DIR)/MemoryManager.cc' || echo '$(srcdir)/'`$(SOURCE_DIR)/MemoryManager.cc; \
@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libamdis_la-MemoryManager.Tpo" "$(DEPDIR)/libamdis_la-MemoryManager.Plo"; else rm -f "$(DEPDIR)/libamdis_la-MemoryManager.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(SOURCE_DIR)/MemoryManager.cc' object='libamdis_la-MemoryManager.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libamdis_la_CXXFLAGS) $(CXXFLAGS) -c -o libamdis_la-MemoryManager.lo `test -f '$(SOURCE_DIR)/MemoryManager.cc' || echo '$(srcdir)/'`$(SOURCE_DIR)/MemoryManager.cc
libamdis_la-VtkWriter.lo: $(SOURCE_DIR)/VtkWriter.cc
@am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libamdis_la_CXXFLAGS) $(CXXFLAGS) -MT libamdis_la-VtkWriter.lo -MD -MP -MF "$(DEPDIR)/libamdis_la-VtkWriter.Tpo" -c -o libamdis_la-VtkWriter.lo `test -f '$(SOURCE_DIR)/VtkWriter.cc' || echo '$(srcdir)/'`$(SOURCE_DIR)/VtkWriter.cc; \
@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libamdis_la-VtkWriter.Tpo" "$(DEPDIR)/libamdis_la-VtkWriter.Plo"; else rm -f "$(DEPDIR)/libamdis_la-VtkWriter.Tpo"; exit 1; fi
......
......@@ -2,7 +2,6 @@
#define AMDIS_CFE_INTEGRATION_H
#include "ElementFunction.h"
#include "MemoryManager.h"
#include "Quadrature.h"
#include "ElementLevelSet.h"
......@@ -11,8 +10,6 @@ namespace AMDiS {
class CFE_Integration
{
public:
MEMORY_MANAGED(CFE_Integration);
/**
* Calculates integral of function f on domain where level set function
* is negative.
......
......@@ -4,7 +4,6 @@
#include "AbstractFunction.h"
#include "DOFVector.h"
#include "FixVec.h"
#include "MemoryManager.h"
#include "Quadrature.h"
#include "ElementLevelSet.h"
......@@ -16,8 +15,6 @@ namespace AMDiS {
class ElementNorm
{
public:
MEMORY_MANAGED(ElementNorm);
/**
* Constructor.
*/
......@@ -65,8 +62,6 @@ namespace AMDiS {
class ElementL1Norm_Analyt : public ElementNorm
{
public:
MEMORY_MANAGED(ElementL1Norm_Analyt);
/**
* Constructor.
*/
......@@ -93,8 +88,6 @@ namespace AMDiS {
class ElementL2Norm_Analyt : public ElementNorm
{
public:
MEMORY_MANAGED(ElementL2Norm_Analyt);
/**
* Constructor.
*/
......@@ -121,8 +114,6 @@ namespace AMDiS {
class ElementH1Norm_Analyt : public ElementNorm
{
public:
MEMORY_MANAGED(ElementH1Norm_Analyt);
/**
* Constructor.
*/
......@@ -156,8 +147,6 @@ namespace AMDiS {
class ElementL1Norm_DOF : public ElementNorm
{
public:
MEMORY_MANAGED(ElementL1Norm_DOF);
/**
* Constructor.
*/
......@@ -183,8 +172,6 @@ namespace AMDiS {
class ElementL2Norm_DOF : public ElementNorm
{
public:
MEMORY_MANAGED(ElementL2Norm_DOF);
/**
* Constructor.
*/
......@@ -210,8 +197,6 @@ namespace AMDiS {
class ElementH1Norm_DOF : public ElementNorm
{
public:
MEMORY_MANAGED(ElementH1Norm_DOF);
/**
* Constructor.
*/
......@@ -243,8 +228,6 @@ namespace AMDiS {
class ElementL2Err : public ElementNorm
{
public:
MEMORY_MANAGED(ElementL2Err);
/**
* Constructor.
*/
......@@ -297,8 +280,6 @@ namespace AMDiS {
class ElementH1Err : public ElementNorm
{
public:
MEMORY_MANAGED(ElementH1Err);
/**
* Constructor.
*/
......@@ -362,8 +343,6 @@ namespace AMDiS {
class CFE_NormAndErrorFcts
{
public:
MEMORY_MANAGED(CFE_NormAndErrorFcts);
// ========================================================================
// Calculation of L1-Norm, L2-Norm and H1-Norm on domain depending
// on the level set function.
......
......@@ -4,8 +4,6 @@
#include "AbstractFunction.h"
#include "DOFVector.h"
#include "FiniteElemSpace.h"
#include "MemoryManager.h"
#include "ElementLevelSet.h"
using namespace AMDiS;
......@@ -13,8 +11,6 @@ using namespace AMDiS;
class CompositeFEMMethods
{
public:
MEMORY_MANAGED(CompositeFEMMethods);
/**
* Set all dof-values on domain with positive level set function values
* to val.
......
......@@ -3,7 +3,6 @@
#include "ElementFunction.h"
#include "FixVec.h"
#include "MemoryManager.h"
#include "Parameters.h"
namespace AMDiS {
......@@ -58,8 +57,6 @@ using namespace std;
class ElementLevelSet
{
public:
MEMORY_MANAGED(ElementLevelSet);
/**
* Constructor.
*/
......
......@@ -4,7 +4,6 @@
#include "AdaptInfo.h"
#include "ElInfo.h"
#include "Global.h"
#include "MemoryManager.h"
#include "Mesh.h"
#include "ProblemStatBase.h"
......@@ -15,8 +14,6 @@ using namespace AMDiS;
class LevelSetAdaptMesh
{
public:
MEMORY_MANAGED(LevelSetAdaptMesh);
/**
* Constructor.
*/
......
......@@ -5,7 +5,6 @@
#include <vector>
#include "ElInfo.h"
#include "MemoryManager.h"
#include "Mesh.h"
#include "FixVec.h"
#include "SubElInfo.h"
......@@ -57,8 +56,6 @@ namespace AMDiS {
class SubPolytope
{
public:
MEMORY_MANAGED(SubPolytope);
/**
* Constructor
*
......
......@@ -3,7 +3,6 @@
#include "ElementFunction.h"
#include "FixVec.h"
#include "MemoryManager.h"
using namespace AMDiS;
......@@ -11,8 +10,6 @@ template<typename T>
class TranslateLsFct : public ElementFunction<T>
{
public:
MEMORY_MANAGED(TranslateLsFct);
/**
* Constructor
*/
......
......@@ -47,7 +47,6 @@
#include "MacroWriter.h"
#include "Marker.h"
#include "MatrixVector.h"
#include "MemoryManager.h"
#include "MemoryPool.h"
#include "Mesh.h"
#include "ComponentTraverseInfo.h"
......
......@@ -39,8 +39,10 @@ namespace AMDiS {
class DOFContainer;
class DOFIndexedBase;
class DOFMatrix;
class DOFVectorDOF;
class Element;
class ElInfo;
class ElMatrixInfo;
class Estimator;
class FastQuadrature;
class FillInfo;
......@@ -51,13 +53,17 @@ namespace AMDiS {
class LeafDataPeriodic;
class LevelAdmin;
class MacroElement;
class MacroInfo;
class Marker;
class Mesh;
class OEMSolver;
class Operator;
class OperatorTerm;
class Parametric;
class PeriodicBC;
class ProblemInstat;
class ProblemIterationInterface;
class ProblemStatBase;
class ProblemTimeInterface;
class ProblemVec;
class Projection;
......@@ -67,6 +73,7 @@ namespace AMDiS {
class RefinementManager;
class RobinBC;
class SystemVector;
class TraverseStack;
class VertexInfo;
class VertexVector;
......@@ -79,6 +86,7 @@ namespace AMDiS {
template<typename ITLSolver> class ITL_OEMSolver;
template<typename T> class ITL_Preconditioner;
template<typename T> class Matrix;
template<typename T> class MatrixOfFixVecs;
template<typename T> class MatVecMultiplier;
template<typename T> class SolverMatrix;
template<typename T> class Vector;
......@@ -87,7 +95,6 @@ namespace AMDiS {
template<typename T> class VectorOfFixVecs;
typedef mtl::dense2D<double> ElementMatrix;
typedef mtl::dense_vector<double> ElementVector;
......
#include "MemoryManager.h"
#include <map>
namespace AMDiS {
......
......@@ -34,8 +34,6 @@ namespace AMDiS {
class ElInfo2d : public ElInfo
{
public:
MEMORY_MANAGED(ElInfo2d);
/// Constructor. Calls ElInfo's protected Constructor.
ElInfo2d(Mesh* aMesh);
......
......@@ -34,8 +34,6 @@ namespace AMDiS {
class ElInfo3d : public ElInfo
{
public:
MEMORY_MANAGED(ElInfo3d);
/// Constructor. Calls ElInfo's protected Constructor.
ElInfo3d(Mesh* aMesh)
: ElInfo(aMesh)
......
#include "MemoryManager.h"
#include "ElementData.h"
#include "PartitionElementData.h"
namespace AMDiS {
......
......@@ -28,7 +28,6 @@
#include <vector>
#include <string>
#include "MemoryManager.h"
#include "MatrixVector.h"
#include "Mesh.h"
#include "DataCollector.h"
......@@ -112,8 +111,6 @@ namespace AMDiS {
class FileWriter : public FileWriterInterface
{
public:
MEMORY_MANAGED(FileWriter);
/// Constructor for a filewriter for one data component.
FileWriter(const std::string& name,
Mesh *mesh,
......
......@@ -73,8 +73,6 @@ namespace AMDiS {
class Stand10 : public FirstOrderAssembler
{
public:
MEMORY_MANAGED(Stand10);
/// Constructor
Stand10(Operator *op, Assembler *assembler, Quadrature *quad);
......@@ -102,8 +100,6 @@ namespace AMDiS {
class Stand01 : public FirstOrderAssembler
{
public:
MEMORY_MANAGED(Stand01);
/// Constructor.
Stand01(Operator *op, Assembler *assembler, Quadrature *quad);
......@@ -133,8 +129,6 @@ namespace AMDiS {
class Quad10 : public FirstOrderAssembler
{
public:
MEMORY_MANAGED(Quad10);
/// Constructor.
Quad10(Operator *op, Assembler *assembler, Quadrature *quad);
......@@ -164,8 +158,6 @@ namespace AMDiS {
class Quad01 : public FirstOrderAssembler
{
public:
MEMORY_MANAGED(Quad01);
/// Constructor.
Quad01(Operator *op, Assembler *assembler, Quadrature *quad);
......@@ -198,8 +190,6 @@ namespace AMDiS {
class Pre10 : public FirstOrderAssembler
{
public:
MEMORY_MANAGED(Pre10);
/// Constructor.
Pre10(Operator *op, Assembler *assembler, Quadrature *quad);
......@@ -239,8 +229,6 @@ namespace AMDiS {
class Pre01 : public FirstOrderAssembler
{
public:
MEMORY_MANAGED(Pre01);
/// Constructor.
Pre01(Operator *op, Assembler *assembler, Quadrature *quad);
......
......@@ -22,9 +22,8 @@
#ifndef AMDIS_FIXVEC_H
#define AMDIS_FIXVEC_H
#include "Global.h"
#include "MemoryManager.h"
#include <iostream>
#include "Global.h"
#include "MatrixVector.h"
namespace AMDiS {
......@@ -57,8 +56,6 @@ namespace AMDiS {
class FixVec : public Vector<T>
{
public:
MEMORY_MANAGED(FixVec<T COMMA d>);
/** \brief
* constructor without initialisation. initType must be NO_INIT. If dim is
* not spezified, a FixVec for DIM_OF_WORLD is created.
......@@ -138,8 +135,6 @@ namespace AMDiS {
class VectorOfFixVecs
{
public:
MEMORY_MANAGED(VectorOfFixVecs<FixVecType>);
/** \brief
* constructs a VectorOfFixVecs without initialisation. dim is passed to
* FixVec's constructors. size_ is the number of contained FixVecs. initType
......@@ -282,8 +277,6 @@ namespace AMDiS {
class MatrixOfFixVecs
{
public:
MEMORY_MANAGED(MatrixOfFixVecs<FixVecType>);
/** \brief
* Constructs the matrix without initialisation. r is the number of rows,
* c is the number of columns. The other parameters are analog to the
......@@ -353,8 +346,6 @@ namespace AMDiS {
template<typename T>
class DimVec : public FixVec<T,PARTS> {
public:
MEMORY_MANAGED(DimVec<T>);
DimVec() {}
/// Calls the corresponding constructor of FixVec
......@@ -385,8 +376,6 @@ namespace AMDiS {
class DimMat : public Matrix<T>
{
public:
MEMORY_MANAGED(DimMat<T>);
/// Calls the corresponding constructor of VectorOfFixVecs
DimMat(int dim, InitType initType = NO_INIT)
: Matrix<T>(dim + 1, dim + 1)
......@@ -423,8 +412,6 @@ namespace AMDiS {
class WorldVector : public FixVec<T, WORLD>
{
public:
MEMORY_MANAGED(WorldVector<T>);
/** \brief
* Calls the corresponding constructor of AlgoVec
*/
......@@ -492,8 +479,6 @@ namespace AMDiS {
class WorldMatrix : public Matrix<T>
{
public:
MEMORY_MANAGED(WorldMatrix<T>);
/// Calls the corresponding constructor of FixVec
WorldMatrix()
: Matrix<T>(Global::getGeo(WORLD), Global::getGeo(WORLD))
......
......@@ -23,7 +23,6 @@
#define AMSID_FIXVECCONVERT_H_
#include "Global.h"
#include "MemoryManager.h"
namespace AMDiS {
......@@ -31,12 +30,10 @@ namespace AMDiS {
class VecConv
{
public:
MEMORY_MANAGED(VecConv<T COMMA d1 COMMA d2>);
static FixVec<T,d1>& convertVec(FixVec<T,d2>& rhs, Mesh* mesh) {
TEST_EXIT(mesh->getGeo(d1)==mesh->getGeo(d2))("Incompatible dimensions.\n");
return reinterpret_cast<FixVec<T,d1>&>(rhs);
};
}
};
}
......
......@@ -23,7 +23,6 @@
#define AMDIS_FLAG_H
#include "Global.h"
#include "MemoryManager.h"
namespace AMDiS {
......@@ -36,96 +35,66 @@ namespace AMDiS {
class Flag
{
public:
MEMORY_MANAGED(Flag);
/** \brief
* Constructs a unset Flag
*/
/// Constructs a unset Flag
inline Flag() : flags(0) {}
/** \brief
* Constructs a Flag initialized by f
*/
/// Constructs a Flag initialized by f
inline Flag(const unsigned long f) : flags(f) {}
/** \brief
* Copy constructor
*/
/// Copy constructor
inline Flag(const Flag& f) : flags(f.flags) {}
/** \brief
* Destructor
*/
/// Destructor
inline ~Flag() {}
/** \brief
* Compares two Flags
*/
/// Compares two Flags
inline bool operator==(const Flag& f) const {
return (flags == f.flags);
}
/** \brief
* Compares two Flags
*/
inline bool operator!=(const Flag& f) const {
/// Compares two Flags
bool operator!=(const Flag& f) const {
return !(f == *this);
}