From 4251ffbe0a1281f425545e31fc01e05a99cd2461 Mon Sep 17 00:00:00 2001
From: Sebastian Eibl <sebastian.eibl@fau.de>
Date: Mon, 4 Dec 2017 10:07:12 +0100
Subject: [PATCH] made integrator and collision model accessable in DEM
---
src/pe/cr/DEM.h | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/pe/cr/DEM.h b/src/pe/cr/DEM.h
index f5269b06f..9d0887e77 100644
--- a/src/pe/cr/DEM.h
+++ b/src/pe/cr/DEM.h
@@ -59,12 +59,14 @@ public:
/// Advances the simulation dt seconds.
void timestep( const real_t dt );
+ inline Integrator getIntegrator() const { return integrate_; }
+ inline ContactResolver getContactResolver() const { return resolveContact_; }
virtual inline real_t getMaximumPenetration() const WALBERLA_OVERRIDE { return maxPenetration_; }
virtual inline size_t getNumberOfContacts() const WALBERLA_OVERRIDE { return numberOfContacts_; }
virtual inline size_t getNumberOfContactsTreated() const WALBERLA_OVERRIDE { return numberOfContactsTreated_; }
private:
- const Integrator integrate_;
- const ContactResolver resolveContact_;
+ Integrator integrate_;
+ ContactResolver resolveContact_;
shared_ptr<BodyStorage> globalBodyStorage_;
shared_ptr<BlockStorage> blockStorage_;
domain_decomposition::BlockDataID storageID_;
@@ -94,7 +96,7 @@ public:
};
} // namespace cr
-} // namespace pe
+} // namespace pe
} // namespace walberla
#include "DEM.impl.h"
--
GitLab