From 93be8a6a7e9263ee00ba996eb9c6881b7e10f919 Mon Sep 17 00:00:00 2001
From: Konstantin Kutscher <kutscher@irmb.tu-bs.de>
Date: Thu, 1 Nov 2018 17:29:53 +0100
Subject: [PATCH] add tolerance
---
source/DemCoupling/CreateDemObjectsCoProcessor.cpp | 2 +-
source/DemCoupling/CreateDemObjectsCoProcessor.h | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/source/DemCoupling/CreateDemObjectsCoProcessor.cpp b/source/DemCoupling/CreateDemObjectsCoProcessor.cpp
index 1d695f605..2aa86631c 100644
--- a/source/DemCoupling/CreateDemObjectsCoProcessor.cpp
+++ b/source/DemCoupling/CreateDemObjectsCoProcessor.cpp
@@ -92,7 +92,7 @@ void CreateDemObjectsCoProcessor::createGeoObjects()
for (int i = 0; i < size; i++)
{
SPtr<GbSphere3D> sphere = std::dynamic_pointer_cast<GbSphere3D>(geoObjectPrototypeVector[i]);
- if (demCoProcessor->isSpheresIntersection(sphere->getX1Centroid(), sphere->getX2Centroid(), sphere->getX3Centroid(), sphere->getRadius()*2.0*(1.0-toleranz)))
+ if (demCoProcessor->isSpheresIntersection(sphere->getX1Centroid(), sphere->getX2Centroid(), sphere->getX3Centroid(), sphere->getRadius()*2.0*(1.0-tolerance)))
{
continue;
}
diff --git a/source/DemCoupling/CreateDemObjectsCoProcessor.h b/source/DemCoupling/CreateDemObjectsCoProcessor.h
index 6d3a1dc3e..0d4961568 100644
--- a/source/DemCoupling/CreateDemObjectsCoProcessor.h
+++ b/source/DemCoupling/CreateDemObjectsCoProcessor.h
@@ -32,6 +32,8 @@ public:
void addGeoObject(SPtr<GbObject3D> geoObjectPrototype, Vector3D initalVelocity);
void clearGeoObjects();
void createGeoObjects();
+ double getToleranz() const { return tolerance; }
+ void setToleranz(double val) { tolerance = val; }
protected:
private:
SPtr<Communicator> comm;
@@ -42,7 +44,7 @@ private:
SPtr<BCAdapter> velocityBcParticleAdapter;
SPtr<Reconstructor> extrapolationReconstructor;
int demCounter;
- double toleranz;
+ double tolerance;
#ifdef TIMING
UbTimer timer;
#endif
--
GitLab