From da57923558557053ca9f15c4c6601e4616110d02 Mon Sep 17 00:00:00 2001
From: Martin Schoenherr <m.schoenherr@tu-braunschweig.de>
Date: Fri, 28 Apr 2023 16:08:49 +0200
Subject: [PATCH] change K17 Kernel Types
---
apps/gpu/LBM/BoundaryLayer/BoundaryLayer.cpp | 2 +-
apps/gpu/LBM/WTG_RUB/WTG_RUB.cpp | 2 +-
.../Kernel/Utilities/KernelFactory/KernelFactoryImp.cpp | 8 ++++----
src/gpu/VirtualFluids_GPU/Kernel/Utilities/KernelTypes.h | 8 ++++----
src/gpu/VirtualFluids_GPU/Parameter/Parameter.cpp | 4 ++--
src/gpu/VirtualFluids_GPU/Parameter/Parameter.h | 2 +-
src/gpu/VirtualFluids_GPU/Parameter/ParameterTest.cpp | 8 ++++----
7 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/apps/gpu/LBM/BoundaryLayer/BoundaryLayer.cpp b/apps/gpu/LBM/BoundaryLayer/BoundaryLayer.cpp
index 1c5f8ac03..f084d5f8a 100644
--- a/apps/gpu/LBM/BoundaryLayer/BoundaryLayer.cpp
+++ b/apps/gpu/LBM/BoundaryLayer/BoundaryLayer.cpp
@@ -221,7 +221,7 @@ void multipleLevel(const std::string& configPath)
bool useStreams = (nProcs > 1 ? true: false);
// useStreams=false;
para->setUseStreams(useStreams);
- para->setMainKernel(vf::CollisionKernel::Compressible::CumulantK17);
+ para->setMainKernel(vf::CollisionKernel::Compressible::K17CompressibleNavierStokes);
para->setIsBodyForce( config.getValue<bool>("bodyForce") );
para->setTimestepStartOut(uint(tStartOut/dt) );
diff --git a/apps/gpu/LBM/WTG_RUB/WTG_RUB.cpp b/apps/gpu/LBM/WTG_RUB/WTG_RUB.cpp
index 7f4dc9207..de838d339 100644
--- a/apps/gpu/LBM/WTG_RUB/WTG_RUB.cpp
+++ b/apps/gpu/LBM/WTG_RUB/WTG_RUB.cpp
@@ -246,7 +246,7 @@ void multipleLevel(const std::string& configPath)
para->setVelocityRatio(velocity/ velocityLB);
- para->setMainKernel("CumulantK17CompChim"); // CumulantK17Unified, CumulantK17CompChim
+ para->setMainKernel("K17CompressibleNavierStokes"); // K17CompressibleNavierStokesUnified, K17CompressibleNavierStokesChimeraLegacy
para->setInitialCondition([&](real coordX, real coordY, real coordZ, real &rho, real &vx, real &vy, real &vz) {
rho = (real)0.0;
diff --git a/src/gpu/VirtualFluids_GPU/Kernel/Utilities/KernelFactory/KernelFactoryImp.cpp b/src/gpu/VirtualFluids_GPU/Kernel/Utilities/KernelFactory/KernelFactoryImp.cpp
index ee7010804..2de206b50 100644
--- a/src/gpu/VirtualFluids_GPU/Kernel/Utilities/KernelFactory/KernelFactoryImp.cpp
+++ b/src/gpu/VirtualFluids_GPU/Kernel/Utilities/KernelFactory/KernelFactoryImp.cpp
@@ -121,16 +121,16 @@ std::shared_ptr<Kernel> KernelFactoryImp::makeKernel(std::shared_ptr<Parameter>
} else if (kernel == CollisionKernel::Compressible::CumulantK15Unified) {
newKernel = std::make_shared<vf::gpu::CumulantK15Unified>(para, level);
checkStrategy = FluidFlowCompStrategy::getInstance();
- } else if (kernel == CollisionKernel::Compressible::CumulantK17Unified) {
+ } else if (kernel == CollisionKernel::Compressible::K17CompressibleNavierStokesUnified) {
newKernel = std::make_shared<vf::gpu::K17CompressibleNavierStokesUnified>(para, level);
checkStrategy = FluidFlowCompStrategy::getInstance();
- } else if (kernel == CollisionKernel::Compressible::CumulantK17Bulk) {
+ } else if (kernel == CollisionKernel::Compressible::K17CompressibleNavierStokesBulkViscosity) {
newKernel = K17CompressibleNavierStokesBulkViscosity::getNewInstance(para, level);
checkStrategy = FluidFlowCompStrategy::getInstance();
- } else if (kernel == CollisionKernel::Compressible::CumulantK17Chim) {
+ } else if (kernel == CollisionKernel::Compressible::K17CompressibleNavierStokesChimeraLegacy) {
newKernel = K17CompressibleNavierStokesChimeraLegacy::getNewInstance(para, level);
checkStrategy = FluidFlowCompStrategy::getInstance();
- } else if (kernel == CollisionKernel::Compressible::CumulantK17){
+ } else if (kernel == CollisionKernel::Compressible::K17CompressibleNavierStokes){
switch(para->getTurbulenceModel())
{
case TurbulenceModel::AMD:
diff --git a/src/gpu/VirtualFluids_GPU/Kernel/Utilities/KernelTypes.h b/src/gpu/VirtualFluids_GPU/Kernel/Utilities/KernelTypes.h
index f249c0bd5..e27e62f28 100644
--- a/src/gpu/VirtualFluids_GPU/Kernel/Utilities/KernelTypes.h
+++ b/src/gpu/VirtualFluids_GPU/Kernel/Utilities/KernelTypes.h
@@ -11,11 +11,11 @@ namespace vf::CollisionKernel::Compressible {
static const std::string CumulantClassic = "CumulantCompSP27";
static const std::string CumulantK15Unified = "CumulantK15Unified";
- static const std::string CumulantK17Unified = "CumulantK17Unified";
+ static const std::string K17CompressibleNavierStokesUnified = "K17CompressibleNavierStokesUnified";
- static const std::string CumulantK17Bulk = "CumulantK17BulkComp";
- static const std::string CumulantK17Chim = "CumulantK17CompChim";
- static const std::string CumulantK17 = "CumulantK17";
+ 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";
diff --git a/src/gpu/VirtualFluids_GPU/Parameter/Parameter.cpp b/src/gpu/VirtualFluids_GPU/Parameter/Parameter.cpp
index bf0d72448..cf8d1f15e 100644
--- a/src/gpu/VirtualFluids_GPU/Parameter/Parameter.cpp
+++ b/src/gpu/VirtualFluids_GPU/Parameter/Parameter.cpp
@@ -591,7 +591,7 @@ void Parameter::initLBMSimulationParameter()
void Parameter::checkParameterValidityCumulantK17() const
{
- if (this->mainKernel != "CumulantK17")
+ if (this->mainKernel != "K17CompressibleNavierStokes")
return;
const real viscosity = this->parH[maxlevel]->viscosity;
@@ -1630,7 +1630,7 @@ void Parameter::setOutflowBoundaryNormalZ(std::string outflowNormalZ)
void Parameter::setMainKernel(std::string kernel)
{
this->mainKernel = kernel;
- if ( kernel.find("CumulantK17") != std::string::npos )
+ if ( kernel.find("K17CompressibleNavierStokes") != std::string::npos )
this->kernelNeedsFluidNodeIndicesToRun = true;
}
void Parameter::setMultiKernelOn(bool isOn)
diff --git a/src/gpu/VirtualFluids_GPU/Parameter/Parameter.h b/src/gpu/VirtualFluids_GPU/Parameter/Parameter.h
index 5944cf66c..68d56a683 100644
--- a/src/gpu/VirtualFluids_GPU/Parameter/Parameter.h
+++ b/src/gpu/VirtualFluids_GPU/Parameter/Parameter.h
@@ -1085,7 +1085,7 @@ private:
// Kernel
- std::string mainKernel{ "CumulantK17CompChim" };
+ std::string mainKernel{ "K17CompressibleNavierStokes" };
bool multiKernelOn{ false };
std::vector<int> multiKernelLevel;
std::vector<std::string> multiKernel;
diff --git a/src/gpu/VirtualFluids_GPU/Parameter/ParameterTest.cpp b/src/gpu/VirtualFluids_GPU/Parameter/ParameterTest.cpp
index 6073a4d6d..5b2264cce 100644
--- a/src/gpu/VirtualFluids_GPU/Parameter/ParameterTest.cpp
+++ b/src/gpu/VirtualFluids_GPU/Parameter/ParameterTest.cpp
@@ -328,7 +328,7 @@ TEST_F(ParameterTestCumulantK17, CumulantK17_VelocityIsTooHigh_expectWarning)
{
para.setVelocityLB(0.11);
- para.setMainKernel("CumulantK17");
+ para.setMainKernel("K17CompressibleNavierStokes");
testing::internal::CaptureStdout();
para.initLBMSimulationParameter();
@@ -339,7 +339,7 @@ TEST_F(ParameterTestCumulantK17, CumulantK17_VelocityIsTooHigh_expectWarning)
TEST_F(ParameterTestCumulantK17, CumulantK17_VelocityIsOk_expectNoWarning)
{
para.setVelocityLB(0.09);
- para.setMainKernel("CumulantK17");
+ para.setMainKernel("K17CompressibleNavierStokes");
testing::internal::CaptureStdout();
para.initLBMSimulationParameter();
@@ -361,7 +361,7 @@ TEST_F(ParameterTestCumulantK17, NotCumulantK17_VelocityIsTooHigh_expectNoWarnin
TEST_F(ParameterTestCumulantK17, CumulantK17_ViscosityIsTooHigh_expectWarning)
{
para.setViscosityLB(0.024);
- para.setMainKernel("CumulantK17");
+ para.setMainKernel("K17CompressibleNavierStokes");
testing::internal::CaptureStdout();
para.initLBMSimulationParameter();
@@ -372,7 +372,7 @@ TEST_F(ParameterTestCumulantK17, CumulantK17_ViscosityIsTooHigh_expectWarning)
TEST_F(ParameterTestCumulantK17, CumulantK17_ViscosityIsOk_expectNoWarning)
{
para.setViscosityLB(0.023);
- para.setMainKernel("CumulantK17");
+ para.setMainKernel("K17CompressibleNavierStokes");
testing::internal::CaptureStdout();
para.initLBMSimulationParameter();
--
GitLab