diff --git a/cmake/libraries.cmake b/cmake/libraries.cmake index dca31ea9..43d2726e 100644 --- a/cmake/libraries.cmake +++ b/cmake/libraries.cmake @@ -308,5 +308,6 @@ MACRO ( CONFIGURE_LBPM ) # Suppress some common warnings IF ( USING_GCC ) SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-reorder -Wno-unused-parameter") + SET( CMAKE_CUDA_FLAGS "${CMAKE_CUDA_FLAGS} --compiler-options -Wno-reorder,-Wno-unused-parameter") ENDIF() ENDMACRO () diff --git a/common/MPI.cpp b/common/MPI.cpp index 9495372d..8b09bc49 100644 --- a/common/MPI.cpp +++ b/common/MPI.cpp @@ -35,7 +35,7 @@ // Using MAC #define USE_MAC #include -#elif defined( __linux ) || defined( __unix ) || defined( __posix ) +#elif defined( __linux ) || defined( __linux__ ) || defined( __unix ) || defined( __posix ) // We are using linux #define USE_LINUX #include diff --git a/gpu/Color.cu b/gpu/Color.cu index 347858b9..30c16b51 100644 --- a/gpu/Color.cu +++ b/gpu/Color.cu @@ -128,7 +128,7 @@ __global__ void dvc_ScaLBL_Color_InitDistance(char *ID, double *Den, double *Ph __global__ void dvc_ScaLBL_Color_BC(int *list, int *Map, double *Phi, double *Den, double vA, double vB, int count, int Np) { - int idx,n,nm; + int idx,n; // Fill the outlet with component b idx = blockIdx.x*blockDim.x + threadIdx.x; if (idx < count){ @@ -3471,13 +3471,11 @@ __global__ void dvc_ScaLBL_D3Q19_AAeven_ColorMass(double *Aq, double *Bq, double double *Velocity, double *ColorGrad, double beta, int start, int finish, int Np){ int n; - double fq; // non-conserved moments double nA,nB; // number density double a1,b1,a2,b2,nAB,delta; double C,nx,ny,nz; //color gradient magnitude and direction double ux,uy,uz; - double phi,tau,rho0,rlx_setA,rlx_setB; int S = Np/NBLOCKS/NTHREADS + 1; for (int s=0; s