From d335e634ed1b6840361d67f1abf353ddca670311 Mon Sep 17 00:00:00 2001 From: James E McClure Date: Thu, 17 May 2018 09:36:34 -0400 Subject: [PATCH] std ptr in runAnalysis --- analysis/runAnalysis.cpp | 10 +++++----- analysis/runAnalysis.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/analysis/runAnalysis.cpp b/analysis/runAnalysis.cpp index 27235212..dccf9c3c 100644 --- a/analysis/runAnalysis.cpp +++ b/analysis/runAnalysis.cpp @@ -288,7 +288,7 @@ runAnalysis::runAnalysis( std::shared_ptr db, d_beta( beta ), d_rank_info( rank_info ), 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) { NULL_USE( pBC ); @@ -548,10 +548,10 @@ void runAnalysis::run( int timestep, TwoPhase& Averages, const double *Phi, PROFILE_STOP("Copy-Wait",1); PROFILE_START("Copy-State",1); memcpy(Averages.Phase.data(),phase->data(),N*sizeof(double)); - 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[d_Np],Averages.Vel_y); - d_ScaLBL_Comm.RegularLayout(d_Map,&Velocity[2*d_Np],Averages.Vel_z); + 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[d_Np],Averages.Vel_y); + d_ScaLBL_Comm->RegularLayout(d_Map,&Velocity[2*d_Np],Averages.Vel_z); PROFILE_STOP("Copy-State",1); } std::shared_ptr cDen, cfq; diff --git a/analysis/runAnalysis.h b/analysis/runAnalysis.h index 90050ab3..c5644fe2 100644 --- a/analysis/runAnalysis.h +++ b/analysis/runAnalysis.h @@ -86,7 +86,6 @@ private: int d_restart_interval, d_analysis_interval, d_blobid_interval, d_visualization_interval; double d_beta; ThreadPool d_tpool; - ScaLBL_Communicator d_ScaLBL_Comm; RankInfoStruct d_rank_info; IntArray d_Map; BlobIDstruct d_last_ids; @@ -98,6 +97,7 @@ private: MPI_Comm d_comm; MPI_Comm d_comms[1024]; volatile bool d_comm_used[1024]; + std::shared_ptr d_ScaLBL_Comm; // Ids of work items to use for dependencies ThreadPool::thread_id_t d_wait_blobID;