xfygogo/phasicFlow
1
0
Fork 0
mirror of https://github.com/PhasicFlow/phasicFlow.git synced 2025-07-08 03:07:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

global damping is activated for velocity and rVelocity in both sphere and grain solvers

Browse Source
This commit is contained in:
HRN
2025-02-10 01:10:13 +03:30
parent db9b1e62e4
commit 8466e02d81
10 changed files with 72 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/Particles/dynamicPointStructure/dynamicPointStructure.cpp
View File

@ -89,9 +89,11 @@ pFlow::dynamicPointStructure::dynamicPointStructure
fatalExit;
}
REPORT(1)<<"Reading globalDamping dictionary ..."<<END_REPORT;
velDamping_ = makeUnique<globalDamping>(control);
if(control.settingsDict().containsDictionay("globalDamping"))
{
REPORT(1)<<"Reading globalDamping dictionary ..."<<END_REPORT;
velDamping_ = makeUnique<globalDamping>(control);
}
}
@ -111,10 +113,6 @@ bool pFlow::dynamicPointStructure::iterate()
{
return pointStructure::iterate();
/*real dt = this->dt();
auto& acc = time().lookupObject<realx3PointField_D>("acceleration");
return correct(dt, acc);*/
}
bool pFlow::dynamicPointStructure::afterIteration()
@ -122,14 +120,13 @@ bool pFlow::dynamicPointStructure::afterIteration()
//const auto ti = TimeInfo();
auto succs = pointStructure::afterIteration();
//velDamping_().applyDamping(ti, velocity_);
return succs;
}
bool pFlow::dynamicPointStructure::predict(real dt)
{
if(!integrationPos_().predict(dt, pointPosition(), velocity_ ))return false;
if(!integrationVel_().predict(dt, velocity_, acceleration_))return false;
@ -141,7 +138,7 @@ bool pFlow::dynamicPointStructure::correct(real dt)
const auto& ti = TimeInfo();
if(!integrationPos_().correctPStruct(dt, *this, velocity_) )return false;
if(!integrationVel_().correct(dt, velocity_, acceleration_, velDamping_().dampingFactor(ti)))return false;
if(!integrationVel_().correct(dt, velocity_, acceleration_, dampingFactor(ti)))return false;
return true;
}

10
src/Particles/dynamicPointStructure/dynamicPointStructure.hpp
View File

@ -101,6 +101,16 @@ public:
return acceleration_;
}
inline
real dampingFactor(const timeInfo& ti)const
{
if(velDamping_)
{
return velDamping_().dampingFactor(ti);
}
return 1.0;
}
/// In the time loop before iterate
bool beforeIteration() override;