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

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

Browse Source
This commit is contained in:
James E McClure 2017-08-16 19:57:46 -04:00
commit 8f066a1fa3
2 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/lbpm_juanes_bench_disc_pp.cpp
View File

@ -105,9 +105,9 @@ inline void SignedDistanceDiscPack(double *Distance, int ndiscs, double *List_cx
if (jmax<0) kmax = 0;
if (jmax>Ny) kmax = Ny;
// Loop over the domain for this sphere (may be null)
for (k=kmin;k<kmax;k++){
for (k=0;k<Nz;k++){
for (j=jmin;j<jmax;j++){
for (i=0;i<Nx;i++){
for (i=imin;i<imax;i++){
// x,y,z is distance in physical units
x = i*hx;
y = j*hy;

46
tests/lbpm_morph_pp.cpp
View File

@ -265,7 +265,30 @@ int main(int argc, char **argv)
while (GlobalNumber > 0){
//if (rank==0) printf("GlobalNumber=%f \n",GlobalNumber);
// Layer the inlet with NWP
if (kproc == 0){
for(j=0; j<Ny; j++){
for(i=0; i<Nx; i++){
n = j*nx+i;
// n = nx*ny + j*nx+i;
if (id[n] > 0) id[n]=1;
}
}
}
// Layer the outlet with WP
if (kproc == nprocz-1){
for(j=0; j<Ny; j++){
for(i=0; i<Nx; i++){
n = (nz-1)*nx*ny+j*nx+i;
// n = nx*ny + j*nx+i;
if (id[n] > 0) id[n]=2;
}
}
}
if (rank==0) printf("GlobalNumber=%f \n",GlobalNumber);
double LocalNumber=GlobalNumber=0.f;
for(k=0; k<Nz; k++){
for(j=0; j<Ny; j++){
@ -377,27 +400,6 @@ int main(int argc, char **argv)
MPI_Allreduce(&LocalNumber,&GlobalNumber,1,MPI_DOUBLE,MPI_SUM,comm);
// Layer the inlet with NWP
if (kproc == 0){
for(j=0; j<Ny; j++){
for(i=0; i<Nx; i++){
n = j*nx+i;
// n = nx*ny + j*nx+i;
id[n]=1;
}
}
}
// Layer the outlet with WP
if (kproc == nprocz-1){
for(j=0; j<Ny; j++){
for(i=0; i<Nx; i++){
n = (nz-1)*nx*ny+j*nx+i;
// n = nx*ny + j*nx+i;
id[n]=2;
}
}
}
}