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)
{