Merge branch 'master' into 'master'

Combined resolved/unresolved coupling methods showcase

See merge request !264

apps/showcases/CMakeLists.txt

 add_subdirectory( BidisperseFluidizedBed )
+add_subdirectory( CombinedResolvedUnresolved )
 add_subdirectory( Mixer )

apps/showcases/CombinedResolvedUnresolved/CMakeLists.txt

+waLBerla_add_executable ( NAME CombinedResolvedUnresolved
+                          DEPENDS blockforest boundary core domain_decomposition field lbm pe pe_coupling postprocessing timeloop vtk )

src/pe_coupling/utility/BodiesForceTorqueContainer.cpp

@@ -42,6 +42,7 @@ void BodiesForceTorqueContainer::store()
 
       for( auto bodyIt = pe::BodyIterator::begin(*blockIt, bodyStorageID_); bodyIt != pe::BodyIterator::end(); ++bodyIt )
       {
+         if( !bodySelectorFct_(bodyIt.getBodyID()) ) continue;
          auto & f = (*bodyForceTorqueStorage)[ bodyIt->getSystemID() ];
 
          const auto & force = bodyIt->getForce();
@@ -60,6 +61,7 @@ void BodiesForceTorqueContainer::setOnBodies()
 
       for( auto bodyIt = pe::BodyIterator::begin(*blockIt, bodyStorageID_); bodyIt != pe::BodyIterator::end(); ++bodyIt )
       {
+         if( !bodySelectorFct_(bodyIt.getBodyID()) ) continue;
          const auto f = bodyForceTorqueStorage->find( bodyIt->getSystemID() );
 
          if( f != bodyForceTorqueStorage->end() )

src/pe_coupling/utility/BodiesForceTorqueContainer.h

@@ -22,6 +22,7 @@
 #pragma once
 
 #include "blockforest/StructuredBlockForest.h"
+#include "BodySelectorFunctions.h"
 
 #include <map>
 #include <array>
@@ -35,8 +36,9 @@ public:
 
    typedef std::map< walberla::id_t, std::array<real_t,6> > ForceTorqueStorage_T;
 
-   BodiesForceTorqueContainer( const shared_ptr<StructuredBlockForest> & blockForest, const BlockDataID & bodyStorageID )
-   : blockForest_( blockForest ), bodyStorageID_( bodyStorageID )
+   BodiesForceTorqueContainer( const shared_ptr<StructuredBlockForest> & blockForest, const BlockDataID & bodyStorageID, const std::function<bool(
+            pe::BodyID)> &bodySelectorFct = selectRegularBodies)
+   : blockForest_( blockForest ), bodyStorageID_( bodyStorageID ), bodySelectorFct_( bodySelectorFct )
    {
       // has to be added to the forest (not the storage) to register correctly
       bodyForceTorqueStorageID_ = blockForest->addBlockData(make_shared<blockforest::AlwaysCreateBlockDataHandling<ForceTorqueStorage_T> >(), "BodiesForceTorqueContainer");
@@ -60,6 +62,7 @@ private:
    shared_ptr<StructuredBlockStorage> blockForest_;
    const BlockDataID bodyStorageID_;
    BlockDataID bodyForceTorqueStorageID_;
+   std::function<bool(pe::BodyID)> bodySelectorFct_;
 };
 
 

src/pe_coupling/utility/ForceOnBodiesAdder.cpp

@@ -35,6 +35,7 @@ void ForceOnBodiesAdder::operator()()
    {
       for( auto bodyIt = pe::LocalBodyIterator::begin( *blockIt, bodyStorageID_); bodyIt != pe::LocalBodyIterator::end(); ++bodyIt )
       {
+         if( !bodySelectorFct_(bodyIt.getBodyID()) ) continue;
          bodyIt->addForce ( force_ );
       }
    }

src/pe_coupling/utility/ForceOnBodiesAdder.h

@@ -23,6 +23,7 @@
 
 #include "core/math/Vector3.h"
 #include "domain_decomposition/StructuredBlockStorage.h"
+#include "BodySelectorFunctions.h"
 
 namespace walberla {
 namespace pe_coupling {
@@ -32,8 +33,9 @@ class ForceOnBodiesAdder
 public:
 
    ForceOnBodiesAdder( const shared_ptr<StructuredBlockStorage> & blockStorage, const BlockDataID & bodyStorageID,
-                       const Vector3<real_t> & force )
-   : blockStorage_( blockStorage ), bodyStorageID_( bodyStorageID ), force_( force )
+                       const Vector3<real_t> & force, const std::function<bool(
+            pe::BodyID)> &bodySelectorFct = selectRegularBodies )
+   : blockStorage_( blockStorage ), bodyStorageID_( bodyStorageID ), force_( force ), bodySelectorFct_( bodySelectorFct )
      { }
 
    // set a constant force on all (only local, to avoid force duplication) bodies
@@ -46,6 +48,7 @@ private:
    shared_ptr<StructuredBlockStorage> blockStorage_;
    const BlockDataID bodyStorageID_;
    Vector3<real_t> force_;
+   const std::function<bool(pe::BodyID)> bodySelectorFct_;
 };
 
 } // namespace pe_coupling

src/pe_coupling/utility/ForceTorqueOnBodiesResetter.cpp

@@ -32,6 +32,7 @@ void ForceTorqueOnBodiesResetter::operator()()
    {
       for( auto bodyIt = pe::BodyIterator::begin( *blockIt, bodyStorageID_); bodyIt != pe::BodyIterator::end(); ++bodyIt )
       {
+         if( !bodySelectorFct_(bodyIt.getBodyID()) ) continue;
          bodyIt->resetForceAndTorque();
       }
    }

src/pe_coupling/utility/ForceTorqueOnBodiesResetter.h

@@ -22,6 +22,7 @@
 #pragma once
 
 #include "domain_decomposition/StructuredBlockStorage.h"
+#include "BodySelectorFunctions.h"
 
 namespace walberla {
 namespace pe_coupling {
@@ -30,8 +31,9 @@ class ForceTorqueOnBodiesResetter
 {  
 public:
 
-   ForceTorqueOnBodiesResetter( const shared_ptr<StructuredBlockStorage> & blockStorage, const BlockDataID & bodyStorageID )
-   : blockStorage_( blockStorage ), bodyStorageID_( bodyStorageID )
+   ForceTorqueOnBodiesResetter( const shared_ptr<StructuredBlockStorage> & blockStorage, const BlockDataID & bodyStorageID, const std::function<bool(
+            pe::BodyID)> &bodySelectorFct = selectRegularBodies )
+   : blockStorage_( blockStorage ), bodyStorageID_( bodyStorageID ), bodySelectorFct_( bodySelectorFct )
      { }
 
    // resets forces and torques on all (local and remote) bodies
@@ -41,6 +43,7 @@ private:
 
    shared_ptr<StructuredBlockStorage> blockStorage_;
    const BlockDataID bodyStorageID_;
+   const std::function<bool(pe::BodyID)> bodySelectorFct_;
 };
 
 } // namespace pe_coupling

src/pe_coupling/utility/ForceTorqueOnBodiesScaler.cpp

@@ -35,6 +35,7 @@ void ForceTorqueOnBodiesScaler::operator()()
    {
       for( auto bodyIt = pe::BodyIterator::begin( *blockIt, bodyStorageID_); bodyIt != pe::BodyIterator::end(); ++bodyIt )
       {
+         if( !bodySelectorFct_(bodyIt.getBodyID()) ) continue;
          force  = scalingFactor_ * bodyIt->getForce();
          torque = scalingFactor_ * bodyIt->getTorque();
 

src/pe_coupling/utility/ForceTorqueOnBodiesScaler.h

@@ -22,6 +22,7 @@
 #pragma once
 
 #include "domain_decomposition/StructuredBlockStorage.h"
+#include "BodySelectorFunctions.h"
 
 namespace walberla {
 namespace pe_coupling {
@@ -33,8 +34,9 @@ class ForceTorqueOnBodiesScaler
 public:
 
    ForceTorqueOnBodiesScaler( const shared_ptr<StructuredBlockStorage> & blockStorage, const BlockDataID & bodyStorageID,
-                              const real_t & scalingFactor )
-   : blockStorage_( blockStorage ), bodyStorageID_( bodyStorageID ), scalingFactor_( scalingFactor )
+                              const real_t & scalingFactor, const std::function<bool(
+            pe::BodyID)> &bodySelectorFct = selectRegularBodies )
+   : blockStorage_( blockStorage ), bodyStorageID_( bodyStorageID ), scalingFactor_( scalingFactor ), bodySelectorFct_( bodySelectorFct )
      { }
 
    // resets forces and torques on all (local and remote) bodies
@@ -47,6 +49,7 @@ private:
    shared_ptr<StructuredBlockStorage> blockStorage_;
    const BlockDataID bodyStorageID_;
    real_t scalingFactor_;
+   const std::function<bool(pe::BodyID)> bodySelectorFct_;
 };
 
 } // namespace pe_coupling