mirror of
https://github.com/PhasicFlow/phasicFlow.git
synced 2025-06-12 16:26:23 +00:00
readme.md for particlesPhasicFlow and change diameter to distance in dict files
This commit is contained in:
@ -35,10 +35,10 @@ bool pFlow::positionRandom::positionOnePass(collisionCheck& collCheck)
|
||||
{
|
||||
realx3 p = region.peek();
|
||||
|
||||
if( collCheck.checkPoint(p, diameter_) )
|
||||
if( collCheck.checkPoint(p, distance_) )
|
||||
{
|
||||
position_.push_back(p);
|
||||
diameters_.push_back(diameter_);
|
||||
diameters_.push_back(distance_);
|
||||
|
||||
if(!collCheck.mapLastAddedParticle())
|
||||
{
|
||||
@ -64,7 +64,7 @@ bool pFlow::positionRandom::positionPointsRandom()
|
||||
uint32 pass = 0;
|
||||
collisionCheck collCheck(
|
||||
box(pRegion().minPoint(), pRegion().maxPoint()),
|
||||
diameter_,
|
||||
distance_,
|
||||
position_,
|
||||
diameters_);
|
||||
|
||||
@ -107,9 +107,9 @@ pFlow::positionRandom::positionRandom
|
||||
(
|
||||
dict.subDict("randomInfo")
|
||||
),
|
||||
diameter_
|
||||
distance_
|
||||
(
|
||||
prDict_.getVal<real>("diameter")
|
||||
prDict_.getVal<real>("distance")
|
||||
),
|
||||
numPoints_
|
||||
(
|
||||
|
@ -32,23 +32,25 @@ class positionRandom : public positionParticles
|
||||
{
|
||||
private:
|
||||
|
||||
dictionary prDict_;
|
||||
dictionary prDict_;
|
||||
|
||||
real diameter_;
|
||||
real distance_;
|
||||
|
||||
uint32 numPoints_;
|
||||
uint32 numPoints_;
|
||||
|
||||
uint32 maxIterations_;
|
||||
uint32 maxIterations_;
|
||||
|
||||
uint32 reportInterval_ = 100;
|
||||
|
||||
realx3Vector position_;
|
||||
|
||||
// still keeping this variable name as diameters_ since it stores
|
||||
// the collection of distance values
|
||||
realVector diameters_;
|
||||
|
||||
uint32 reportInterval_;
|
||||
bool positionOnePass(collisionCheck& collCheck);
|
||||
|
||||
bool positionOnePass(collisionCheck& collCheck);
|
||||
|
||||
bool positionPointsRandom();
|
||||
bool positionPointsRandom();
|
||||
|
||||
public:
|
||||
|
||||
@ -79,9 +81,9 @@ public:
|
||||
return position_.size();
|
||||
}
|
||||
|
||||
real maxDiameter() const override
|
||||
real distance() const override
|
||||
{
|
||||
return diameter_;
|
||||
return distance_;
|
||||
}
|
||||
|
||||
// - const access to position
|
||||
|
Reference in New Issue
Block a user