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

change in particle insertion ctor and addition to DEMSystem

Browse Source
This commit is contained in:
Hamidreza Norouzi
2023-02-19 11:35:35 -08:00
parent aa4ac3372c
commit 360eda7c6c
8 changed files with 46 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
DEMSystems/sphereDEMSystem/sphereDEMSystem.cpp
View File

@ -20,13 +20,22 @@ Licence:
#include "sphereDEMSystem.hpp"
void pFlow::sphereDEMSystem::loop()
bool pFlow::sphereDEMSystem::loop()
{
do
{
Control().timers().start();
if(! insertion_().insertParticles(
Control().time().currentTime(),
Control().time().dt() ) )
{
fatalError<<
"particle insertion failed in sphereDFlow solver.\n";
return false;
}
geometry_->beforeIteration();
interaction_->beforeIteration();
@ -70,7 +79,11 @@ pFlow::sphereDEMSystem::sphereDEMSystem(
REPORT(0)<<"\nReading sphere particles . . ."<<endREPORT;
particles_ = makeUnique<sphereFluidParticles>(Control(), Property());
insertion_ = makeUnique<sphereInsertion>(
Control().caseSetup().path()+insertionFile__,
particles_(),
particles_().shapes());
REPORT(0)<<"\nCreating interaction model for sphere-sphere contact and sphere-wall contact . . ."<<endREPORT;
interaction_ = interaction::create(
Control(),

2
DEMSystems/sphereDEMSystem/sphereDEMSystem.hpp
View File

@ -82,7 +82,7 @@ protected:
return interaction_();
}
void loop();
bool loop();
public: