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

refactr db

Browse Source
This commit is contained in:
James E McClure
2018-05-15 16:29:32 -04:00
parent 8b00ad6299
commit 9a22d71d0f
3 changed files with 8 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tests/TestForceMoments.cpp
View File

@@ -56,7 +56,7 @@ int main(int argc, char **argv)
MPI_Comm comm = MPI_COMM_WORLD; MPI_Comm comm = MPI_COMM_WORLD;
MPI_Comm_rank(comm,&rank); MPI_Comm_rank(comm,&rank);
MPI_Comm_size(comm,&nprocs); MPI_Comm_size(comm,&nprocs);
int check; int check=0;
{ {
// parallel domain size (# of sub-domains) // parallel domain size (# of sub-domains)
int iproc,jproc,kproc; 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); if (rank==0) printf("No. of timesteps for timing: %i \n", timesteps);
while (timestep < 2) { 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_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_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 ScaLBL_Comm.RecvD3Q19AA(dist); //WRITE INTO OPPOSITE

6
tests/TestPoiseuille.cpp
View File

@@ -25,7 +25,7 @@ int main(int argc, char **argv)
MPI_Comm comm = MPI_COMM_WORLD; MPI_Comm comm = MPI_COMM_WORLD;
MPI_Comm_rank(comm,&rank); MPI_Comm_rank(comm,&rank);
MPI_Comm_size(comm,&nprocs); MPI_Comm_size(comm,&nprocs);
int check; int check=0;
{ {
if (rank == 0){ if (rank == 0){
printf("********************************************************\n"); printf("********************************************************\n");
@@ -48,7 +48,9 @@ int main(int argc, char **argv)
Fx = 0; Fy = 0; Fx = 0; Fy = 0;
Fz = 1e-3; //1.f; // 1e-3; Fz = 1e-3; //1.f; // 1e-3;
string FILENAME = argv[1]; auto FILENAME = argv[1];
auto db = std::make_shared<Database>( FILENAME );
auto domain_db = db->getDatabase( "Domain" );
// Load inputs // Load inputs
if (rank==0) printf("Loading input database \n"); if (rank==0) printf("Loading input database \n");
auto db = std::make_shared<Database>(FILENAME); auto db = std::make_shared<Database>(FILENAME);

4
tests/TestPressVel.cpp
View File

@@ -22,7 +22,7 @@ int main(int argc, char **argv)
MPI_Comm comm = MPI_COMM_WORLD; MPI_Comm comm = MPI_COMM_WORLD;
MPI_Comm_rank(comm,&rank); MPI_Comm_rank(comm,&rank);
MPI_Comm_size(comm,&nprocs); MPI_Comm_size(comm,&nprocs);
int check; int check=0;
{ {
if (rank == 0){ if (rank == 0){
printf("********************************************************\n"); printf("********************************************************\n");
@@ -207,4 +207,6 @@ int main(int argc, char **argv)
MPI_Barrier(comm); MPI_Barrier(comm);
MPI_Finalize(); MPI_Finalize();
// **************************************************** // ****************************************************
return check;
} }