Pressure refactor

This commit is contained in:
James E McClure 2018-01-26 10:26:18 -05:00
parent 47f5cf228c
commit 73dfa1fb7c
2 changed files with 4 additions and 4 deletions

View File

@ -1053,14 +1053,14 @@ extern "C" void ScaLBL_D3Q19_Momentum(double *dist, double *vel, int Np)
} }
} }
extern "C" void ScaLBL_D3Q19_Pressure(const double *fq, double *Pressure, int Np) extern "C" void ScaLBL_D3Q19_Pressure(const double *fq, double *Pressure, int N)
{ {
int n; int n;
// distributions // distributions
double f0,f1,f2,f3,f4,f5,f6,f7,f8,f9; double f0,f1,f2,f3,f4,f5,f6,f7,f8,f9;
double f10,f11,f12,f13,f14,f15,f16,f17,f18; double f10,f11,f12,f13,f14,f15,f16,f17,f18;
for (n=0; n<Np; n++){ for (n=0; n<N; n++){
//........................................................................ //........................................................................
// Registers to store the distributions // Registers to store the distributions
//........................................................................ //........................................................................

View File

@ -1552,7 +1552,7 @@ __global__ void dvc_ScaLBL_D3Q19_Momentum(double *dist, double *vel, int N)
} }
} }
__global__ void dvc_ScaLBL_D3Q19_Pressure(const double *fq, double *Pressure, int Np) __global__ void dvc_ScaLBL_D3Q19_Pressure(const double *fq, double *Pressure, int N)
{ {
int n; int n;
// distributions // distributions
@ -1563,7 +1563,7 @@ __global__ void dvc_ScaLBL_D3Q19_Pressure(const double *fq, double *Pressure, i
for (int s=0; s<S; s++){ for (int s=0; s<S; s++){
//........Get 1-D index for this thread.................... //........Get 1-D index for this thread....................
n = S*blockIdx.x*blockDim.x + s*blockDim.x + threadIdx.x; n = S*blockIdx.x*blockDim.x + s*blockDim.x + threadIdx.x;
if (n<Np){ //....................................................................... if (n<N){ //.......................................................................
// Registers to store the distributions // Registers to store the distributions
//........................................................................ //........................................................................
//........................................................................ //........................................................................