From 2281fff48d7de5878324944b192a87234e6109cf Mon Sep 17 00:00:00 2001
From: Anna Wellmann <a.wellmann@tu-braunschweig.de>
Date: Tue, 2 May 2023 09:40:48 +0200
Subject: [PATCH] Use new kernel name in several apps
---
apps/gpu/LBM/ActuatorLine/ActuatorLine.cpp | 2 +-
apps/gpu/LBM/ChannelFlow/ChannelFlow.cpp | 2 +-
apps/gpu/LBM/DrivenCavity/DrivenCavity.cpp | 2 +-
apps/gpu/LBM/DrivenCavityMultiGPU/DrivenCavityMultiGPU.cpp | 2 +-
apps/gpu/LBM/DrivenCavityUniform/DrivenCavity.cpp | 2 +-
apps/gpu/LBM/MusselOyster/MusselOyster.cpp | 2 +-
apps/gpu/LBM/SphereScaling/SphereScaling.cpp | 2 +-
src/gpu/VirtualFluids_GPU/Kernel/Utilities/KernelTypes.h | 2 +-
8 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/apps/gpu/LBM/ActuatorLine/ActuatorLine.cpp b/apps/gpu/LBM/ActuatorLine/ActuatorLine.cpp
index 368e80a72..c1f979065 100644
--- a/apps/gpu/LBM/ActuatorLine/ActuatorLine.cpp
+++ b/apps/gpu/LBM/ActuatorLine/ActuatorLine.cpp
@@ -185,7 +185,7 @@ void multipleLevel(const std::string& configPath)
para->setViscosityLB(viscosityLB);
para->setVelocityRatio( dx / dt );
para->setViscosityRatio( dx*dx/dt );
- para->setMainKernel(vf::CollisionKernel::Compressible::CumulantK17);
+ para->setMainKernel(vf::CollisionKernel::Compressible::K17CompressibleNavierStokes);
para->setInitialCondition([&](real coordX, real coordY, real coordZ, real &rho, real &vx, real &vy, real &vz) {
rho = (real)0.0;
diff --git a/apps/gpu/LBM/ChannelFlow/ChannelFlow.cpp b/apps/gpu/LBM/ChannelFlow/ChannelFlow.cpp
index 1482adf27..76a5038a9 100644
--- a/apps/gpu/LBM/ChannelFlow/ChannelFlow.cpp
+++ b/apps/gpu/LBM/ChannelFlow/ChannelFlow.cpp
@@ -157,7 +157,7 @@ int main(int argc, char *argv[])
para->setTimestepEnd(timeStepEnd);
para->setOutputPrefix("ChannelFlow");
- para->setMainKernel(vf::CollisionKernel::Compressible::CumulantK17);
+ para->setMainKernel(vf::CollisionKernel::Compressible::K17CompressibleNavierStokes);
const uint generatePart = vf::gpu::MpiCommunicator::getInstance().getPID();
real overlap = (real)8.0 * dx;
diff --git a/apps/gpu/LBM/DrivenCavity/DrivenCavity.cpp b/apps/gpu/LBM/DrivenCavity/DrivenCavity.cpp
index 245d1c052..c27151b53 100644
--- a/apps/gpu/LBM/DrivenCavity/DrivenCavity.cpp
+++ b/apps/gpu/LBM/DrivenCavity/DrivenCavity.cpp
@@ -142,7 +142,7 @@ int main()
para->setTimestepOut(timeStepOut);
para->setTimestepEnd(timeStepEnd);
- para->setMainKernel(vf::CollisionKernel::Compressible::CumulantK17);
+ para->setMainKernel(vf::CollisionKernel::Compressible::K17CompressibleNavierStokes);
//////////////////////////////////////////////////////////////////////////
// set boundary conditions
diff --git a/apps/gpu/LBM/DrivenCavityMultiGPU/DrivenCavityMultiGPU.cpp b/apps/gpu/LBM/DrivenCavityMultiGPU/DrivenCavityMultiGPU.cpp
index d7f6dace7..ba6711fe9 100755
--- a/apps/gpu/LBM/DrivenCavityMultiGPU/DrivenCavityMultiGPU.cpp
+++ b/apps/gpu/LBM/DrivenCavityMultiGPU/DrivenCavityMultiGPU.cpp
@@ -115,7 +115,7 @@ void runVirtualFluids(const vf::basics::ConfigurationFile& config)
para->setPrintFiles(true);
std::cout << "Write result files to " << para->getFName() << std::endl;
- para->setMainKernel(vf::CollisionKernel::Compressible::CumulantK17);
+ para->setMainKernel(vf::CollisionKernel::Compressible::K17CompressibleNavierStokes);
scalingFactory.setScalingFactory(GridScalingFactory::GridScaling::ScaleCompressible);
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/apps/gpu/LBM/DrivenCavityUniform/DrivenCavity.cpp b/apps/gpu/LBM/DrivenCavityUniform/DrivenCavity.cpp
index 05c164ea8..a0dc2545b 100644
--- a/apps/gpu/LBM/DrivenCavityUniform/DrivenCavity.cpp
+++ b/apps/gpu/LBM/DrivenCavityUniform/DrivenCavity.cpp
@@ -145,7 +145,7 @@ int main()
para->setTimestepOut(timeStepOut);
para->setTimestepEnd(timeStepEnd);
- para->setMainKernel(vf::CollisionKernel::Compressible::CumulantK17);
+ para->setMainKernel(vf::CollisionKernel::Compressible::K17CompressibleNavierStokes);
//////////////////////////////////////////////////////////////////////////
// set boundary conditions
diff --git a/apps/gpu/LBM/MusselOyster/MusselOyster.cpp b/apps/gpu/LBM/MusselOyster/MusselOyster.cpp
index 1cff9cf26..c6b11339f 100644
--- a/apps/gpu/LBM/MusselOyster/MusselOyster.cpp
+++ b/apps/gpu/LBM/MusselOyster/MusselOyster.cpp
@@ -151,7 +151,7 @@ void runVirtualFluids(const vf::basics::ConfigurationFile& config)
std::cout << "Write result files to " << para->getFName() << std::endl;
para->setUseStreams(useStreams);
- para->setMainKernel(vf::CollisionKernel::Compressible::CumulantK17);
+ para->setMainKernel(vf::CollisionKernel::Compressible::K17CompressibleNavierStokes);
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/apps/gpu/LBM/SphereScaling/SphereScaling.cpp b/apps/gpu/LBM/SphereScaling/SphereScaling.cpp
index e4291f81a..c604fb670 100755
--- a/apps/gpu/LBM/SphereScaling/SphereScaling.cpp
+++ b/apps/gpu/LBM/SphereScaling/SphereScaling.cpp
@@ -124,7 +124,7 @@ void runVirtualFluids(const vf::basics::ConfigurationFile& config)
else
para->setMaxLevel(1);
- para->setMainKernel(vf::CollisionKernel::Compressible::CumulantK17);
+ para->setMainKernel(vf::CollisionKernel::Compressible::K17CompressibleNavierStokes);
scalingFactory.setScalingFactory(GridScalingFactory::GridScaling::ScaleCompressible);
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/gpu/VirtualFluids_GPU/Kernel/Utilities/KernelTypes.h b/src/gpu/VirtualFluids_GPU/Kernel/Utilities/KernelTypes.h
index e27e62f28..ebc2d94da 100644
--- a/src/gpu/VirtualFluids_GPU/Kernel/Utilities/KernelTypes.h
+++ b/src/gpu/VirtualFluids_GPU/Kernel/Utilities/KernelTypes.h
@@ -13,9 +13,9 @@ namespace vf::CollisionKernel::Compressible {
static const std::string CumulantK15Unified = "CumulantK15Unified";
static const std::string K17CompressibleNavierStokesUnified = "K17CompressibleNavierStokesUnified";
+ static const std::string K17CompressibleNavierStokes = "K17CompressibleNavierStokes";
static const std::string K17CompressibleNavierStokesBulkViscosity = "K17CompressibleNavierStokesBulkViscosity";
static const std::string K17CompressibleNavierStokesChimeraLegacy = "K17CompressibleNavierStokesChimeraLegacy";
- static const std::string K17CompressibleNavierStokes = "K17CompressibleNavierStokes";
static const std::string CumulantAll4SP27 = "CumulantAll4CompSP27";
static const std::string CumulantK18 = "CumulantK18Comp";
--
GitLab