diff --git a/src/Interaction/contactSearch/ContactSearch/ContactSearch.hpp b/src/Interaction/contactSearch/ContactSearch/ContactSearch.hpp index bb72657d..8906eaa5 100644 --- a/src/Interaction/contactSearch/ContactSearch/ContactSearch.hpp +++ b/src/Interaction/contactSearch/ContactSearch/ContactSearch.hpp @@ -130,10 +130,10 @@ public: csPairContainerType& pwPairs, bool force = false) override { - ppTimer().start(); - - Particles().boundingSphere().updateBoundaries(DataDirection::SlaveToMaster); + + ppTimer().start(); + const auto& position = Particles().pointPosition().deviceViewAll(); const auto& flags = Particles().dynPointStruct().activePointsMaskDevice(); const auto& diam = Particles().boundingSphere().deviceViewAll(); @@ -167,6 +167,7 @@ public: csPairContainerType& pwPairs, bool force = false)override { + Particles().boundingSphere().updateBoundaries(DataDirection::SlaveToMaster); return csBoundaries_[i].broadSearch( iter, t, @@ -176,7 +177,6 @@ public: force); } - bool enterBroadSearch(uint32 iter, real t, real dt)const override { if(ppwContactSearch_) diff --git a/src/Interaction/sphereInteraction/sphereInteraction/sphereInteraction.cpp b/src/Interaction/sphereInteraction/sphereInteraction/sphereInteraction.cpp index 29451289..40176d02 100644 --- a/src/Interaction/sphereInteraction/sphereInteraction/sphereInteraction.cpp +++ b/src/Interaction/sphereInteraction/sphereInteraction/sphereInteraction.cpp @@ -166,12 +166,12 @@ bool pFlow::sphereInteraction::iterate() bool broadSearch = contactSearch_().enterBroadSearch(iter, t, dt); - /*sphParticles_.diameter().updateBoundaries(DataDirection::SlaveToMaster); + sphParticles_.diameter().updateBoundaries(DataDirection::SlaveToMaster); sphParticles_.velocity().updateBoundaries(DataDirection::SlaveToMaster); sphParticles_.rVelocity().updateBoundaries(DataDirection::SlaveToMaster); sphParticles_.mass().updateBoundaries(DataDirection::SlaveToMaster); sphParticles_.I().updateBoundaries(DataDirection::SlaveToMaster); - sphParticles_.propertyId().updateBoundaries(DataDirection::SlaveToMaster);*/ + sphParticles_.propertyId().updateBoundaries(DataDirection::SlaveToMaster); if(broadSearch) diff --git a/src/phasicFlow/streams/processorOstream/processorOstream.cpp b/src/phasicFlow/streams/processorOstream/processorOstream.cpp index b91950cd..e59c759a 100755 --- a/src/phasicFlow/streams/processorOstream/processorOstream.cpp +++ b/src/phasicFlow/streams/processorOstream/processorOstream.cpp @@ -156,3 +156,9 @@ void pFlow::processorOstream::indent() checkForPrefix(); Ostream::indent(); } + +pFlow::processorOstream &pFlow::processorOstream::setColor(const char *colorCode) +{ + Ostream::write(colorCode); + return *this; +} diff --git a/src/phasicFlow/streams/processorOstream/processorOstream.hpp b/src/phasicFlow/streams/processorOstream/processorOstream.hpp index d448f082..92c77d22 100755 --- a/src/phasicFlow/streams/processorOstream/processorOstream.hpp +++ b/src/phasicFlow/streams/processorOstream/processorOstream.hpp @@ -139,6 +139,8 @@ public: /// Add indentation characters void indent() override; + processorOstream& setColor(const char* colorCode); + }; // processorOstream diff --git a/src/phasicFlow/streams/streams.hpp b/src/phasicFlow/streams/streams.hpp index 56e2f2b6..e34a28cd 100755 --- a/src/phasicFlow/streams/streams.hpp +++ b/src/phasicFlow/streams/streams.hpp @@ -33,7 +33,7 @@ namespace pFlow } -#define INFORMATION pFlow::pOutput< INFO: "< INFO: "<