From 866499f5858508e8742debbea024e65a84878e69 Mon Sep 17 00:00:00 2001 From: James E McClure Date: Fri, 26 Jan 2018 08:58:04 -0500 Subject: [PATCH] re-factoring color simulator --- tests/CMakeLists.txt | 2 +- tests/lbpm_color_macro_simulator.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index d2a0908e..d54b33db 100755 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -3,7 +3,7 @@ #ADD_LBPM_EXECUTABLE( lbpm_permeability_simulator ) #ADD_LBPM_EXECUTABLE( lbpm_nondarcy_simulator ) #ADD_LBPM_EXECUTABLE( lbpm_color_simulator ) -#ADD_LBPM_EXECUTABLE( lbpm_color_macro_simulator ) +ADD_LBPM_EXECUTABLE( lbpm_color_macro_simulator ) ADD_LBPM_EXECUTABLE( lbpm_sphere_pp ) ADD_LBPM_EXECUTABLE( lbpm_random_pp ) ADD_LBPM_EXECUTABLE( lbpm_refine_pp ) diff --git a/tests/lbpm_color_macro_simulator.cpp b/tests/lbpm_color_macro_simulator.cpp index f42d1f1a..96893431 100644 --- a/tests/lbpm_color_macro_simulator.cpp +++ b/tests/lbpm_color_macro_simulator.cpp @@ -513,10 +513,10 @@ int main(int argc, char **argv) ScaLBL_CopyToHost(Averages->Vel_y.data(),&Velocity[N],Np*sizeof(double)); ScaLBL_CopyToHost(Averages->Vel_z.data(),&Velocity[2*N],Np*sizeof(double)); - double TmpDat; + double *TmpDat; TmpDat = new double [Np]; - ScaLBL_CopyToHost(&TmpDat[0],&Pressure[0],SIZE); - ScaLBL_Comm.RegularLayout(Map,TmpDat,Averages->Press.data()); + ScaLBL_CopyToHost(&TmpDat[0],&Pressure[0], Np*sizeof(double)); + ScaLBL_Comm.RegularLayout(Map,TmpDat,Averages->Press.data()); //........................................................................... if (rank==0) printf("********************************************************\n");