From 502c82b3b8308dd616d745b27f26887e3c1de42d Mon Sep 17 00:00:00 2001 From: James E McClure Date: Fri, 26 Jan 2018 10:28:58 -0500 Subject: [PATCH] Pressure refactor --- cpu/D3Q19.cpp | 2 +- gpu/D3Q19.cu | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cpu/D3Q19.cpp b/cpu/D3Q19.cpp index 32ba966f..08f4dccf 100644 --- a/cpu/D3Q19.cpp +++ b/cpu/D3Q19.cpp @@ -1053,7 +1053,7 @@ extern "C" void ScaLBL_D3Q19_Momentum(double *dist, double *vel, int Np) } } -extern "C" void ScaLBL_D3Q19_Pressure(const double *fq, double *Pressure, int N) +extern "C" void ScaLBL_D3Q19_Pressure(const double *dist, double *Pressure, int N) { int n; // distributions diff --git a/gpu/D3Q19.cu b/gpu/D3Q19.cu index f55db1bd..93ac0232 100644 --- a/gpu/D3Q19.cu +++ b/gpu/D3Q19.cu @@ -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 N) +__global__ void dvc_ScaLBL_D3Q19_Pressure(const double *dist, double *Pressure, int N) { int n; // distributions @@ -2344,7 +2344,7 @@ extern "C" void ScaLBL_D3Q19_Momentum(double *dist, double *vel, int Np){ } extern "C" void ScaLBL_D3Q19_Pressure(double *fq, double *Pressure, int Np){ - dvc_ScaLBL_D3Q19_Pressure<<< NBLOCKS,NTHREADS >>>(disteven, distodd, Pressure, Nx, Ny, Nz); + dvc_ScaLBL_D3Q19_Pressure<<< NBLOCKS,NTHREADS >>>(fq, Pressure, Np); } extern "C" void ScaLBL_D3Q19_Velocity_BC_z(double *disteven, double *distodd, double uz,int Nx, int Ny, int Nz){