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

std ptr in runAnalysis

Browse Source
This commit is contained in:
James E McClure 2018-05-17 09:36:34 -04:00
parent 80d4ec4807
commit d335e634ed
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
analysis/runAnalysis.cpp
View File

@ -288,7 +288,7 @@ runAnalysis::runAnalysis( std::shared_ptr<Database> db,
d_beta( beta ), d_beta( beta ),
d_rank_info( rank_info ), d_rank_info( rank_info ),
d_Map( Map ), d_Map( Map ),
d_ScaLBL_Comm( ScLBL_Comm ), d_ScaLBL_Comm( ScaLBL_Comm),
d_fillData(Dm->Comm,Dm->rank_info,Dm->Nx-2,Dm->Ny-2,Dm->Nz-2,1,1,1,0,1) d_fillData(Dm->Comm,Dm->rank_info,Dm->Nx-2,Dm->Ny-2,Dm->Nz-2,1,1,1,0,1)
{ {
NULL_USE( pBC ); NULL_USE( pBC );
@ -548,10 +548,10 @@ void runAnalysis::run( int timestep, TwoPhase& Averages, const double *Phi,
PROFILE_STOP("Copy-Wait",1); PROFILE_STOP("Copy-Wait",1);
PROFILE_START("Copy-State",1); PROFILE_START("Copy-State",1);
memcpy(Averages.Phase.data(),phase->data(),N*sizeof(double)); memcpy(Averages.Phase.data(),phase->data(),N*sizeof(double));
d_ScaLBL_Comm.RegularLayout(d_Map,Pressure,Averages.Press); d_ScaLBL_Comm->RegularLayout(d_Map,Pressure,Averages.Press);
d_ScaLBL_Comm.RegularLayout(d_Map,&Velocity[0],Averages.Vel_x); d_ScaLBL_Comm->RegularLayout(d_Map,&Velocity[0],Averages.Vel_x);
d_ScaLBL_Comm.RegularLayout(d_Map,&Velocity[d_Np],Averages.Vel_y); d_ScaLBL_Comm->RegularLayout(d_Map,&Velocity[d_Np],Averages.Vel_y);
d_ScaLBL_Comm.RegularLayout(d_Map,&Velocity[2*d_Np],Averages.Vel_z); d_ScaLBL_Comm->RegularLayout(d_Map,&Velocity[2*d_Np],Averages.Vel_z);
PROFILE_STOP("Copy-State",1); PROFILE_STOP("Copy-State",1);
} }
std::shared_ptr<double> cDen, cfq; std::shared_ptr<double> cDen, cfq;

2
analysis/runAnalysis.h
View File

@ -86,7 +86,6 @@ private:
int d_restart_interval, d_analysis_interval, d_blobid_interval, d_visualization_interval; int d_restart_interval, d_analysis_interval, d_blobid_interval, d_visualization_interval;
double d_beta; double d_beta;
ThreadPool d_tpool; ThreadPool d_tpool;
ScaLBL_Communicator d_ScaLBL_Comm;
RankInfoStruct d_rank_info; RankInfoStruct d_rank_info;
IntArray d_Map; IntArray d_Map;
BlobIDstruct d_last_ids; BlobIDstruct d_last_ids;
@ -98,6 +97,7 @@ private:
MPI_Comm d_comm; MPI_Comm d_comm;
MPI_Comm d_comms[1024]; MPI_Comm d_comms[1024];
volatile bool d_comm_used[1024]; volatile bool d_comm_used[1024];
std::shared_ptr<ScaLBL_Communicator> d_ScaLBL_Comm;
// Ids of work items to use for dependencies // Ids of work items to use for dependencies
ThreadPool::thread_id_t d_wait_blobID; ThreadPool::thread_id_t d_wait_blobID;