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

24
src/Particles/Insertion/Insertion/Insertion.cpp
View File

@ -68,11 +68,9 @@ bool pFlow::Insertion<ShapeType>::writeInsertionDict
}
template<typename ShapeType>
pFlow::Insertion<ShapeType>::Insertion
(
pFlow::Insertion<ShapeType>::Insertion(
particles& prtcl,
const ShapeType& shapes
)
const ShapeType& shapes)
:
insertion(prtcl),
shapes_(shapes)
@ -81,6 +79,24 @@ pFlow::Insertion<ShapeType>::Insertion
}
template<typename ShapeType>
pFlow::Insertion<ShapeType>::Insertion(
fileSystem file,
particles& prtcl,
const ShapeType& shapes)
:
Insertion(prtcl, shapes)
{
dictionary inDict(file.fileName(), file);
if(!readInsertionDict(inDict))
{
fatalErrorInFunction<< "could not read from file "<<
file<<endl;
fatalExit;
}
}
template<typename ShapeType>
bool pFlow::Insertion<ShapeType>::insertParticles

2
src/Particles/Insertion/Insertion/Insertion.hpp
View File

@ -54,6 +54,8 @@ public:
Insertion(particles& prtcl, const ShapeType& shapes);
Insertion(fileSystem file, particles& prtcl, const ShapeType& shapes);
bool insertParticles(real currentTime, real dt);

2
src/Particles/Insertion/insertion/insertion.cpp
View File

@ -71,4 +71,4 @@ pFlow::insertion::insertion
)
:
particles_(prtcl)
{}
{}

1
src/Particles/Insertion/insertion/insertion.hpp
View File

@ -54,6 +54,7 @@ public:
insertion(particles& prtcl);
virtual ~insertion() = default;
bool isActive()const {

1
src/phasicFlow/repository/systemControl/systemControl.cpp
View File

@ -248,7 +248,6 @@ bool pFlow::systemControl::operator ++(int)
}
else if( time().finalTime() )
{
output<<"****************************************************************"<<endl;
if( !time().write() )
{
fatalErrorInFunction;