Merge branch 'develop' into MPI

src/Particles/CMakeLists.txt

@@ -16,6 +16,11 @@ Insertion/shapeMixture/shapeMixture.cpp
 Insertion/Insertion/Insertions.cpp
 )
 
+if(pFlow_Build_MPI)
+    list(APPEND SourceFiles 
+    particles/MPIParticleIdHandler/MPIParticleIdHandler.cpp)
+endif()
+
 set(link_libs Kokkos::kokkos phasicFlow Integration Property)
 
 pFlow_add_library_install(Particles SourceFiles link_libs)

src/Particles/SphereParticles/sphereParticles/sphereParticles.cpp

@@ -513,6 +513,14 @@ bool pFlow::sphereParticles::beforeIteration()
 		dynPointStruct().predict(dt, accelertion());
 		rVelIntegration_().predict(dt,rVelocity_, rAcceleration_);
 	intPredictTimer_.end();
+
+	propertyId_.updateBoundariesSlaveToMasterIfRequested();
+	diameter_.updateBoundariesSlaveToMasterIfRequested();
+	mass_.updateBoundariesSlaveToMasterIfRequested();
+	I_.updateBoundariesSlaveToMasterIfRequested();
+	rVelocity_.updateBoundariesSlaveToMasterIfRequested();
+	rAcceleration_.updateBoundariesSlaveToMasterIfRequested();
+	
 	
 	return true;
 }

src/Particles/particles/particleIdHandler/particleIdHandler.hpp

@@ -31,7 +31,12 @@ class particleIdHandler
 :
 	public uint32PointField_D
 {
-  
+
+private:
+
+	virtual 
+	bool initialIdCheck()=0;
+
 public:
 	
 	/// class info
@@ -53,7 +58,9 @@ public:
 	Pair<uint32, uint32> getIdRange(uint32 nNewParticles)=0;
 
 	virtual 
-	bool initialIdCheck()=0;
+	uint32 maxId()const = 0;
+
+	
 
 	// heat change for possible insertion of particles
 	// overrdie from internalField

src/Particles/particles/particles.cpp

@@ -78,7 +78,7 @@ pFlow::particles::particles(systemControl& control)
 {
 	this->addToSubscriber(dynPointStruct_);
 
-	idHandler_().initialIdCheck();
+	//idHandler_().initialIdCheck();
 }
 
 bool
@@ -87,7 +87,16 @@ pFlow::particles::beforeIteration()
 	zeroForce();
 	zeroTorque();
 
-	return dynPointStruct_.beforeIteration();
+	if( !dynPointStruct_.beforeIteration())
+  {
+    return false;
+  }
+
+  shapeIndex_.updateBoundariesSlaveToMasterIfRequested();
+  accelertion_.updateBoundariesSlaveToMasterIfRequested();
+  idHandler_().updateBoundariesSlaveToMasterIfRequested();
+
+  return true;
 }
 
 bool

src/Particles/particles/particles.hpp

@@ -181,6 +181,12 @@ public:
 		return contactTorque_;
 	}
 
+	inline 
+	uint maxId()const
+	{
+		return idHandler_().maxId();
+	}
+
 	bool         beforeIteration() override;
 
 	bool         iterate() override;

src/Particles/particles/regularParticleIdHandler/regularParticleIdHandler.cpp

@@ -9,6 +9,7 @@ pFlow::regularParticleIdHandler::regularParticleIdHandler
 :
     particleIdHandler(pStruct)
 {
+    initialIdCheck();
 }
 
 pFlow::Pair<pFlow::uint32, pFlow::uint32> 

src/Particles/particles/regularParticleIdHandler/regularParticleIdHandler.hpp

@@ -33,6 +33,7 @@ private:
     
     uint32 maxId_ = -1;
 
+  bool initialIdCheck()override; 
 public:
 
     ClassInfo("particleIdHandler<regular>");
@@ -50,7 +51,10 @@ public:
 
     Pair<uint32, uint32> getIdRange(uint32 nNewParticles)override;
 
-	bool initialIdCheck()override;
+	uint32 maxId()const override
+	{
+		return maxId_;
+	}
 
 };