From d83ead52fbb06e930455aa1a21b19ac2a181222e Mon Sep 17 00:00:00 2001
From: Hkorb <henry.korb@geo.uu.se>
Date: Fri, 17 Sep 2021 16:03:02 +0200
Subject: [PATCH] bugfix in probe: wrong number of threads in visit
---
src/gpu/VirtualFluids_GPU/Visitor/ActuatorLine.cu | 2 +-
src/gpu/VirtualFluids_GPU/Visitor/Probe.cu | 6 ++----
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/gpu/VirtualFluids_GPU/Visitor/ActuatorLine.cu b/src/gpu/VirtualFluids_GPU/Visitor/ActuatorLine.cu
index e69d91d9c..7996e81d8 100644
--- a/src/gpu/VirtualFluids_GPU/Visitor/ActuatorLine.cu
+++ b/src/gpu/VirtualFluids_GPU/Visitor/ActuatorLine.cu
@@ -181,7 +181,7 @@ void ActuatorLine::visit(Parameter* para, CudaMemoryManager* cudaManager, int le
cudaManager->cudaCopyBladeCoordsHtoD(this);
- unsigned int numberOfThreads = 128;
+ uint numberOfThreads = 128;
vf::gpu::CudaGrid bladeGrid = vf::gpu::CudaGrid(numberOfThreads, this->numberOfNodes);
interpolateVelocities<<< bladeGrid.grid, bladeGrid.threads >>>(
diff --git a/src/gpu/VirtualFluids_GPU/Visitor/Probe.cu b/src/gpu/VirtualFluids_GPU/Visitor/Probe.cu
index b4395b98b..7cd1ad872 100644
--- a/src/gpu/VirtualFluids_GPU/Visitor/Probe.cu
+++ b/src/gpu/VirtualFluids_GPU/Visitor/Probe.cu
@@ -109,7 +109,7 @@ void Probe::init(Parameter* para, GridProvider* gridProvider, CudaMemoryManager*
std::vector<real> pointCoordsY_level;
std::vector<real> pointCoordsZ_level;
real dx = abs(para->getParH(level)->coordX_SP[1]-para->getParH(level)->coordX_SP[para->getParH(level)->neighborX_SP[1]]);
- for(uint j=0; j<para->getParH(level)->size_Mat_SP; j++ )
+ for(uint j=1; j<para->getParH(level)->size_Mat_SP; j++ )
{
for(uint point=0; point<this->nProbePoints; point++)
{
@@ -190,7 +190,7 @@ void Probe::visit(Parameter* para, CudaMemoryManager* cudaManager, int level, un
{
ProbeStruct* probeStruct = this->getProbeStruct(level);
- vf::gpu::CudaGrid grid = vf::gpu::CudaGrid(probeStruct->nPoints, 128);
+ vf::gpu::CudaGrid grid = vf::gpu::CudaGrid(128, probeStruct->nPoints);
interpQuantities<<<grid.grid, grid.threads>>>( probeStruct->pointIndicesD, probeStruct->nPoints,
probeStruct->distXD, probeStruct->distYD, probeStruct->distZD,
@@ -202,8 +202,6 @@ void Probe::visit(Parameter* para, CudaMemoryManager* cudaManager, int level, un
cudaManager->cudaCopyProbeQuantityArrayDtoH(this, level);
this->write(para, level, t);
}
-
-
}
void Probe::free(Parameter* para, CudaMemoryManager* cudaManager)
--
GitLab