OilfieldToolsNet/LBPM
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

small cleanup

Browse Source
This commit is contained in:
James E McClure
2018-05-01 13:47:45 -04:00
parent fc365e9aba
commit 5c3f4cf38d
2 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
cpu/dfh.cpp
View File

@@ -123,12 +123,11 @@ extern "C" void ScaLBL_D3Q19_AAeven_DFH(int *neighborList, double *dist, double
m17 = Phi[nn]; m17 = Phi[nn];
nn = neighborList[n+16*Np]%Np; nn = neighborList[n+16*Np]%Np;
m18 = Phi[nn]; m18 = Phi[nn];
//............Compute the Color Gradient...................................
//............Compute the wn fluid Gradient................................... //............Compute the wn fluid Gradient...................................
nx = -(m1-m2+0.5*(m7-m8+m9-m10+m11-m12+m13-m14)); nx = (m1-m2+0.5*(m7-m8+m9-m10+m11-m12+m13-m14));
ny = -(m3-m4+0.5*(m7-m8-m9+m10+m15-m16+m17-m18)); ny = (m3-m4+0.5*(m7-m8-m9+m10+m15-m16+m17-m18));
nz = -(m5-m6+0.5*(m11-m12-m13+m14+m15-m16-m17+m18)); nz = (m5-m6+0.5*(m11-m12-m13+m14+m15-m16-m17+m18));
// .... read the solid potential gradient..................... // .... read the solid potential gradient.....................
m1 = SolidPotential[n]; m1 = SolidPotential[n];
m2 = SolidPotential[n+Np]; m2 = SolidPotential[n+Np];
@@ -698,11 +697,11 @@ extern "C" void ScaLBL_D3Q19_AAodd_DFH(int *neighborList, double *dist, double *
m17 = Phi[nn]; m17 = Phi[nn];
nn = neighborList[n+16*Np]%Np; nn = neighborList[n+16*Np]%Np;
m18 = Phi[nn]; m18 = Phi[nn];
//............Compute the Color Gradient................................... //............Compute the Color Gradient...................................
nx = -(m1-m2+0.5*(m7-m8+m9-m10+m11-m12+m13-m14)); //............Compute the wn fluid Gradient...................................
ny = -(m3-m4+0.5*(m7-m8-m9+m10+m15-m16+m17-m18)); nx = (m1-m2+0.5*(m7-m8+m9-m10+m11-m12+m13-m14));
nz = -(m5-m6+0.5*(m11-m12-m13+m14+m15-m16-m17+m18)); ny = (m3-m4+0.5*(m7-m8-m9+m10+m15-m16+m17-m18));
nz = (m5-m6+0.5*(m11-m12-m13+m14+m15-m16-m17+m18));
// .... read the solid potential gradient..................... // .... read the solid potential gradient.....................
m1 = SolidPotential[n]; m1 = SolidPotential[n];
m2 = SolidPotential[n+Np]; m2 = SolidPotential[n+Np];
@@ -710,7 +709,6 @@ extern "C" void ScaLBL_D3Q19_AAodd_DFH(int *neighborList, double *dist, double *
nx += m1; nx += m1;
ny += m2; ny += m2;
nz += m3; nz += m3;
//...........Normalize the Color Gradient................................. //...........Normalize the Color Gradient.................................
C = sqrt(nx*nx+ny*ny+nz*nz); C = sqrt(nx*nx+ny*ny+nz*nz);
if (C==0.0) C=1.0; if (C==0.0) C=1.0;

8
gpu/dfh.cu
View File

@@ -1447,10 +1447,10 @@ __global__ void dvc_ScaLBL_D3Q19_Gradient_DFH(int *neighborList, double *Phi, do
m17 = Phi[nn]; m17 = Phi[nn];
nn = neighborList[n+16*Np]%Np; nn = neighborList[n+16*Np]%Np;
m18 = Phi[nn]; m18 = Phi[nn];
//............Compute the wn fluid Gradient...................................
nx = -(m1-m2+0.5*(m7-m8+m9-m10+m11-m12+m13-m14)); nx = (m1-m2+0.5*(m7-m8+m9-m10+m11-m12+m13-m14));
ny = -(m3-m4+0.5*(m7-m8-m9+m10+m15-m16+m17-m18)); ny = (m3-m4+0.5*(m7-m8-m9+m10+m15-m16+m17-m18));
nz = -(m5-m6+0.5*(m11-m12-m13+m14+m15-m16-m17+m18)); nz = (m5-m6+0.5*(m11-m12-m13+m14+m15-m16-m17+m18));
//............................................... //...............................................
//...Store the Color Gradient.................... //...Store the Color Gradient....................
ColorGrad[n] = nx; ColorGrad[n] = nx;