First clean build of lbpm_color_macro_simulator
This commit is contained in:
parent
056ba3a1ae
commit
b5697ea55e
@ -225,7 +225,7 @@ private:
|
|||||||
|
|
||||||
// Function to start the analysis
|
// Function to start the analysis
|
||||||
void run_analysis( int timestep, int restart_interval,
|
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,
|
BlobIDstruct& last_ids, BlobIDstruct& last_index, BlobIDList& last_id_map,
|
||||||
int Np, int Nx, int Ny, int Nz, bool pBC, double beta, double err,
|
int Np, int Nx, int Ny, int Nz, bool pBC, double beta, double err,
|
||||||
const double *Phi, double *Pressure, double *Velocity,
|
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_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));
|
||||||
ScaLBL_Comm.RegularLayout(Map,Pressure,Averages->Press);
|
ScaLBL_Comm.RegularLayout(Map,Pressure,Averages.Press);
|
||||||
ScaLBL_Comm.RegularLayout(Map,&Velocity[0],Averages->Vel_x);
|
ScaLBL_Comm.RegularLayout(Map,&Velocity[0],Averages.Vel_x);
|
||||||
ScaLBL_Comm.RegularLayout(Map,&Velocity[Np],Averages->Vel_y);
|
ScaLBL_Comm.RegularLayout(Map,&Velocity[Np],Averages.Vel_y);
|
||||||
ScaLBL_Comm.RegularLayout(Map,&Velocity[2*Np],Averages->Vel_z);
|
ScaLBL_Comm.RegularLayout(Map,&Velocity[2*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;
|
||||||
|
Loading…
Reference in New Issue
Block a user