diff --git a/common/ScaLBL.h b/common/ScaLBL.h index bb033755..55eee4af 100644 --- a/common/ScaLBL.h +++ b/common/ScaLBL.h @@ -175,6 +175,7 @@ extern "C" void ScaLBL_D3Q19_AAeven_ColorMass(double *Aq, double *Bq, double *De extern "C" void ScaLBL_D3Q19_AAodd_ColorMass(int *d_neighborList, double *Aq, double *Bq, double *Den, double *Vel, double *ColorGrad, double beta, int start, int finish, int Np); +*/ /* class ScaLBL_Color{ public: diff --git a/example/Piston/Color.in b/example/Piston/Color.in index c0e4aa35..a1c83625 100644 --- a/example/Piston/Color.in +++ b/example/Piston/Color.in @@ -1,6 +1,6 @@ -1.0 -1.0e-2 0.95 -0.7 -0.7 +1.0 1.0 +1.0 1.0 +1.0e-2 0.95 0.0 0.0 0.0 -0 1 1.01 0.99 -50000 20000 1e-5 \ No newline at end of file +0 4 0.0 1.0 +10000 2000 1e-5 diff --git a/tests/lbpm_color_macro_simulator.cpp b/tests/lbpm_color_macro_simulator.cpp index 5d8f7599..f358c012 100644 --- a/tests/lbpm_color_macro_simulator.cpp +++ b/tests/lbpm_color_macro_simulator.cpp @@ -371,7 +371,7 @@ int main(int argc, char **argv) int *neighborList; IntArray Map(Nx,Ny,Nz); neighborList= new int[18*Np]; - ScaLBL_Comm.MemoryOptimizedLayoutAA(Map,neighborList,Dm.id,Np); + ScaLBL_Comm.MemoryOptimizedLayoutAA(Map,neighborList,Mask.id,Np); MPI_Barrier(comm); //...........................................................................