From bf0a4b05485a1ddd4d641387e91462c91548dd3b Mon Sep 17 00:00:00 2001
From: Anna Wellmann <a.wellmann@tu-braunschweig.de>
Date: Wed, 2 Aug 2023 12:31:31 +0000
Subject: [PATCH] Revert "Move the routine to set
kernelNeedsFluidNodeIndicesToRun to K17 kernel"
This was not working, as kernelNeedsFluidNodeIndicesToRun is used before
creating the kernel. I still don't like the current solution.
This reverts commit 273156bafaa6529ab827cf944ebd67acda3859c9.
---
.../Compressible/FluidFlow/K17/K17CompressibleNavierStokes.cu | 1 -
src/gpu/VirtualFluids_GPU/Parameter/Parameter.cpp | 2 ++
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/gpu/VirtualFluids_GPU/Kernel/Compressible/FluidFlow/K17/K17CompressibleNavierStokes.cu b/src/gpu/VirtualFluids_GPU/Kernel/Compressible/FluidFlow/K17/K17CompressibleNavierStokes.cu
index 438d544c6..fccd9bfd2 100644
--- a/src/gpu/VirtualFluids_GPU/Kernel/Compressible/FluidFlow/K17/K17CompressibleNavierStokes.cu
+++ b/src/gpu/VirtualFluids_GPU/Kernel/Compressible/FluidFlow/K17/K17CompressibleNavierStokes.cu
@@ -9,7 +9,6 @@
template<TurbulenceModel turbulenceModel>
std::shared_ptr< K17CompressibleNavierStokes<turbulenceModel> > K17CompressibleNavierStokes<turbulenceModel>::getNewInstance(std::shared_ptr<Parameter> para, int level)
{
- para->setKernelNeedsFluidNodeIndicesToRun(true);
return std::shared_ptr<K17CompressibleNavierStokes<turbulenceModel> >(new K17CompressibleNavierStokes<turbulenceModel>(para,level));
}
diff --git a/src/gpu/VirtualFluids_GPU/Parameter/Parameter.cpp b/src/gpu/VirtualFluids_GPU/Parameter/Parameter.cpp
index ef66076f9..0ae2161bb 100644
--- a/src/gpu/VirtualFluids_GPU/Parameter/Parameter.cpp
+++ b/src/gpu/VirtualFluids_GPU/Parameter/Parameter.cpp
@@ -1638,6 +1638,8 @@ void Parameter::setOutflowBoundaryNormalZ(std::string outflowNormalZ)
void Parameter::setMainKernel(std::string kernel)
{
this->mainKernel = kernel;
+ if ( kernel.find(vf::CollisionKernel::Compressible::K17CompressibleNavierStokes) != std::string::npos )
+ this->kernelNeedsFluidNodeIndicesToRun = true;
}
void Parameter::setMultiKernelOn(bool isOn)
{
--
GitLab