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

Refactoring MassColorCollideD3Q7 (cpu/gpu)

Browse Source
This commit is contained in:
James E McClure
2015-06-24 19:11:50 -04:00
parent fe07dfc2ad
commit f96e8b8a5c
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cpu/Color.cpp
View File

@@ -1118,7 +1118,7 @@ extern "C" void MassColorCollideD3Q7(char *ID, double *A_even, double *A_odd, do
for (n=0; n<N; n++){
id = ID[n];
if (id > 0 ){
if (id != 0 ){
//.....Load the Color gradient.........
nx = ColorGrad[n];

9
gpu/Color.cu
View File

@@ -703,7 +703,9 @@ __global__ void dvc_ColorCollideOpt( char *ID, double *disteven, double *distod
for (int s=0; s<S; s++){
//........Get 1-D index for this thread....................
n = S*blockIdx.x*blockDim.x + s*blockDim.x + threadIdx.x;
if (n<N && ID[n] > 0){
if (n<N)
id = ID[n];
if ( id != 0){
//.......Back out the 3-D indices for node n..............
k = n/(Nx*Ny);
@@ -1078,7 +1080,8 @@ __global__ void dvc_ColorCollideOpt( char *ID, double *disteven, double *distod
Velocity[N+n] = jy;
Velocity[2*N+n] = jz;
//***************************************************************
} // check if n is in the solid
} }// check if n is in the solid
} // loop over n
}
@@ -1101,7 +1104,7 @@ __global__ void dvc_MassColorCollideD3Q7(char *ID, double *A_even, double *A_od
if (n<N)
id = ID[n];
if ( id > 0){
if ( id != 0){
//.....Load the Color gradient.........
nx = ColorGrad[n];