diff --git a/common/ScaLBL.h b/common/ScaLBL.h index 1d766ef6..1952d13d 100644 --- a/common/ScaLBL.h +++ b/common/ScaLBL.h @@ -77,7 +77,7 @@ extern "C" void ScaLBL_D3Q7_AAeven_PhaseField(int *Map, double *Aq, double *Bq, extern "C" void ScaLBL_D3Q19_Gradient(int *Map, double *Phi, double *ColorGrad, int start, int finish, int Np, int Nx, int Ny, int Nz); -extern "C" void ScaLBL_PhaseField_Init(int *Map, double *Phi, double *Den, double *Aq, double *Bq, int Np); +extern "C" void ScaLBL_PhaseField_Init(int *Map, double *Phi, double *Den, double *Aq, double *Bq, int start, int finish, int Np); // Density functional hydrodynamics LBM extern "C" void ScaLBL_DFH_Init(double *Phi, double *Den, double *Aq, double *Bq, int Np); diff --git a/cpu/dfh.cpp b/cpu/dfh.cpp index acc139da..960a51ab 100644 --- a/cpu/dfh.cpp +++ b/cpu/dfh.cpp @@ -1429,6 +1429,7 @@ extern "C" void ScaLBL_D3Q19_Gradient_DFH(int *neighborList, double *Phi, double m1 = Phi[nn]; nn = neighborList[n]%Np; m2 = Phi[nn]; + printf("m1=%f, m2=%f \n",m1,m2); nn = neighborList[n+3*Np]%Np; m3 = Phi[nn]; nn = neighborList[n+2*Np]%Np; @@ -1437,7 +1438,7 @@ extern "C" void ScaLBL_D3Q19_Gradient_DFH(int *neighborList, double *Phi, double m5 = Phi[nn]; nn = neighborList[n+4*Np]%Np; m6 = Phi[nn]; - nn = neighborList[n+7*Np]%Np; +/* nn = neighborList[n+7*Np]%Np; m7 = Phi[nn]; nn = neighborList[n+6*Np]%Np; m8 = Phi[nn]; @@ -1461,7 +1462,7 @@ extern "C" void ScaLBL_D3Q19_Gradient_DFH(int *neighborList, double *Phi, double m17 = Phi[nn]; nn = neighborList[n+16*Np]%Np; m18 = Phi[nn]; - + */ //............Compute the Color Gradient................................... //............Compute the wn fluid Gradient................................... nx = -(m1-m2+0.5*(m7-m8+m9-m10+m11-m12+m13-m14)); diff --git a/gpu/Color.cu b/gpu/Color.cu index 748df636..f5cf86e6 100644 --- a/gpu/Color.cu +++ b/gpu/Color.cu @@ -3885,7 +3885,7 @@ __global__ void dvc_ScaLBL_D3Q19_Gradient(int *Map, double *phi, double *ColorGr } } } -__global__ void dvc_ScaLBL_PhaseField_Init(int *Map, double *Phi, double *Den, double *Aq, double *Bq, int Np){ +__global__ void dvc_ScaLBL_PhaseField_Init(int *Map, double *Phi, double *Den, double *Aq, double *Bq, int start, int finish, int Np){ int idx,n; double phi,nA,nB; @@ -4048,8 +4048,8 @@ extern "C" void ScaLBL_D3Q19_Gradient(int *Map, double *Phi, double *ColorGrad, } -extern "C" void ScaLBL_PhaseField_Init(int *Map, double *Phi, double *Den, double *Aq, double *Bq, int Np){ - dvc_ScaLBL_PhaseField_Init<<>>(Map, Phi, Den, Aq, Bq, Np); +extern "C" void ScaLBL_PhaseField_Init(int *Map, double *Phi, double *Den, double *Aq, double *Bq, int start, int finish, int Np){ + dvc_ScaLBL_PhaseField_Init<<>>(Map, Phi, Den, Aq, Bq, start, finish, Np); cudaError_t err = cudaGetLastError(); if (cudaSuccess != err){ printf("CUDA error in ScaLBL_D3Q19_ColorGrad: %s \n",cudaGetErrorString(err));