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

Merge branch 'master' of https://github.com/JamesEMcClure/LBPM-WIA

Browse Source
This commit is contained in:
James E McClure 2014-07-17 10:33:38 -04:00
commit 74227d6c7e
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/lb2_Color_wia_mpi.cpp
View File

@ -1220,7 +1220,11 @@ int main(int argc, char **argv)
//...........................................................................
InitD3Q19(ID, f_even, f_odd, Nx, Ny, Nz);
//......................................................................
#ifdef USE_EXP_CONTACT_ANGLE
InitDenColorDistance(ID, Den, Phi, dvcSignDist, das, dbs, beta, xIntPos, Nx, Ny, Nz);
#else
InitDenColor(ID, Den, Phi, das, dbs, Nx, Ny, Nz);
#endif
//.......................................................................
sprintf(LocalRankString,"%05d",rank);
sprintf(LocalRankFilename,"%s%s","ID.",LocalRankString);
@ -1239,11 +1243,7 @@ int main(int argc, char **argv)
DeviceBarrier();
MPI_Barrier(MPI_COMM_WORLD);
}
#ifdef USE_EXP_CONTACT_ANGLE
InitDenColorDistance(ID, Den, Phi, dvcSignDist, das, dbs, beta, xIntPos, Nx, Ny, Nz);
#else
InitDenColor(ID, Den, Phi, das, dbs, Nx, Ny, Nz);
#endif
//......................................................................
InitD3Q7(ID, A_even, A_odd, &Den[0], Nx, Ny, Nz);
InitD3Q7(ID, B_even, B_odd, &Den[N], Nx, Ny, Nz);