xfygogo/phasicFlow
1
0
Fork 0
mirror of https://github.com/PhasicFlow/phasicFlow.git synced 2025-06-12 16:26:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

positionParticles-ordered modified to accept cylinder&sphere region

Browse Source
This commit is contained in:
hamidrezanorouzi
2022-09-07 22:22:23 +04:30
parent 370e3b8b1b
commit ceb3e0596c
26 changed files with 1138 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
utilities/particlesPhasicFlow/positionOrdered/positionOrdered.C
View File

@ -82,15 +82,19 @@ bool pFlow::positionOrdered::positionPointsOrdered()
position_.clear();
realx3 dl(diameter_);
auto minP = static_cast<real>(0.5)*dl + box_.minPoint();
auto maxP = static_cast<real>(0.5)*dl + box_.maxPoint();
auto minP = region_->minPoint();
auto maxP = region_->maxPoint();
auto cntr = minP;
size_t n = 0;
while( n < numPoints_ )
{
position_.push_back(cntr);
if(region_->isInside(cntr))
{
position_.push_back(cntr);
n++;
}
cntr += dl*uVector1_;
@ -111,7 +115,7 @@ bool pFlow::positionOrdered::positionPointsOrdered()
}
}
}
n++;
}
return true;
@ -139,10 +143,6 @@ pFlow::positionOrdered::positionOrdered
(
poDict_.getValOrSet("axisOrder", wordList{"x", "y", "z"})
),
box_
(
poDict_.subDict("box")
),
position_
(
maxNumberOfParticles_, RESERVE()
@ -154,6 +154,13 @@ pFlow::positionOrdered::positionOrdered
fatalExit;
}
if(!region_)
{
fatalErrorInFunction<<"You must provided a region (box, cylinder, ...) for positioning particles in dictionary "<<
dict.globalName()<<endl;
fatalExit;
}
if(!positionPointsOrdered())
{
fatalExit;

3
utilities/particlesPhasicFlow/positionOrdered/positionOrdered.H
View File

@ -22,7 +22,6 @@ Licence:
#define __positionOrdered_H__
#include "positionParticles.H"
#include "box.H"
namespace pFlow
{
@ -42,8 +41,6 @@ protected:
wordList axisOrder_;
box box_;
// - unit vector of the first axis
realx3 uVector1_;