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

* Added AdaptInfo to debug server for parallel problem debugging

parent 91718fb9
......@@ -43,11 +43,11 @@ namespace AMDiS {
/** \brief
* Constructor
*/
AdaptBase(const ::std::string& name,
AdaptBase(const ::std::string& name,
ProblemIterationInterface *problemIteration,
AdaptInfo *adaptInfo,
ProblemTimeInterface *problemTime = NULL,
AdaptInfo *initialAdaptInfo = NULL)
AdaptInfo *adaptInfo,
ProblemTimeInterface *problemTime = NULL,
AdaptInfo *initialAdaptInfo = NULL)
: name_(name),
problemIteration_(problemIteration),
adaptInfo_(adaptInfo),
......
......@@ -8,12 +8,12 @@
namespace AMDiS {
AdaptInstationary::AdaptInstationary(const char *name,
AdaptInstationary::AdaptInstationary(const char *name,
ProblemIterationInterface *problemStat,
AdaptInfo *info,
ProblemTimeInterface *problemInstat,
AdaptInfo *initialInfo,
time_t initialTimestamp)
AdaptInfo *info,
ProblemTimeInterface *problemInstat,
AdaptInfo *initialInfo,
time_t initialTimestamp)
: AdaptBase(name, problemStat, info, problemInstat, initialInfo),
breakWhenStable(0)
{
......
......@@ -54,12 +54,12 @@ namespace AMDiS {
* Creates a AdaptInstationary object with the given name for the time
* dependent problem problemInstat.
*/
AdaptInstationary(const char *name_,
AdaptInstationary(const char *name_,
ProblemIterationInterface *problemStat,
AdaptInfo *info,
ProblemTimeInterface *problemInstat,
AdaptInfo *initialInfo,
time_t initialTimestamp = 0);
AdaptInfo *info,
ProblemTimeInterface *problemInstat,
AdaptInfo *initialInfo,
time_t initialTimestamp = 0);
/** \brief
* Destructor
......
......@@ -6,7 +6,12 @@ namespace AMDiS
template<typename VectorType>
BiCGStab<VectorType>::BiCGStab(::std::string name)
: OEMSolver<VectorType>(name),
r(NULL), rstar(NULL), p(NULL), v(NULL), t(NULL), xmin(NULL)
r(NULL),
rstar(NULL),
p(NULL),
v(NULL),
t(NULL),
xmin(NULL)
{}
template<typename VectorType>
......@@ -16,11 +21,11 @@ namespace AMDiS
template<typename VectorType>
void BiCGStab<VectorType>::init()
{
r = this->vectorCreator->create();
r = this->vectorCreator->create();
rstar = this->vectorCreator->create();
p = this->vectorCreator->create();
v = this->vectorCreator->create();
t = this->vectorCreator->create();
p = this->vectorCreator->create();
v = this->vectorCreator->create();
t = this->vectorCreator->create();
xmin = this->vectorCreator->create();
}
......
......@@ -299,7 +299,9 @@ namespace AMDiS {
/** \brief
* Sets \ref problem
*/
void setName(::std::string name_) { name = name_; };
void setName(::std::string name_) {
name = name_;
};
protected:
/** \brief
......
#include "ParallelProblem.h"
"ParallelProblem.h"
#include "ProblemScal.h"
#include "ProblemVec.h"
#include "ProblemInstat.h"
......@@ -75,7 +75,8 @@ namespace AMDiS {
ProblemTimeInterface *timeIF)
: iterationIF_(iterationIF),
timeIF_(timeIF),
debugMode(0)
debugMode(0),
debugServerProcess(false)
{
mpiRank = MPI::COMM_WORLD.Get_rank();
mpiSize = MPI::COMM_WORLD.Get_size();
......@@ -1727,7 +1728,7 @@ namespace AMDiS {
}
}
void ParallelProblemVec::startDebugServer()
void ParallelProblemVec::startDebugServer(AdaptInfo *adaptInfo)
{
FUNCNAME("ParallelProblemVec::startDebugServer()");
......@@ -1842,7 +1843,7 @@ namespace AMDiS {
/* ====== Finally, call debug function ====== */
debugFunction();
debugFunction(adaptInfo);
}
FREE_MEMORY(elDOFs, DegreeOfFreedom, numFcts);
......
......@@ -553,9 +553,9 @@ namespace AMDiS {
return name_;
};
virtual void startDebugServer();
virtual void startDebugServer(AdaptInfo *adaptInfo);
virtual void debugFunction() {};
virtual void debugFunction(AdaptInfo *adaptInfo) {};
protected:
ProblemVec *problem;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment