Commit 31febd6d authored by Praetorius, Simon's avatar Praetorius, Simon
Browse files

merge of trunk with arhfile2 branch: 'using namespace' removed from header...

merge of trunk with arhfile2 branch: 'using namespace' removed from header files, file readers/writer moved to subnamespace AMDiS::io, test for arh2writer added
parent 9c91bc29
...@@ -55,14 +55,28 @@ else() ...@@ -55,14 +55,28 @@ else()
endif() endif()
unset(_AMDIS_LIB CACHE) unset(_AMDIS_LIB CACHE)
# Boost libraries # Boost libraries
# --------------- # ---------------
set(AMDIS_HAS_PARALLEL_DOMAIN @ENABLE_PARALLEL_DOMAIN@)
set(AMDIS_NEED_COMPRESSION @ENABLE_COMPRESSIN@)
set(BOOST_LIBS_REQUIRED system iostreams filesystem program_options date_time)
if(AMDIS_NEED_COMPRESSION)
list(APPEND BOOST_LIBS_REQUIRED zlib bzip2)
endif(AMDIS_NEED_COMPRESSION)
set(BOOST_VERSION "1.42")
if(AMDIS_HAS_PARALLEL_DOMAIN)
set(BOOST_VERSION "1.48")
endif(AMDIS_HAS_PARALLEL_DOMAIN)
if(WIN32) if(WIN32)
set(Boost_USE_STATIC_LIBS ON) set(Boost_USE_STATIC_LIBS ON)
find_package(Boost 1.42 REQUIRED system iostreams filesystem program_options date_time zlib bzip2) find_package(Boost ${BOOST_VERSION} REQUIRED ${BOOST_LIBS_REQUIRED})
else() else()
set(Boost_USE_STATIC_LIBS OFF) set(Boost_USE_STATIC_LIBS OFF)
find_package(Boost 1.42 REQUIRED system iostreams filesystem program_options date_time) find_package(Boost ${BOOST_VERSION} REQUIRED ${BOOST_LIBS_REQUIRED})
endif() endif()
if(Boost_FOUND) if(Boost_FOUND)
list(APPEND AMDIS_LIBRARIES ${Boost_LIBRARIES}) list(APPEND AMDIS_LIBRARIES ${Boost_LIBRARIES})
...@@ -81,11 +95,10 @@ list(APPEND AMDIS_INCLUDE_DIRS ${AMDIS_INCLUDE_DIR}/muparser) ...@@ -81,11 +95,10 @@ list(APPEND AMDIS_INCLUDE_DIRS ${AMDIS_INCLUDE_DIR}/muparser)
# ------------------------------------------------------------------ # ------------------------------------------------------------------
set(AMDIS_NEED_ZOLTAN @ENABLE_ZOLTAN@) set(AMDIS_NEED_ZOLTAN @ENABLE_ZOLTAN@)
set(AMDIS_HAS_PARALLEL_DOMAIN @ENABLE_PARALLEL_DOMAIN@)
set(AMDIS_OPENMP @ENABLE_OPENMP@) set(AMDIS_OPENMP @ENABLE_OPENMP@)
set(AMDIS_NEED_UMFPACK @ENABLE_UMFPACK@) set(AMDIS_NEED_UMFPACK @ENABLE_UMFPACK@)
set(AMDIS_NEED_HYPRE @ENABLE_HYPRE@) set(AMDIS_NEED_HYPRE @ENABLE_HYPRE@)
set(AMDIS_NEED_PETSC @ENABLE_PETSC@) set(AMDIS_NEED_SEQ_PETSC @ENABLE_SEQ_PETSC@)
set(AMDIS_NEED_PNG @ENABLE_PNG@) set(AMDIS_NEED_PNG @ENABLE_PNG@)
set(AMDIS_NEED_BDDCML @ENABLE_BDDCML@) set(AMDIS_NEED_BDDCML @ENABLE_BDDCML@)
set(AMDIS_NEED_MKL @ENABLE_MKL@) set(AMDIS_NEED_MKL @ENABLE_MKL@)
......
...@@ -41,13 +41,14 @@ endif() ...@@ -41,13 +41,14 @@ endif()
SET(ENABLE_PARALLEL_DOMAIN "OFF" CACHE STRING "use parallel domain decomposition. please set to one of: PMTL, PETSC, OFF" ) SET(ENABLE_PARALLEL_DOMAIN "OFF" CACHE STRING "use parallel domain decomposition. please set to one of: PMTL, PETSC, OFF" )
option(USE_PETSC_DEV false) option(USE_PETSC_DEV false)
option(ENABLE_ZOLTAN false) option(ENABLE_ZOLTAN false)
option(ENABLE_PETSC "Use sequential PETSc solvers" false) option(ENABLE_SEQ_PETSC "Use sequential PETSc solvers" false)
option(ENABLE_UMFPACK "Use of UMFPACK solver" false) option(ENABLE_UMFPACK "Use of UMFPACK solver" false)
option(ENABLE_HYPRE "Use HYPRE AMG solver" false) option(ENABLE_HYPRE "Use HYPRE AMG solver" false)
option(ENABLE_PNG "use png reader/writer" false) option(ENABLE_PNG "use png reader/writer" false)
option(ENABLE_BDDCML "Use of BDDCML library" false) option(ENABLE_BDDCML "Use of BDDCML library" false)
option(ENABLE_EXTENSIONS "Use extensions" false) option(ENABLE_EXTENSIONS "Use extensions" false)
option(ENABLE_OPENMP "Use OpenMP" false) option(ENABLE_OPENMP "Use OpenMP" false)
option(ENABLE_COMPRESSION "Use output compression" false)
option(ENABLE_OUTPUT "AMDiS output printing, disable only for debugging!" true) option(ENABLE_OUTPUT "AMDiS output printing, disable only for debugging!" true)
...@@ -160,7 +161,11 @@ SET(AMDIS_SRC ${SOURCE_DIR}/AdaptBase.cc ...@@ -160,7 +161,11 @@ SET(AMDIS_SRC ${SOURCE_DIR}/AdaptBase.cc
${SOURCE_DIR}/est/ResidualEstimator.cc ${SOURCE_DIR}/est/ResidualEstimator.cc
${SOURCE_DIR}/est/SimpleResidualEstimator.cc ${SOURCE_DIR}/est/SimpleResidualEstimator.cc
${SOURCE_DIR}/io/ArhReader.cc ${SOURCE_DIR}/io/ArhReader.cc
${SOURCE_DIR}/io/ArhWriter.cc ${SOURCE_DIR}/io/detail/ArhReader.cc
${SOURCE_DIR}/io/Arh2Reader.cc
${SOURCE_DIR}/io/detail/Arh2Reader.cc
${SOURCE_DIR}/io/detail/ArhWriter.cc
${SOURCE_DIR}/io/detail/Arh2Writer.cc
${SOURCE_DIR}/io/DofWriter.cc ${SOURCE_DIR}/io/DofWriter.cc
${SOURCE_DIR}/io/ElementFileWriter.cc ${SOURCE_DIR}/io/ElementFileWriter.cc
${SOURCE_DIR}/io/FileWriter.cc ${SOURCE_DIR}/io/FileWriter.cc
...@@ -176,6 +181,7 @@ SET(AMDIS_SRC ${SOURCE_DIR}/AdaptBase.cc ...@@ -176,6 +181,7 @@ SET(AMDIS_SRC ${SOURCE_DIR}/AdaptBase.cc
${SOURCE_DIR}/io/ValueWriter.cc ${SOURCE_DIR}/io/ValueWriter.cc
${SOURCE_DIR}/io/VtkWriter.cc ${SOURCE_DIR}/io/VtkWriter.cc
${SOURCE_DIR}/io/VtkVectorWriter.cc ${SOURCE_DIR}/io/VtkVectorWriter.cc
${SOURCE_DIR}/io/detail/VtkWriter.cc
${SOURCE_DIR}/nonlin/ProblemNonLin.cc ${SOURCE_DIR}/nonlin/ProblemNonLin.cc
${SOURCE_DIR}/solver/SolverMatrix.cc ${SOURCE_DIR}/solver/SolverMatrix.cc
${SOURCE_DIR}/time/RosenbrockAdaptInstationary.cc ${SOURCE_DIR}/time/RosenbrockAdaptInstationary.cc
...@@ -257,7 +263,7 @@ if(ENABLE_PARALLEL_DOMAIN) ...@@ -257,7 +263,7 @@ if(ENABLE_PARALLEL_DOMAIN)
set(PETSC_EXECUTABLE_RUNS ON) set(PETSC_EXECUTABLE_RUNS ON)
find_package(PETSc REQUIRED) find_package(PETSc REQUIRED)
include_directories(${PETSC_DIR}/include ${PETSC_DIR}/${PETSC_ARCH}/include) include_directories(${PETSC_DIR}/include ${PETSC_DIR}/${PETSC_ARCH}/include)
list(APPEND COMPILEFLAGS "-DHAVE_PARALLEL_PETSC") list(APPEND COMPILEFLAGS "-DHAVE_PARALLEL_PETSC" "-DPETSC_VERSION=${PETSC_VERSION}")
list(APPEND AMDIS_INCLUDE_DIRS ${PETSC_DIR}/include ${PETSC_DIR}/${PETSC_ARCH}/include) list(APPEND AMDIS_INCLUDE_DIRS ${PETSC_DIR}/include ${PETSC_DIR}/${PETSC_ARCH}/include)
list(APPEND PARALLEL_DOMAIN_AMDIS_SRC list(APPEND PARALLEL_DOMAIN_AMDIS_SRC
${SOURCE_DIR}/parallel/MatrixNnzStructure.cc ${SOURCE_DIR}/parallel/MatrixNnzStructure.cc
...@@ -297,7 +303,7 @@ if(ENABLE_PARALLEL_DOMAIN) ...@@ -297,7 +303,7 @@ if(ENABLE_PARALLEL_DOMAIN)
endif(ENABLE_PARALLEL_DOMAIN) endif(ENABLE_PARALLEL_DOMAIN)
if(ENABLE_PETSC) if(ENABLE_SEQ_PETSC)
find_package(MPI REQUIRED) find_package(MPI REQUIRED)
if(MPI_FOUND) if(MPI_FOUND)
list(APPEND COMPILEFLAGS "${MPI_COMPILE_FLAGS}") list(APPEND COMPILEFLAGS "${MPI_COMPILE_FLAGS}")
...@@ -309,12 +315,12 @@ if(ENABLE_PETSC) ...@@ -309,12 +315,12 @@ if(ENABLE_PETSC)
find_package(PETSc REQUIRED) find_package(PETSc REQUIRED)
include_directories(${PETSC_DIR}/include ${PETSC_DIR}/${PETSC_ARCH}/include) include_directories(${PETSC_DIR}/include ${PETSC_DIR}/${PETSC_ARCH}/include)
list(APPEND AMDIS_INCLUDE_DIRS ${PETSC_DIR}/include ${PETSC_DIR}/${PETSC_ARCH}/include) list(APPEND AMDIS_INCLUDE_DIRS ${PETSC_DIR}/include ${PETSC_DIR}/${PETSC_ARCH}/include)
list(APPEND COMPILEFLAGS "-DHAVE_PETSC" "-DPETSC_VERSION=${PETSC_VERSION}") list(APPEND COMPILEFLAGS "-DHAVE_SEQ_PETSC" "-DPETSC_VERSION=${PETSC_VERSION}")
list(APPEND AMDIS_SRC list(APPEND AMDIS_SRC
${SOURCE_DIR}/solver/PetscSolver.cc ${SOURCE_DIR}/solver/PetscSolver.cc
${SOURCE_DIR}/solver/PetscTypes.cc) ${SOURCE_DIR}/solver/PetscTypes.cc)
endif(ENABLE_PETSC) endif(ENABLE_SEQ_PETSC)
if(ENABLE_UMFPACK) if(ENABLE_UMFPACK)
find_file(UMFPACK_H umfpack.h find_file(UMFPACK_H umfpack.h
...@@ -362,6 +368,9 @@ if(ENABLE_PNG) ...@@ -362,6 +368,9 @@ if(ENABLE_PNG)
endif() endif()
endif(ENABLE_PNG) endif(ENABLE_PNG)
if(ENABLE_COMPRESSION)
list(APPEND COMPILEFLAGS "-DHAVE_COMPRESSION=1")
endif(ENABLE_COMPRESSION)
if(NOT ENABLE_OUTPUT) if(NOT ENABLE_OUTPUT)
message(WARNING "AMDiS cout output disabled!") message(WARNING "AMDiS cout output disabled!")
...@@ -421,11 +430,11 @@ if(ENABLE_EXTENSIONS) ...@@ -421,11 +430,11 @@ if(ENABLE_EXTENSIONS)
${EXTENSIONS_DIR}/preconditioner/PhaseFieldCrystal_.cc ${EXTENSIONS_DIR}/preconditioner/PhaseFieldCrystal_.cc
${EXTENSIONS_DIR}/preconditioner/CahnHilliard_.cc) ${EXTENSIONS_DIR}/preconditioner/CahnHilliard_.cc)
if(ENABLE_PETSC) if(ENABLE_SEQ_PETSC)
list(APPEND EXTENSIONS_SRC list(APPEND EXTENSIONS_SRC
${EXTENSIONS_DIR}/preconditioner/PetscPreconPfc.cc ${EXTENSIONS_DIR}/preconditioner/PetscPreconPfc.cc
${EXTENSIONS_DIR}/preconditioner/PetscPreconCahnHilliard.cc) ${EXTENSIONS_DIR}/preconditioner/PetscPreconCahnHilliard.cc)
endif(ENABLE_PETSC) endif(ENABLE_SEQ_PETSC)
if(ENABLE_PARALLEL_DOMAIN) if(ENABLE_PARALLEL_DOMAIN)
list(APPEND EXTENSIONS_SRC list(APPEND EXTENSIONS_SRC
...@@ -650,6 +659,11 @@ list(APPEND deb_add_dirs "include/amdis/io") ...@@ -650,6 +659,11 @@ list(APPEND deb_add_dirs "include/amdis/io")
FILE(GLOB HEADERS "${SOURCE_DIR}/io/*.hh") FILE(GLOB HEADERS "${SOURCE_DIR}/io/*.hh")
INSTALL(FILES ${HEADERS} INSTALL(FILES ${HEADERS}
DESTINATION include/amdis/io) DESTINATION include/amdis/io)
FILE(GLOB HEADERS "${SOURCE_DIR}/io/detail/*h")
INSTALL(FILES ${HEADERS}
DESTINATION include/amdis/io/detail)
list(APPEND deb_add_dirs "include/amdis/io/detail")
FILE(GLOB HEADERS "${REINIT_SOURCE_DIR}/*.h") FILE(GLOB HEADERS "${REINIT_SOURCE_DIR}/*.h")
INSTALL(FILES ${HEADERS} INSTALL(FILES ${HEADERS}
......
...@@ -36,7 +36,7 @@ namespace AMDiS { ...@@ -36,7 +36,7 @@ namespace AMDiS {
void init(int argc, char **argv, std::string initFileName) void init(int argc, char **argv, std::string initFileName)
{ {
#if defined(HAVE_PARALLEL_DOMAIN_AMDIS) || defined(HAVE_PETSC) #if defined(HAVE_PARALLEL_DOMAIN_AMDIS) || defined(HAVE_SEQ_PETSC)
#ifdef HAVE_PARALLEL_MTL4 #ifdef HAVE_PARALLEL_MTL4
mtl_environment = new mtl::par::environment(argc, argv); mtl_environment = new mtl::par::environment(argc, argv);
#else #else
...@@ -142,12 +142,10 @@ namespace AMDiS { ...@@ -142,12 +142,10 @@ namespace AMDiS {
#ifdef HAVE_PARALLEL_MTL4 #ifdef HAVE_PARALLEL_MTL4
if (mtl_environment) if (mtl_environment)
delete mtl_environment; delete mtl_environment;
#else
PetscFinalize();
#endif #endif
#endif #endif
#ifdef HAVE_PETSC #if (defined HAVE_SEQ_PETSC) || (defined HAVE_PARALLEL_PETSC)
PetscFinalize(); PetscFinalize();
#endif #endif
......
...@@ -113,7 +113,9 @@ ...@@ -113,7 +113,9 @@
#include "est/Estimator.h" #include "est/Estimator.h"
#include "io/ArhReader.h" #include "io/ArhReader.h"
#include "io/Arh2Reader.h"
#include "io/ArhWriter.h" #include "io/ArhWriter.h"
#include "io/Arh2Writer.h"
#include "io/DataCollector.h" #include "io/DataCollector.h"
#include "io/FileWriter.h" #include "io/FileWriter.h"
#include "io/GNUPlotWriter.h" #include "io/GNUPlotWriter.h"
...@@ -126,6 +128,11 @@ ...@@ -126,6 +128,11 @@
#include "io/ValueWriter.h" #include "io/ValueWriter.h"
#include "io/VtkWriter.h" #include "io/VtkWriter.h"
#include "io/VtkVectorWriter.h" #include "io/VtkVectorWriter.h"
#ifdef HAVE_EXTENSIONS
#include "io/VtkReader.h"
#endif
#include "io/Reader.h"
#include "io/Writer.h"
#include "nonlin/ProblemNonLin.h" #include "nonlin/ProblemNonLin.h"
#include "nonlin/NonLinSolver.h" #include "nonlin/NonLinSolver.h"
......
...@@ -99,6 +99,16 @@ namespace AMDiS { ...@@ -99,6 +99,16 @@ namespace AMDiS {
class Triangle; class Triangle;
class VertexInfo; class VertexInfo;
class VertexVector; class VertexVector;
namespace io {
class ElementFileWriter;
class GNUPlotWriter;
class MacroReader;
class MacroWriter;
class PngWriter;
class PovrayWriter;
class Spreadsheet;
}
#ifdef HAVE_PARALLEL_DOMAIN_AMDIS #ifdef HAVE_PARALLEL_DOMAIN_AMDIS
namespace Parallel { namespace Parallel {
......
...@@ -31,14 +31,12 @@ ...@@ -31,14 +31,12 @@
namespace AMDiS { namespace AMDiS {
using namespace std;
/// Interface for adaption loops. /// Interface for adaption loops.
class AdaptBase class AdaptBase
{ {
public: public:
/// Constructor /// Constructor
AdaptBase(string sname, AdaptBase(std::string sname,
ProblemIterationInterface *problemIteration_, ProblemIterationInterface *problemIteration_,
AdaptInfo *adapt, AdaptInfo *adapt,
ProblemTimeInterface *problemTime_ = nullptr, ProblemTimeInterface *problemTime_ = nullptr,
...@@ -60,7 +58,7 @@ namespace AMDiS { ...@@ -60,7 +58,7 @@ namespace AMDiS {
virtual int adapt() = 0; virtual int adapt() = 0;
/// Returns \ref name /// Returns \ref name
inline string getName() const inline std::string getName() const
{ {
return name; return name;
} }
...@@ -103,7 +101,7 @@ namespace AMDiS { ...@@ -103,7 +101,7 @@ namespace AMDiS {
protected: protected:
/// Name of the adaption loop /// Name of the adaption loop
string name; std::string name;
/// Problem iteration interface /// Problem iteration interface
ProblemIterationInterface *problemIteration; ProblemIterationInterface *problemIteration;
......
...@@ -33,6 +33,8 @@ ...@@ -33,6 +33,8 @@
#endif #endif
#endif #endif
using namespace std;
namespace AMDiS { namespace AMDiS {
AdaptInstationary::AdaptInstationary(std::string name, AdaptInstationary::AdaptInstationary(std::string name,
......
...@@ -35,8 +35,6 @@ ...@@ -35,8 +35,6 @@
namespace AMDiS { namespace AMDiS {
using namespace std;
/** \ingroup Adaption /** \ingroup Adaption
* \brief * \brief
* AdaptInstationary implements the adaptive procdure for time dependent * AdaptInstationary implements the adaptive procdure for time dependent
...@@ -48,21 +46,21 @@ namespace AMDiS { ...@@ -48,21 +46,21 @@ namespace AMDiS {
public: public:
/// Creates a AdaptInstationary object with the given name for the time /// Creates a AdaptInstationary object with the given name for the time
/// dependent problem problemInstat. TODO: Make obsolete! /// dependent problem problemInstat. TODO: Make obsolete!
AdaptInstationary(string name, AdaptInstationary(std::string name,
ProblemIterationInterface *problemStat, ProblemIterationInterface *problemStat,
AdaptInfo *info, AdaptInfo *info,
ProblemTimeInterface *problemInstat, ProblemTimeInterface *problemInstat,
AdaptInfo *initialInfo, AdaptInfo *initialInfo,
time_t initialTimestampSet = 0); std::time_t initialTimestampSet = 0);
/// Creates a AdaptInstationary object with the given name for the time /// Creates a AdaptInstationary object with the given name for the time
/// dependent problem problemInstat. /// dependent problem problemInstat.
AdaptInstationary(string name, AdaptInstationary(std::string name,
ProblemIterationInterface &problemStat, ProblemIterationInterface &problemStat,
AdaptInfo &info, AdaptInfo &info,
ProblemTimeInterface &problemInstat, ProblemTimeInterface &problemInstat,
AdaptInfo &initialInfo, AdaptInfo &initialInfo,
time_t initialTimestampSet = 0); std::time_t initialTimestampSet = 0);
/** \brief /** \brief
* This funciton is used only to avoid double code in both constructors. If the * This funciton is used only to avoid double code in both constructors. If the
...@@ -73,7 +71,7 @@ namespace AMDiS { ...@@ -73,7 +71,7 @@ namespace AMDiS {
void initConstructor(ProblemIterationInterface *problemStat, void initConstructor(ProblemIterationInterface *problemStat,
AdaptInfo *info, AdaptInfo *info,
AdaptInfo *initialInfo, AdaptInfo *initialInfo,
time_t initialTimestampSet); std::time_t initialTimestampSet);
/// Destructor /// Destructor
virtual ~AdaptInstationary() {} virtual ~AdaptInstationary() {}
...@@ -94,10 +92,10 @@ namespace AMDiS { ...@@ -94,10 +92,10 @@ namespace AMDiS {
int adapt() override; int adapt() override;
/// Serialization /// Serialization
virtual void serialize(ostream &out); virtual void serialize(std::ostream &out);
/// deserialization /// deserialization
virtual void deserialize(istream &in); virtual void deserialize(std::istream &in);
protected: protected:
...@@ -113,7 +111,7 @@ namespace AMDiS { ...@@ -113,7 +111,7 @@ namespace AMDiS {
virtual void oneTimestep(); virtual void oneTimestep();
/// Initialisation of this AdaptInstationary object /// Initialisation of this AdaptInstationary object
void initialize(string aName); void initialize(std::string aName);
/// Implements the explit time strategy. Used by \ref oneTimestep(). /// Implements the explit time strategy. Used by \ref oneTimestep().
virtual void explicitTimeStrategy(); virtual void explicitTimeStrategy();
...@@ -160,18 +158,18 @@ namespace AMDiS { ...@@ -160,18 +158,18 @@ namespace AMDiS {
int queueRuntime; int queueRuntime;
/// Name of the file used to automatically serialize the problem. /// Name of the file used to automatically serialize the problem.
string queueSerializationFilename; std::string queueSerializationFilename;
/// Timestamp at the beginning of all calculations. It is used to calculate the /// Timestamp at the beginning of all calculations. It is used to calculate the
/// overall runtime of the problem. /// overall runtime of the problem.
time_t initialTimestamp; std::time_t initialTimestamp;
/// Timestamp at the beginning of the last timestep iteration. Is is used to /// Timestamp at the beginning of the last timestep iteration. Is is used to
/// calculate the runtime of the last timestep. /// calculate the runtime of the last timestep.
time_t iterationTimestamp; std::time_t iterationTimestamp;
/// Stores the runtime (in seconds) of some last timestep iterations. /// Stores the runtime (in seconds) of some last timestep iterations.
queue<int> lastIterationsDuration; std::queue<int> lastIterationsDuration;
/// In debug mode, the adapt loop will print information about timestep decreasing /// In debug mode, the adapt loop will print information about timestep decreasing
/// and increasing. /// and increasing.
......
...@@ -40,8 +40,6 @@ ...@@ -40,8 +40,6 @@
namespace AMDiS { namespace AMDiS {
using namespace std;
/** \ingroup Adaption /** \ingroup Adaption
* \brief * \brief
* AdaptStationary contains information about the adaptive procedure and the * AdaptStationary contains information about the adaptive procedure and the
...@@ -51,12 +49,12 @@ namespace AMDiS { ...@@ -51,12 +49,12 @@ namespace AMDiS {
{ {
public: public:
/// Creates a AdaptStationary object with given name. TODO: Make obsolete! /// Creates a AdaptStationary object with given name. TODO: Make obsolete!
AdaptStationary(string name, AdaptStationary(std::string name,
ProblemIterationInterface *prob, ProblemIterationInterface *prob,
AdaptInfo *info); AdaptInfo *info);
/// Creates a AdaptStationary object with given name. /// Creates a AdaptStationary object with given name.
AdaptStationary(string name, AdaptStationary(std::string name,
ProblemIterationInterface &prob, ProblemIterationInterface &prob,
AdaptInfo &info); AdaptInfo &info);
......
...@@ -34,8 +34,6 @@ ...@@ -34,8 +34,6 @@
namespace AMDiS { namespace AMDiS {
using namespace std;
/// Function interface for evaluating basis functions. /// Function interface for evaluating basis functions.
class BasFctType class BasFctType
{ {
...@@ -91,7 +89,7 @@ namespace AMDiS { ...@@ -91,7 +89,7 @@ namespace AMDiS {
{ {
protected: protected:
/// Creates a BasisFunction object of given dim and degree /// Creates a BasisFunction object of given dim and degree
BasisFunction(string name, int dim, int degree); BasisFunction(std::string name, int dim, int degree);
/// destructor /// destructor
virtual ~BasisFunction(); virtual ~BasisFunction();
...@@ -145,7 +143,7 @@ namespace AMDiS { ...@@ -145,7 +143,7 @@ namespace AMDiS {
} }
/// Returns \ref name of BasisFunction /// Returns \ref name of BasisFunction
inline string getName() const inline std::string getName() const
{ {
return name; return name;
} }
...@@ -271,13 +269,13 @@ namespace AMDiS { ...@@ -271,13 +269,13 @@ namespace AMDiS {
/// Returns local dof indices of the element for the given fe space. /// Returns local dof indices of the element for the given fe space.
virtual void getLocalIndices(const Element *el, virtual void getLocalIndices(const Element *el,
const DOFAdmin *admin, const DOFAdmin *admin,
vector<DegreeOfFreedom> &indices) const std::vector<DegreeOfFreedom> &indices) const
{} {}
/// ///
virtual void getLocalDofPtrVec(const Element *el, virtual void getLocalDofPtrVec(const Element *el,
const DOFAdmin *admin, const DOFAdmin *admin,
vector<const DegreeOfFreedom*>& vec) const std::vector<const DegreeOfFreedom*>& vec) const
{} {}
...@@ -315,7 +313,7 @@ namespace AMDiS { ...@@ -315,7 +313,7 @@ namespace AMDiS {
protected: protected:
/// Textual description /// Textual description
string name; std::string name;
/// Number of basisfunctions on one Element /// Number of basisfunctions on one Element
int nBasFcts; int nBasFcts;
...@@ -333,13 +331,13 @@ namespace AMDiS { ...@@ -333,13 +331,13 @@ namespace AMDiS {
DimVec<int> *nDOF; DimVec<int> *nDOF;
/// Vector of the local functions /// Vector of the local functions
vector<BasFctType*> *phi; std::vector<BasFctType*> *phi;
/// Vector of gradients /// Vector of gradients
vector<GrdBasFctType*> *grdPhi; std::vector<GrdBasFctType*> *grdPhi;
/// Vector of second derivatives /// Vector of second derivatives
vector<D2BasFctType*> *d2Phi;