diff --git a/AMDiS/src/ParallelProblem.h b/AMDiS/src/ParallelProblem.h index 947707bb12f8dd0f9a1b0e4d2884978041baab47..503b03f4863b81bfe7e7e188ba7ce4365f261c24 100644 --- a/AMDiS/src/ParallelProblem.h +++ b/AMDiS/src/ParallelProblem.h @@ -328,9 +328,17 @@ namespace AMDiS { virtual ProblemStatBase *getProblem(const std::string& name); - void setEstimator(Estimator *est) { usersEstimator_ = est; }; + void setEstimator(Estimator *est) { + usersEstimator_ = est; + }; + + void setMarker(Marker *marker) { + usersMarker_ = marker; + }; - void setMarker(Marker *marker) { usersMarker_ = marker; }; + inline virtual const ::std::string& getName() { + return name_; + }; protected: ProblemScal *problem_; @@ -388,11 +396,14 @@ namespace AMDiS { usersEstimator_ = est; }; - void setMarker(std::vector<Marker*> marker) - { + void setMarker(std::vector<Marker*> marker) { usersMarker_ = marker; }; + inline virtual const ::std::string& getName() { + return name_; + }; + protected: ProblemVec *problem_; diff --git a/demo/Makefile b/demo/Makefile index 58e91133677b383aa2c61fbd93965fac12586d2d..fbe132f682815a5ad192858226fbaff9818846bb 100644 --- a/demo/Makefile +++ b/demo/Makefile @@ -14,7 +14,8 @@ USE_MPCCI = 0 DEBUG = 0 AMDIS_DIR = /usr/local/AMDiS -SMI_DIR = +MPI_DIR = +SMI_DIR = MPCCI_DIR =