Particle insertion is added with anyList

- collision check is not active yet.
- variable velocity is not active yet.
- events and messages are not active yet.
This commit is contained in:
Hamidreza Norouzi
2024-04-12 22:39:09 -07:00
parent 97f0ddf82e
commit 9c2a9a81b0
71 changed files with 1878 additions and 1534 deletions

View File

@ -2,150 +2,167 @@
O C enter of
O O E ngineering and
O O M ultiscale modeling of
OOOOOOO F luid flow
OOOOOOO F luid flow
------------------------------------------------------------------------------
Copyright (C): www.cemf.ir
email: hamid.r.norouzi AT gmail.com
------------------------------------------------------------------------------
------------------------------------------------------------------------------
Licence:
This file is part of phasicFlow code. It is a free software for simulating
This file is part of phasicFlow code. It is a free software for simulating
granular and multiphase flows. You can redistribute it and/or modify it under
the terms of GNU General Public License v3 or any other later versions.
phasicFlow is distributed to help others in their research in the field of
the terms of GNU General Public License v3 or any other later versions.
phasicFlow is distributed to help others in their research in the field of
granular and multiphase flows, but WITHOUT ANY WARRANTY; without even the
implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-----------------------------------------------------------------------------*/
#include "shapeMixture.hpp"
#include "dictionary.hpp"
pFlow::shapeMixture::shapeMixture
(
const dictionary & dict
pFlow::shapeMixture::shapeMixture(
const dictionary& dict,
const wordList& validNames
)
{
if( !read(dict))
if (!read(dict))
{
fatalExit;
}
for (const auto& rN : names_)
{
bool found = false;
for (const auto& vN : validNames)
{
if (rN == vN)
{
found = true;
break;
}
}
if (!found)
{
fatalErrorInFunction
<< "Shape name " << rN << " provided in mixture dictionary "
<< dict.globalName() << " is invalid. \n Valid names are "
<< validNames << endl;
}
}
}
pFlow::word pFlow::shapeMixture::getNextShapeName()
pFlow::word
pFlow::shapeMixture::getNextShapeName()
{
ForAll(i, names_)
{
if(current_[i]< number_[i])
if (current_[i] < number_[i])
{
current_[i]++;
numberInserted_[i]++;
return names_[i];
}
}
fill(current_, static_cast<uint32>(0));
return getNextShapeName();
}
void pFlow::shapeMixture::getNextShapeNameN
(
size_t n,
wordVector& names
)
void
pFlow::shapeMixture::getNextShapeNameN(size_t n, wordVector& names)
{
names.clear();
for(label i=0; i<n; ++i)
for (size_t i = 0u; i < n; ++i)
{
names.push_back( getNextShapeName() );
names.push_back(getNextShapeName());
}
}
bool pFlow::shapeMixture::read(const dictionary& dict)
bool
pFlow::shapeMixture::read(const dictionary& dict)
{
bool containNumberIneserted = false;
auto shNames = dict.dataEntryKeywords();
for (auto nm = shNames.begin(); nm != shNames.end(); )
for (auto nm = shNames.begin(); nm != shNames.end();)
{
if ( *nm == "numberInserted")
{
nm = shNames.erase(nm);
containNumberIneserted = true;
}
else
++nm;
}
if (*nm == "numberInserted")
{
nm = shNames.erase(nm);
containNumberIneserted = true;
}
else
++nm;
}
for(const auto& nm:shNames)
{
names_.push_back(nm);
uint32 num = dict.getVal<uint32>(nm);
if( num <= 0 )
{
fatalErrorInFunction<<
" number inserte in front of "<< nm << " is invalid: "<< num<<endl<<
" in dictionary "<<dict.globalName()<<endl;
return false;
}
number_.push_back( num );
}
for (const auto& nm : shNames)
{
names_.push_back(nm);
uint32 num = dict.getVal<uint32>(nm);
if (num <= 0)
{
fatalErrorInFunction << " number inserte in front of " << nm
<< " is invalid: " << num << endl
<< " in dictionary " << dict.globalName()
<< endl;
return false;
}
number_.push_back(num);
}
if(containNumberIneserted)
{
numberInserted_ = dict.getVal<uint32Vector>("numberInserted");
}
else
{
numberInserted_ = uint32Vector(size(), static_cast<uint32>(0));
}
if (containNumberIneserted)
{
numberInserted_ = dict.getVal<uint32Vector>("numberInserted");
}
else
{
numberInserted_ =
uint32Vector(numberInserted_.name(), size(), static_cast<uint32>(0));
}
if(numberInserted_.size() != names_.size() )
{
fatalErrorInFunction<<
" number of elements in numberInserted ("<<numberInserted_.size()<<
") is not equal to the number of shape names: "<< names_<<endl;
return false;
}
if (numberInserted_.size() != names_.size())
{
fatalErrorInFunction
<< " number of elements in numberInserted ("
<< numberInserted_.size()
<< ") is not equal to the number of shape names: " << names_ << endl;
return false;
}
current_.clear();
ForAll(i, numberInserted_)
{
current_.push_back(numberInserted_[i]%number_[i]);
}
current_.clear();
ForAll(i, numberInserted_)
{
current_.push_back(numberInserted_[i] % number_[i]);
}
return true;
return true;
}
bool pFlow::shapeMixture::write
(
dictionary& dict
) const
bool
pFlow::shapeMixture::write(dictionary& dict) const
{
ForAll(i, names_)
{
if(!dict.add(names_[i],number_[i]))
if (!dict.add(names_[i], number_[i]))
{
fatalErrorInFunction<<
" error in writing "<< names_[i] << " to dictionary "<<dict.globalName()<<endl;
fatalErrorInFunction << " error in writing " << names_[i]
<< " to dictionary " << dict.globalName()
<< endl;
return false;
}
}
if(!dict.add("numberInserted", numberInserted_))
if (!dict.add("numberInserted", numberInserted_))
{
fatalErrorInFunction<<
" error in writing numberInserted to dictionary "<< dict.globalName()<<endl;
fatalErrorInFunction
<< " error in writing numberInserted to dictionary "
<< dict.globalName() << endl;
return false;
}
}
return true;
}