periodict boundary condition ->DEBUG and some minor changes boundaries

This commit is contained in:
HRN 2025-02-03 19:16:14 +03:30
parent f5ba30b901
commit fac5576df1
10 changed files with 146 additions and 115 deletions

View File

@ -93,7 +93,7 @@ bool pFlow::contactSearch::boundaryBroadSearch
bTimer_.start(); bTimer_.start();
for(uint32 i=0u; i<6u; i++) for(uint32 i=0u; i<6u; i++)
{ {
output<<" boundarySearch "<< i <<" for iter "<< ti.iter()<<endl; //output<<" boundarySearch "<< i <<" for iter "<< ti.iter()<<endl;
if(!BoundaryBroadSearch( if(!BoundaryBroadSearch(
i, i,
ti, ti,

View File

@ -10,8 +10,8 @@ pFlow::boundarySphereInteractionList<CFModel, gMModel>::boundarySphereInteractio
boundaryListPtr<boundarySphereInteraction<CFModel,gMModel>>(), boundaryListPtr<boundarySphereInteraction<CFModel,gMModel>>(),
boundaries_(sphPrtcls.pStruct().boundaries()) boundaries_(sphPrtcls.pStruct().boundaries())
{ {
output<<boundaries_.size()<<endl;
ForAllActiveBoundariesPtr(i, this) ForAllBoundariesPtr(i, this)
{ {
this->set( this->set(
i, i,

View File

@ -145,6 +145,11 @@ pFlow::sphereInteraction<cFM,gMM, cLT>::sphereInteraction
{ {
fatalExit; fatalExit;
} }
for(uint32 i=0; i<6; i++)
{
activeBoundaries_[i] = boundaryInteraction_[i].ppPairsAllocated();
}
} }
template<typename cFM,typename gMM,template <class, class, class> class cLT> template<typename cFM,typename gMM,template <class, class, class> class cLT>
@ -190,11 +195,15 @@ bool pFlow::sphereInteraction<cFM,gMM, cLT>::iterate()
ComputationTimer().start(); ComputationTimer().start();
ForAllActiveBoundaries(i, boundaryInteraction_) ForAllActiveBoundaries(i, boundaryInteraction_)
//for(size_t i=0; i<6; i++)
{
if(activeBoundaries_[i])
{ {
auto& BI = boundaryInteraction_[i]; auto& BI = boundaryInteraction_[i];
BI.ppPairs().beforeBroadSearch(); BI.ppPairs().beforeBroadSearch();
BI.pwPairs().beforeBroadSearch(); BI.pwPairs().beforeBroadSearch();
} }
}
ComputationTimer().end(); ComputationTimer().end();
contactListMangementBoundaryTimer_.pause(); contactListMangementBoundaryTimer_.pause();
@ -214,6 +223,9 @@ bool pFlow::sphereInteraction<cFM,gMM, cLT>::iterate()
} }
ForAllActiveBoundaries(i, boundaryInteraction_) ForAllActiveBoundaries(i, boundaryInteraction_)
//for(size_t i=0; i<6; i++)
{
if(activeBoundaries_[i])
{ {
auto& BI = boundaryInteraction_[i]; auto& BI = boundaryInteraction_[i];
if(!contactSearchRef.boundaryBroadSearch( if(!contactSearchRef.boundaryBroadSearch(
@ -228,6 +240,7 @@ bool pFlow::sphereInteraction<cFM,gMM, cLT>::iterate()
return false; return false;
} }
} }
}
ComputationTimer().end(); ComputationTimer().end();
if(broadSearch && contactSearchRef.performedSearch()) if(broadSearch && contactSearchRef.performedSearch())
@ -246,11 +259,15 @@ bool pFlow::sphereInteraction<cFM,gMM, cLT>::iterate()
ComputationTimer().start(); ComputationTimer().start();
ForAllActiveBoundaries(i, boundaryInteraction_) ForAllActiveBoundaries(i, boundaryInteraction_)
//for(size_t i=0; i<6; i++)
{
if(activeBoundaries_[i])
{ {
auto& BI = boundaryInteraction_[i]; auto& BI = boundaryInteraction_[i];
BI.ppPairs().afterBroadSearch(); BI.ppPairs().afterBroadSearch();
BI.pwPairs().afterBroadSearch(); BI.pwPairs().afterBroadSearch();
} }
}
ComputationTimer().end(); ComputationTimer().end();
contactListMangementBoundaryTimer_.end(); contactListMangementBoundaryTimer_.end();
@ -265,6 +282,7 @@ bool pFlow::sphereInteraction<cFM,gMM, cLT>::iterate()
while(requireStep.anyElement(true) && step <= 10) while(requireStep.anyElement(true) && step <= 10)
{ {
ForAllBoundaries(i, boundaryInteraction_) ForAllBoundaries(i, boundaryInteraction_)
//for(size_t i=0; i<6; i++)
{ {
if(requireStep[i] ) if(requireStep[i] )
{ {
@ -304,6 +322,7 @@ bool pFlow::sphereInteraction<cFM,gMM, cLT>::iterate()
while( requireStep.anyElement(true) && step < 20 ) while( requireStep.anyElement(true) && step < 20 )
{ {
ForAllBoundaries(i, boundaryInteraction_) ForAllBoundaries(i, boundaryInteraction_)
//for(size_t i=0; i<6; i++)
{ {
if(requireStep[i]) if(requireStep[i])
{ {

View File

@ -53,7 +53,7 @@ public:
boundaryListPtr<BoundaryFieldType>(), boundaryListPtr<BoundaryFieldType>(),
boundaries_(boundaries) boundaries_(boundaries)
{ {
ForAllBoundaries(i, *this) ForAllBoundariesPtr(i, this)
{ {
this->set this->set
( (
@ -69,13 +69,13 @@ public:
&& slaveToMasterUpdateIter_ == iter) return; && slaveToMasterUpdateIter_ == iter) return;
// first step // first step
ForAllBoundaries(i,*this) ForAllBoundariesPtr(i,this)
{ {
this->boundaryPtr(i)->updateBoundary(1, direction); this->boundaryPtr(i)->updateBoundary(1, direction);
} }
// second step // second step
ForAllBoundaries(i,*this) ForAllBoundariesPtr(i,this)
{ {
this->boundaryPtr(i)->updateBoundary(1, direction); this->boundaryPtr(i)->updateBoundary(1, direction);
} }
@ -88,7 +88,7 @@ public:
void fill(const T& val) void fill(const T& val)
{ {
ForAllBoundaries(i, *this) ForAllBoundariesPtr(i, this)
{ {
this->boundaryPtr(i)->fill(val); this->boundaryPtr(i)->fill(val);
} }

View File

@ -24,6 +24,11 @@ Licence:
#include "observer.hpp" #include "observer.hpp"
#include "message.hpp" #include "message.hpp"
pFlow::subscriber::subscriber(const word& name)
:
observerList_(message::numEvents())
{}
pFlow::subscriber::subscriber(const subscriber & src) pFlow::subscriber::subscriber(const subscriber & src)
{ {
} }

View File

@ -39,14 +39,14 @@ class subscriber
private: private:
// - list of subsribed objectd that recieve updage messages // - list of subsribed objectd that recieve updage messages
mutable std::vector<List<observer*>> observerList_{message::numEvents()}; mutable std::vector<List<observer*>> observerList_;
//word subName_; //word subName_;
public: public:
subscriber(const word& name) subscriber(const word& name);
{}
/// Copy constructor, only copies the name, not the list /// Copy constructor, only copies the name, not the list
subscriber(const subscriber&); subscriber(const subscriber&);

View File

@ -144,7 +144,7 @@ pFlow::boundaryList::createBoundaries()
if (listSet_) if (listSet_)
return true; return true;
ForAllBoundaries(i, *this) ForAllBoundariesPtr(i, this)
{ {
this->set( this->set(
i, i,
@ -200,7 +200,7 @@ pFlow::boundaryList::beforeIteration(const timeInfo& ti, bool force)
while(callAgain.anyElement(true) && step <= 10u) while(callAgain.anyElement(true) && step <= 10u)
{ {
ForAllBoundaries(i,*this) ForAllBoundariesPtr(i,this)
{ {
if(callAgain[i]) if(callAgain[i])
{ {
@ -239,7 +239,7 @@ pFlow::boundaryList::beforeIteration(const timeInfo& ti, bool force)
step++; step++;
} }
ForAllBoundaries(i,*this) ForAllBoundariesPtr(i,this)
{ {
boundary(i).updataBoundaryData(1); boundary(i).updataBoundaryData(1);
} }
@ -248,7 +248,7 @@ pFlow::boundaryList::beforeIteration(const timeInfo& ti, bool force)
bdry->updataBoundaryData(1); bdry->updataBoundaryData(1);
}*/ }*/
ForAllBoundaries(i,*this) ForAllBoundariesPtr(i,this)
{ {
boundary(i).updataBoundaryData(2); boundary(i).updataBoundaryData(2);
} }
@ -263,7 +263,7 @@ pFlow::boundaryList::beforeIteration(const timeInfo& ti, bool force)
bool bool
pFlow::boundaryList::iterate(const timeInfo& ti, bool force) pFlow::boundaryList::iterate(const timeInfo& ti, bool force)
{ {
ForAllBoundaries(i, *this) ForAllBoundariesPtr(i, this)
{ {
if (!boundary(i).iterate(ti)) if (!boundary(i).iterate(ti))
{ {
@ -293,7 +293,7 @@ pFlow::boundaryList::afterIteration(const timeInfo& ti, bool force)
int step = 1; int step = 1;
while(callAgain.anyElement(true)&& step <=10) while(callAgain.anyElement(true)&& step <=10)
{ {
ForAllBoundaries(i,*this) ForAllBoundariesPtr(i,this)
{ {
if(callAgain[i]) if(callAgain[i])
{ {

View File

@ -34,35 +34,19 @@ template<typename BoundaryType>
class boundaryListPtr class boundaryListPtr
{ {
private: private:
std::array<BoundaryType*,6> boundaries_; std::array<BoundaryType*,6> baseBoundaries_;
std::bitset<6> activeBoundaries_=0B000000; std::bitset<6> activeBoundaries_=0B000000;
public: public:
boundaryListPtr(): boundaryListPtr():
boundaries_({nullptr, nullptr, nullptr, nullptr, nullptr, nullptr}) baseBoundaries_({nullptr, nullptr, nullptr, nullptr, nullptr, nullptr})
{} {}
void set(size_t i, uniquePtr<BoundaryType>&& ptr ) boundaryListPtr(const boundaryListPtr&)=delete;
{
if( i > boundaries_.size() )
{
fatalErrorInFunction<<
"Out of range access of boundaryListPtr members. List size is "<<
size() << "and you are accessing "<< i << "\n";
fatalExit;
}
if(boundaries_[i]) delete boundaries_[i]; boundaryListPtr(boundaryListPtr&&)=default;
boundaries_[i] = ptr.release();
if(boundaries_[i])
{
// query if this boundary active or not
activeBoundaries_.set(i,boundaries_[i]->isActive());
}
}
~boundaryListPtr() ~boundaryListPtr()
{ {
@ -71,7 +55,7 @@ public:
void clear() void clear()
{ {
for(auto& bndry:boundaries_) for(auto& bndry:baseBoundaries_)
{ {
if(bndry != nullptr) if(bndry != nullptr)
{ {
@ -82,16 +66,36 @@ public:
activeBoundaries_.reset(); activeBoundaries_.reset();
} }
void set(size_t i, uniquePtr<BoundaryType>&& ptr )
{
if( i > baseBoundaries_.size() )
{
fatalErrorInFunction<<
"Out of range access of boundaryListPtr members. List size is "<<
size() << "and you are accessing "<< i << "\n";
fatalExit;
}
if(baseBoundaries_[i]) delete baseBoundaries_[i];
baseBoundaries_[i] = ptr.release();
if(baseBoundaries_[i])
{
// query if this boundary active or not
activeBoundaries_.set(i,baseBoundaries_[i]->isActive());
}
}
// - access to ith element // - access to ith element
inline inline
BoundaryType& operator[](size_t i) BoundaryType& operator[](size_t i)
{ {
if(boundaries_[i]== nullptr) if(baseBoundaries_[i]== nullptr)
{ {
fatalErrorInFunction<<"Accessing nullptr element"<<endl; fatalErrorInFunction<<"Accessing nullptr element"<<endl;
fatalExit; fatalExit;
} }
return *boundaries_[i]; return *(baseBoundaries_[i]);
} }
// - const access to ith element // - const access to ith element
@ -99,34 +103,34 @@ public:
inline inline
const BoundaryType& operator[](size_t i) const const BoundaryType& operator[](size_t i) const
{ {
if(boundaries_[i]== nullptr) if(baseBoundaries_[i]== nullptr)
{ {
fatalErrorInFunction<<"Accessing nullptr element"<<endl; fatalErrorInFunction<<"Accessing nullptr element"<<endl;
fatalExit; fatalExit;
} }
return *boundaries_[i]; return *(baseBoundaries_[i]);
} }
inline inline
BoundaryType* boundaryPtr(size_t i) BoundaryType* boundaryPtr(size_t i)
{ {
if(boundaries_[i]== nullptr) if(baseBoundaries_[i]== nullptr)
{ {
fatalErrorInFunction<<"Accessing nullptr element"<<endl; fatalErrorInFunction<<"Accessing nullptr element"<<endl;
fatalExit; fatalExit;
} }
return boundaries_[i]; return baseBoundaries_[i];
} }
inline inline
const BoundaryType* boundaryPtr(size_t i)const const BoundaryType* boundaryPtr(size_t i)const
{ {
if(boundaries_[i]== nullptr) if(baseBoundaries_[i]== nullptr)
{ {
fatalErrorInFunction<<"Accessing nullptr element"<<endl; fatalErrorInFunction<<"Accessing nullptr element"<<endl;
fatalExit; fatalExit;
} }
return boundaries_[i]; return baseBoundaries_[i];
} }
inline constexpr inline constexpr
@ -178,7 +182,7 @@ public:
} }
#define ForAllBoundaries(i,bndryList) for(size_t i = 0ul; i<(bndryList).size(); i++) #define ForAllBoundaries(i,bndryList) for(size_t i = 0ul; i<bndryList.size(); i++)
#define ForAllBoundariesPtr(i,bndryList) for(size_t i = 0ul; i<bndryList->size(); i++) #define ForAllBoundariesPtr(i,bndryList) for(size_t i = 0ul; i<bndryList->size(); i++)
#define ForAllActiveBoundaries(i,bndryList) for(size_t i = bndryList.firstActive(); i<bndryList.size(); i=bndryList.nextActive(i)) #define ForAllActiveBoundaries(i,bndryList) for(size_t i = bndryList.firstActive(); i<bndryList.size(); i=bndryList.nextActive(i))
#define ForAllActiveBoundariesPtr(i,bndryList) for(size_t i = bndryList->firstActive(); i<bndryList->size(); i=bndryList->nextActive(i)) #define ForAllActiveBoundariesPtr(i,bndryList) for(size_t i = bndryList->firstActive(); i<bndryList->size(); i=bndryList->nextActive(i))

View File

@ -47,22 +47,25 @@ bool pFlow::boundaryPeriodic::beforeIteration(
{ {
if(step==1) if(step==1)
{ {
boundaryBase::beforeIteration(step, ti, updateIter, iterBeforeUpdate, callAgain);
callAgain = true; callAgain = true;
return true;
} }
else
{
callAgain = false; callAgain = false;
// nothing have to be done // nothing have to be done
if(empty()) if(empty())
{ {
return true; return true;
} }
//output<<this->thisBoundaryIndex()<<" ->"<<ti.iter()<<" update called\n";
if(!performBoundarytUpdate()) if(!performBoundarytUpdate())
{ {
return true; return true;
} }
//output<<this->thisBoundaryIndex()<<" ->"<< ti.iter()<<" update is being performed \n";
uint32 s = size(); uint32 s = size();
uint32Vector_D transferFlags("transferFlags",s+1, s+1, RESERVE()); uint32Vector_D transferFlags("transferFlags",s+1, s+1, RESERVE());
transferFlags.fill(0u); transferFlags.fill(0u);
@ -104,10 +107,10 @@ bool pFlow::boundaryPeriodic::beforeIteration(
mirrorBoundaryIndex(), mirrorBoundaryIndex(),
transferVec transferVec
); );
}
return true; return true;
} }
bool pFlow::boundaryPeriodic::iterate(const timeInfo& ti) bool pFlow::boundaryPeriodic::iterate(const timeInfo& ti)

View File

@ -75,7 +75,7 @@ bool pFlow::simulationDomain::prepareBoundaryDicts()
return false; return false;
} }
bDict.addOrReplace("boundaryExtntionLengthRatio", boundaryExtntionLengthRatio); bDict.addOrKeep("boundaryExtntionLengthRatio", boundaryExtntionLengthRatio);
} }