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

Updating get ready to merge

Browse Source
This commit is contained in:
James E McClure 2018-04-14 20:10:45 -04:00
parent 30c5535610
commit 202233ef09
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common/ScaLBL.cpp
View File

@ -1,7 +1,6 @@
#include "common/Domain.h"
#include "common/ScaLBL.h"
ScaLBL_Communicator::ScaLBL_Communicator(Domain &Dm){
//......................................................................................
Lock=false; // unlock the communicator

8
tests/lbpm_BGK_simulator.cpp
View File

@ -272,15 +272,15 @@ int main(int argc, char **argv)
// Create a communicator for the device
ScaLBL_Communicator ScaLBL_Comm(Mask);
// LBM variables
if (rank==0) printf ("Allocating distributions \n");
int *neighborList;
IntArray Map(Nx,Ny,Nz);
neighborList= new int[18*(Np+32)];
Np = ScaLBL_Comm.MemoryOptimizedLayoutAA(Map,neighborList,Mask.id,Np);
MPI_Barrier(comm);
// LBM variables
if (rank==0) printf ("Allocating distributions \n");
//......................device distributions.................................
int dist_mem_size = Np*sizeof(double);

1
tests/lbpm_permeability_simulator.cpp
View File

@ -190,7 +190,6 @@ int main(int argc, char **argv)
double porosity, pore_vol;
//...........................................................................
if (rank == 0) cout << "Reading in domain from signed distance function..." << endl;
//.......................................................................
// Read the signed distance
sprintf(LocalRankString,"%05d",rank);