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

input database for lbpm_segmented_pp

Browse Source
This commit is contained in:
James E McClure
2018-05-26 08:38:32 -04:00
parent 68874b3811
commit 9f06e9cafa
1 changed files with 20 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
tests/lbpm_segmented_pp.cpp
View File

@@ -131,63 +131,32 @@ int main(int argc, char **argv)
// char fluidValue,solidValue; // char fluidValue,solidValue;
int MAXTIME=1000; int MAXTIME=1000;
int READ_FROM_BLOCK=0; int READ_FROM_BLOCK=0;
if (argc > 1){
MAXTIME=atoi(argv[1]);
}
if (argc > 2){
READ_FROM_BLOCK=atoi(argv[2]);
}
std::vector<char> solidValues; string filename;
std::vector<char> nwpValues; if (argc > 1) filename=argv[1];
std::string line; else ERROR("No input database provided\n");
// read the input database
auto db = std::make_shared<Database>( filename );
auto domain_db = db->getDatabase( "Domain" );
if (rank==0){ // Read domain parameters
ifstream domain("Domain.in"); auto L = domain_db->getVector<double>( "L" );
domain >> nprocx; auto size = domain_db->getVector<int>( "n" );
domain >> nprocy; auto nproc = domain_db->getVector<int>( "nproc" );
domain >> nprocz; auto ReadValues = domain_db->getVector<char>( "ReadValues" );
domain >> nx; auto WriteValues = domain_db->getVector<char>( "WriteValues" );
domain >> ny;
domain >> nz;
domain >> nspheres;
domain >> Lx;
domain >> Ly;
domain >> Lz;
} nx = size[0];
MPI_Barrier(comm); ny = size[1];
// Computational domain nz = size[2];
MPI_Bcast(&nx,1,MPI_INT,0,comm); nprocx = nproc[0];
MPI_Bcast(&ny,1,MPI_INT,0,comm); nprocy = nproc[1];
MPI_Bcast(&nz,1,MPI_INT,0,comm); nprocz = nproc[2];
MPI_Bcast(&nprocx,1,MPI_INT,0,comm);
MPI_Bcast(&nprocy,1,MPI_INT,0,comm);
MPI_Bcast(&nprocz,1,MPI_INT,0,comm);
MPI_Bcast(&nspheres,1,MPI_INT,0,comm);
MPI_Bcast(&Lx,1,MPI_DOUBLE,0,comm);
MPI_Bcast(&Ly,1,MPI_DOUBLE,0,comm);
MPI_Bcast(&Lz,1,MPI_DOUBLE,0,comm);
//.................................................
MPI_Barrier(comm);
// Check that the number of processors >= the number of ranks
if ( rank==0 ) {
printf("Number of MPI ranks required: %i \n", nprocx*nprocy*nprocz);
printf("Number of MPI ranks used: %i \n", nprocs);
printf("Full domain size: %i x %i x %i \n",nx*nprocx,ny*nprocy,nz*nprocz);
fflush(stdout);
}
if ( nprocs < nprocx*nprocy*nprocz ){
ERROR("Insufficient number of processors");
}
char LocalRankFilename[40];
int N = (nx+2)*(ny+2)*(nz+2); int N = (nx+2)*(ny+2)*(nz+2);
std::shared_ptr<Domain> Dm (new Domain(nx,ny,nz,rank,nprocx,nprocy,nprocz,Lx,Ly,Lz,BC)); std::shared_ptr<Domain> Dm (new Domain(db,comm));
// std::shared_ptr<Domain> Dm (new Domain(nx,ny,nz,rank,nprocx,nprocy,nprocz,Lx,Ly,Lz,BC));
for (n=0; n<N; n++) Dm->id[n]=1; for (n=0; n<N; n++) Dm->id[n]=1;
Dm->CommInit(); Dm->CommInit();
std::shared_ptr<TwoPhase> Averages( new TwoPhase(Dm) ); std::shared_ptr<TwoPhase> Averages( new TwoPhase(Dm) );