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

bug fix for particle insertion and id handling

Browse Source
This commit is contained in:
Hamidreza Norouzi
2023-04-02 23:34:37 -07:00
parent 60ed8eb2b7
commit 651c74313c
9 changed files with 88 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/Particles/SphereParticles/sphereParticles/sphereParticles.cpp
View File

@ -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(!id_.insertSetElement(indices, IdVec))
if(setId)
{
fatalErrorInFunction<< " failed to insert id to the id field. \n";
return false;
if( !id_.insertSetElement(indices, IdVec))
{
fatalErrorInFunction<< " failed to insert id to the id field. \n";
return false;
}
}
return true;

5
src/Particles/SphereParticles/sphereParticles/sphereParticles.hpp
View File

@ -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;