From 3c22a1102f6a514f6895409bdcbae80a4571bef9 Mon Sep 17 00:00:00 2001 From: James McClure Date: Tue, 11 Mar 2014 16:22:59 -0400 Subject: [PATCH] Finished removing S from cpu branch --- tests/cpu/lb2_Color_wia_mpi.cpp | 64 +++++++++++++-------------------- 1 file changed, 25 insertions(+), 39 deletions(-) diff --git a/tests/cpu/lb2_Color_wia_mpi.cpp b/tests/cpu/lb2_Color_wia_mpi.cpp index 899cd44c..84e75001 100644 --- a/tests/cpu/lb2_Color_wia_mpi.cpp +++ b/tests/cpu/lb2_Color_wia_mpi.cpp @@ -1147,12 +1147,12 @@ int main(int argc, char **argv) //........................................................................... if (rank==0) printf("Setting the distributions, size = %i\n", N); //........................................................................... - dvc_InitD3Q19(ID, f_even, f_odd, Nx, Ny, Nz, S); + dvc_InitD3Q19(ID, f_even, f_odd, Nx, Ny, Nz); //...................................................................... // dvc_InitDenColorDistance(ID, Copy, Phi, SignDist.data, das, dbs, beta, xIntPos, Nx, Ny, Nz, S); - dvc_InitDenColorDistance(ID, Den, Phi, SignDist.data, das, dbs, beta, xIntPos, Nx, Ny, Nz, S); - dvc_InitD3Q7(ID, A_even, A_odd, &Den[0], Nx, Ny, Nz, S); - dvc_InitD3Q7(ID, B_even, B_odd, &Den[N], Nx, Ny, Nz, S); + dvc_InitDenColorDistance(ID, Den, Phi, SignDist.data, das, dbs, beta, xIntPos, Nx, Ny, Nz); + dvc_InitD3Q7(ID, A_even, A_odd, &Den[0], Nx, Ny, Nz); + dvc_InitD3Q7(ID, B_even, B_odd, &Den[N], Nx, Ny, Nz); //...................................................................... // Once phase has been initialized, map solid to account for 'smeared' interface //...................................................................... @@ -1181,7 +1181,7 @@ int main(int argc, char **argv) // Compute the phase indicator field and reset Copy, Den //************************************************************************* // dvc_ComputePhi(ID, Phi, Copy, Den, N, S); - dvc_ComputePhi(ID, Phi, Den, N, S); + dvc_ComputePhi(ID, Phi, Den, N); //************************************************************************* //................................................................................... dvc_PackValues(dvcSendList_x, sendCount_x,sendbuf_x, Phi, N); @@ -1284,13 +1284,13 @@ int main(int argc, char **argv) printf("Setting outlet pressure = %f \n", dout); } if (pBC && kproc == 0) { - dvc_PressureBC_inlet(f_even,f_odd,din,Nx,Ny,Nz,S); - dvc_ColorBC_inlet(Phi,Den,A_even,A_odd,B_even,B_odd,Nx,Ny,Nz,S); + dvc_PressureBC_inlet(f_even,f_odd,din,Nx,Ny,Nz); + dvc_ColorBC_inlet(Phi,Den,A_even,A_odd,B_even,B_odd,Nx,Ny,Nz); } if (pBC && kproc == nprocz-1){ - dvc_PressureBC_outlet(f_even,f_odd,dout,Nx,Ny,Nz,S,Nx*Ny*(Nz-2)); - dvc_ColorBC_outlet(Phi,Den,A_even,A_odd,B_even,B_odd,Nx,Ny,Nz,S); + dvc_PressureBC_outlet(f_even,f_odd,dout,Nx,Ny,Nz,Nx*Ny*(Nz-2)); + dvc_ColorBC_outlet(Phi,Den,A_even,A_odd,B_even,B_odd,Nx,Ny,Nz); } //........................................................................... @@ -1304,7 +1304,7 @@ int main(int argc, char **argv) // Copy the phase from the GPU -> CPU //........................................................................... dvc_Barrier(); - dvc_ComputePressureD3Q19(ID,f_even,f_odd,Pressure,Nx,Ny,Nz,S); + dvc_ComputePressureD3Q19(ID,f_even,f_odd,Pressure,Nx,Ny,Nz); dvc_CopyToHost(Phase.data,Phi,N*sizeof(double)); dvc_CopyToHost(Press.data,Pressure,N*sizeof(double)); dvc_CopyToHost(Vel_x.data,&Velocity[0],N*sizeof(double)); @@ -1342,25 +1342,11 @@ int main(int argc, char **argv) //************ MAIN ITERATION LOOP ***************************************/ while (timestep < timestepMax){ - //************************************************************************* - // Compute the color gradient - //************************************************************************* - //dvc_ComputeColorGradient(nBlocks, nthreads, S, - // ID, Phi, ColorGrad, Nx, Ny, Nz); - //************************************************************************* - - //************************************************************************* - // Perform collision step for the momentum transport - //************************************************************************* -// dvc_ColorCollide(nBlocks, nthreads, S, ID, f_even, f_odd, ColorGrad, Velocity, -// rlxA, rlxB,alpha, beta, Fx, Fy, Fz, Nx, Ny, Nz, pBC); - //************************************************************************* - //************************************************************************* // Fused Color Gradient and Collision //************************************************************************* dvc_ColorCollideOpt( ID,f_even,f_odd,Phi,ColorGrad, - Velocity,Nx,Ny,Nz,S,rlxA,rlxB,alpha,beta,Fx,Fy,Fz); + Velocity,Nx,Ny,Nz,rlxA,rlxB,alpha,beta,Fx,Fy,Fz); //************************************************************************* //................................................................................... @@ -1472,13 +1458,13 @@ int main(int argc, char **argv) // dvc_DensityStreamD3Q7(ID, Den, Copy, Phi, ColorGrad, Velocity, beta, Nx, Ny, Nz, pBC, S); //************************************************************************* dvc_MassColorCollideD3Q7(ID, A_even, A_odd, B_even, B_odd, Den, Phi, - ColorGrad, Velocity, beta, N, pBC, S); + ColorGrad, Velocity, beta, N, pBC); //************************************************************************* // Swap the distributions for momentum transport //************************************************************************* - dvc_SwapD3Q19(ID, f_even, f_odd, Nx, Ny, Nz, S); + dvc_SwapD3Q19(ID, f_even, f_odd, Nx, Ny, Nz); //************************************************************************* //................................................................................... @@ -1592,8 +1578,8 @@ int main(int argc, char **argv) MPI_Irecv(recvbuf_z, 2*recvCount_z,MPI_DOUBLE,rank_z,recvtag,MPI_COMM_WORLD,&req2[5]); //................................................................................... - dvc_SwapD3Q7(ID, A_even, A_odd, Nx, Ny, Nz, S); - dvc_SwapD3Q7(ID, B_even, B_odd, Nx, Ny, Nz, S); + dvc_SwapD3Q7(ID, A_even, A_odd, Nx, Ny, Nz); + dvc_SwapD3Q7(ID, B_even, B_odd, Nx, Ny, Nz); //................................................................................... // Wait for completion of D3Q19 communication @@ -1627,14 +1613,14 @@ int main(int argc, char **argv) //.................................................................................. //.................................................................................. - dvc_ComputeDensityD3Q7(ID, A_even, A_odd, &Den[0], Nx, Ny, Nz, S); - dvc_ComputeDensityD3Q7(ID, B_even, B_odd, &Den[N], Nx, Ny, Nz, S); + dvc_ComputeDensityD3Q7(ID, A_even, A_odd, &Den[0], Nx, Ny, Nz); + dvc_ComputeDensityD3Q7(ID, B_even, B_odd, &Den[N], Nx, Ny, Nz); //************************************************************************* // Compute the phase indicator field //************************************************************************* -// dvc_ComputePhi(ID, Phi, Copy, Den, N, S); - dvc_ComputePhi(ID, Phi, Den, N, S); +// dvc_ComputePhi(ID, Phi, Copy, Den, N); + dvc_ComputePhi(ID, Phi, Den, N); //************************************************************************* //................................................................................... @@ -1733,13 +1719,13 @@ int main(int argc, char **argv) if (pBC && kproc == 0) { - dvc_PressureBC_inlet(f_even,f_odd,din,Nx,Ny,Nz,S); - dvc_ColorBC_inlet(Phi,Den,A_even,A_odd,B_even,B_odd,Nx,Ny,Nz,S); + dvc_PressureBC_inlet(f_even,f_odd,din,Nx,Ny,Nz); + dvc_ColorBC_inlet(Phi,Den,A_even,A_odd,B_even,B_odd,Nx,Ny,Nz); } if (pBC && kproc == nprocz-1){ - dvc_PressureBC_outlet(f_even,f_odd,dout,Nx,Ny,Nz,S,Nx*Ny*(Nz-2)); - dvc_ColorBC_outlet(Phi,Den,A_even,A_odd,B_even,B_odd,Nx,Ny,Nz,S); + dvc_PressureBC_outlet(f_even,f_odd,dout,Nx,Ny,Nz,Nx*Ny*(Nz-2)); + dvc_ColorBC_outlet(Phi,Den,A_even,A_odd,B_even,B_odd,Nx,Ny,Nz); } //................................................................................... @@ -1763,7 +1749,7 @@ int main(int argc, char **argv) // Copy the phase from the GPU -> CPU //........................................................................... dvc_Barrier(); - dvc_ComputePressureD3Q19(ID,f_even,f_odd,Pressure,Nx,Ny,Nz,S); + dvc_ComputePressureD3Q19(ID,f_even,f_odd,Pressure,Nx,Ny,Nz); dvc_CopyToHost(Phase.data,Phi,N*sizeof(double)); dvc_CopyToHost(Press.data,Pressure,N*sizeof(double)); dvc_CopyToHost(Vel_x.data,&Velocity[0],N*sizeof(double)); @@ -2238,7 +2224,7 @@ int main(int argc, char **argv) // fwrite(MeanCurvature.data,8,N,PHASE); fclose(PHASE); //#endif - dvc_ComputePressureD3Q19(ID,f_even,f_odd,Pressure,Nx,Ny,Nz,S); + dvc_ComputePressureD3Q19(ID,f_even,f_odd,Pressure,Nx,Ny,Nz); dvc_CopyToHost(Press.data,Pressure,N*sizeof(double)); sprintf(LocalRankFilename,"%s%s","Pressure.",LocalRankString); FILE *PRESS;