From d5b0734966f5c1c78c9d7c7917d62e791897789c Mon Sep 17 00:00:00 2001
From: Konstantin Kutscher <kutscher@irmb.tu-bs.de>
Date: Mon, 5 Nov 2018 10:35:26 +0100
Subject: [PATCH] fixes tolerance
---
source/DemCoupling/CreateDemObjectsCoProcessor.cpp | 4 ++--
source/DemCoupling/CreateDemObjectsCoProcessor.h | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/source/DemCoupling/CreateDemObjectsCoProcessor.cpp b/source/DemCoupling/CreateDemObjectsCoProcessor.cpp
index 2aa86631c..6e99b35f5 100644
--- a/source/DemCoupling/CreateDemObjectsCoProcessor.cpp
+++ b/source/DemCoupling/CreateDemObjectsCoProcessor.cpp
@@ -20,12 +20,12 @@
-CreateDemObjectsCoProcessor::CreateDemObjectsCoProcessor(SPtr<Grid3D> grid, SPtr<UbScheduler> s, std::shared_ptr<Communicator> comm, SPtr<DemCoProcessor> demCoProcessor, SPtr<PhysicsEngineMaterialAdapter> demObjectMaterial, double toleranz) :
+CreateDemObjectsCoProcessor::CreateDemObjectsCoProcessor(SPtr<Grid3D> grid, SPtr<UbScheduler> s, std::shared_ptr<Communicator> comm, SPtr<DemCoProcessor> demCoProcessor, SPtr<PhysicsEngineMaterialAdapter> demObjectMaterial, double tolerance) :
CoProcessor(grid, s),
comm(comm),
demCoProcessor(demCoProcessor),
demObjectMaterial(demObjectMaterial),
- toleranz(toleranz)
+ tolerance(tolerance)
{
mu::Parser fct;
fct.SetExpr("U");
diff --git a/source/DemCoupling/CreateDemObjectsCoProcessor.h b/source/DemCoupling/CreateDemObjectsCoProcessor.h
index 0d4961568..38ce7c2f5 100644
--- a/source/DemCoupling/CreateDemObjectsCoProcessor.h
+++ b/source/DemCoupling/CreateDemObjectsCoProcessor.h
@@ -27,7 +27,7 @@ class PhysicsEngineMaterialAdapter;
class CreateDemObjectsCoProcessor : public CoProcessor
{
public:
- CreateDemObjectsCoProcessor(SPtr<Grid3D> grid, SPtr<UbScheduler> s, std::shared_ptr<Communicator> comm, SPtr<DemCoProcessor> demCoProcessor, SPtr<PhysicsEngineMaterialAdapter> geoObjectMaterial, double toleranz = 0);
+ CreateDemObjectsCoProcessor(SPtr<Grid3D> grid, SPtr<UbScheduler> s, std::shared_ptr<Communicator> comm, SPtr<DemCoProcessor> demCoProcessor, SPtr<PhysicsEngineMaterialAdapter> geoObjectMaterial, double tolerance = 0);
void process(double step) override;
void addGeoObject(SPtr<GbObject3D> geoObjectPrototype, Vector3D initalVelocity);
void clearGeoObjects();
--
GitLab