updated disc pack benchmark

This commit is contained in:
James E McClure
2017-08-16 09:54:19 -04:00
parent efabefdc38
commit 2806a26623
2 changed files with 5 additions and 5 deletions

View File

@@ -214,7 +214,7 @@ int main(int argc, char **argv)
outlet_radius=atoi(argv[2]);
}
else{
INSIST(argc==3,"Did not provide correct input arguments!")
INSIST(argc==3,"Did not provide correct input arguments!");
}
if (nprocs != nprocx*nprocy*nprocz){
@@ -307,8 +307,8 @@ int main(int argc, char **argv)
// Assign walls in the signed distance functions (x,y boundaries)
double dst;
int center_x=Nprocx*Nx/2;
int center_y=Nprocy*Ny/2;
int center_x=nprocx*Nx/2;
int center_y=nprocy*Ny/2;
for (k=0;k<Nz;k++){
for (j=0;j<Ny;j++){
@@ -335,7 +335,7 @@ int main(int argc, char **argv)
if (k<5) SignDist(i,j,k) = dst;
else if (Nz-k<5) SignDist(i,j,k) = dst;
else if (dst < SignDist(i,j,k)) SignDist(i,j,k) = dst;
che }
}
}
}

View File

@@ -297,7 +297,7 @@ int main(int argc, char **argv)
while (GlobalNumber > 0){
if (rank==0) printf("GlobalNumber=%f \n",GlobalNumber);
//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++){