Merge pull request #24 from hamidrezanorouzi/solvers

correted position random

utilities/particlesPhasicFlow/positionParticles/positionParticles.H

@@ -46,6 +46,7 @@ public:
 
 	virtual realx3 maxPoint()const =0;
 
+	virtual word name()const =0;
 
 };
 
@@ -91,6 +92,11 @@ class region
 			return region_.maxPoint();
 		}
 
+		word name()const override
+		{
+			return region_.typeName();
+		}
+
 };
 
 class positionParticles

utilities/particlesPhasicFlow/positionRandom/positionRandom.C

@@ -21,10 +21,9 @@ Licence:
 
 #include "positionRandom.H"
 #include "uniformRandomReal.H"
-#include "VectorSingles.H"
-#include "VectorDuals.H"
 #include "NBS.H"
 #include "unsortedPairs.H"
+#include "box.H"
 
 
 
@@ -35,12 +34,6 @@ using SearchType = NBS<DefaultExecutionSpace, int32> ;
 using ContainerType = unsortedPairs<DefaultExecutionSpace, int32>;
 
 
-void fillPoints(
-		uint numPoints,
-		realx3 minP,
-		realx3 maxP,
-		realx3Vector_HD& points,
-		int32Vector_HD& flags );
 
 int32 findCollisions(
 		ContainerType& pairs,
@@ -70,11 +63,11 @@ bool pFlow::positionRandom::positionOnePass(int32 pass, int32 startNum)
 	int32Vector_HD  flagHD(startNum, 0);
 	realx3Vector_HD positionHD(startNum);
 	
-	auto minP = box_.minPoint() + static_cast<real>(0.5)*realx3(diameter_);
-	auto maxP = box_.maxPoint() - static_cast<real>(0.5)*realx3(diameter_);
+	auto minP = region_->minPoint();
+	auto maxP = region_->maxPoint();
 
 	SearchType search(
-					box_,
+					box(minP, maxP),
 					diameter_,
 					positionHD.deviceVectorAll(),
 					diameter.deviceVectorAll());
@@ -85,7 +78,7 @@ bool pFlow::positionRandom::positionOnePass(int32 pass, int32 startNum)
 		greenText("(Pass #"<< pass+1<<")")<< 
 		": started with "<< startNum <<" points."<<endReport;
 	
-	fillPoints(startNum, minP, maxP, positionHD, flagHD);
+	fillPoints(startNum, positionHD, flagHD);
 		
 	search.broadSearch(pairs, range(0, startNum), true);
 
@@ -181,10 +174,6 @@ pFlow::positionRandom::positionRandom
 	(
 		prDict_.getVal<size_t>("numPoints")
 	),
-	box_
-	(
-		prDict_.subDict("box")
-	),
 	maxIterations_
 	(
 		prDict_.getValOrSet("maxIterations", 10)
@@ -201,24 +190,53 @@ pFlow::positionRandom::positionRandom
 	{
 		fatalExit;
 	}
+
+	if(!region_)
+	{
+		fatalErrorInFunction<<"You must provided a region (box, cylinder, ...) for positioning particles in dictionary "<<
+		dict.globalName()<<endl;
+		fatalExit;
+	}
+
 }
 
-void pFlow::fillPoints(
+void pFlow::positionRandom::fillPoints(
 	uint numPoints,
-	realx3 minP,
-	realx3 maxP,
 	realx3Vector_HD& points,
 	int32Vector_HD& flags )
 {
 
 	uniformRandomReal rand;
 	
+	auto minP = region_().minPoint();
+	auto maxP = region_().maxPoint();
 
 	for(size_t i=0; i<numPoints; i++)
 	{
 		if(flags[i] == 0)
 		{
-			points[i] =rand(minP, maxP);	
+			bool loop=true;
+			size_t n=0;
+			while (loop)
+			{
+
+				auto pos = rand(minP, maxP);
+				if( region_().isInside(pos))
+				{
+					points[i] =pos;
+					loop = false;		
+				}
+				n++;
+
+				if(n>100)
+				{
+					fatalErrorInFunction<< 
+					"could not find a point inside region"<<region_->name()<<endl;
+					fatalExit;
+				}
+				
+			}
+			
 		}
 	}
 	points.modifyOnHost();

utilities/particlesPhasicFlow/positionRandom/positionRandom.H

@@ -24,12 +24,14 @@ Licence:
 
 #include "positionParticles.H"
 #include "VectorSingles.H"
+#include "VectorDuals.H"
 
-#include "box.H"
 
 namespace pFlow
 {
 
+
+
 class positionRandom
 :
 	public positionParticles
@@ -41,8 +43,6 @@ protected:
 	real 		diameter_;
 
 	size_t 		numPoints_;
-	
-	box 		box_;
 
 	size_t 		maxIterations_;
 	
@@ -56,6 +56,11 @@ protected:
 
 	bool inCollision(const realx3 &cntr, real diam);
 
+	void fillPoints(
+		uint numPoints,
+		realx3Vector_HD& points,
+		int32Vector_HD& flags );
+
 public:
 
 	// - type Info