bug fix for particle insertion and id handling

src/Particles/CMakeLists.txt

@@ -2,6 +2,7 @@
 set(SourceFiles 
 dynamicPointStructure/dynamicPointStructure.cpp
 particles/particles.cpp
+particles/particleIdHandler.cpp
 SphereParticles/sphereShape/sphereShape.cpp
 SphereParticles/sphereParticles/sphereParticles.cpp
 Insertion/shapeMixture/shapeMixture.cpp

src/Particles/SphereParticles/sphereParticles/sphereParticles.cpp

@@ -77,7 +77,7 @@ bool pFlow::sphereParticles::initializeParticles()
 		0, 
 		static_cast<int32>(shapeName_.size()));
 	
-	return insertSphereParticles(shapeName_, indices);
+	return insertSphereParticles(shapeName_, indices, false);
 }
 
 
@@ -119,11 +119,11 @@ bool pFlow::sphereParticles::iterate()
 	accelerationTimer_.end();
 	
 	intCorrectTimer_.start();
-	//INFO<<"before correct dyn "<<endINFO;
+	
 		dynPointStruct_.correct(this->dt(), accelertion_);
-	//INFO<<"after correct dyn "<<endINFO;
+	
 		rVelIntegration_().correct(this->dt(), rVelocity_, rAcceleration_);
-	//INFO<<"after correct rvel "<<endINFO;
+	
 	intCorrectTimer_.end();
 	
 	return true;
@@ -138,7 +138,8 @@ bool pFlow::sphereParticles::afterIteration()
 
 bool pFlow::sphereParticles::insertSphereParticles(
 	const wordVector& names,
-	const int32IndexContainer& indices
+	const int32IndexContainer& indices,
+	bool setId
 	)
 {
 
@@ -170,7 +171,8 @@ bool pFlow::sphereParticles::insertSphereParticles(
 			massVec.push_back(m);
 			IVec.push_back(I);
 			pIdVec.push_back(pId);
-			IdVec.push_back(idHandler_.getNextId());
+			if(setId) IdVec.push_back(idHandler_.getNextId());
+			//output<<" we are in sphereParticles nextId "<< idHandler_.nextId()<<endl;
 		}
 		else
 		{
@@ -205,11 +207,15 @@ bool pFlow::sphereParticles::insertSphereParticles(
 		return false;
 	}
 
+	if(setId)
+	{
 		if( !id_.insertSetElement(indices, IdVec))
 		{
 			fatalErrorInFunction<< " failed to insert id to the id field. \n";
 			return false;
 		}	
+	}
+	
 
 	return true;
 

src/Particles/SphereParticles/sphereParticles/sphereParticles.hpp

@@ -78,7 +78,10 @@ protected:
 
 	bool initializeParticles();
 
-	bool insertSphereParticles(const wordVector& names, const int32IndexContainer& indices);
+	bool insertSphereParticles(
+		const wordVector& names, 
+		const int32IndexContainer& indices,
+		bool setId = true);
 
 	virtual uniquePtr<List<eventObserver*>> getFieldObjectList()const override;
 

src/Particles/particles/particleIdHandler.cpp

@@ -0,0 +1,58 @@
+/*------------------------------- phasicFlow ---------------------------------
+      O        C enter of
+     O O       E ngineering and
+    O   O      M ultiscale modeling of
+   OOOOOOO     F luid flow       
+------------------------------------------------------------------------------
+  Copyright (C): www.cemf.ir
+  email: hamid.r.norouzi AT gmail.com
+------------------------------------------------------------------------------  
+Licence:
+  This file is part of phasicFlow code. It is a free software for simulating 
+  granular and multiphase flows. You can redistribute it and/or modify it under
+  the terms of GNU General Public License v3 or any other later versions. 
+ 
+  phasicFlow is distributed to help others in their research in the field of 
+  granular and multiphase flows, but WITHOUT ANY WARRANTY; without even the
+  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+-----------------------------------------------------------------------------*/
+
+#include "particleIdHandler.hpp"
+
+
+
+pFlow::particleIdHandler::particleIdHandler(int32PointField_HD & id)
+{
+	int32 maxID = maxActive<DeviceSide>(id);
+
+	if( maxID != -1 	 && id.size() == 0 )
+	{
+		nextId_ = 0;
+	}
+	else if( maxID == -1 && id.size()>0 )
+	{
+
+		nextId_ = 0; 
+		id.modifyOnHost();
+
+		ForAll(i,id)
+		{
+			if(id.isActive(i))
+			{
+				id[i] = getNextId();	
+			}
+		}
+
+		id.syncViews();
+	}
+	else if( maxID >= static_cast<int32>(id.size()) )
+	{
+		nextId_ = maxID + 1;
+	}
+	else
+	{
+		nextId_ = id.size();
+	}
+}
+

src/Particles/particles/particleIdHandler.hpp

@@ -32,38 +32,7 @@ class particleIdHandler
 protected:
 	int32 nextId_=0;
 public:
-	particleIdHandler(int32PointField_HD & id)
-	{
-		int32 maxID = maxActive<DeviceSide>(id);
-
-		if( maxID != -1 	 && id.size() == 0 ) 
-		{
-			nextId_ = 0;
-		}
-		else if( maxID == -1 && id.size()>0 )
-		{
-			nextId_ = 0; 
-			id.modifyOnHost();
-
-			ForAll(i,id)
-			{
-				if(id.isActive(i))
-				{
-					id[i] = getNextId();
-				}
-			}
-
-			id.syncViews();
-		}
-		else if( maxID >= static_cast<int32>(id.size()) )
-		{
-			nextId_ = maxID + 1;
-		}
-		else
-		{
-			nextId_ = id.size();
-		}
-	}
+	particleIdHandler(int32PointField_HD & id);
 	
 	int32 getNextId()
 	{

src/Particles/particles/particles.hpp

@@ -246,10 +246,7 @@ public:
 		auto domain = this->control().domain();
 
 		auto numMarked = dynPointStruct_.markDeleteOutOfBox(domain);
-		/*if(numMarked)
-		{
-			output<<"\nNumber of deleted points/particles that are out of domain box: "<<numMarked<<endl;
-		}*/
+		
 
 		this->zeroForce();
 		this->zeroTorque();

src/phasicFlow/containers/VectorHD/VectorDual.hpp

@@ -128,7 +128,7 @@ protected:
 	// use actualCap = true only for reserve
 	INLINE_FUNCTION_H void changeSize(size_t n, bool actualCap=false)
 	{
-		if(n >= capacity_ )
+		if(n > capacity_ )
 		{
 			if(actualCap)
 				capacity_ = n;

src/phasicFlow/containers/VectorHD/VectorSingle.hpp

@@ -28,6 +28,8 @@ Licence:
 #include "Vector.hpp"
 #include "indexContainer.hpp"
 
+#include "streams.hpp"
+
 #include "KokkosTypes.hpp"
 #include "ViewAlgorithms.hpp"
 
@@ -106,7 +108,7 @@ protected:
 	// use actualCap = true only for reserve
 	INLINE_FUNCTION_H void changeSize(size_t n, bool actualCap=false)
 	{
-		if(n >= capacity_ )
+		if(n > capacity_ )
 		{
 			if(actualCap)
 				capacity_ = n;
@@ -565,7 +567,8 @@ public:
 			if(indices.size() != vals.size())return false;
 
 			auto maxInd = indices.max(); 
-			
+			/*output<<"maxInd "<< maxInd<<endl;
+			output<<"size() "<< size()<<endl;*/
 			if(this->empty() || maxInd > size()-1 )
 			{
 				resize(maxInd+1);

src/phasicFlow/structuredData/pointStructure/pointStructure.cpp

@@ -83,6 +83,7 @@ pFlow::uniquePtr<pFlow::int32IndexContainer>
 		return makeUnique<int32IndexContainer>(
 			activeRange_.second,
 			activeRange_.second+numNewPoints);
+
 	}
 
 	// second, check if there is space at the beginning
@@ -334,8 +335,6 @@ pFlow::uniquePtr<pFlow::int32IndexContainer> pFlow::pointStructure::insertPoints
 		static_cast<int8>(PointFlag::ACTIVE))
 		)return nullptr;
 
-
-
 	setNumMaxPoints();
 	auto minInd = newPointsPtr().min();
 	auto maxInd = newPointsPtr().max();