From 4a4125795534fd5bcbcdab64bbd99aa6e13a680c Mon Sep 17 00:00:00 2001 From: James E McClure Date: Wed, 16 May 2018 15:15:01 -0400 Subject: [PATCH] dbg --- models/ColorModel.cpp | 6 ++++-- models/ColorModel.h | 6 +++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/models/ColorModel.cpp b/models/ColorModel.cpp index 8c2fac4e..ab277ab3 100644 --- a/models/ColorModel.cpp +++ b/models/ColorModel.cpp @@ -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(new Domain(domain_db)); for (int i=0; i ( 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(new ScaLBL_Communicator(Mask)); + //Create a second communicator based on the regular data layout //ScaLBL_Communicator ScaLBL_Comm_Regular(Mask); diff --git a/models/ColorModel.h b/models/ColorModel.h index 88cce645..8fcfa299 100644 --- a/models/ColorModel.h +++ b/models/ColorModel.h @@ -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 Dm; // this domain is for analysis + std::shared_ptr Mask; // this domain is for lbm + std::shared_ptr ScaLBL_Comm; std::shared_ptr Averages; // filenames