This is the first merge from main into MPI branch

Merge branch 'main' into local-MPI

src/Interaction/sphereInteraction/boundaries/boundarySphereInteraction/boundarySphereInteraction.hpp

@@ -110,7 +110,7 @@ public:
 		return geometryMotion_;
 	}
 
-	ContactListType& ppPairs()
+	ContactListType& ppPairs() 
 	{
 		return ppPairs_();
 	}
@@ -148,7 +148,7 @@ public:
 		const ContactForceModel& cfModel,
 		uint32 step)
 	{
-		// for default boundary, no thing to be done 
+		// for default boundary, nothing to be done 
 		return false;
 	}
 
@@ -156,20 +156,26 @@ public:
 
 	bool hearChanges
 	(
-		real t,
-		real dt,
-		uint32 iter,
+		const timeInfo& ti,
 		const message& msg, 
     	const anyList& varList
 	) override
     {
-		
+		if(msg.equivalentTo(message::BNDR_RESET))
+		{
+			// do nothing 
+			return true;
+		}
 		pOutput<<"Function (hearChanges in boundarySphereInteractions)is not implmented Message "<<
-		 msg <<endl<<" name "<< this->name() <<" type "<< this->type()<<endl;;
-		//notImplementedFunction;
+		 msg <<endl<<" name "<< this->boundaryName() <<" type "<< this->type()<<endl;
 		return true;
 	}
 
+	bool isActive()const override
+	{
+		return false;
+	}
+
 	static
 	uniquePtr<BoundarySphereInteractionType> create(
 		const boundaryBase& boundary,

src/Interaction/sphereInteraction/boundaries/boundarySphereInteractionList.cpp

@@ -7,11 +7,11 @@ pFlow::boundarySphereInteractionList<CFModel, gMModel>::boundarySphereInteractio
     const gMModel &geomMotion
 )
 :
-	ListPtr<boundarySphereInteraction<CFModel,gMModel>>(6),
+	boundaryListPtr<boundarySphereInteraction<CFModel,gMModel>>(),
 	boundaries_(sphPrtcls.pStruct().boundaries())
 {
-	//gSettings::sleepMiliSeconds(1000*pFlowProcessors().localRank());
-	for(uint32 i=0; i<6; i++)
+	output<<boundaries_.size()<<endl;
+	ForAllBoundariesPtr(i, this)
 	{
 		this->set(
 			i,

src/Interaction/sphereInteraction/boundaries/boundarySphereInteractionList.hpp

@@ -3,7 +3,7 @@
 
 
 #include "boundaryList.hpp"
-#include "ListPtr.hpp"
+#include "boundaryListPtr.hpp"
 #include "boundarySphereInteraction.hpp"
 
 
@@ -14,7 +14,7 @@ namespace pFlow
 template<typename contactForceModel,typename geometryMotionModel>
 class boundarySphereInteractionList
 :
-    public ListPtr<boundarySphereInteraction<contactForceModel,geometryMotionModel>>
+    public boundaryListPtr<boundarySphereInteraction<contactForceModel,geometryMotionModel>>
 {
 private:
 

src/Interaction/sphereInteraction/boundaries/periodicBoundarySphereInteraction/periodicBoundarySphereInteraction.hpp

@@ -76,15 +76,17 @@ public:
         boundaryBase
     );
     
-    ~periodicBoundarySphereInteraction()override = default;
-
-
-    
+    ~periodicBoundarySphereInteraction()override = default;  
 
     bool sphereSphereInteraction(
         real dt,
 		const ContactForceModel& cfModel,
         uint32 step)override;
+    
+    bool isActive()const override
+	{
+		return true;
+	}
 	
 };
 

src/Interaction/sphereInteraction/sphereInteraction/sphereInteraction.cpp

@@ -41,9 +41,9 @@ bool pFlow::sphereInteraction<cFM,gMM, cLT>::createSphereInteraction()
 	geometryMotion_,
 	timers());
 
-	ppContactList_ = makeUnique<ContactListType>(nPrtcl+1);
+	ppContactList_ = makeUnique<ContactListType>("sphere-sphere",nPrtcl+1);
 	
-	pwContactList_ = makeUnique<ContactListType>(nPrtcl/5+1);
+	pwContactList_ = makeUnique<ContactListType>("sphere-wall",nPrtcl/5+1);
 
 	return true;
 }
@@ -134,18 +134,22 @@ pFlow::sphereInteraction<cFM,gMM, cLT>::sphereInteraction
 	geometryMotion_(dynamic_cast<const GeometryMotionModel&>(geom)),
 	sphParticles_(dynamic_cast<const sphereParticles&>(prtcl)),
 	boundaryInteraction_(sphParticles_,geometryMotion_),
-	ppInteractionTimer_("sphere-sphere interaction", &this->timers()),
-	pwInteractionTimer_("sphere-wall interaction", &this->timers()),
-	contactListMangementTimer_("contact-list management", &this->timers()),
-	boundaryContactSearchTimer_("contact search for boundary", &this->timers()),
-	boundaryInteractionTimer_("interaction for boundary", &this->timers()),
-	contactListBoundaryTimer_("contact-list management for boundary", &this->timers())
+	ppInteractionTimer_("sphere-sphere interaction (internal)", &this->timers()),
+	pwInteractionTimer_("sphere-wall interaction (internal)", &this->timers()),
+	boundaryInteractionTimer_("sphere-sphere interaction (boundary)",&this->timers()),
+	contactListMangementTimer_("list management (interal)", &this->timers()),
+	contactListMangementBoundaryTimer_("list management (boundary)", &this->timers())
 {
 	
 	if(!createSphereInteraction())
 	{
 		fatalExit;
 	}
+
+	for(uint32 i=0; i<6; i++)
+	{
+		activeBoundaries_[i] = boundaryInteraction_[i].ppPairsAllocated();
+	}
 }
 
 template<typename cFM,typename gMM,template <class, class, class> class cLT>
@@ -158,45 +162,58 @@ template<typename cFM,typename gMM,template <class, class, class> class cLT>
 bool pFlow::sphereInteraction<cFM,gMM, cLT>::iterate()
 {
 	
-	auto iter = this->currentIter();
-	auto t = this->currentTime();
-	auto dt = this->dt();
+	timeInfo ti = this->TimeInfo();
+	auto iter = ti.iter();
+	auto t = ti.t();
+	auto dt = ti.dt();
 
-	
-	bool broadSearch = contactSearch_().enterBroadSearch(iter, t, dt);
+	auto& contactSearchRef = contactSearch_();
 
+	bool broadSearch = contactSearchRef.enterBroadSearch(ti);
+	bool broadSearchBoundary = contactSearchRef.enterBroadSearchBoundary(ti);
+
+	/// update boundaries of the fields that are being used by inreaction 
 	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);
 	
-	
+	/// lists 
 	if(broadSearch)
 	{
 		contactListMangementTimer_.start();
-		ppContactList_().beforeBroadSearch();
-		pwContactList_().beforeBroadSearch();
+		ComputationTimer().start();
+			ppContactList_().beforeBroadSearch();
+			pwContactList_().beforeBroadSearch();
+		ComputationTimer().end();
 		contactListMangementTimer_.pause();
 	} 
 
-	contactListBoundaryTimer_.start();
-	for(uint32 i=0; i<6u; i++)
+	if(broadSearchBoundary)
 	{
-		auto& BI = boundaryInteraction_[i];
-		if(BI.ppPairsAllocated()) BI.ppPairs().beforeBroadSearch();
-		if(BI.pwPairsAllocated()) BI.pwPairs().beforeBroadSearch();
+		contactListMangementBoundaryTimer_.start();
+		ComputationTimer().start();
+
+		ForAllActiveBoundaries(i, boundaryInteraction_)
+		//for(size_t i=0; i<6; i++)
+		{
+			if(activeBoundaries_[i])
+			{
+				auto& BI = boundaryInteraction_[i];
+				BI.ppPairs().beforeBroadSearch();
+				BI.pwPairs().beforeBroadSearch();
+			}
+		}
+
+		ComputationTimer().end();
+		contactListMangementBoundaryTimer_.pause();	
 	}
-	contactListBoundaryTimer_.pause();
 	
 	if( sphParticles_.numActive()<=0)return true;
 	
-	
-	if( !contactSearch_().broadSearch(
-			iter,
-			t,
-			dt,		
+	ComputationTimer().start();
+	if( !contactSearchRef.broadSearch(
+			ti,		
 			ppContactList_(),
 			pwContactList_()) )
 	{
@@ -205,62 +222,69 @@ bool pFlow::sphereInteraction<cFM,gMM, cLT>::iterate()
 		fatalExit;
 	}
 	
-	boundaryContactSearchTimer_.start();
-	for(uint32 i=0; i<6u; i++)
+	ForAllActiveBoundaries(i, boundaryInteraction_)
+	//for(size_t i=0; i<6; i++)
 	{
-		auto& BI =boundaryInteraction_[i];
-		if(BI.ppPairsAllocated())
+		if(activeBoundaries_[i])
 		{
-			if( !contactSearch_().boundaryBroadSearch(
+			auto& BI = boundaryInteraction_[i];
+			if(!contactSearchRef.boundaryBroadSearch(
 				i,
-				iter,
-				t,
-				dt,
+				ti,
 				BI.ppPairs(),
-				BI.pwPairs()))
+				BI.pwPairs())
+			)
 			{
 				fatalErrorInFunction<<
 				"failed to perform broadSearch for boundary index "<<i<<endl;
 				return false;
 			}
-		} 
+		}
 	}
-	boundaryContactSearchTimer_.end();
+	ComputationTimer().end();
 	
-	if(broadSearch && contactSearch_().performedBroadSearch())
+	if(broadSearch && contactSearchRef.performedSearch())
 	{
 		contactListMangementTimer_.resume();
-		ppContactList_().afterBroadSearch();
-		pwContactList_().afterBroadSearch();
+		ComputationTimer().start();
+			ppContactList_().afterBroadSearch();
+			pwContactList_().afterBroadSearch();
+		ComputationTimer().end();
 		contactListMangementTimer_.end();
 	}
 
-	contactListBoundaryTimer_.resume();
-	for(uint32 i=0; i<6u; i++)
+	if(broadSearchBoundary && contactSearchRef.performedSearchBoundary())
 	{
-		auto& BI = boundaryInteraction_[i];
-		if(BI.ppPairsAllocated()) BI.ppPairs().afterBroadSearch();
-		if(BI.pwPairsAllocated()) BI.pwPairs().afterBroadSearch();
-	}
-	contactListBoundaryTimer_.end();
-	
-	
-	{
-	boundaryInteractionTimer_.start();
-	std::array<bool,6> requireStep{
-		boundaryInteraction_[0].isBoundaryMaster(),
-		boundaryInteraction_[1].isBoundaryMaster(),
-		boundaryInteraction_[2].isBoundaryMaster(),
-		boundaryInteraction_[3].isBoundaryMaster(),
-		boundaryInteraction_[4].isBoundaryMaster(),
-		boundaryInteraction_[5].isBoundaryMaster()};
-	int step = 1;
-	const auto& cfModel = this->forceModel_();
-	while( std::any_of(requireStep.begin(), requireStep.end(), [](bool v) { return v==true; }))
-	{
-		for(uint32 i=0; i<6u; i++)
+		contactListMangementBoundaryTimer_.resume();
+		ComputationTimer().start();
+		
+		ForAllActiveBoundaries(i, boundaryInteraction_)
+		//for(size_t i=0; i<6; i++)
 		{
-			if(step==1u || requireStep[i] )
+			if(activeBoundaries_[i])
+			{
+				auto& BI = boundaryInteraction_[i];
+				BI.ppPairs().afterBroadSearch();
+				BI.pwPairs().afterBroadSearch();
+			}
+		}
+
+		ComputationTimer().end();
+		contactListMangementBoundaryTimer_.end();
+	}
+	
+	/// peform contact search on boundareis with active contact search (master boundaries)
+	auto requireStep = boundariesMask<6>(true);
+	const auto& cfModel = this->forceModel_();
+	uint32 step=1;
+	boundaryInteractionTimer_.start();
+	ComputationTimer().start();
+	while(requireStep.anyElement(true) && step <= 10)
+	{
+		ForAllBoundaries(i, boundaryInteraction_)
+		//for(size_t i=0; i<6; i++)
+		{
+			if(requireStep[i] )
 			{
 				requireStep[i] = boundaryInteraction_[i].sphereSphereInteraction(
 					dt, 
@@ -271,44 +295,47 @@ bool pFlow::sphereInteraction<cFM,gMM, cLT>::iterate()
 		}
 		step++;
 	}
+	ComputationTimer().end();
 	boundaryInteractionTimer_.pause();
-	}
+	
+
 	ppInteractionTimer_.start();
+	ComputationTimer().start();
 		sphereSphereInteraction();
+	ComputationTimer().end();
 	ppInteractionTimer_.end();
 
 	
 	pwInteractionTimer_.start();
+	ComputationTimer().start();
 		sphereWallInteraction();
+	ComputationTimer().start();
 	pwInteractionTimer_.end();
 
 	{
 	boundaryInteractionTimer_.resume();
-	std::array<bool,6> requireStep{
-		!boundaryInteraction_[0].isBoundaryMaster(),
-		!boundaryInteraction_[1].isBoundaryMaster(),
-		!boundaryInteraction_[2].isBoundaryMaster(),
-		!boundaryInteraction_[3].isBoundaryMaster(),
-		!boundaryInteraction_[4].isBoundaryMaster(),
-		!boundaryInteraction_[5].isBoundaryMaster()};
+	ComputationTimer().start();
+	auto requireStep = boundariesMask<6>(true);
 
-	int step = 2;
+	uint32 step = 11;
 	const auto& cfModel = this->forceModel_();
-	while(std::any_of(requireStep.begin(), requireStep.end(), [](bool v) { return v==true; }))
+	while( requireStep.anyElement(true) && step < 20 )
 	{
-		for(uint32 i=0; i<6u; i++)
+		ForAllBoundaries(i, boundaryInteraction_)
+		//for(size_t i=0; i<6; i++)
 		{
 			if(requireStep[i])
 			{
 				requireStep[i] = boundaryInteraction_[i].sphereSphereInteraction(
 					dt, 
-					this->forceModel_(),
+					cfModel,
 					step
 				);
 			}		
 		}
 		step++;
 	}
+	ComputationTimer().end();
 	boundaryInteractionTimer_.end();
 	}
 	
@@ -324,17 +351,18 @@ bool pFlow::sphereInteraction<cFM,gMM, cLT>::afterIteration()
 template<typename cFM,typename gMM,template <class, class, class> class cLT>
 bool pFlow::sphereInteraction<cFM,gMM, cLT>::hearChanges
 (
-	real t,
-	real dt,
-	uint32 iter,
+	const timeInfo& ti,
 	const message& msg, 
 	const anyList& varList
 )
 {
-	if(msg.equivalentTo(message::ITEM_REARRANGE))
+	if(msg.equivalentTo(message::ITEMS_REARRANGE))
 	{
 		notImplementedFunction;
+		return false;
 	}
-	return true;
-}
-
+	
+	fatalErrorInFunction<<"Event "<< msg.eventNames()<<
+	" is not handled in sphereInteraction"<<endl;
+	return false;
+}

src/Interaction/sphereInteraction/sphereInteraction/sphereInteraction.hpp

@@ -25,6 +25,8 @@ Licence:
 #include "sphereParticles.hpp"
 #include "boundarySphereInteractionList.hpp"
 #include "sphereInteractionKernels.hpp"
+#include "boundariesMask.hpp"
+#include "MPITimer.hpp"
 //#include "unsortedContactList.hpp"
 
 
@@ -74,6 +76,9 @@ private:
 	/// particle-particle and particle-wall interactions at boundaries 
 	BoundaryListType 					boundaryInteraction_;	
 
+	/// a mask for active boundaries (boundaries with intreaction)
+	boundariesMask<6> 					activeBoundaries_;
+
 	/// contact search object for pp and pw interactions 
 	uniquePtr<contactSearch> 			contactSearch_ = nullptr;
 
@@ -93,14 +98,13 @@ private:
 	/// timer for particle-wall interaction computations
 	Timer       pwInteractionTimer_;
 
-	/// timer for managing contact lists (only inernal points)
-	Timer 		contactListMangementTimer_;
-
-	Timer 		boundaryContactSearchTimer_;
 	/// timer for boundary interaction time 
 	Timer 		boundaryInteractionTimer_;
 
-	Timer 		contactListBoundaryTimer_;
+	/// timer for managing contact lists (only inernal points)
+	Timer 		contactListMangementTimer_;	
+
+	Timer 		contactListMangementBoundaryTimer_;
 
 	
 
@@ -110,10 +114,6 @@ private:
 
 	bool sphereWallInteraction();
 
-	//bool managePPContactLists();
-
-	//bool managePWContactLists();
-
 	/// range policy for p-p interaction execution 
 	using rpPPInteraction = 
 		Kokkos::RangePolicy<Kokkos::IndexType<uint32>, Kokkos::Schedule<Kokkos::Dynamic>>;
@@ -152,9 +152,7 @@ public:
 
 	/// Check for changes in the point structures. (overriden from observer)
 	bool hearChanges(
-		real t,
-		real dt,
-		uint32 iter,
+		const timeInfo& ti,
 		const message& msg, 
 		const anyList& varList)override;
 	

src/Interaction/sphereInteraction/sphereInteractionsLinearModels.cpp

@@ -53,6 +53,10 @@ createInteraction(pFlow::cfModels::nonLimitedLinearNormalRolling,pFlow::rotation
 createInteraction(pFlow::cfModels::limitedLinearNormalRolling, pFlow::vibratingMotionGeometry);
 createInteraction(pFlow::cfModels::nonLimitedLinearNormalRolling,pFlow::vibratingMotionGeometry);
 
+// conveyorBeltGeometry
+createInteraction(pFlow::cfModels::limitedLinearNormalRolling, pFlow::conveyorBeltMotionGeometry);
+createInteraction(pFlow::cfModels::nonLimitedLinearNormalRolling,pFlow::conveyorBeltMotionGeometry);
+
 // multiRotationAxisMotionGeometry
 //createInteraction(pFlow::cfModels::limitedLinearNormalRolling, pFlow::multiRotationAxisMotionGeometry);
 //createInteraction(pFlow::cfModels::nonLimitedLinearNormalRolling,pFlow::multiRotationAxisMotionGeometry);

src/Interaction/sphereInteraction/sphereInteractionsNonLinearModModels.cpp

@@ -53,6 +53,10 @@ createInteraction(pFlow::cfModels::nonLimitedNonLinearModNormalRolling,pFlow::ro
 createInteraction(pFlow::cfModels::limitedNonLinearModNormalRolling, pFlow::vibratingMotionGeometry);
 createInteraction(pFlow::cfModels::nonLimitedNonLinearModNormalRolling,pFlow::vibratingMotionGeometry);
 
+// conveyorBeltMotionGeometry
+createInteraction(pFlow::cfModels::limitedNonLinearModNormalRolling, pFlow::conveyorBeltMotionGeometry);
+createInteraction(pFlow::cfModels::nonLimitedNonLinearModNormalRolling,pFlow::conveyorBeltMotionGeometry);
+
 // multiRotationAxisMotionGeometry
-//createInteraction(pFlow::cfModels::limitedNonLinearModNormalRolling, pFlow::multiRotationAxisMotionGeometry);
-//createInteraction(pFlow::cfModels::nonLimitedNonLinearModNormalRolling,pFlow::multiRotationAxisMotionGeometry);
+createInteraction(pFlow::cfModels::limitedNonLinearModNormalRolling, pFlow::multiRotationAxisMotionGeometry);
+createInteraction(pFlow::cfModels::nonLimitedNonLinearModNormalRolling,pFlow::multiRotationAxisMotionGeometry);

src/Interaction/sphereInteraction/sphereInteractionsNonLinearModels.cpp

@@ -53,6 +53,10 @@ createInteraction(pFlow::cfModels::nonLimitedNonLinearNormalRolling,pFlow::rotat
 createInteraction(pFlow::cfModels::limitedNonLinearNormalRolling, pFlow::vibratingMotionGeometry);
 createInteraction(pFlow::cfModels::nonLimitedNonLinearNormalRolling,pFlow::vibratingMotionGeometry);
 
+// conveyorBeltMotionGeometry
+createInteraction(pFlow::cfModels::limitedNonLinearNormalRolling, pFlow::conveyorBeltMotionGeometry);
+createInteraction(pFlow::cfModels::nonLimitedNonLinearNormalRolling,pFlow::conveyorBeltMotionGeometry);
+
 // multiRotationAxisMotionGeometry
 //createInteraction(pFlow::cfModels::limitedNonLinearNormalRolling, pFlow::multiRotationAxisMotionGeometry);
 //createInteraction(pFlow::cfModels::nonLimitedNonLinearNormalRolling,pFlow::multiRotationAxisMotionGeometry);