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

Including two domains in lbpm_color_simulator: Full domain Dm and Mask which excludes the solid portion (for LB communications)

Browse Source
This commit is contained in:
James E McClure 2015-11-14 17:05:07 -05:00
parent b05181bfb2
commit 5c1a361f23
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tests/lbpm_color_simulator.cpp
View File

@ -116,12 +116,12 @@ int main(int argc, char **argv)
int iproc,jproc,kproc; int iproc,jproc,kproc;
//***************************************** //*****************************************
// MPI ranks for all 18 neighbors // MPI ranks for all 18 neighbors
//********************************** /* //**********************************
int rank_x,rank_y,rank_z,rank_X,rank_Y,rank_Z; int rank_x,rank_y,rank_z,rank_X,rank_Y,rank_Z;
int rank_xy,rank_XY,rank_xY,rank_Xy; int rank_xy,rank_XY,rank_xY,rank_Xy;
int rank_xz,rank_XZ,rank_xZ,rank_Xz; int rank_xz,rank_XZ,rank_xZ,rank_Xz;
int rank_yz,rank_YZ,rank_yZ,rank_Yz; int rank_yz,rank_YZ,rank_yZ,rank_Yz;
//********************************** */ //**********************************
MPI_Request req1[18],req2[18]; MPI_Request req1[18],req2[18];
MPI_Status stat1[18],stat2[18]; MPI_Status stat1[18],stat2[18];
@ -309,20 +309,21 @@ int main(int argc, char **argv)
else Restart=false; else Restart=false;
NULL_USE(pBC); NULL_USE(velBC); NULL_USE(pBC); NULL_USE(velBC);
// Full domain // Full domain used for averaging (do not use mask for analysis)
Domain Dm(Nx,Ny,Nz,rank,nprocx,nprocy,nprocz,Lx,Ly,Lz,BoundaryCondition); Domain Dm(Nx,Ny,Nz,rank,nprocx,nprocy,nprocz,Lx,Ly,Lz,BoundaryCondition);
for (i=0; i<Dm.Nx*Dm.Ny*Dm.Nz; i++) Mask.id[i] = 1; for (i=0; i<Dm.Nx*Dm.Ny*Dm.Nz; i++) Dm.id[i] = 1;
Dm.CommInit(comm); Dm.CommInit(comm);
std::shared_ptr<TwoPhase> Averages( new TwoPhase(Dm) ); std::shared_ptr<TwoPhase> Averages( new TwoPhase(Dm) );
// Mask that excludes the solid phase // Mask that excludes the solid phase
Domain Mask(Nx,Ny,Nz,rank,nprocx,nprocy,nprocz,Lx,Ly,Lz,BoundaryCondition); Domain Mask(Nx,Ny,Nz,rank,nprocx,nprocy,nprocz,Lx,Ly,Lz,BoundaryCondition);
InitializeRanks( rank, nprocx, nprocy, nprocz, iproc, jproc, kproc, /* InitializeRanks( rank, nprocx, nprocy, nprocz, iproc, jproc, kproc,
rank_x, rank_y, rank_z, rank_X, rank_Y, rank_Z, rank_x, rank_y, rank_z, rank_X, rank_Y, rank_Z,
rank_xy, rank_XY, rank_xY, rank_Xy, rank_xz, rank_XZ, rank_xZ, rank_Xz, rank_xy, rank_XY, rank_xY, rank_Xy, rank_xz, rank_XZ, rank_xZ, rank_Xz,
rank_yz, rank_YZ, rank_yZ, rank_Yz ); rank_yz, rank_YZ, rank_yZ, rank_Yz );
*/
MPI_Barrier(comm); MPI_Barrier(comm);
Nz += 2; Nz += 2;