From ee319d21f72d36bb06b2b64f245c673ca144cf6f Mon Sep 17 00:00:00 2001
From: Thomas Witkowski <thomas.witkowski@gmx.de>
Date: Thu, 7 May 2009 13:02:40 +0000
Subject: [PATCH] Bugfix if there is no solver defined in problem definition.
---
AMDiS/src/CreatorMap.h | 1 -
AMDiS/src/ProblemScal.cc | 6 +++---
AMDiS/src/ProblemVec.cc | 6 +++---
3 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/AMDiS/src/CreatorMap.h b/AMDiS/src/CreatorMap.h
index a5c6ac11..8a122a02 100644
--- a/AMDiS/src/CreatorMap.h
+++ b/AMDiS/src/CreatorMap.h
@@ -23,7 +23,6 @@
#define AMDIS_CREATORMAP_H
#include <map>
-
#include "Global.h"
#include "CreatorInterface.h"
diff --git a/AMDiS/src/ProblemScal.cc b/AMDiS/src/ProblemScal.cc
index bfacb520..841dfd62 100644
--- a/AMDiS/src/ProblemScal.cc
+++ b/AMDiS/src/ProblemScal.cc
@@ -456,7 +456,7 @@ namespace AMDiS {
void ProblemScal::createSolver()
{
// === create solver ===
- std::string solverType("no");
+ std::string solverType("0");
GET_PARAMETER(0, name + "->solver", &solverType);
OEMSolverCreator *solverCreator =
dynamic_cast<OEMSolverCreator*>(CreatorMap<OEMSolver>::getCreator(solverType));
@@ -472,7 +472,7 @@ namespace AMDiS {
mesh->setElementDataPrototype(NEW LeafDataEstimatable(NEW LeafDataCoarsenable));
// === create estimator ===
- std::string estimatorType("no");
+ std::string estimatorType("0");
GET_PARAMETER(0, name + "->estimator", &estimatorType);
EstimatorCreator *estimatorCreator =
dynamic_cast<EstimatorCreator*>(
@@ -647,7 +647,7 @@ namespace AMDiS {
void ProblemScal::createPrecon()
{
- ::std::string preconType("no");
+ std::string preconType("no");
GET_PARAMETER(0, name + "->solver->left precon", &preconType);
CreatorInterface<ITL_BasePreconditioner> *preconCreator =
diff --git a/AMDiS/src/ProblemVec.cc b/AMDiS/src/ProblemVec.cc
index d175ddeb..43c563ea 100644
--- a/AMDiS/src/ProblemVec.cc
+++ b/AMDiS/src/ProblemVec.cc
@@ -345,7 +345,7 @@ namespace AMDiS {
FUNCNAME("ProblemVec::createSolver()");
// === create solver ===
- std::string solverType("no");
+ std::string solverType("0");
GET_PARAMETER(0, name + "->solver", &solverType);
OEMSolverCreator *solverCreator =
dynamic_cast<OEMSolverCreator*>(CreatorMap<OEMSolver>::getCreator(solverType));
@@ -374,7 +374,7 @@ namespace AMDiS {
estName = name + "->estimator[" + std::string(number) + "]";
// === create estimator ===
- std::string estimatorType("no");
+ std::string estimatorType("0");
GET_PARAMETER(0, estName, &estimatorType);
EstimatorCreator *estimatorCreator =
dynamic_cast<EstimatorCreator*>(
@@ -824,7 +824,7 @@ namespace AMDiS {
void ProblemVec::createPrecon()
{
- ::std::string preconType("no");
+ std::string preconType("no");
GET_PARAMETER(0, name + "->solver->left precon", &preconType);
CreatorInterface<ITL_BasePreconditioner> *preconCreator =
--
GitLab