Commit a07b559f authored by Thomas Witkowski's avatar Thomas Witkowski

Work on pdd, code refactoring.

parent b017fc35
......@@ -30,10 +30,10 @@
# the same distribution terms that you use for the rest of that program.
# A sed program that does not truncate output.
SED="/bin/sed"
SED="/usr/bin/sed"
# Sed that helps us avoid accidentally triggering echo(1) options like -n.
Xsed="/bin/sed -e 1s/^X//"
Xsed="/usr/bin/sed -e 1s/^X//"
# The HP-UX ksh and POSIX shell print the target directory to stdout
# if CDPATH is set.
......@@ -44,7 +44,7 @@ available_tags=" CXX F77"
# ### BEGIN LIBTOOL CONFIG
# Libtool was configured on host NWRW15:
# Libtool was configured on host p1d062:
# Shell to use when invoking shell scripts.
SHELL="/bin/sh"
......@@ -66,12 +66,12 @@ fast_install=yes
# The host system.
host_alias=
host=i686-pc-linux-gnu
host=x86_64-unknown-linux-gnu
host_os=linux-gnu
# The build system.
build_alias=
build=i686-pc-linux-gnu
build=x86_64-unknown-linux-gnu
build_os=linux-gnu
# An echo program that does not interpret backslashes.
......@@ -82,13 +82,13 @@ AR="ar"
AR_FLAGS="cru"
# A C compiler.
LTCC="gcc"
LTCC="/licsoft/libraries/openmpi/1.2.6/64bit/bin/mpicc"
# LTCC compiler flags.
LTCFLAGS="-g -O2"
# A language-specific compiler.
CC="gcc"
CC="/licsoft/libraries/openmpi/1.2.6/64bit/bin/mpicc"
# Is the compiler the GNU C compiler?
with_gcc=yes
......@@ -97,7 +97,7 @@ with_gcc=yes
EGREP="grep -E"
# The linker used to build libraries.
LD="/usr/bin/ld"
LD="/usr/x86_64-suse-linux/bin/ld -m elf_x86_64"
# Whether we need hard or soft links.
LN_S="ln -s"
......@@ -171,7 +171,7 @@ dlopen_self=unknown
dlopen_self_static=unknown
# Compiler flag to prevent dynamic linking.
link_static_flag="-static"
link_static_flag=""
# Compiler flag to turn off builtin functions.
no_builtin_flag=" -fno-builtin"
......@@ -325,10 +325,10 @@ variables_saved_for_relink="PATH LD_LIBRARY_PATH LD_RUN_PATH GCC_EXEC_PREFIX COM
link_all_deplibs=unknown
# Compile-time system search path for libraries
sys_lib_search_path_spec=" /usr/lib/gcc/i386-redhat-linux/4.1.2/ /usr/lib/gcc/i386-redhat-linux/4.1.2/ /usr/lib/gcc/i386-redhat-linux/4.1.2/../../../../i386-redhat-linux/lib/i386-redhat-linux/4.1.2/ /usr/lib/gcc/i386-redhat-linux/4.1.2/../../../../i386-redhat-linux/lib/ /usr/lib/gcc/i386-redhat-linux/4.1.2/../../../i386-redhat-linux/4.1.2/ /usr/lib/gcc/i386-redhat-linux/4.1.2/../../../ /lib/i386-redhat-linux/4.1.2/ /lib/ /usr/lib/i386-redhat-linux/4.1.2/ /usr/lib/"
sys_lib_search_path_spec=" /usr/lib64/gcc/x86_64-suse-linux/4.1.2/ /usr/lib/gcc/x86_64-suse-linux/4.1.2/ /usr/lib64/gcc/x86_64-suse-linux/4.1.2/../../../../x86_64-suse-linux/lib/x86_64-suse-linux/4.1.2/ /usr/lib64/gcc/x86_64-suse-linux/4.1.2/../../../../x86_64-suse-linux/lib/../lib64/ /usr/lib64/gcc/x86_64-suse-linux/4.1.2/../../../x86_64-suse-linux/4.1.2/ /usr/lib64/gcc/x86_64-suse-linux/4.1.2/../../../../lib64/ /lib/x86_64-suse-linux/4.1.2/ /lib/../lib64/ /usr/lib/x86_64-suse-linux/4.1.2/ /usr/lib/../lib64/ /usr/lib64/gcc/x86_64-suse-linux/4.1.2/../../../../x86_64-suse-linux/lib/ /usr/lib64/gcc/x86_64-suse-linux/4.1.2/../../../ /lib/ /usr/lib/"
# Run-time system search path for libraries
sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/lib/octave-2.9.9 /usr/lib/qt-3.3/lib "
sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/X11R6/lib64/Xaw3d /usr/X11R6/lib64 /usr/X11R6/lib/Xaw3d /usr/X11R6/lib /usr/x86_64-suse-linux/lib /usr/local/lib64 /usr/local/lib /opt/kde3/lib64 /opt/kde3/lib /opt/gnome/lib64 /opt/gnome/lib /lib64 /lib /usr/lib64 /usr/lib /opt/cluster/intel/cce/9.1.042/lib /opt/cluster/intel/fce/9.1.036/lib /opt/cluster/Pathscale3.0/lib/2.9.99 /opt/cluster/Pathscale3.0/lib/2.9.99/32 /work/licsoft/compilers/pgi/linux86-64/6.2/lib /work/licsoft/compilers/pgi/linux86-64/6.2/libso "
# Fix the shell variable $srcfile for the compiler.
fix_srcfile_path=""
......@@ -6760,7 +6760,7 @@ build_old_libs=`case $build_libtool_libs in yes) $echo no;; *) $echo yes;; esac`
# End:
# ### BEGIN LIBTOOL TAG CONFIG: CXX
# Libtool was configured on host NWRW15:
# Libtool was configured on host p1d062:
# Shell to use when invoking shell scripts.
SHELL="/bin/sh"
......@@ -6782,12 +6782,12 @@ fast_install=yes
# The host system.
host_alias=
host=i686-pc-linux-gnu
host=x86_64-unknown-linux-gnu
host_os=linux-gnu
# The build system.
build_alias=
build=i686-pc-linux-gnu
build=x86_64-unknown-linux-gnu
build_os=linux-gnu
# An echo program that does not interpret backslashes.
......@@ -6798,13 +6798,13 @@ AR="ar"
AR_FLAGS="cru"
# A C compiler.
LTCC="gcc"
LTCC="/licsoft/libraries/openmpi/1.2.6/64bit/bin/mpicc"
# LTCC compiler flags.
LTCFLAGS="-g -O2"
# A language-specific compiler.
CC="g++"
CC="/licsoft/libraries/openmpi/1.2.6/64bit/bin/mpiCC"
# Is the compiler the GNU C compiler?
with_gcc=yes
......@@ -6813,7 +6813,7 @@ with_gcc=yes
EGREP="grep -E"
# The linker used to build libraries.
LD="/usr/bin/ld"
LD="/usr/x86_64-suse-linux/bin/ld -m elf_x86_64"
# Whether we need hard or soft links.
LN_S="ln -s"
......@@ -6887,7 +6887,7 @@ dlopen_self=unknown
dlopen_self_static=unknown
# Compiler flag to prevent dynamic linking.
link_static_flag="-static"
link_static_flag=""
# Compiler flag to turn off builtin functions.
no_builtin_flag=" -fno-builtin"
......@@ -6942,11 +6942,11 @@ striplib="strip --strip-unneeded"
# Dependencies to place before the objects being linked to create a
# shared library.
predep_objects="/usr/lib/gcc/i386-redhat-linux/4.1.2/../../../crti.o /usr/lib/gcc/i386-redhat-linux/4.1.2/crtbeginS.o"
predep_objects="/usr/lib64/gcc/x86_64-suse-linux/4.1.2/../../../../lib64/crti.o /usr/lib64/gcc/x86_64-suse-linux/4.1.2/crtbeginS.o"
# Dependencies to place after the objects being linked to create a
# shared library.
postdep_objects="/usr/lib/gcc/i386-redhat-linux/4.1.2/crtendS.o /usr/lib/gcc/i386-redhat-linux/4.1.2/../../../crtn.o"
postdep_objects="/usr/lib64/gcc/x86_64-suse-linux/4.1.2/crtendS.o /usr/lib64/gcc/x86_64-suse-linux/4.1.2/../../../../lib64/crtn.o"
# Dependencies to place before the objects being linked to create a
# shared library.
......@@ -6954,11 +6954,11 @@ predeps=""
# Dependencies to place after the objects being linked to create a
# shared library.
postdeps="-lstdc++ -lm -lgcc_s -lc -lgcc_s"
postdeps="-lmpi_cxx -lmpi -lopen-rte -lopen-pal -libverbs -lrt -lnuma -ldl -lnsl -lutil -ldl -lstdc++ -lm -lgcc_s -lpthread -lc -lgcc_s"
# The library search path used internally by the compiler when linking
# a shared library.
compiler_lib_search_path="-L/usr/lib/gcc/i386-redhat-linux/4.1.2 -L/usr/lib/gcc/i386-redhat-linux/4.1.2 -L/usr/lib/gcc/i386-redhat-linux/4.1.2/../../.."
compiler_lib_search_path="-L/usr/lib64 -L/licsoft/libraries/openmpi/1.2.6/64bit/lib -L/usr/lib64/gcc/x86_64-suse-linux/4.1.2 -L/usr/lib64/gcc/x86_64-suse-linux/4.1.2/../../../../lib64 -L/lib/../lib64 -L/usr/lib/../lib64 -L/usr/lib64/gcc/x86_64-suse-linux/4.1.2/../../../../x86_64-suse-linux/lib -L/usr/lib64/gcc/x86_64-suse-linux/4.1.2/../../.."
# Method to check whether dependent libraries are shared objects.
deplibs_check_method="pass_all"
......@@ -7038,10 +7038,10 @@ variables_saved_for_relink="PATH LD_LIBRARY_PATH LD_RUN_PATH GCC_EXEC_PREFIX COM
link_all_deplibs=unknown
# Compile-time system search path for libraries
sys_lib_search_path_spec=" /usr/lib/gcc/i386-redhat-linux/4.1.2/ /usr/lib/gcc/i386-redhat-linux/4.1.2/ /usr/lib/gcc/i386-redhat-linux/4.1.2/../../../../i386-redhat-linux/lib/i386-redhat-linux/4.1.2/ /usr/lib/gcc/i386-redhat-linux/4.1.2/../../../../i386-redhat-linux/lib/ /usr/lib/gcc/i386-redhat-linux/4.1.2/../../../i386-redhat-linux/4.1.2/ /usr/lib/gcc/i386-redhat-linux/4.1.2/../../../ /lib/i386-redhat-linux/4.1.2/ /lib/ /usr/lib/i386-redhat-linux/4.1.2/ /usr/lib/"
sys_lib_search_path_spec=" /usr/lib64/gcc/x86_64-suse-linux/4.1.2/ /usr/lib/gcc/x86_64-suse-linux/4.1.2/ /usr/lib64/gcc/x86_64-suse-linux/4.1.2/../../../../x86_64-suse-linux/lib/x86_64-suse-linux/4.1.2/ /usr/lib64/gcc/x86_64-suse-linux/4.1.2/../../../../x86_64-suse-linux/lib/../lib64/ /usr/lib64/gcc/x86_64-suse-linux/4.1.2/../../../x86_64-suse-linux/4.1.2/ /usr/lib64/gcc/x86_64-suse-linux/4.1.2/../../../../lib64/ /lib/x86_64-suse-linux/4.1.2/ /lib/../lib64/ /usr/lib/x86_64-suse-linux/4.1.2/ /usr/lib/../lib64/ /usr/lib64/gcc/x86_64-suse-linux/4.1.2/../../../../x86_64-suse-linux/lib/ /usr/lib64/gcc/x86_64-suse-linux/4.1.2/../../../ /lib/ /usr/lib/"
# Run-time system search path for libraries
sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/lib/octave-2.9.9 /usr/lib/qt-3.3/lib "
sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/X11R6/lib64/Xaw3d /usr/X11R6/lib64 /usr/X11R6/lib/Xaw3d /usr/X11R6/lib /usr/x86_64-suse-linux/lib /usr/local/lib64 /usr/local/lib /opt/kde3/lib64 /opt/kde3/lib /opt/gnome/lib64 /opt/gnome/lib /lib64 /lib /usr/lib64 /usr/lib /opt/cluster/intel/cce/9.1.042/lib /opt/cluster/intel/fce/9.1.036/lib /opt/cluster/Pathscale3.0/lib/2.9.99 /opt/cluster/Pathscale3.0/lib/2.9.99/32 /work/licsoft/compilers/pgi/linux86-64/6.2/lib /work/licsoft/compilers/pgi/linux86-64/6.2/libso "
# Fix the shell variable $srcfile for the compiler.
fix_srcfile_path=""
......@@ -7065,7 +7065,7 @@ include_expsyms=""
# ### BEGIN LIBTOOL TAG CONFIG: F77
# Libtool was configured on host NWRW15:
# Libtool was configured on host p1d062:
# Shell to use when invoking shell scripts.
SHELL="/bin/sh"
......@@ -7087,12 +7087,12 @@ fast_install=yes
# The host system.
host_alias=
host=i686-pc-linux-gnu
host=x86_64-unknown-linux-gnu
host_os=linux-gnu
# The build system.
build_alias=
build=i686-pc-linux-gnu
build=x86_64-unknown-linux-gnu
build_os=linux-gnu
# An echo program that does not interpret backslashes.
......@@ -7103,7 +7103,7 @@ AR="ar"
AR_FLAGS="cru"
# A C compiler.
LTCC="gcc"
LTCC="/licsoft/libraries/openmpi/1.2.6/64bit/bin/mpicc"
# LTCC compiler flags.
LTCFLAGS="-g -O2"
......@@ -7112,13 +7112,13 @@ LTCFLAGS="-g -O2"
CC="g77"
# Is the compiler the GNU C compiler?
with_gcc=yes
with_gcc=
# An ERE matcher.
EGREP="grep -E"
# The linker used to build libraries.
LD="/usr/bin/ld"
LD="/usr/x86_64-suse-linux/bin/ld -m elf_x86_64"
# Whether we need hard or soft links.
LN_S="ln -s"
......@@ -7346,10 +7346,10 @@ variables_saved_for_relink="PATH LD_LIBRARY_PATH LD_RUN_PATH GCC_EXEC_PREFIX COM
link_all_deplibs=unknown
# Compile-time system search path for libraries
sys_lib_search_path_spec=" /usr/lib/gcc/i386-redhat-linux/3.4.6/ /usr/lib/gcc/i386-redhat-linux/3.4.6/ /usr/lib/gcc/i386-redhat-linux/3.4.6/../../../../i386-redhat-linux/lib/i386-redhat-linux/3.4.6/ /usr/lib/gcc/i386-redhat-linux/3.4.6/../../../../i386-redhat-linux/lib/ /usr/lib/gcc/i386-redhat-linux/3.4.6/../../../i386-redhat-linux/3.4.6/ /usr/lib/gcc/i386-redhat-linux/3.4.6/../../../ /lib/i386-redhat-linux/3.4.6/ /lib/ /usr/lib/i386-redhat-linux/3.4.6/ /usr/lib/"
sys_lib_search_path_spec=" /usr/lib64/gcc-lib/x86_64-suse-linux/3.3.5/ /usr/lib/gcc/x86_64-suse-linux/3.3.5/ /usr/lib64/gcc-lib/x86_64-suse-linux/3.3.5/../../../../x86_64-suse-linux/lib/x86_64-suse-linux/3.3.5/ /usr/lib64/gcc-lib/x86_64-suse-linux/3.3.5/../../../../x86_64-suse-linux/lib/ /usr/lib64/gcc-lib/x86_64-suse-linux/3.3.5/../../../x86_64-suse-linux/3.3.5/ /usr/lib64/gcc-lib/x86_64-suse-linux/3.3.5/../../../ /lib/x86_64-suse-linux/3.3.5/ /lib/ /usr/lib/x86_64-suse-linux/3.3.5/ /usr/lib/"
# Run-time system search path for libraries
sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/lib/octave-2.9.9 /usr/lib/qt-3.3/lib "
sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/X11R6/lib64/Xaw3d /usr/X11R6/lib64 /usr/X11R6/lib/Xaw3d /usr/X11R6/lib /usr/x86_64-suse-linux/lib /usr/local/lib64 /usr/local/lib /opt/kde3/lib64 /opt/kde3/lib /opt/gnome/lib64 /opt/gnome/lib /lib64 /lib /usr/lib64 /usr/lib /opt/cluster/intel/cce/9.1.042/lib /opt/cluster/intel/fce/9.1.036/lib /opt/cluster/Pathscale3.0/lib/2.9.99 /opt/cluster/Pathscale3.0/lib/2.9.99/32 /work/licsoft/compilers/pgi/linux86-64/6.2/lib /work/licsoft/compilers/pgi/linux86-64/6.2/libso "
# Fix the shell variable $srcfile for the compiler.
fix_srcfile_path=""
......
......@@ -62,7 +62,10 @@ namespace AMDiS {
class Parametric;
class PeriodicBC;
class ProblemInstat;
class ProblemInstatScal;
class ProblemInstatVec;
class ProblemIterationInterface;
class ProblemScal;
class ProblemStatBase;
class ProblemTimeInterface;
class ProblemVec;
......@@ -77,6 +80,7 @@ namespace AMDiS {
class RCNeighbourList;
class RefinementManager;
class RobinBC;
class SMIAdapter;
class SystemVector;
class TraverseStack;
class VertexInfo;
......
......@@ -160,9 +160,9 @@ namespace AMDiS {
FUNCNAME("DOFAdmin::enlargeDOFLists()");
int old = size;
if (minsize > 0) {
if (old > minsize) return;
}
if (minsize > 0)
if (old > minsize)
return;
int newval = max(minsize, static_cast<int>((dofFree.size() + sizeIncrement)));
......@@ -177,9 +177,7 @@ namespace AMDiS {
// but DOFVectors<int> don't have to be changed
std::list<DOFIndexedBase*>::iterator di;
std::list<DOFIndexedBase*>::iterator end = dofIndexedList.end();
for (di = dofIndexedList.begin(); di != end; ++di)
for (di = dofIndexedList.begin(); di != dofIndexedList.end(); ++di)
if ((*di)->getSize() < newval)
(*di)->resize(newval);
}
......@@ -194,9 +192,8 @@ namespace AMDiS {
#pragma omp critical (dofIndexAccess)
#endif
{
if (dofIndexed->getSize() < size) {
if (dofIndexed->getSize() < size)
dofIndexed->resize(size);
}
dofIndexedList.push_back(dofIndexed);
}
......
......@@ -175,7 +175,8 @@ namespace AMDiS {
}
/// Returns \ref mesh
inline const Mesh* getMesh() const {
inline const Mesh* getMesh() const
{
return mesh;
}
......@@ -196,6 +197,26 @@ namespace AMDiS {
{
dofFree[i] = b;
}
/// Sets \ref usedSize.
inline void setUsedSize(int i)
{
sizeUsed = i;
}
/// Sets \ref usedCount.
inline void setUsedCount(int i)
{
usedCount = i;
}
/// Sets \ref firstHole
inline void setFirstHole(int i)
{
TEST_EXIT_DBG(!dofFree[i])("There is no hole!\n");
firstHole = i;
}
/** \} */
......
......@@ -56,47 +56,56 @@ namespace AMDiS {
*/
/// Returns \ref index.
inline int getIndex() const {
inline int getIndex() const
{
return index;
}
/// Returns ref projection[i].
inline Projection *getProjection(int i) const {
inline Projection *getProjection(int i) const
{
return projection[i];
}
/// Returns \ref el
inline Element* getElement() const {
inline Element* getElement() const
{
return element;
}
/// Returns the i-th neighbour of this MacroElement \ref neighbour[i]
inline MacroElement* getNeighbour(int i) const {
inline MacroElement* getNeighbour(int i) const
{
return neighbour[i];
}
/// Returns the i-th opp-vertex of this MacroElement \ref oppVertex[i]
inline char getOppVertex(int i) const {
inline char getOppVertex(int i) const
{
return oppVertex[i];
}
/// Returns \ref coord[i]
inline WorldVector<double>& getCoord(int i) {
inline WorldVector<double>& getCoord(int i)
{
return coord[i];
}
/// Returns \ref coord
inline FixVec<WorldVector<double>, VERTEX>& getCoord() {
inline FixVec<WorldVector<double>, VERTEX>& getCoord()
{
return coord;
}
/// Returns \ref boundary[i]
inline BoundaryType getBoundary(int i) const {
inline BoundaryType getBoundary(int i) const
{
return boundary[i];
}
/// Returns \ref elType
inline unsigned char getElType() const {
inline unsigned char getElType() const
{
return elType;
}
......@@ -107,12 +116,14 @@ namespace AMDiS {
*/
/// Sets \ref index
inline void setIndex(int n) {
inline void setIndex(int n)
{
index = n ;
}
/// Sets \ref element if not yet set.
inline void setElement(Element* element_) {
inline void setElement(Element* element_)
{
if (!element) {
element = element_;
} else {
......@@ -122,33 +133,38 @@ namespace AMDiS {
}
/// Sets \ref elType
inline void setElType(unsigned char typ) {
inline void setElType(unsigned char typ)
{
elType = typ;
}
/// Sets \ref projection[i] = p.
inline void setProjection(int i, Projection *p) {
inline void setProjection(int i, Projection *p)
{
projection[i] = p;
}
/// Sets the i-th Neighbour to n
inline void setNeighbour(int i, MacroElement *n) {
inline void setNeighbour(int i, MacroElement *n)
{
neighbour[i] = n;
}
/// Sets the i-th opp vertex to c
inline void setOppVertex(int i, char c) {
inline void setOppVertex(int i, char c)
{
oppVertex[i] = c;
}
/// Sets \ref boundary[i] to b
inline void setBoundary(int i, BoundaryType b) {
inline void setBoundary(int i, BoundaryType b)
{
boundary[i] = b;
}
///
inline void setCoord(int i, const WorldVector<double> c) {
inline void setCoord(int i, const WorldVector<double> c)
{
coord[i] = c;
}
......@@ -162,7 +178,8 @@ namespace AMDiS {
void deserialize(std::istream &in);
///
inline void writeNeighboursTo(std::vector<int> *indices) {
inline void writeNeighboursTo(std::vector<int> *indices)
{
deserializedNeighbourIndices_ = indices;
}
......
......@@ -46,20 +46,14 @@ namespace AMDiS {
class MacroWriter
{
public:
/** \brief
* Stores a list of vertex infos for each dof.
*/
/// Stores a list of vertex infos for each dof.
static DOFVector< std::list<VertexInfo> > *vertexInfos;
/** \brief
* List that stores an ElementInfo for each element.
*/
/// List that stores an ElementInfo for each element.
static std::list<ElementInfo> elements;
public:
/** \brief
* Writes the leaf elements of a Mesh as a macro triangulation to a file.
*/
/// Writes the leaf elements of a Mesh as a macro triangulation to a file.
static int writeMacro(DataCollector *dc,
const char *name,
double time = 0.0,
......@@ -67,57 +61,36 @@ namespace AMDiS {
Flag traverseFlag = Mesh::CALL_LEAF_EL,
bool (*writeElem)(ElInfo*) = NULL);
/** \brief
* Init \ref periodicFile for the next macro to be written.
*/
static void writePeriodicFile(DataCollector *dc,
const std::string filename);
/// Init \ref periodicFile for the next macro to be written.
static void writePeriodicFile(DataCollector *dc, const std::string filename);
protected:
/** \brief
* Mesh that should be written
*/
/// Mesh that should be written
static Mesh *mesh;
/** \brief
* File to which the mesh should be written
*/
/// File to which the mesh should be written
static FILE *macroFile;
/** \brief
* File in which the periodic infos are stored.
*/
/// File in which the periodic infos are stored.
static FILE *periodicFile;
/** \brief
* vertex pre-dofs
*/
/// vertex pre-dofs
static int n0;
/** \brief
* Number of vertices.
*/
/// Number of vertices.
static int nv;
/** \brief
* Number of elements.
*/
/// Number of elements.
static int ne;
/** \brief
* Number of connections.
*/
/// Number of connections.
static int nc;
/** \brief
* Dimension of \ref mesh
*/
/// Dimension of \ref mesh
static int dim;
/** \brief
* Maps internal element indices to global output indices.
*/
/// Maps internal element indices to global output indices.
static std::map<int, int> outputIndices;
/** \brief
......@@ -126,9 +99,7 @@ namespace AMDiS {
*/
static std::vector<DimVec<bool> > periodicConnections;
/** \brief
*
*/
///
static bool (*writeElement)(ElInfo*);
};
......
......@@ -41,14 +41,10 @@ namespace AMDiS {
class Marker
{
public:
/** \brief
* Constructor.
*/
/// Constructor.
Marker() {}
/** \brief
* Constructor.
*/
/// Constructor.
Marker(std::string name_, int row_)
: name(name_),
row(row_),
......@@ -62,9 +58,7 @@ namespace AMDiS {
GET_PARAMETER(0, name + "->max refinement level", "%d", &maxRefineLevel);
}
/** \brief
* destructor
*/
/// destructor
virtual ~Marker() {}
/** \brief
......@@ -72,7 +66,8 @@ namespace AMDiS {
* is marked only if the new mark is bigger than the old one. The return
* value specifies whether the element has been marked, or not.
*/
inline void setMark(Element *el, char newMark) {
inline void setMark(Element *el, char newMark)
{
char oldMark = el->getMark();
if (!maximumMarking || (newMark > oldMark)) {
......@@ -94,50 +89,39 @@ namespace AMDiS {
}
}
/** \brief
* Can be used by sub classes. Called before traversal.
*/
/// Can be used by sub classes. Called before traversal.
virtual void initMarking(AdaptInfo *adaptInfo, Mesh *mesh);
/** \brief
* Can be used by sub classes. Called after traversal.
*/
/// Can be used by sub classes. Called after traversal.
virtual void finishMarking(AdaptInfo *adaptInfo);
/** \brief
* Marks one element.
*/
/// Marks one element.
virtual void markElement(AdaptInfo *adaptInfo, ElInfo *elInfo);
/** \brief
* Marking of the mesh.
*/
/// Marking of the mesh.
virtual Flag markMesh(AdaptInfo *adaptInfo, Mesh *mesh);
/** \brief
* Sets \ref maximumMarking.
*/
inline void setMaximumMarking(bool maxMark) {
/// Sets \ref maximumMarking.
inline void setMaximumMarking(bool maxMark)
{
maximumMarking = maxMark;
}
inline int getElMarkRefine() {
inline int getElMarkRefine()
{
return elMarkRefine;
}
inline int getElMarkCoarsen() {
inline int getElMarkCoarsen()
{
return elMarkCoarsen;
}
/** \brief
* Creates a scalr marker depending on the strategy set in parameters.
*/
/// Creates a scalr marker depending on the strategy set in parameters.
static Marker *createMarker(std::string name, int row_);
protected:
/** \brief
* Name of the scalar marker.
*/
/// Name of the scalar marker.
std::string name;