From c7001e3c4168bc6d47ec4980946628807cc22202 Mon Sep 17 00:00:00 2001
From: Thomas Witkowski <thomas.witkowski@gmx.de>
Date: Fri, 22 Feb 2008 09:16:20 +0000
Subject: [PATCH] * Problem with ParallelProblemScal and ParallelProblemVec
---
AMDiS/src/ParallelProblem.h | 19 +++++++++++++++----
demo/Makefile | 3 ++-
2 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/AMDiS/src/ParallelProblem.h b/AMDiS/src/ParallelProblem.h
index 947707bb..503b03f4 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 58e91133..fbe132f6 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 =
--
GitLab