diff --git a/tests/TestForceMoments.cpp b/tests/TestForceMoments.cpp index 02bd3f65..1f9196ae 100644 --- a/tests/TestForceMoments.cpp +++ b/tests/TestForceMoments.cpp @@ -56,7 +56,7 @@ int main(int argc, char **argv) MPI_Comm comm = MPI_COMM_WORLD; MPI_Comm_rank(comm,&rank); MPI_Comm_size(comm,&nprocs); - int check; + int check=0; { // parallel domain size (# of sub-domains) int iproc,jproc,kproc; @@ -234,18 +234,7 @@ int main(int argc, char **argv) if (rank==0) printf("No. of timesteps for timing: %i \n", timesteps); while (timestep < 2) { -/* - ScaLBL_D3Q19_AAeven_MRT(dist, 0, Np, Np, rlx_setA, rlx_setB, Fx, Fy, Fz); - ScaLBL_Comm.SendD3Q19AA(dist); //READ FROM NORMAL - ScaLBL_Comm.RecvD3Q19AA(dist); //WRITE INTO OPPOSITE - ScaLBL_DeviceBarrier(); MPI_Barrier(comm); - timestep++; - ScaLBL_D3Q19_AAodd_MRT(NeighborList, dist, 0, Np, Np, rlx_setA, rlx_setB, Fx, Fy, Fz); - ScaLBL_Comm.SendD3Q19AA(dist); //READ FROM NORMAL - ScaLBL_Comm.RecvD3Q19AA(dist); //WRITE INTO OPPOSITE - ScaLBL_DeviceBarrier(); MPI_Barrier(comm); - */ ScaLBL_Comm.SendD3Q19AA(dist); //READ FROM NORMAL ScaLBL_D3Q19_AAodd_MRT(NeighborList, dist, ScaLBL_Comm.first_interior, ScaLBL_Comm.last_interior, Np, rlx_setA, rlx_setB, Fx, Fy, Fz); ScaLBL_Comm.RecvD3Q19AA(dist); //WRITE INTO OPPOSITE diff --git a/tests/TestPoiseuille.cpp b/tests/TestPoiseuille.cpp index 3598995f..1abdaf4d 100644 --- a/tests/TestPoiseuille.cpp +++ b/tests/TestPoiseuille.cpp @@ -25,7 +25,7 @@ int main(int argc, char **argv) MPI_Comm comm = MPI_COMM_WORLD; MPI_Comm_rank(comm,&rank); MPI_Comm_size(comm,&nprocs); - int check; + int check=0; { if (rank == 0){ printf("********************************************************\n"); @@ -48,7 +48,9 @@ int main(int argc, char **argv) Fx = 0; Fy = 0; Fz = 1e-3; //1.f; // 1e-3; - string FILENAME = argv[1]; + auto FILENAME = argv[1]; + auto db = std::make_shared( FILENAME ); + auto domain_db = db->getDatabase( "Domain" ); // Load inputs if (rank==0) printf("Loading input database \n"); auto db = std::make_shared(FILENAME); diff --git a/tests/TestPressVel.cpp b/tests/TestPressVel.cpp index 11b83f65..d2aebeba 100644 --- a/tests/TestPressVel.cpp +++ b/tests/TestPressVel.cpp @@ -22,7 +22,7 @@ int main(int argc, char **argv) MPI_Comm comm = MPI_COMM_WORLD; MPI_Comm_rank(comm,&rank); MPI_Comm_size(comm,&nprocs); - int check; + int check=0; { if (rank == 0){ printf("********************************************************\n"); @@ -207,4 +207,6 @@ int main(int argc, char **argv) MPI_Barrier(comm); MPI_Finalize(); // **************************************************** + return check; + }