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

dbg

Browse Source
This commit is contained in:
James E McClure
2018-05-16 15:15:01 -04:00
parent 4d43977f98
commit 4a41257955
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
models/ColorModel.cpp
View File

@@ -59,7 +59,7 @@ void ScaLBL_ColorModel::ReadParams(string filename){
if (BoundaryCondition==4) flux = din*rhoA; // mass flux must adjust for density (see formulation for details)
// Full domain used for analysis
Domain Dm(domain_db);
Dm = std::shared_ptr<Domain>(new Domain(domain_db));
for (int i=0; i<Dm.Nx*Dm.Ny*Dm.Nz; i++) Dm.id[i] = 1;
Averages = std::shared_ptr<TwoPhase> ( new TwoPhase(Dm) );
// TwoPhase Averages(Dm);
@@ -197,7 +197,9 @@ void ScaLBL_ColorModel::Create(){
//...........................................................................
if (rank==0) printf ("Create ScaLBL_Communicator \n");
// Create a communicator for the device (will use optimized layout)
ScaLBL_Communicator ScaLBL_Comm(Mask);
// ScaLBL_Communicator ScaLBL_Comm(Mask); // original
ScaLBL_Comm = std::shared_ptr<ScaLBL_Communicator>(new ScaLBL_Communicator(Mask));
//Create a second communicator based on the regular data layout
//ScaLBL_Communicator ScaLBL_Comm_Regular(Mask);

6
models/ColorModel.h
View File

@@ -41,9 +41,9 @@ public:
private:
MPI_Comm comm;
Domain Dm; // this domain is for analysis
Domain Mask; // this domain is for lbm
ScaLBL_Communicator ScaLBL_Comm;
std::shared_ptr<Domain> Dm; // this domain is for analysis
std::shared_ptr<Domain> Mask; // this domain is for lbm
std::shared_ptr<ScaLBL_Communicator> ScaLBL_Comm;
std::shared_ptr<TwoPhase> Averages;
// filenames