Skip to content
Snippets Groups Projects
Commit e43c9bf2 authored by schoen's avatar schoen
Browse files

deleted a not used kernel an fixed a bug

parent c27947a6
No related branches found
No related tags found
1 merge request!51Open source
......@@ -125,19 +125,6 @@ void calcAD(SPtr<Parameter> para)
para->getParD()->forcing,
para->getParD()->isEvenTimestep);
/*CentralMomentsAdvectionDiffusionDeviceKernel(
para->getParD()->numberofthreads,
para->getParD()->omegaD,
para->getParD()->typeOfGridNode,
para->getParD()->neighborX,
para->getParD()->neighborY,
para->getParD()->neighborZ,
para->getParD()->distributions.f[0],
para->getParD()->distributionsAD.f[0],
para->getParD()->numberOfNodes,
para->getParD()->forcing,
para->getParD()->isEvenTimestep);*/
if (para->getParD()->numberOfSlipBCnodes > 1) {
ADSlipVelDevComp(
para->getParD()->numberofthreads,
......
......@@ -133,21 +133,6 @@ extern "C" void FactorizedCentralMomentsAdvectionDiffusionDeviceKernel(
real* forces,
bool isEvenTimestep);
//////////////////////////////////////////////////////////////////////////
//! \brief Advection Diffusion kernel
extern "C" void CentralMomentsAdvectionDiffusionDeviceKernel(
uint numberOfThreads,
real omegaD,
uint* typeOfGridNode,
uint* neighborX,
uint* neighborY,
uint* neighborZ,
real* distributions,
real* distributionsAD,
int size_Mat,
real* forces,
bool isEvenTimestep);
//////////////////////////////////////////////////////////////////////////
//! \brief initialize the Advection Diffusion distribution functions
extern "C" void InitADdevice(
......
......@@ -129,20 +129,6 @@ extern "C" __global__ void Factorized_Central_Moments_Advection_Diffusion_Device
real* forces,
bool isEvenTimestep);
//////////////////////////////////////////////////////////////////////////
//! \brief \ref Advection_Diffusion_Device_Kernel : central moments for Advection Diffusion Equation
extern "C" __global__ void Central_Moments_Advection_Diffusion_Device_Kernel(
real omegaD,
uint* typeOfGridNode,
uint* neighborX,
uint* neighborY,
uint* neighborZ,
real* distributions,
real* distributionsAD,
int size_Mat,
real* forces,
bool isEvenTimestep);
//////////////////////////////////////////////////////////////////////////
//! \brief \ref InitAD : device function to initialize the distributionsAD
extern "C" __global__ void InitAD(
......
......@@ -244,37 +244,6 @@ extern "C" void FactorizedCentralMomentsAdvectionDiffusionDeviceKernel(
getLastCudaError("Factorized_Central_Moments_Advection_Diffusion_Device_Kernel execution failed");
}
//////////////////////////////////////////////////////////////////////////
extern "C" void CentralMomentsAdvectionDiffusionDeviceKernel(
uint numberOfThreads,
real omegaD,
uint* typeOfGridNode,
uint* neighborX,
uint* neighborY,
uint* neighborZ,
real* distributions,
real* distributionsAD,
int size_Mat,
real* forces,
bool isEvenTimestep)
{
int Grid = (size_Mat / numberOfThreads) + 1;
dim3 grid(Grid, 1, 1);
dim3 threads(numberOfThreads, 1, 1);
Central_Moments_Advection_Diffusion_Device_Kernel <<< grid, threads >>> (
omegaD,
typeOfGridNode,
neighborX,
neighborY,
neighborZ,
distributions,
distributionsAD,
size_Mat,
forces,
isEvenTimestep);
getLastCudaError("Central_Moments_Advection_Diffusion_Device_Kernel execution failed");
}
//////////////////////////////////////////////////////////////////////////
extern "C" void InitADdevice(
uint numberOfThreads,
uint* neighborX,
......
......@@ -341,12 +341,12 @@ std::function<void(real, real, real, real&, real&, real&, real&)>& Parameter::ge
}
// initial condition concentration
void Parameter::setInitialConditionAD(std::function<void(real, real, real, real&, real)> initialConditionAD)
void Parameter::setInitialConditionAD(std::function<void(real, real, real, real&)> initialConditionAD)
{
this->initialConditionAD = initialConditionAD;
}
std::function<void(real, real, real, real&, real)>& Parameter::getInitialConditionAD()
std::function<void(real, real, real, real&)>& Parameter::getInitialConditionAD()
{
return this->initialConditionAD;
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment