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

Merge branch 'develop' into MPIdev

Browse Source
This commit is contained in:
HRN
2024-05-05 23:07:48 +03:30
parent 68b7d141fa 0e54e260e6
commit e756d471ba
15 changed files with 99 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -76,10 +76,6 @@ public:
*this)
{
/*auto method = dict().getVal<word>("method");
auto nbDict = dict().subDict(method+"Info");*/
real minD;
real maxD;
this->Particles().boundingSphereMinMax(minD, maxD);
@ -110,9 +106,6 @@ public:
wVertices,
wNormals
);
REPORT(2)<<"Contact search algorithm for particle-particle is "<<
Green_Text(ppwContactSearch_().typeName())<<END_REPORT;
}

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

@ -50,13 +50,13 @@ pFlow::boundaryContactSearch::create(
if( boundaryBasevCtorSelector_.search(bType) )
{
REPORT(2)<<"Creating contact search boundary "<< Green_Text(bType)<<
pOutput.space(4)<<"Creating contact search boundary "<< Green_Text(bType)<<
" for "<<boundary.name()<<endl;
return boundaryBasevCtorSelector_[bType](dict, boundary, cSearch);
}
else if(boundaryBasevCtorSelector_.search(altBType))
{
REPORT(2)<<"Creating contact search boundary "<< Green_Text(altBType)<<
pOutput.space(4)<<"Creating contact search boundary "<< Green_Text(altBType)<<
" for "<<boundary.name()<<endl;
return boundaryBasevCtorSelector_[altBType](dict, boundary, cSearch);
}

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

@ -55,13 +55,11 @@ pFlow::uniquePtr<pFlow::contactSearch> pFlow::contactSearch::create(
word baseMethName = dict.getVal<word>("method");
auto model = angleBracketsNames("ContactSearch", baseMethName);
REPORT(1)<<"Selecting contact search model . . ."<<END_REPORT;
pOutput.space(2)<<"Selecting contact search model "<<Green_Text(model)<<endl;
if( dictionaryvCtorSelector_.search(model))
{
auto objPtr = dictionaryvCtorSelector_[model] (dict, extDomain, prtcl, geom, timers);
REPORT(2)<<"Model "<< Green_Text(model)<<" is created."<< END_REPORT;
return objPtr;
}
else