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

merge Lee model

Browse Source
This commit is contained in:
JamesEMcclure 2021-01-13 22:06:08 -05:00
parent 0fe3125833
commit a066fa6606
4 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
models/FreeLeeModel.cpp
View File

@ -9,7 +9,7 @@ color lattice boltzmann model
#include <stdlib.h> #include <stdlib.h>
#include <time.h> #include <time.h>
ScaLBL_FreeLeeModel::ScaLBL_FreeLeeModel(int RANK, int NP, MPI_Comm COMM): ScaLBL_FreeLeeModel::ScaLBL_FreeLeeModel(int RANK, int NP, const Utilities::MPI& COMM):
rank(RANK), nprocs(NP), Restart(0),timestep(0),timestepMax(0),tauA(0),tauB(0),rhoA(0),rhoB(0),W(0),gamma(0), rank(RANK), nprocs(NP), Restart(0),timestep(0),timestepMax(0),tauA(0),tauB(0),rhoA(0),rhoB(0),W(0),gamma(0),
Fx(0),Fy(0),Fz(0),flux(0),din(0),dout(0),inletA(0),inletB(0),outletA(0),outletB(0), Fx(0),Fy(0),Fz(0),flux(0),din(0),dout(0),inletA(0),inletB(0),outletA(0),outletB(0),
Nx(0),Ny(0),Nz(0),N(0),Np(0),nprocx(0),nprocy(0),nprocz(0),BoundaryCondition(0),Lx(0),Ly(0),Lz(0),comm(COMM) Nx(0),Ny(0),Nz(0),N(0),Np(0),nprocx(0),nprocy(0),nprocz(0),BoundaryCondition(0),Lx(0),Ly(0),Lz(0),comm(COMM)
@ -107,9 +107,9 @@ void ScaLBL_FreeLeeModel::SetDomain(){
id = new signed char [N]; id = new signed char [N];
for (int i=0; i<Nx*Ny*Nz; i++) Dm->id[i] = 1; // initialize this way for (int i=0; i<Nx*Ny*Nz; i++) Dm->id[i] = 1; // initialize this way
MPI_Barrier(comm); comm.barrier()
Dm->CommInit(); Dm->CommInit();
MPI_Barrier(comm); comm.barrier()
// Read domain parameters // Read domain parameters
rank = Dm->rank(); rank = Dm->rank();
nprocx = Dm->nprocx(); nprocx = Dm->nprocx();
@ -206,8 +206,8 @@ void ScaLBL_FreeLeeModel::Create(){
if (rank==0) printf ("Set up memory efficient layout, %i | %i | %i \n", Np, Npad, N); if (rank==0) printf ("Set up memory efficient layout, %i | %i | %i \n", Np, Npad, N);
Map.resize(Nx,Ny,Nz); Map.fill(-2); Map.resize(Nx,Ny,Nz); Map.fill(-2);
auto neighborList= new int[18*Npad]; auto neighborList= new int[18*Npad];
Np = ScaLBL_Comm->MemoryOptimizedLayoutAA(Map,neighborList,Mask->id,Np,2); Np = ScaLBL_Comm->MemoryOptimizedLayoutAA(Map,neighborList,Mask->id.data(),Np,2);
MPI_Barrier(comm); comm.barrier()
//........................................................................... //...........................................................................
// MAIN VARIABLES ALLOCATED HERE // MAIN VARIABLES ALLOCATED HERE
@ -335,7 +335,7 @@ void ScaLBL_FreeLeeModel::Initialize(){
ScaLBL_CopyToDevice(Phi,cPhi,N*sizeof(double)); ScaLBL_CopyToDevice(Phi,cPhi,N*sizeof(double));
ScaLBL_DeviceBarrier(); ScaLBL_DeviceBarrier();
MPI_Barrier(comm); comm.barrier()
} }
if (rank==0) printf ("Initializing phase field \n"); if (rank==0) printf ("Initializing phase field \n");
@ -371,7 +371,7 @@ void ScaLBL_FreeLeeModel::Run(){
//.......create and start timer............ //.......create and start timer............
double starttime,stoptime,cputime; double starttime,stoptime,cputime;
ScaLBL_DeviceBarrier(); ScaLBL_DeviceBarrier();
MPI_Barrier(comm); comm.barrier()
starttime = MPI_Wtime(); starttime = MPI_Wtime();
//......................................... //.........................................

4
models/FreeLeeModel.h
View File

@ -18,7 +18,7 @@ Implementation of Lee et al JCP 2016 lattice boltzmann model
class ScaLBL_FreeLeeModel{ class ScaLBL_FreeLeeModel{
public: public:
ScaLBL_FreeLeeModel(int RANK, int NP, MPI_Comm COMM); ScaLBL_FreeLeeModel(int RANK, int NP, const Utilities::MPI& COMM);
~ScaLBL_FreeLeeModel(); ~ScaLBL_FreeLeeModel();
// functions in they should be run // functions in they should be run
@ -70,7 +70,7 @@ public:
DoubleArray SignDist; DoubleArray SignDist;
private: private:
MPI_Comm comm; Utilities::MPI comm;
int dist_mem_size; int dist_mem_size;
int neighborSize; int neighborSize;

5
tests/CMakeLists.txt
View File

@ -4,13 +4,8 @@
ADD_LBPM_EXECUTABLE( lbpm_color_simulator ) ADD_LBPM_EXECUTABLE( lbpm_color_simulator )
ADD_LBPM_EXECUTABLE( lbpm_permeability_simulator ) ADD_LBPM_EXECUTABLE( lbpm_permeability_simulator )
ADD_LBPM_EXECUTABLE( lbpm_greyscale_simulator ) ADD_LBPM_EXECUTABLE( lbpm_greyscale_simulator )
<<<<<<< HEAD
ADD_LBPM_EXECUTABLE( lbpm_greyscaleColor_simulator )
ADD_LBPM_EXECUTABLE( lbpm_electrokinetic_SingleFluid_simulator )
=======
ADD_LBPM_EXECUTABLE( lbpm_electrokinetic_SingleFluid_simulator ) ADD_LBPM_EXECUTABLE( lbpm_electrokinetic_SingleFluid_simulator )
ADD_LBPM_EXECUTABLE( lbpm_greyscaleColor_simulator ) ADD_LBPM_EXECUTABLE( lbpm_greyscaleColor_simulator )
>>>>>>> FOM
#ADD_LBPM_EXECUTABLE( lbpm_BGK_simulator ) #ADD_LBPM_EXECUTABLE( lbpm_BGK_simulator )
#ADD_LBPM_EXECUTABLE( lbpm_color_macro_simulator ) #ADD_LBPM_EXECUTABLE( lbpm_color_macro_simulator )
ADD_LBPM_EXECUTABLE( lbpm_dfh_simulator ) ADD_LBPM_EXECUTABLE( lbpm_dfh_simulator )

5
tests/TestMRT.cpp
View File

@ -804,13 +804,8 @@ int main(int argc, char **argv)
} }
// **************************************************** // ****************************************************
<<<<<<< HEAD
comm.barrier(); comm.barrier();
Utilities::shutdown(); Utilities::shutdown();
=======
MPI_Barrier(comm);
MPI_Finalize();
>>>>>>> electrokinetic
// **************************************************** // ****************************************************
return check; return check;