diff --git a/src/pe_coupling/discrete_particle_methods/evaluators/AddedMassForceEvaluator.h b/src/pe_coupling/discrete_particle_methods/evaluators/AddedMassForceEvaluator.h
index 4daed731d9671f39df0137cc850217afb3146240..5950cfc3fc1f8dc59119ad24072f8609f218d762 100644
--- a/src/pe_coupling/discrete_particle_methods/evaluators/AddedMassForceEvaluator.h
+++ b/src/pe_coupling/discrete_particle_methods/evaluators/AddedMassForceEvaluator.h
@@ -39,6 +39,8 @@
#include "pe/Types.h"
#include "pe/Materials.h"
+#include "pe_coupling/utility/BodySelectorFunctions.h"
+
#include "BodyVelocityTimeDerivativeEvaluator.h"
#include "stencil/Directions.h"
@@ -57,6 +59,8 @@ namespace discrete_particle_methods {
*
* Note that the fluid velocity (and its derivatives) has to be the fluid-phase velocity (and not the volume-averaged velocity).
*
+ * Whether or not a body gets treated by the evaluator depends on the return value of 'dpmBodySelectorFct'.
+ *
* For more infos on interpolators, see field interpolators in src/field/interpolators.
* For more infos on distributors, see src/field/distributors.
*/
@@ -75,9 +79,12 @@ public:
const BlockDataID & flagFieldID, const Set< FlagUID > & domainFlags,
const BlockDataID & velocityTimeDerivativeFieldID,
const boost::function<Vector3<real_t> ( const Vector3<real_t> &, const Vector3<real_t> &, real_t, real_t )> & addedMassForceCorrelationFunction,
- const shared_ptr< BodyVelocityTimeDerivativeEvaluator > & bodyVelocityTimeDerivativeEvaluator )
+ const shared_ptr< BodyVelocityTimeDerivativeEvaluator > & bodyVelocityTimeDerivativeEvaluator,
+ const boost::function<bool(pe::BodyID)> & dpmBodySelectorFct = selectRegularBodies )
: blockStorage_( blockStorage ), bodyStorageID_( bodyStorageID ),
- addedMassForceCorrelationFunction_( addedMassForceCorrelationFunction ), bodyVelocityTimeDerivativeEvaluator_( bodyVelocityTimeDerivativeEvaluator )
+ addedMassForceCorrelationFunction_( addedMassForceCorrelationFunction ),
+ bodyVelocityTimeDerivativeEvaluator_( bodyVelocityTimeDerivativeEvaluator ),
+ dpmBodySelectorFct_( dpmBodySelectorFct)
{
velocityTimeDerivativeFieldInterpolatorID_ = field::addFieldInterpolator< Vec3FieldInterpolator_T, FlagField_T >( blockStorage, velocityTimeDerivativeFieldID, flagFieldID, domainFlags );
forceDistributorID_ = field::addDistributor< ForceDistributor_T, FlagField_T >( blockStorage, forceFieldID, flagFieldID, domainFlags );
@@ -94,6 +101,8 @@ private:
shared_ptr< BodyVelocityTimeDerivativeEvaluator > bodyVelocityTimeDerivativeEvaluator_;
+ boost::function<bool(pe::BodyID)> dpmBodySelectorFct_;
+
BlockDataID velocityTimeDerivativeFieldInterpolatorID_;
BlockDataID forceDistributorID_;
@@ -112,7 +121,7 @@ void AddedMassForceEvaluator< FlagField_T, FieldInterpolator_T, Distributor_T >
for( auto bodyIt = pe::LocalBodyIterator::begin(*blockIt, bodyStorageID_); bodyIt != pe::LocalBodyIterator::end(); ++bodyIt )
{
- //TODO check if body should be treated by DPM
+ if(!dpmBodySelectorFct_(*bodyIt)) continue;
Vector3<real_t> forceOnFluid( real_t(0) );
diff --git a/src/pe_coupling/discrete_particle_methods/evaluators/BodyVelocityTimeDerivativeEvaluator.h b/src/pe_coupling/discrete_particle_methods/evaluators/BodyVelocityTimeDerivativeEvaluator.h
index d9eadc43ca14ea8b4f9bf93057b34fb29e15d2bd..95d64064089c8a89081774b59a7f0f90b3856ecc 100644
--- a/src/pe_coupling/discrete_particle_methods/evaluators/BodyVelocityTimeDerivativeEvaluator.h
+++ b/src/pe_coupling/discrete_particle_methods/evaluators/BodyVelocityTimeDerivativeEvaluator.h
@@ -25,6 +25,9 @@
#include "pe/rigidbody/BodyIterators.h"
+#include "pe_coupling/utility/BodySelectorFunctions.h"
+
+#include <boost/function.hpp>
#include <map>
namespace walberla {
@@ -38,14 +41,18 @@ namespace discrete_particle_methods {
* Calling get(..), the body's former velocity is fetched from the map and used to calculate a simple approximation of the
* body velocity time derivative (du/dt = ( u_new - u_old ) / deltaT )
*
+ * Whether or not a body gets treated by the evaluator depends on the return value of 'dpmBodySelectorFct'.
+ *
*/
class BodyVelocityTimeDerivativeEvaluator
{
public:
BodyVelocityTimeDerivativeEvaluator( const shared_ptr<StructuredBlockStorage> & blockStorage,
- const BlockDataID & bodyStorageID, const real_t & deltaT = real_t(1) )
- : blockStorage_( blockStorage ), bodyStorageID_( bodyStorageID ), deltaTinv_( real_t(1) / deltaT )
+ const BlockDataID & bodyStorageID, const real_t & deltaT = real_t(1),
+ const boost::function<bool(pe::BodyID)> & dpmBodySelectorFct = selectRegularBodies )
+ : blockStorage_( blockStorage ), bodyStorageID_( bodyStorageID ), deltaTinv_( real_t(1) / deltaT ),
+ dpmBodySelectorFct_( dpmBodySelectorFct)
{ }
void operator()()
@@ -56,6 +63,8 @@ public:
{
for( auto bodyIt = pe::BodyIterator::begin(*blockIt, bodyStorageID_); bodyIt != pe::BodyIterator::end(); ++bodyIt )
{
+ if(!dpmBodySelectorFct_(*bodyIt)) continue;
+
bodyVelocityMap_.insert( std::pair<walberla::id_t, Vector3< real_t > >( bodyIt->getSystemID(), bodyIt->getLinearVel() ) );
}
}
@@ -79,7 +88,7 @@ private:
const BlockDataID bodyStorageID_;
std::map< walberla::id_t, Vector3< real_t > > bodyVelocityMap_;
real_t deltaTinv_;
-
+ boost::function<bool(pe::BodyID)> dpmBodySelectorFct_;
};
diff --git a/src/pe_coupling/discrete_particle_methods/evaluators/InteractionForceEvaluator.h b/src/pe_coupling/discrete_particle_methods/evaluators/InteractionForceEvaluator.h
index c913952e3eeddaf1a507fc7edd687dfa3022d1f6..d3a6dc098cb536ba85794543c69086095b074566 100644
--- a/src/pe_coupling/discrete_particle_methods/evaluators/InteractionForceEvaluator.h
+++ b/src/pe_coupling/discrete_particle_methods/evaluators/InteractionForceEvaluator.h
@@ -41,6 +41,7 @@
#include "pe/Materials.h"
#include "pe_coupling/geometry/SphereEquivalentDiameter.h"
+#include "pe_coupling/utility/BodySelectorFunctions.h"
#include "stencil/Directions.h"
@@ -65,6 +66,8 @@ namespace discrete_particle_methods {
*
* Note that the fluid velocity, contained in the velocityField, has to be the fluid-phase velocity (and not the volume-averaged velocity).
*
+ * Whether or not a body gets treated by the evaluator depends on the return value of 'dpmBodySelectorFct'.
+ *
* For more infos on interpolators, see field interpolators in src/field/interpolators.
* For more infos on distributors, see src/field/distributors.
*/
@@ -86,9 +89,11 @@ public:
const BlockDataID & flagFieldID, const Set< FlagUID > & domainFlags,
const BlockDataID & velocityFieldID, const BlockDataID & solidVolumeFractionFieldID, const BlockDataID & pressureGradientFieldID,
const boost::function<Vector3<real_t> ( const Vector3<real_t> &, const Vector3<real_t> &, real_t, real_t, real_t, real_t )> & dragForceCorrelationFunction,
- real_t fluidDynamicViscosity )
+ real_t fluidDynamicViscosity,
+ const boost::function<bool(pe::BodyID)> & dpmBodySelectorFct = selectRegularBodies )
: blockStorage_( blockStorage ), bodyStorageID_( bodyStorageID ),
- dragForceCorrelationFunction_( dragForceCorrelationFunction ), fluidDynamicViscosity_( fluidDynamicViscosity )
+ dragForceCorrelationFunction_( dragForceCorrelationFunction ), fluidDynamicViscosity_( fluidDynamicViscosity ),
+ dpmBodySelectorFct_( dpmBodySelectorFct)
{
velocityFieldInterpolatorID_ = field::addFieldInterpolator< Vec3FieldInterpolator_T, FlagField_T >( blockStorage, velocityFieldID, flagFieldID, domainFlags );
solidVolumeFractionFieldInterpolatorID_ = field::addFieldInterpolator< ScalarFieldInterpolator_T, FlagField_T >( blockStorage, solidVolumeFractionFieldID, flagFieldID, domainFlags );
@@ -106,12 +111,14 @@ private:
boost::function<Vector3<real_t> ( const Vector3<real_t> &, const Vector3<real_t> &, real_t, real_t, real_t, real_t )> dragForceCorrelationFunction_;
+ real_t fluidDynamicViscosity_;
+
+ boost::function<bool(pe::BodyID)> dpmBodySelectorFct_;
+
BlockDataID velocityFieldInterpolatorID_;
BlockDataID solidVolumeFractionFieldInterpolatorID_;
BlockDataID pressureGradientFieldInterpolatorID_;
BlockDataID forceDistributorID_;
-
- real_t fluidDynamicViscosity_;
};
template< typename FlagField_T, template<typename,typename> class FieldInterpolator_T, template<typename,typename> class Distributor_T >
@@ -129,7 +136,7 @@ void InteractionForceEvaluator< FlagField_T, FieldInterpolator_T, Distributor_T
for( auto bodyIt = pe::LocalBodyIterator::begin(*blockIt, bodyStorageID_); bodyIt != pe::LocalBodyIterator::end(); ++bodyIt )
{
- //TODO check if body should be treated by DPM
+ if(!dpmBodySelectorFct_(*bodyIt)) continue;
Vector3<real_t> forceOnFluid( real_t(0) );
diff --git a/src/pe_coupling/discrete_particle_methods/evaluators/LiftForceEvaluator.h b/src/pe_coupling/discrete_particle_methods/evaluators/LiftForceEvaluator.h
index 5ad9c96596064dfe066dda7236e7c7f950fa0996..97dee854dc7d68d66e165dd5849de0a8b04af2cd 100644
--- a/src/pe_coupling/discrete_particle_methods/evaluators/LiftForceEvaluator.h
+++ b/src/pe_coupling/discrete_particle_methods/evaluators/LiftForceEvaluator.h
@@ -36,6 +36,7 @@
#include "pe/Materials.h"
#include "pe_coupling/geometry/SphereEquivalentDiameter.h"
+#include "pe_coupling/utility/BodySelectorFunctions.h"
#include <boost/function.hpp>
@@ -53,6 +54,8 @@ namespace discrete_particle_methods {
*
* Note that the fluid velocity, contained in the velocityField, has to be the fluid-phase velocity (and not the volume-averaged velocity).
*
+ * Whether or not a body gets treated by the evaluator depends on the return value of 'dpmBodySelectorFct'.
+ *
* For more infos on interpolators, see field interpolators in src/field/interpolators.
* For more infos on distributors, see src/field/distributors.
*/
@@ -70,8 +73,10 @@ public:
const BlockDataID & forceFieldID, const BlockDataID & bodyStorageID, const BlockDataID & flagFieldID, const Set< FlagUID > & domainFlags,
const BlockDataID & velocityFieldID, const BlockDataID & velocityCurlFieldID,
const boost::function<Vector3<real_t> ( const Vector3<real_t> &, const Vector3<real_t> &, const Vector3<real_t> &, real_t, real_t, real_t )> & liftForceCorrelationFunction,
- real_t fluidDynamicViscosity )
- : blockStorage_( blockStorage ), bodyStorageID_( bodyStorageID ), liftForceCorrelationFunction_( liftForceCorrelationFunction ), fluidDynamicViscosity_( fluidDynamicViscosity )
+ real_t fluidDynamicViscosity,
+ const boost::function<bool(pe::BodyID)> & dpmBodySelectorFct = selectRegularBodies )
+ : blockStorage_( blockStorage ), bodyStorageID_( bodyStorageID ), liftForceCorrelationFunction_( liftForceCorrelationFunction ),
+ fluidDynamicViscosity_( fluidDynamicViscosity ), dpmBodySelectorFct_( dpmBodySelectorFct)
{
velocityFieldInterpolatorID_ = field::addFieldInterpolator< Vec3FieldInterpolator_T, FlagField_T >( blockStorage, velocityFieldID, flagFieldID, domainFlags );
velocityCurlFieldInterpolatorID_ = field::addFieldInterpolator< Vec3FieldInterpolator_T, FlagField_T >( blockStorage, velocityCurlFieldID, flagFieldID, domainFlags );
@@ -89,6 +94,8 @@ private:
real_t fluidDynamicViscosity_;
+ boost::function<bool(pe::BodyID)> dpmBodySelectorFct_;
+
BlockDataID velocityFieldInterpolatorID_;
BlockDataID velocityCurlFieldInterpolatorID_;
BlockDataID forceDistributorID_;
@@ -108,7 +115,7 @@ void LiftForceEvaluator< FlagField_T, FieldInterpolator_T, Distributor_T >
for( auto bodyIt = pe::LocalBodyIterator::begin(*blockIt, bodyStorageID_); bodyIt != pe::LocalBodyIterator::end(); ++bodyIt )
{
- //TODO check if body should be treated by DPM
+ if(!dpmBodySelectorFct_(*bodyIt)) continue;
Vector3<real_t> forceOnFluid( real_t(0) );
diff --git a/src/pe_coupling/discrete_particle_methods/evaluators/SolidVolumeFractionFieldEvaluator.h b/src/pe_coupling/discrete_particle_methods/evaluators/SolidVolumeFractionFieldEvaluator.h
index 776aba2298313a10387c1dd6f781b7ef86f43d66..eb0bbafb4b3b8ff7d74da6ea51661698a92a821d 100644
--- a/src/pe_coupling/discrete_particle_methods/evaluators/SolidVolumeFractionFieldEvaluator.h
+++ b/src/pe_coupling/discrete_particle_methods/evaluators/SolidVolumeFractionFieldEvaluator.h
@@ -30,11 +30,15 @@
#include "pe/rigidbody/BodyIterators.h"
+#include "pe_coupling/utility/BodySelectorFunctions.h"
+
+#include <boost/function.hpp>
+
namespace walberla {
namespace pe_coupling {
namespace discrete_particle_methods {
-/*!\brief Evalutor of the solid volume fraction field.
+/*!\brief Evaluator of the solid volume fraction field.
*
* Updates the solid volume fraction field. Includes firstly removing all old entries from the field, then remapping
* the local bodies' volumes to the cells.
@@ -49,6 +53,8 @@ namespace discrete_particle_methods {
* See Finn, Li, Apte - "Particle based modelling and simulation of natural sand dynamics in the wave bottom boundary layer" (2016)
* for the application, even though different kernel was used there.
*
+ * Whether or not a body gets treated by the evaluator depends on the return value of 'dpmBodySelectorFct'.
+ *
* For more infos on distributors, see src/field/distributors.
*/
template< typename FlagField_T, template <typename,typename> class Distributor_T >
@@ -61,8 +67,10 @@ public:
SolidVolumeFractionFieldEvaluator( const shared_ptr<StructuredBlockStorage> & blockStorage,
const BlockDataID & solidVolumeFractionFieldID, const BlockDataID & bodyStorageID,
- const BlockDataID & flagFieldID, const Set< FlagUID > & domainFlags )
- : blockStorage_( blockStorage ), solidVolumeFractionFieldID_( solidVolumeFractionFieldID ), bodyStorageID_( bodyStorageID )
+ const BlockDataID & flagFieldID, const Set< FlagUID > & domainFlags,
+ const boost::function<bool(pe::BodyID)> & dpmBodySelectorFct = selectRegularBodies )
+ : blockStorage_( blockStorage ), solidVolumeFractionFieldID_( solidVolumeFractionFieldID ),
+ bodyStorageID_( bodyStorageID ), dpmBodySelectorFct_( dpmBodySelectorFct)
{
scalarDistributorID_ = field::addDistributor< ScalarDistributor_T, FlagField_T >( blockStorage, solidVolumeFractionFieldID, flagFieldID, domainFlags );
}
@@ -81,6 +89,8 @@ public:
// assign the local bodies' volume to the cell, depending on the chosen Distributor_T
for( auto bodyIt = pe::LocalBodyIterator::begin(*block, bodyStorageID_); bodyIt != pe::LocalBodyIterator::end(); ++bodyIt )
{
+ if(!dpmBodySelectorFct_(*bodyIt)) continue;
+
real_t bodyVolume = bodyIt->getVolume();
const Vector3<real_t> bodyPosition = bodyIt->getPosition();
@@ -93,6 +103,9 @@ private:
shared_ptr<StructuredBlockStorage> blockStorage_;
BlockDataID solidVolumeFractionFieldID_;
BlockDataID bodyStorageID_;
+
+ boost::function<bool(pe::BodyID)> dpmBodySelectorFct_;
+
BlockDataID scalarDistributorID_;
};
diff --git a/src/pe_coupling/discrete_particle_methods/utility/BodyVelocityInitializer.h b/src/pe_coupling/discrete_particle_methods/utility/BodyVelocityInitializer.h
index 5e9a475eb7a261821c78f1ab4e802fd1580a3330..3ad78d1ad3f1929342c05c101b516dbe1a00b403 100644
--- a/src/pe_coupling/discrete_particle_methods/utility/BodyVelocityInitializer.h
+++ b/src/pe_coupling/discrete_particle_methods/utility/BodyVelocityInitializer.h
@@ -33,9 +33,8 @@
#include "pe/rigidbody/BodyIterators.h"
#include "pe/rigidbody/RigidBody.h"
#include "pe/Types.h"
-#include "pe/Materials.h"
-#include "pe_coupling/geometry/SphereEquivalentDiameter.h"
+#include "pe_coupling/utility/BodySelectorFunctions.h"
#include <boost/function.hpp>
@@ -50,6 +49,8 @@ namespace discrete_particle_methods {
* The class uses an interpolator to obtain the approximate value of the fluid velocity at the bodies' position,
* and then sets the bodies' velocity accordingly.
*
+ * Whether or not a body gets treated by this initializer depends on the return value of 'dpmBodySelectorFct'.
+ *
* For more infos on interpolators, see field interpolators in src/field/interpolators.
*/
@@ -64,8 +65,10 @@ public:
BodyVelocityInitializer( const shared_ptr<StructuredBlockStorage> & blockStorage,
const BlockDataID & bodyStorageID, const BlockDataID & flagFieldID, const Set< FlagUID > & domainFlags,
- const BlockDataID & velocityFieldID )
- : blockStorage_( blockStorage ), bodyStorageID_( bodyStorageID )
+ const BlockDataID & velocityFieldID,
+ const boost::function<bool(pe::BodyID)> & dpmBodySelectorFct = selectRegularBodies )
+ : blockStorage_( blockStorage ), bodyStorageID_( bodyStorageID ),
+ dpmBodySelectorFct_( dpmBodySelectorFct)
{
velocityFieldInterpolatorID_ = field::addFieldInterpolator< Vec3FieldInterpolator_T, FlagField_T >( blockStorage, velocityFieldID, flagFieldID, domainFlags );
}
@@ -79,7 +82,7 @@ public:
for( auto bodyIt = pe::LocalBodyIterator::begin(*blockIt, bodyStorageID_); bodyIt != pe::LocalBodyIterator::end(); ++bodyIt )
{
- //TODO check if body should be treated by DPM
+ if(!dpmBodySelectorFct_(*bodyIt)) continue;
Vector3<real_t> forceOnFluid( real_t(0) );
@@ -102,6 +105,7 @@ private:
shared_ptr<StructuredBlockStorage> blockStorage_;
BlockDataID bodyStorageID_;
BlockDataID velocityFieldInterpolatorID_;
+ boost::function<bool(pe::BodyID)> dpmBodySelectorFct_;
};