Updating unit test TestCommD3Q19

This commit is contained in:
James E McClure
2015-06-25 11:13:48 -04:00
parent 0b9bb076db
commit 0ce0043f17

View File

@@ -210,8 +210,6 @@ int main(int argc, char **argv)
domain >> Ly; domain >> Ly;
domain >> Lz; domain >> Lz;
//....................................................................... //.......................................................................
// **************************************************************
} }
// ************************************************************** // **************************************************************
// Broadcast simulation parameters from rank 0 to all other procs // Broadcast simulation parameters from rank 0 to all other procs
@@ -240,11 +238,10 @@ int main(int argc, char **argv)
// ************************************************************** // **************************************************************
if (nprocs != nprocx*nprocy*nprocz){ if (nprocs != nprocx*nprocy*nprocz){
printf("Fatal error in processor number! \n");
printf("nprocx = %i \n",nprocx); printf("nprocx = %i \n",nprocx);
printf("nprocy = %i \n",nprocy); printf("nprocy = %i \n",nprocy);
printf("nprocz = %i \n",nprocz); printf("nprocz = %i \n",nprocz);
abort(); INSIST(nprocs == nprocx*nprocy*nprocz,"Fatal error in processor count!");
} }
if (rank==0){ if (rank==0){
@@ -259,9 +256,8 @@ int main(int argc, char **argv)
jproc = (rank-nprocx*nprocy*kproc)/nprocx; jproc = (rank-nprocx*nprocy*kproc)/nprocx;
iproc = rank-nprocx*nprocy*kproc-nprocz*jproc; iproc = rank-nprocx*nprocy*kproc-nprocz*jproc;
int BoundaryCondition=0;
double iVol_global = 1.0/Nx/Ny/Nz/nprocx/nprocy/nprocz; double iVol_global = 1.0/Nx/Ny/Nz/nprocx/nprocy/nprocz;
int BoundaryCondition=0;
Domain Dm(Nx,Ny,Nz,rank,nprocx,nprocy,nprocz,Lx,Ly,Lz,BoundaryCondition); Domain Dm(Nx,Ny,Nz,rank,nprocx,nprocy,nprocz,Lx,Ly,Lz,BoundaryCondition);
InitializeRanks( rank, nprocx, nprocy, nprocz, iproc, jproc, kproc, InitializeRanks( rank, nprocx, nprocy, nprocz, iproc, jproc, kproc,