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

for merging

Browse Source
This commit is contained in:
omid.khs
2023-02-26 15:48:07 +03:30
parent 73bfd41546 3bcfc31fd2
commit d46e0b208b
9 changed files with 62 additions and 13 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);

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

@ -74,6 +74,7 @@ pFlow::Insertion<ShapeType>::Insertion
const ShapeType& shapes
)
:
<<<<<<< HEAD
insertion(prtcl),
shapes_(shapes)
{
@ -201,4 +202,8 @@ bool pFlow::Insertion<ShapeType>::write
}
return true;
}
}
=======
particles_(prtcl)
{}
>>>>>>> 3bcfc31fd23a197b71377b16e95f41c1c0da2593

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

@ -52,7 +52,18 @@ public:
TypeInfoTemplateNV("Insertion",ShapeType);
<<<<<<< HEAD
Insertion(particles& prtcl, const ShapeType& shapes);
=======
insertion(particles& prtcl);
virtual ~insertion() = default;
bool isActive()const {
return active_();
}
>>>>>>> 3bcfc31fd23a197b71377b16e95f41c1c0da2593
bool insertParticles(real currentTime, real dt);

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;