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

correction in the macros to be compatible with OpenFOAM

Browse Source
This commit is contained in:
hamidrezanorouzi
2022-12-24 15:00:00 +03:30
parent 080f7dea7d
commit 853d50e96f
61 changed files with 670 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,7 +37,7 @@ bool pFlow::Insertion<ShapeType>::readInsertionDict
for(auto& name:regionDicNames)
{
Report(2)<<"reading insertion region "<< greenText(name)<<endReport;
REPORT(2)<<"reading insertion region "<< greenText(name)<<endREPORT;
regions_.push_backSafe(dict.subDict(name), shapes_);
}
@ -54,7 +54,7 @@ bool pFlow::Insertion<ShapeType>::writeInsertionDict
if( !this->isActive() ) return true;
forAll(i,regions_)
ForAll(i,regions_)
{
auto& rgnDict = dict.subDictOrCreate(regions_[i].name());
@ -92,7 +92,7 @@ bool pFlow::Insertion<ShapeType>::insertParticles
if(!isActive()) return true;
forAll(i,regions_)
ForAll(i,regions_)
{
bool insertionOccured = false;
auto& rgn = regions_[i];
@ -106,9 +106,9 @@ bool pFlow::Insertion<ShapeType>::insertParticles
if(insertionOccured)
{
Report(0)<<"\nParticle insertion from "<< greenText(rgn.name())<<endReport;
Report(1)<< cyanText(pos.size()) << " new particles is being inserted at Time: "<<
cyanText(currentTime) <<" s."<<endReport;
REPORT(0)<<"\nParticle insertion from "<< greenText(rgn.name())<<endREPORT;
REPORT(1)<< cyanText(pos.size()) << " new particles is being inserted at Time: "<<
cyanText(currentTime) <<" s."<<endREPORT;
if(!particles_.insertParticles(pos, shapes, rgn.setFields()))
{
@ -117,8 +117,8 @@ bool pFlow::Insertion<ShapeType>::insertParticles
" to particles. \n";
return false;
}
Report(1)<<"Total number of particles inserted from this region is "<<
cyanText(rgn.totalInserted())<<'\n'<<endReport;
REPORT(1)<<"Total number of particles inserted from this region is "<<
cyanText(rgn.totalInserted())<<'\n'<<endREPORT;
}
else
{
@ -130,8 +130,8 @@ bool pFlow::Insertion<ShapeType>::insertParticles
{
if(insertionOccured)
{
Warning<< "\n fewer number of particles are inserted from region "<< rgn.name() <<
" than expected. You may stop the simulation to change settings."<<endWarning;
yWARNING<< "\n fewer number of particles are inserted from region "<< rgn.name() <<
" than expected. You may stop the simulation to change settings."<<endyWARNING;
continue;
}
else

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

@ -28,7 +28,7 @@ bool pFlow::InsertionRegion<ShapeType>::checkForContact
)
{
forAll(i, pos)
ForAll(i, pos)
{
if( length(pos[i]-p) < 0.5*(diams[i]+d) ) return true;
}

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

@ -33,11 +33,11 @@ bool pFlow::insertion::readInsertionDict
active_ = dict.getVal<Logical>("active");
if(active_)
Report(1)<< "Particle insertion mechanism is "<<
yellowText("active")<<" in the simulation."<<endReport;
REPORT(1)<< "Particle insertion mechanism is "<<
yellowText("active")<<" in the simulation."<<endREPORT;
else
Report(1)<< "Particle insertion mechanism is "<<
yellowText("not active")<<" in the simulation."<<endReport;
REPORT(1)<< "Particle insertion mechanism is "<<
yellowText("not active")<<" in the simulation."<<endREPORT;
return true;

6
src/Particles/Insertion/shapeMixture/shapeMixture.cpp
View File

@ -37,7 +37,7 @@ pFlow::shapeMixture::shapeMixture
pFlow::word pFlow::shapeMixture::getNextShapeName()
{
forAll(i, names_)
ForAll(i, names_)
{
if(current_[i]< number_[i])
{
@ -116,7 +116,7 @@ bool pFlow::shapeMixture::read(const dictionary& dict)
}
current_.clear();
forAll(i, numberInserted_)
ForAll(i, numberInserted_)
{
current_.push_back(numberInserted_[i]%number_[i]);
}
@ -130,7 +130,7 @@ bool pFlow::shapeMixture::write
) const
{
forAll(i, names_)
ForAll(i, names_)
{
if(!dict.add(names_[i],number_[i]))
{