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

changes in contactSearch and timeControl and timeInfo

Browse Source
This commit is contained in:
HRN
2025-01-27 14:26:20 +03:30
parent 42b024e1ed
commit f98a696fc8
5 changed files with 19 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/Interaction/contactSearch/ContactSearch/ContactSearch.hpp
View File

@ -134,7 +134,7 @@ public:
ppwContactSearch_ =
makeUnique<SearchMethodType>
(
dict(),
csDict,
this->extendedDomainBox(),
minD,
maxD,
@ -154,10 +154,8 @@ public:
ContactSearch,
dictionary);
bool enterBroadSearchBoundary(const timeInfo& ti, bool force=false)const override
{
return enterBroadSearch(ti, force) || csBoundaries_.boundariesUpdated();
}
bool enterBroadSearchBoundary(const timeInfo& ti, bool force=false)const override;
real sizeRatio()const override
{
@ -171,7 +169,12 @@ public:
};
template <class searchMethod>
inline bool ContactSearch<searchMethod>::enterBroadSearchBoundary(const timeInfo &ti, bool force) const
{
return performSearch(ti.iter(),force) || csBoundaries_.boundariesUpdated();
}
}
#endif //__ContactSearch_hpp__

4
src/Interaction/contactSearch/contactSearch/contactSearch.cpp
View File

@ -35,8 +35,7 @@ pFlow::contactSearch::contactSearch(
particles_(prtcl),
geometry_(geom),
bTimer_("Boundary particles contact search", &timers),
ppTimer_("Internal particles contact search", &timers),
dict_(dict)
ppTimer_("Internal particles contact search", &timers)
{
}
@ -70,6 +69,7 @@ bool pFlow::contactSearch::broadSearch
}
ppTimer_.end();
performedSearch_ = true;
lastUpdated_ = ti.currentIter();
}
else
{

8
src/Interaction/contactSearch/contactSearch/contactSearch.hpp
View File

@ -67,8 +67,6 @@ private:
Timer ppTimer_;
dictionary dict_;
virtual
bool BroadSearch(
const timeInfo& ti,
@ -150,12 +148,6 @@ public:
return updateInterval_;
}
inline
const dictionary& dict()const
{
return dict_;
}
inline
const box& extendedDomainBox()const
{