From eda88946f9cf6ef4f356cf660444df2beb5dba63 Mon Sep 17 00:00:00 2001 From: James E McClure Date: Fri, 26 Jan 2018 15:09:46 -0500 Subject: [PATCH] debugging color --- common/ScaLBL.h | 6 +++--- tests/lbpm_color_macro_simulator.cpp | 8 ++++---- tests/lbpm_color_simulator.h | 8 ++++---- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/common/ScaLBL.h b/common/ScaLBL.h index 2802c6a0..c0596241 100644 --- a/common/ScaLBL.h +++ b/common/ScaLBL.h @@ -256,7 +256,7 @@ public: void BiRecvD3Q7AA(double *Aq, double *Bq); void SendHalo(double *data); void RecvHalo(double *data); - void RegularLayout(IntArray map, double *data, double *regdata); + void RegularLayout(IntArray map, double *data, DoubleArray regdata); // Routines to set boundary conditions void Color_BC_z(int *Map, double *Phi, double *Den, double vA, double vB); @@ -4267,7 +4267,7 @@ void ScaLBL_Communicator::RecvHalo(double *data){ //................................................................................... } -void ScaLBL_Communicator::RegularLayout(IntArray map, double *data, double *regdata){ +void ScaLBL_Communicator::RegularLayout(IntArray map, double *data, DoubleArray regdata){ // Gets data from the device and stores in regular layout int i,j,k,n,idx; int Nx = map.size(0); @@ -4285,7 +4285,7 @@ void ScaLBL_Communicator::RegularLayout(IntArray map, double *data, double *regd idx=map(i,j,k); if (!(idx<0)){ double value=TmpDat[idx]; - regdata[n]=value; + regdata(i,j,k)=value; } } } diff --git a/tests/lbpm_color_macro_simulator.cpp b/tests/lbpm_color_macro_simulator.cpp index 72024fc3..5d8f7599 100644 --- a/tests/lbpm_color_macro_simulator.cpp +++ b/tests/lbpm_color_macro_simulator.cpp @@ -493,10 +493,10 @@ int main(int argc, char **argv) //........................................................................... ScaLBL_DeviceBarrier(); ScaLBL_CopyToHost(Averages->Phase.data(),Phi,N*sizeof(double)); - ScaLBL_Comm.RegularLayout(Map,Pressure,Averages->Press.data()); - ScaLBL_Comm.RegularLayout(Map,&Velocity[0],Averages->Vel_x.data()); - ScaLBL_Comm.RegularLayout(Map,&Velocity[Np],Averages->Vel_y.data()); - ScaLBL_Comm.RegularLayout(Map,&Velocity[2*Np],Averages->Vel_z.data()); + 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); //........................................................................... if (rank==0) printf("********************************************************\n"); diff --git a/tests/lbpm_color_simulator.h b/tests/lbpm_color_simulator.h index 698c9769..9ae7121b 100644 --- a/tests/lbpm_color_simulator.h +++ b/tests/lbpm_color_simulator.h @@ -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.data()); - ScaLBL_Comm.RegularLayout(Map,&Velocity[0],Averages->Vel_x.data()); - ScaLBL_Comm.RegularLayout(Map,&Velocity[Np],Averages->Vel_y.data()); - ScaLBL_Comm.RegularLayout(Map,&Velocity[2*Np],Averages->Vel_z.data()); + 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;