From bc2473f1b491fd4253b1d1e1356213d82ea65b73 Mon Sep 17 00:00:00 2001
From: HenrikAsmuth <henrik.asmuth@geo.uu.se>
Date: Fri, 30 Sep 2022 12:18:04 +0200
Subject: [PATCH] further small fixes and clean up
---
.../CumulantK17chimStream/CumulantK17CompChimStream.cu | 2 +-
.../CumulantK17chim/TurbulentViscosityCumulantK17CompChim.cu | 3 ++-
.../TurbulentViscosityCumulantK17CompChim_Device.cu | 4 +---
3 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK17chimStream/CumulantK17CompChimStream.cu b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK17chimStream/CumulantK17CompChimStream.cu
index 6fae9f6d4..958ef59fb 100644
--- a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK17chimStream/CumulantK17CompChimStream.cu
+++ b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK17chimStream/CumulantK17CompChimStream.cu
@@ -33,7 +33,7 @@ void CumulantK17CompChimStream::run()
void CumulantK17CompChimStream::runOnIndices(const unsigned int *indices, unsigned int size_indices, int streamIndex)
{
cudaStream_t stream = (streamIndex == -1) ? CU_STREAM_LEGACY : para->getStreamManager()->getStream(streamIndex);
-
+
LB_Kernel_CumulantK17CompChimStream<<< cudaGrid.grid, cudaGrid.threads, 0, stream>>>(
para->getParD(level)->omega,
para->getParD(level)->neighborX,
diff --git a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/TurbulentViscosityKernels/FluidFlow/Compressible/CumulantK17chim/TurbulentViscosityCumulantK17CompChim.cu b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/TurbulentViscosityKernels/FluidFlow/Compressible/CumulantK17chim/TurbulentViscosityCumulantK17CompChim.cu
index 2af4dfb83..2ff397220 100644
--- a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/TurbulentViscosityKernels/FluidFlow/Compressible/CumulantK17chim/TurbulentViscosityCumulantK17CompChim.cu
+++ b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/TurbulentViscosityKernels/FluidFlow/Compressible/CumulantK17chim/TurbulentViscosityCumulantK17CompChim.cu
@@ -46,7 +46,7 @@ template<TurbulenceModel turbulenceModel>
void TurbulentViscosityCumulantK17CompChim<turbulenceModel>::runOnIndices(const unsigned int *indices, unsigned int size_indices, int streamIndex)
{
cudaStream_t stream = (streamIndex == -1) ? CU_STREAM_LEGACY : para->getStreamManager()->getStream(streamIndex);
-
+
LB_Kernel_TurbulentViscosityCumulantK17CompChim < turbulenceModel > <<< cudaGrid.grid, cudaGrid.threads, 0, stream >>>( para->getParD(level)->omega,
para->getParD(level)->typeOfGridNode, para->getParD(level)->neighborX,
para->getParD(level)->neighborY,
@@ -83,6 +83,7 @@ TurbulentViscosityCumulantK17CompChim<turbulenceModel>::TurbulentViscosityCumula
myKernelGroup = BasicKernel;
+ this->cudaGrid = vf::cuda::CudaGrid(para->getParD(level)->numberofthreads, para->getParD(level)->numberOfNodes);
this->kernelUsesFluidNodeIndices = true;
VF_LOG_INFO("Using turbulence model: {}", turbulenceModel);
diff --git a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/TurbulentViscosityKernels/FluidFlow/Compressible/CumulantK17chim/TurbulentViscosityCumulantK17CompChim_Device.cu b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/TurbulentViscosityKernels/FluidFlow/Compressible/CumulantK17chim/TurbulentViscosityCumulantK17CompChim_Device.cu
index 3d8a9f29e..20bc507e5 100644
--- a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/TurbulentViscosityKernels/FluidFlow/Compressible/CumulantK17chim/TurbulentViscosityCumulantK17CompChim_Device.cu
+++ b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/TurbulentViscosityKernels/FluidFlow/Compressible/CumulantK17chim/TurbulentViscosityCumulantK17CompChim_Device.cu
@@ -90,13 +90,11 @@ __global__ void LB_Kernel_TurbulentViscosityCumulantK17CompChim(
//! - Get node index coordinates from threadIdx, blockIdx, blockDim and gridDim.
//!
const unsigned kThread = vf::gpu::getNodeIndex();
-
+
//////////////////////////////////////////////////////////////////////////
// run for all indices in size_Mat and fluid nodes
if (kThread >= numberOfFluidNodes)
return;
- // if ((k_000 < size_Mat) && (typeOfGridNode[k_000] == GEO_FLUID))
- // return;
////////////////////////////////////////////////////////////////////////////////
//! - Get the node index from the array containing all indices of fluid nodes
//!
--
GitLab