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

change for predictor-corrector and adams-moulton3

Browse Source
This commit is contained in:
hamidrezanorouzi
2022-10-25 19:30:57 +03:30
parent db0da79a72
commit 490577dcd2
27 changed files with 869 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Interaction/contactSearch/ContactSearch/ContactSearch.H
View File

@ -162,7 +162,9 @@ public:
}
else
return false;
//output<<" ContactSearch::broadSearch::PP fater.\n";
//output<<" ContactSearch::broadSearch::PW before.\n";
if(wallMapping_)
{
sphereWallTimer_.start();
@ -171,6 +173,8 @@ public:
}
else
return false;
//output<<" ContactSearch::broadSearch::PW after.\n";
return true;
}

6
src/Interaction/contactSearch/methods/NBS.H
View File

@ -302,11 +302,13 @@ public:
performedSearch_ = false;
if( !performSearch() ) return true;
//Info<<"NBS::broadSearch(PairsContainer& pairs, range activeRange, bool force=false) before build"<<endInfo;
build(activeRange);
//Info<<"NBS::broadSearch(PairsContainer& pairs, range activeRange, bool force=false) after build"<<endInfo;
//Info<<"NBS::broadSearch(PairsContainer& pairs, range activeRange, bool force=false) before findPairs"<<endInfo;
findPairs(pairs);
//Info<<"NBS::broadSearch(PairsContainer& pairs, range activeRange, bool force=false) after findPairs"<<endInfo;
performedSearch_ = true;
return true;
}

1
src/Interaction/contactSearch/methods/NBSLoop.H
View File

@ -42,6 +42,7 @@ while( m > -1 )
{
auto ln = n;
auto lm = m;
//output<<"lm "<< lm <<" ln "<< ln << " i j k "<< int32x3(i,j,k)<<endl;
if(lm>ln) Swap(lm,ln);
if( auto res = pairs.insert(lm,ln); res <0)
{

24
src/Interaction/sphereInteraction/sphereInteraction.H
View File

@ -134,19 +134,26 @@ public:
bool iterate() override
{
//Info<<"before contact search"<<endInfo;
if(this->contactSearch_)
{
if( this->contactSearch_().ppEnterBroadSearch())
{
//Info<<" before ppEnterBroadSearch"<<endInfo;
ppContactList_().beforeBroadSearch();
//Info<<" after ppEnterBroadSearch"<<endInfo;
}
if(this->contactSearch_().pwEnterBroadSearch())
{
//Info<<" before pwEnterBroadSearch"<<endInfo;
pwContactList_().beforeBroadSearch();
//Info<<" after pwEnterBroadSearch"<<endInfo;
}
//Info<<" before broadSearch"<<endInfo;
if( !contactSearch_().broadSearch(
ppContactList_(),
pwContactList_()) )
@ -156,26 +163,37 @@ public:
fatalExit;
}
//Info<<" before broadSearch"<<endInfo;
if(this->contactSearch_().ppPerformedBroadSearch())
{
//Info<<" before afterBroadSearch"<<endInfo;
ppContactList_().afterBroadSearch();
//Info<<" after afterBroadSearch"<<endInfo;
}
if(this->contactSearch_().pwPerformedBroadSearch())
{
//Info<<" before pwContactList_().afterBroadSearch()"<<endInfo;
pwContactList_().afterBroadSearch();
//Info<<" after pwContactList_().afterBroadSearch()"<<endInfo;
}
}
//Info<<"after contact search"<<endInfo;
if( sphParticles_.numActive()<=0)return true;
//Info<<"before sphereSphereInteraction "<<endInfo;
ppInteractionTimer_.start();
sphereSphereInteraction();
ppInteractionTimer_.end();
//Info<<"after sphereSphereInteraction "<<endInfo;
//Info<<"before sphereWallInteraction "<<endInfo;
pwInteractionTimer_.start();
sphereWallInteraction();
pwInteractionTimer_.end();
//Info<<"after sphereWallInteraction "<<endInfo;
return true;
}