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

simulator clean up

Browse Source
This commit is contained in:
James E McClure
2018-05-01 13:56:38 -04:00
parent 5c3f4cf38d
commit 47e9602654
4 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/lbpm_BGK_simulator.cpp
View File

@@ -271,8 +271,7 @@ int main(int argc, char **argv)
if (rank==0) printf ("Create ScaLBL_Communicator \n");
// Create a communicator for the device
int Npad=(Np/32 + 1)*32;
Np = Npad;
int Npad=(Np/16 + 2)*16;
ScaLBL_Communicator ScaLBL_Comm(Mask);
int *neighborList;
IntArray Map(Nx,Ny,Nz);

3
tests/lbpm_color_macro_simulator.cpp
View File

@@ -438,14 +438,13 @@ int main(int argc, char **argv)
//Create a second communicator based on the regular data layout
ScaLBL_Communicator ScaLBL_Comm_Regular(Mask);
int Npad=(Np/32 + 1)*32;
int Npad=(Np/16 + 2)*16;
if (rank==0) printf ("Set up memory efficient layout Npad=%i \n",Npad);
int *neighborList;
IntArray Map(Nx,Ny,Nz);
neighborList= new int[18*Npad];
Np = ScaLBL_Comm.MemoryOptimizedLayoutAA(Map,neighborList,Mask.id,Np);
MPI_Barrier(comm);
Np = Npad;
//...........................................................................
// MAIN VARIABLES ALLOCATED HERE
//...........................................................................

3
tests/lbpm_dfh_simulator.cpp
View File

@@ -447,9 +447,8 @@ int main(int argc, char **argv)
//Create a second communicator based on the regular data layout
ScaLBL_Communicator ScaLBL_Comm_Regular(Mask);
int Npad=(Np/32 + 1)*32;
int Npad=(Np/16 + 2)*16;
if (rank==0) printf ("Set up memory efficient layout Npad=%i \n",Npad);
int *neighborList;
IntArray Map(Nx,Ny,Nz);
neighborList= new int[18*Npad];

3
tests/lbpm_permeability_simulator.cpp
View File

@@ -277,10 +277,11 @@ int main(int argc, char **argv)
// LBM variables
if (rank==0) printf ("Allocating distributions \n");
int Npad=(Np/16 + 2)*16;
int *neighborList;
IntArray Map(Nx,Ny,Nz);
neighborList= new int[18*(Np)];
neighborList= new int[18*Npad];
Np = ScaLBL_Comm.MemoryOptimizedLayoutAA(Map,neighborList,Mask.id,Np);
MPI_Barrier(comm);