OilfieldToolsNet/LBPM
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed bugs in bounceback list

Browse Source
This commit is contained in:
JamesEMcclure 2020-08-11 15:34:12 -04:00
parent e0b0e05664
commit 6ff5a9a8ae
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
common/ScaLBL.cpp
View File

@ -854,9 +854,11 @@ int ScaLBL_Communicator::MemoryOptimizedLayoutAA(IntArray &Map, int *neighborLis
}
void ScaLBL_Communicator::SetupBounceBackList()
void ScaLBL_Communicator::SetupBounceBackList(IntArray &Map, signed char *id, int Np)
{
int idx,i,j,k;
int neighbor;
// save list of bounce-back distributions and interaction sites
n_bb_d3q7 = 0; n_bb_d3q19 = 0;
@ -866,9 +868,8 @@ void ScaLBL_Communicator::SetupBounceBackList()
for (i=1;i<Nx-1;i++){
n=k*Nx*Ny+j*Nx+i;
idx=Map(i,j,k);
else if (!(idx<0)){
if (!(idx<0)){
int neighbor; // cycle through the neighbors of lattice site idx
neighbor=Map(i-1,j,k);
if (neighbor==-1) local_count++;
@ -937,7 +938,7 @@ void ScaLBL_Communicator::SetupBounceBackList()
for (i=1;i<Nx-1;i++){
n=k*Nx*Ny+j*Nx+i;
idx=Map(i,j,k);
else if (!(idx<0)){
if (!(idx<0)){
int neighbor; // cycle through the neighbors of lattice site idx
neighbor=Map(i-1,j,k);
@ -985,7 +986,7 @@ void ScaLBL_Communicator::SetupBounceBackList()
for (i=1;i<Nx-1;i++){
n=k*Nx*Ny+j*Nx+i;
idx=Map(i,j,k);
else if (!(idx<0)){
if (!(idx<0)){
neighbor=Map(i-1,j-1,k);
if (neighbor==-1){

4
common/ScaLBL.h
View File

@ -205,8 +205,8 @@ public:
void RecvHalo(double *data);
void RecvGrad(double *Phi, double *Gradient);
void RegularLayout(IntArray map, const double *data, DoubleArray &regdata);
void SolidDirichletD3Q7_init();
void SolidDirichletD3Q7();
void SetupBounceBackList(IntArray &Map, signed char *id, int Np);
//void SolidDirichletD3Q7();
// Routines to set boundary conditions
void Color_BC_z(int *Map, double *Phi, double *Den, double vA, double vB);