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

merging multi-halo

Browse Source
This commit is contained in:
JamesEMcclure
2021-01-13 21:44:23 -05:00
parent 29e486a1a0 64b49f720e
commit 0fe3125833
184 changed files with 22054 additions and 7588 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
tests/TestColorGradDFH.cpp
View File

@@ -7,7 +7,7 @@
#include <iostream>
#include <fstream>
#include "common/ScaLBL.h"
#include "common/MPI_Helpers.h"
#include "common/MPI.h"
using namespace std;
@@ -25,15 +25,11 @@ std::shared_ptr<Database> loadInputs( int nprocs )
//***************************************************************************************
int main(int argc, char **argv)
{
//*****************************************
// ***** MPI STUFF ****************
//*****************************************
// Initialize MPI
int rank,nprocs;
MPI_Init(&argc,&argv);
MPI_Comm comm = MPI_COMM_WORLD;
MPI_Comm_rank(comm,&rank);
MPI_Comm_size(comm,&nprocs);
Utilities::startup( argc, argv );
Utilities::MPI comm( MPI_COMM_WORLD );
int rank = comm.getRank();
int nprocs = comm.getSize();
int check=0;
{
// parallel domain size (# of sub-domains)
@@ -82,7 +78,7 @@ int main(int argc, char **argv)
}
}
Dm->CommInit();
MPI_Barrier(comm);
comm.barrier();
if (rank == 0) cout << "Domain set." << endl;
if (rank==0) printf ("Create ScaLBL_Communicator \n");
@@ -104,8 +100,8 @@ int main(int argc, char **argv)
int *neighborList;
IntArray Map(Nx,Ny,Nz);
neighborList= new int[18*Npad];
Np = ScaLBL_Comm->MemoryOptimizedLayoutAA(Map,neighborList,Dm->id,Np,1);
MPI_Barrier(comm);
Np = ScaLBL_Comm->MemoryOptimizedLayoutAA(Map,neighborList,Dm->id.data(),Np,1);
comm.barrier();
//......................device distributions.................................
int neighborSize=18*Np*sizeof(int);
@@ -210,10 +206,7 @@ int main(int argc, char **argv)
}
}
// ****************************************************
MPI_Barrier(comm);
MPI_Finalize();
// ****************************************************
Utilities::shutdown();
return check;
}