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

Revert "clean up ScaLBL barriers"

Browse Source 
This reverts commit 50b8407145.
This commit is contained in:
James McClure
2020-04-01 13:15:24 -04:00
parent 50b8407145
commit f12f8154b1
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cpu/Extras.cpp
View File

@@ -49,5 +49,5 @@ extern "C" void ScaLBL_CopyToZeroCopy(void* dest, const void* source, size_t siz
}
extern "C" void ScaLBL_DeviceBarrier(){
MPI_Barrier(ScaLBL_Comm->MPI_COMM_SCALBL)
// cudaDeviceSynchronize();
}

1
gpu/Extras.cu
View File

@@ -59,5 +59,4 @@ extern "C" void ScaLBL_CopyToHost(void* dest, const void* source, size_t size){
extern "C" void ScaLBL_DeviceBarrier(){
cudaDeviceSynchronize();
MPI_Barrier(ScaLBL_Comm->MPI_COMM_SCALBL)
}

4
models/ColorModel.cpp
View File

@@ -717,7 +717,7 @@ void ScaLBL_ColorModel::Run(){
ScaLBL_D3Q19_AAodd_Color(NeighborList, dvcMap, fq, Aq, Bq, Den, Phi, Velocity, rhoA, rhoB, tauA, tauB,
alpha, beta, Fx, Fy, Fz, Nx, Nx*Ny, 0, ScaLBL_Comm->LastExterior(), Np);
ScaLBL_DeviceBarrier();
;
MPI_Barrier(ScaLBL_Comm->MPI_COMM_SCALBL);
// *************EVEN TIMESTEP*************
timestep++;
@@ -753,6 +753,7 @@ void ScaLBL_ColorModel::Run(){
ScaLBL_D3Q19_AAeven_Color(dvcMap, fq, Aq, Bq, Den, Phi, Velocity, rhoA, rhoB, tauA, tauB,
alpha, beta, Fx, Fy, Fz, Nx, Nx*Ny, 0, ScaLBL_Comm->LastExterior(), Np);
ScaLBL_DeviceBarrier();
MPI_Barrier(ScaLBL_Comm->MPI_COMM_SCALBL);
//************************************************************************
PROFILE_STOP("Update");
@@ -1010,6 +1011,7 @@ void ScaLBL_ColorModel::Run(){
PROFILE_SAVE("lbpm_color_simulator",1);
//************************************************************************
ScaLBL_DeviceBarrier();
MPI_Barrier(ScaLBL_Comm->MPI_COMM_SCALBL);
stoptime = MPI_Wtime();
if (rank==0) printf("-------------------------------------------------------------------\n");
// Compute the walltime per timestep