[API] added reset function to ReduceProperty

apps/tutorials/mesa_pd/01_LennardJones.cpp

@@ -89,15 +89,15 @@ int main( int argc, char ** argv )
       WALBERLA_LOG_DEVEL(timestep);
       linkedCells.clear();
       storage->forEachParticle(true, kernel::SelectAll(), ac, ipilc, ac, linkedCells);
-      storage->forEachParticle(true, kernel::SelectAll(), ac, vvPreForce, ac);
+      storage->forEachParticle(true, kernel::SelectLocal(), ac, vvPreForce, ac);
       linkedCells.forEachParticlePairHalf(true, kernel::SelectAll(), ac, lj, ac);
       const real_t coeff = real_t(0.2);
       storage->forEachParticle(true,
-                               kernel::SelectAll(),
+                               kernel::SelectLocal(),
                                ac,
                                [coeff](const size_t idx, auto& access){ access.setForce(idx, -coeff*access.getPosition(idx) + access.getForce(idx)); },
                                ac);
-      storage->forEachParticle(true, kernel::SelectAll(), ac, vvPostForce, ac);
+      storage->forEachParticle(true, kernel::SelectLocal(), ac, vvPostForce, ac);
       vtkWriter->write();
    }
 

python/mesa_pd/templates/mpi/ReduceProperty.templ.h

@@ -29,6 +29,7 @@
 #include <mesa_pd/data/DataTypes.h>
 #include <mesa_pd/data/Flags.h>
 #include <mesa_pd/data/ParticleStorage.h>
+#include <mesa_pd/mpi/notifications/reset.h>
 
 #include <core/mpi/BufferSystem.h>
 #include <core/logging/Logging.h>
@@ -100,6 +101,7 @@ void ReduceProperty::operator()(data::ParticleStorage& ps) const
          }
 
          sb << Notification( p );
+         reset<Notification>( p );
       } else
       {
          //local particles should receive the property and sum it up

python/mesa_pd/templates/mpi/notifications/ContactHistoryNotification.templ.h

@@ -28,6 +28,7 @@
 
 #include <mesa_pd/data/ContactHistory.h>
 #include <mesa_pd/data/DataTypes.h>
+#include <mesa_pd/mpi/notifications/reset.h>
 
 #include <core/mpi/BufferDataTypeExtensions.h>
 #include <core/mpi/Datatype.h>
@@ -56,6 +57,12 @@ public:
    const data::Particle& p_;
 };
 
+template <>
+void reset<ContactHistoryNotification>(data::Particle& p)
+{
+   p.setNewContactHistory(std::map<walberla::id_t, walberla::mesa_pd::data::ContactHistory>());
+}
+
 void reduce(data::Particle&& p, const ContactHistoryNotification::Parameters& objparam)
 {
    auto& ch = p.getNewContactHistoryRef();

python/mesa_pd/templates/mpi/notifications/ForceTorqueNotification.templ.h

@@ -29,6 +29,7 @@
 #include <mesa_pd/data/DataTypes.h>
 #include <mesa_pd/data/ParticleStorage.h>
 #include <mesa_pd/mpi/notifications/NotificationType.h>
+#include <mesa_pd/mpi/notifications/reset.h>
 
 #include <core/mpi/Datatype.h>
 #include <core/mpi/RecvBuffer.h>
@@ -55,6 +56,13 @@ public:
    const data::Particle& p_;
 };
 
+template <>
+void reset<ForceTorqueNotification>(data::Particle& p)
+{
+   p.setForce(  Vec3(real_t(0)) );
+   p.setTorque( Vec3(real_t(0)) );
+}
+
 void reduce(data::Particle&& p, const ForceTorqueNotification::Parameters& objparam)
 {
    p.getForceRef()  += objparam.force_;

src/mesa_pd/mpi/ReduceProperty.h

@@ -29,6 +29,7 @@
 #include <mesa_pd/data/DataTypes.h>
 #include <mesa_pd/data/Flags.h>
 #include <mesa_pd/data/ParticleStorage.h>
+#include <mesa_pd/mpi/notifications/reset.h>
 
 #include <core/mpi/BufferSystem.h>
 #include <core/logging/Logging.h>
@@ -100,6 +101,7 @@ void ReduceProperty::operator()(data::ParticleStorage& ps) const
          }
 
          sb << Notification( p );
+         reset<Notification>( p );
       } else
       {
          //local particles should receive the property and sum it up

src/mesa_pd/mpi/notifications/ContactHistoryNotification.h

@@ -28,6 +28,7 @@
 
 #include <mesa_pd/data/ContactHistory.h>
 #include <mesa_pd/data/DataTypes.h>
+#include <mesa_pd/mpi/notifications/reset.h>
 
 #include <core/mpi/BufferDataTypeExtensions.h>
 #include <core/mpi/Datatype.h>
@@ -56,6 +57,12 @@ public:
    const data::Particle& p_;
 };
 
+template <>
+void reset<ContactHistoryNotification>(data::Particle& p)
+{
+   p.setNewContactHistory(std::map<walberla::id_t, walberla::mesa_pd::data::ContactHistory>());
+}
+
 void reduce(data::Particle&& p, const ContactHistoryNotification::Parameters& objparam)
 {
    auto& ch = p.getNewContactHistoryRef();

src/mesa_pd/mpi/notifications/ForceTorqueNotification.h

@@ -29,6 +29,7 @@
 #include <mesa_pd/data/DataTypes.h>
 #include <mesa_pd/data/ParticleStorage.h>
 #include <mesa_pd/mpi/notifications/NotificationType.h>
+#include <mesa_pd/mpi/notifications/reset.h>
 
 #include <core/mpi/Datatype.h>
 #include <core/mpi/RecvBuffer.h>
@@ -55,6 +56,13 @@ public:
    const data::Particle& p_;
 };
 
+template <>
+void reset<ForceTorqueNotification>(data::Particle& p)
+{
+   p.setForce(  Vec3(real_t(0)) );
+   p.setTorque( Vec3(real_t(0)) );
+}
+
 void reduce(data::Particle&& p, const ForceTorqueNotification::Parameters& objparam)
 {
    p.getForceRef()  += objparam.force_;

src/mesa_pd/mpi/notifications/reset.h

+//======================================================================================================================
+//
+//  This file is part of waLBerla. waLBerla is free software: you can
+//  redistribute it and/or modify it under the terms of the GNU General Public
+//  License as published by the Free Software Foundation, either version 3 of
+//  the License, or (at your option) any later version.
+//
+//  waLBerla is distributed in the hope that it will be useful, but WITHOUT
+//  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+//  for more details.
+//
+//  You should have received a copy of the GNU General Public License along
+//  with waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
+//
+//! \file reset.h
+//! \author Sebastian Eibl <sebastian.eibl@fau.de>
+//
+//======================================================================================================================
+
+#pragma once
+
+#include <mesa_pd/data/ParticleStorage.h>
+
+namespace walberla {
+namespace mesa_pd {
+
+template <class Notification>
+void reset(data::Particle& /*p*/)
+{
+   WALBERLA_ABORT("not implemented!");
+}
+
+} // mpi
+} // walberla

tests/mesa_pd/mpi/ReduceProperty.cpp

@@ -95,7 +95,7 @@ void main( int argc, char ** argv )
       WALBERLA_CHECK_FLOAT_EQUAL( pIt->getForce(), Vec3(real_t(28)) );
    } else
    {
-      WALBERLA_CHECK_FLOAT_EQUAL( pIt->getForce(), Vec3(real_t(walberla::mpi::MPIManager::instance()->rank())) );
+      WALBERLA_CHECK_FLOAT_EQUAL( pIt->getForce(), Vec3(0) );
    }
 }