Commit 35c63e58 authored by Thomas Witkowski's avatar Thomas Witkowski
Browse files

* Small bug, if not compiled with openmp

parent 68d44797
...@@ -225,8 +225,10 @@ namespace AMDiS { ...@@ -225,8 +225,10 @@ namespace AMDiS {
creator = NEW ResidualEstimator::Creator; creator = NEW ResidualEstimator::Creator;
addCreator("residual", creator); addCreator("residual", creator);
#ifdef _OPENMP
creator = NEW ResidualParallelEstimator::Creator; creator = NEW ResidualParallelEstimator::Creator;
addCreator("residualparallel", creator); addCreator("residualparallel", creator);
#endif
creator = NEW RecoveryEstimator::Creator; creator = NEW RecoveryEstimator::Creator;
addCreator("recovery", creator); addCreator("recovery", creator);
......
...@@ -4,6 +4,8 @@ ...@@ -4,6 +4,8 @@
#include "Parameters.h" #include "Parameters.h"
#include "OpenMP.h" #include "OpenMP.h"
#ifdef _OPENMP
namespace AMDiS { namespace AMDiS {
ResidualParallelEstimator::ResidualParallelEstimator(::std::string name, int r) ResidualParallelEstimator::ResidualParallelEstimator(::std::string name, int r)
: Estimator(name, r), : Estimator(name, r),
...@@ -106,3 +108,4 @@ namespace AMDiS { ...@@ -106,3 +108,4 @@ namespace AMDiS {
} }
#endif // _OPENMP
...@@ -26,6 +26,8 @@ ...@@ -26,6 +26,8 @@
#ifndef AMDIS_RESIDUALPARALLELESTIMATOR_H #ifndef AMDIS_RESIDUALPARALLELESTIMATOR_H
#define AMDIS_RESIDUALPARALLELESTIMATOR_H #define AMDIS_RESIDUALPARALLELESTIMATOR_H
#ifdef _OPENMP
#include "ResidualEstimator.h" #include "ResidualEstimator.h"
#include <vector> #include <vector>
...@@ -106,4 +108,6 @@ namespace AMDiS { ...@@ -106,4 +108,6 @@ namespace AMDiS {
} }
#endif // _OPENMP
#endif // AMDIS_RESIDUALPARALLELESTIMATOR_H #endif // AMDIS_RESIDUALPARALLELESTIMATOR_H
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