From b5697ea55e98a8f9cb6479c552ea32b9815e26f5 Mon Sep 17 00:00:00 2001 From: James E McClure Date: Fri, 26 Jan 2018 15:22:49 -0500 Subject: [PATCH] First clean build of lbpm_color_macro_simulator --- tests/lbpm_color_simulator.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/lbpm_color_simulator.h b/tests/lbpm_color_simulator.h index 9ae7121b..626ef757 100644 --- a/tests/lbpm_color_simulator.h +++ b/tests/lbpm_color_simulator.h @@ -225,7 +225,7 @@ private: // Function to start the analysis void run_analysis( int timestep, int restart_interval, - const RankInfoStruct& rank_info, const ScaLBL_Communicator &ScaLBL_Comm, TwoPhase& Averages, + const RankInfoStruct& rank_info, ScaLBL_Communicator &ScaLBL_Comm, TwoPhase& Averages, BlobIDstruct& last_ids, BlobIDstruct& last_index, BlobIDList& last_id_map, int Np, int Nx, int Ny, int Nz, bool pBC, double beta, double err, const double *Phi, double *Pressure, double *Velocity, @@ -312,10 +312,10 @@ void run_analysis( int timestep, int restart_interval, PROFILE_STOP("Copy-Wait",1); PROFILE_START("Copy-State",1); memcpy(Averages.Phase.data(),phase->data(),N*sizeof(double)); - ScaLBL_Comm.RegularLayout(Map,Pressure,Averages->Press); - ScaLBL_Comm.RegularLayout(Map,&Velocity[0],Averages->Vel_x); - ScaLBL_Comm.RegularLayout(Map,&Velocity[Np],Averages->Vel_y); - ScaLBL_Comm.RegularLayout(Map,&Velocity[2*Np],Averages->Vel_z); + ScaLBL_Comm.RegularLayout(Map,Pressure,Averages.Press); + ScaLBL_Comm.RegularLayout(Map,&Velocity[0],Averages.Vel_x); + ScaLBL_Comm.RegularLayout(Map,&Velocity[Np],Averages.Vel_y); + ScaLBL_Comm.RegularLayout(Map,&Velocity[2*Np],Averages.Vel_z); PROFILE_STOP("Copy-State",1); } std::shared_ptr cDen, cfq;