diff --git a/src/Interaction/contactSearch/ContactSearch/ContactSearch.hpp b/src/Interaction/contactSearch/ContactSearch/ContactSearch.hpp index 8906eaa5..d80813ca 100644 --- a/src/Interaction/contactSearch/ContactSearch/ContactSearch.hpp +++ b/src/Interaction/contactSearch/ContactSearch/ContactSearch.hpp @@ -76,10 +76,6 @@ public: *this) { - /*auto method = dict().getVal("method"); - - auto nbDict = dict().subDict(method+"Info");*/ - real minD; real maxD; this->Particles().boundingSphereMinMax(minD, maxD); @@ -110,9 +106,6 @@ public: wVertices, wNormals ); - REPORT(2)<<"Contact search algorithm for particle-particle is "<< - Green_Text(ppwContactSearch_().typeName())< pFlow::contactSearch::create( word baseMethName = dict.getVal("method"); auto model = angleBracketsNames("ContactSearch", baseMethName); - - REPORT(1)<<"Selecting contact search model . . ."< pFlow::interaction::create clType); - - REPORT(1)<<"Creating interaction "<::create( if (boundaryBasevCtorSelector_.search(boundaryTypeName)) { - REPORT(2) << "Creating boundry type " << Green_Text(boundaryTypeName) << + pOutput.space(4) << "Creating boundry type " << Green_Text(boundaryTypeName) << " for boundary " << boundary.name() << " . . ." << END_REPORT; return boundaryBasevCtorSelector_[boundaryTypeName]( boundary, @@ -67,7 +67,7 @@ pFlow::boundarySphereInteraction::create( { // if boundary condition is not implemented, the default is used - REPORT(2) << "Creating boundry type " << Green_Text(altBTypeName) << + pOutput.space(4) << "Creating boundry type " << Green_Text(altBTypeName) << " for boundary " << boundary.name() << " . . ." << END_REPORT; return boundaryBasevCtorSelector_[altBTypeName]( boundary, diff --git a/src/Interaction/sphereInteraction/boundaries/boundarySphereInteractionList.cpp b/src/Interaction/sphereInteraction/boundaries/boundarySphereInteractionList.cpp index 7bc37847..00b86bc4 100644 --- a/src/Interaction/sphereInteraction/boundaries/boundarySphereInteractionList.cpp +++ b/src/Interaction/sphereInteraction/boundaries/boundarySphereInteractionList.cpp @@ -10,7 +10,7 @@ pFlow::boundarySphereInteractionList::boundarySphereInteractio ListPtr>(6), boundaries_(sphPrtcls.pStruct().boundaries()) { - + //gSettings::sleepMiliSeconds(1000*pFlowProcessors().localRank()); for(uint32 i=0; i<6; i++) { this->set( diff --git a/src/Interaction/sphereInteraction/sphereInteraction/sphereInteraction.cpp b/src/Interaction/sphereInteraction/sphereInteraction/sphereInteraction.cpp index 40176d02..b4546521 100644 --- a/src/Interaction/sphereInteraction/sphereInteraction/sphereInteraction.cpp +++ b/src/Interaction/sphereInteraction/sphereInteraction/sphereInteraction.cpp @@ -26,7 +26,6 @@ bool pFlow::sphereInteraction::createSphereInteraction() auto modelDict = this->subDict("model"); - REPORT(1)<<"Createing contact force model . . ."<( this->numMaterials(), rhoD.deviceView(), @@ -46,8 +45,6 @@ bool pFlow::sphereInteraction::createSphereInteraction() pwContactList_ = makeUnique(nPrtcl/5+1); - - return true; } diff --git a/src/phasicFlow/eventManagement/message.hpp b/src/phasicFlow/eventManagement/message.hpp index e5e1bfb0..3ece7411 100644 --- a/src/phasicFlow/eventManagement/message.hpp +++ b/src/phasicFlow/eventManagement/message.hpp @@ -47,13 +47,15 @@ public: BNDR_TRANSFER = 9, // boundary indices transfered BNDR_RESET = 10, // boundary indices reset entirely BNDR_DELETE = 11, // boundary indices deleted - BNDR_APPEND = 12 + BNDR_APPEND = 12, // + BNDR_PROCTRANS1 = 13, // transfer of data between processors step 1 + BNDR_PROCTRANS2 = 14 // transfer of data between processors step 2 }; private: - static constexpr size_t numberOfEvents_ = 13; + static constexpr size_t numberOfEvents_ = 15; std::bitset events_{0x0000}; @@ -72,7 +74,9 @@ private: "transferredIndices", "", "deletedIndices", - "appendedIndices" + "appendedIndices", + "transferredIndices", + "numberRecieved" }; public: diff --git a/src/phasicFlow/globals/globalSettings.cpp b/src/phasicFlow/globals/globalSettings.cpp index 36115c8c..ced0f76a 100644 --- a/src/phasicFlow/globals/globalSettings.cpp +++ b/src/phasicFlow/globals/globalSettings.cpp @@ -1,6 +1,14 @@ +#include +#include #include "globalSettings.hpp" -const double pFlow::gSettings::vectorGrowthFactor__ = 1.1; \ No newline at end of file + +const double pFlow::gSettings::vectorGrowthFactor__ = 1.1; + +void pFlow::gSettings::sleepMiliSeconds(int miliSeconds) +{ + std::this_thread::sleep_for(std::chrono::milliseconds(miliSeconds)); +} diff --git a/src/phasicFlow/globals/globalSettings.hpp b/src/phasicFlow/globals/globalSettings.hpp index 734db3c3..21dead3f 100755 --- a/src/phasicFlow/globals/globalSettings.hpp +++ b/src/phasicFlow/globals/globalSettings.hpp @@ -28,6 +28,8 @@ namespace pFlow::gSettings extern const double vectorGrowthFactor__; +void sleepMiliSeconds(int miliSeconds); + } diff --git a/src/phasicFlow/structuredData/boundaries/boundaryBase/boundaryBase.cpp b/src/phasicFlow/structuredData/boundaries/boundaryBase/boundaryBase.cpp index 596eb238..f8307478 100644 --- a/src/phasicFlow/structuredData/boundaries/boundaryBase/boundaryBase.cpp +++ b/src/phasicFlow/structuredData/boundaries/boundaryBase/boundaryBase.cpp @@ -98,15 +98,11 @@ bool pFlow::boundaryBase::removeIndices keepIndices ); - if(!internal_.deletePoints(removeIndices)) + if(!setRemoveKeepIndices(removeIndices, keepIndices)) { - fatalErrorInFunction<< - "error in deleting points from boundary "<< name()< requireStep{true, true, true, true, true, true}; + + int step = 1; + while(std::any_of(requireStep.begin(), requireStep.end(), [](bool v) { return v==true; })) + { + for(auto i=0uL; i<6; i++) + { + if(requireStep[i]) + { + requireStep[i] = this->operator[](i).transferData(step); + } + } + step++; + } + + /*for (auto& bdry : *this) { if (!bdry->afterIteration(iter, t, dt)) { @@ -213,6 +229,6 @@ pFlow::boundaryList::afterIteration(uint32 iter, real t, real dt) << bdry->name() << endl; return false; } - } + }*/ return true; }