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

Updated lbpm_disc_pp and lbpm_random_Pp

Browse Source
This commit is contained in:
James E McClure 2015-07-10 15:38:09 -04:00
parent 02268a6830
commit c6a240beaa
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/lbpm_disc_pp.cpp
View File

@ -308,7 +308,7 @@ int main(int argc, char **argv)
// if ((Nx-2)*nprocx-2-iproc*(Nx-2)-i+1 < dst) dst = 1.0*((Nx-2)*nprocx-2-iproc*(Nx-2)-i+1);
// Add walls at the boundary
if ( (jproc*(Ny-2)+j-2)*1.0 < dst) dst = (jproc*(Ny-2)+j-2)*1.0;
if ((Ny-2)*nprocy-2-(jproc*(Ny-2)+j-1)*1.0 < dst) dst = ((Ny-2)*nprocy-(jproc*(Ny-2)+j-2))*1.0;
if ((Ny-2)*nprocy-3-(jproc*(Ny-2)+j-1)*1.0 < dst) dst = ((Ny-2)*nprocy-3-(jproc*(Ny-2)+j-1))*1.0;
// Assign the Signed Distance where valid
if (dst < SignDist(i,j,k)) SignDist(i,j,k) = dst;

10
tests/lbpm_random_pp.cpp
View File

@ -191,12 +191,12 @@ int main(int argc, char **argv)
jj = j;
kk = k;
if (ii>nprocx*(Nx-2)+1) ii-=nprocx*(Nx-2);
if (jj>nprocy*(Ny-2)+1) jj-=nprocy*(Ny-2);
if (kk>nprocz*(Nz-2)+1) kk-=nprocz*(Nz-2);
if (ii>nprocx*(Nx-2)) ii-=nprocx*(Nx-2);
if (jj>nprocy*(Ny-2)) jj-=nprocy*(Ny-2);
if (kk>nprocz*(Nz-2)) kk-=nprocz*(Nz-2);
// Check if this is in the subdomain
if (ii < (iproc+1)*(Nx-2) && jj < (jproc+1)*(Ny-2) && kk < (kproc+1)*(Nz-2) &&
if (ii < (iproc+1)*(Nx-2)+1 && jj < (jproc+1)*(Ny-2)+1 && kk < (kproc+1)*(Nz-2)+1 &&
ii > iproc*(Nx-2) && jj > jproc*(Ny-2) && kk > kproc*(Nz-2) ){
// Map from global to local coordinates
@ -256,6 +256,6 @@ int main(int argc, char **argv)
fclose(ID);
MPI_Barrier(MPI_COMM_WORLD);
MPI_Finalize();
MPI_Finalize();
return 0;
}