diff --git a/apps/gpu/TGV_3D_GridRef/TGV_3D_GridRef.cpp b/apps/gpu/TGV_3D_GridRef/TGV_3D_GridRef.cpp index 83247df03e783395adc0ee3e04abe46e826166e5..9de9f861c705ed1256c132ee6d51edb63ab1f0af 100644 --- a/apps/gpu/TGV_3D_GridRef/TGV_3D_GridRef.cpp +++ b/apps/gpu/TGV_3D_GridRef/TGV_3D_GridRef.cpp @@ -77,6 +77,7 @@ #include "VirtualFluids_GPU/LBM/Simulation.h" #include "VirtualFluids_GPU/Output/FileWriter.h" #include "VirtualFluids_GPU/Parameter/Parameter.h" +#include "VirtualFluids_GPU/Kernel/Utilities/KernelTypes.h" //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// @@ -122,7 +123,7 @@ uint gpuIndex = 0; bool useLimiter = false; bool useWale = false; -std::string kernel( "CumulantK17CompChimRedesigned" ); +std::string kernel(vf::CollisionKernel::Compressible::K17CompressibleNavierStokes); std::string path("D:/out/TGV_3D/"); //MOLLOK diff --git a/apps/gpu/WTG_RUB/WTG_RUB.cpp b/apps/gpu/WTG_RUB/WTG_RUB.cpp index f9c50de1a7f8235ce69a6ed3ea170b5f53d632bb..dd585de69d0525d576b07dc3deeca56e17f3dea3 100644 --- a/apps/gpu/WTG_RUB/WTG_RUB.cpp +++ b/apps/gpu/WTG_RUB/WTG_RUB.cpp @@ -73,6 +73,7 @@ #include "VirtualFluids_GPU/Output/FileWriter.h" #include "VirtualFluids_GPU/GPU/CudaMemoryManager.h" #include "VirtualFluids_GPU/Factories/BoundaryConditionFactory.h" +#include "VirtualFluids_GPU/Kernel/Utilities/KernelTypes.h" #include <parallel/MPICommunicator.h> @@ -242,7 +243,7 @@ void multipleLevel(const std::string& configPath) para->setVelocityRatio(velocity/ velocityLB); - para->setMainKernel("K17CompressibleNavierStokes"); // K17CompressibleNavierStokesUnified, K17CompressibleNavierStokesChimeraLegacy + 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/src/gpu/VirtualFluids_GPU/Parameter/Parameter.cpp b/src/gpu/VirtualFluids_GPU/Parameter/Parameter.cpp index 4df626875ad522288325a1a9acd034ca85a56ea3..0ae2161bb71ff3a6827369842b893d82bec56c8b 100644 --- a/src/gpu/VirtualFluids_GPU/Parameter/Parameter.cpp +++ b/src/gpu/VirtualFluids_GPU/Parameter/Parameter.cpp @@ -599,7 +599,7 @@ void Parameter::initLBMSimulationParameter() void Parameter::checkParameterValidityCumulantK17() const { - if (this->mainKernel != "K17CompressibleNavierStokes") + if (this->mainKernel != vf::CollisionKernel::Compressible::K17CompressibleNavierStokes) return; const real viscosity = this->parH[maxlevel]->viscosity; @@ -1638,7 +1638,7 @@ void Parameter::setOutflowBoundaryNormalZ(std::string outflowNormalZ) void Parameter::setMainKernel(std::string kernel) { this->mainKernel = kernel; - if ( kernel.find("K17CompressibleNavierStokes") != std::string::npos ) + if ( kernel.find(vf::CollisionKernel::Compressible::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 005236788b7670e8a1a8eb5ac021918b11eee86e..f7cb65457babc26db320d72290c4b14efc0355b0 100644 --- a/src/gpu/VirtualFluids_GPU/Parameter/Parameter.h +++ b/src/gpu/VirtualFluids_GPU/Parameter/Parameter.h @@ -43,6 +43,7 @@ #include "LBM/LB.h" #include "PreCollisionInteractor/PreCollisionInteractor.h" #include "TurbulenceModels/TurbulenceModelFactory.h" +#include "VirtualFluids_GPU/Kernel/Utilities/KernelTypes.h" #include "VirtualFluids_GPU_export.h" @@ -1085,7 +1086,7 @@ private: // Kernel - std::string mainKernel{ "K17CompressibleNavierStokes" }; + std::string mainKernel{ vf::CollisionKernel::Compressible::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 65ee97243d9f1df69d1592419a707a6667d91fcf..47272ebde266be1279273541849e6cf117af951d 100644 --- a/src/gpu/VirtualFluids_GPU/Parameter/ParameterTest.cpp +++ b/src/gpu/VirtualFluids_GPU/Parameter/ParameterTest.cpp @@ -14,6 +14,7 @@ #include "Factories/GridScalingFactory.h" #include "GPU/CudaMemoryManager.h" #include "gpu/GridGenerator/grid/GridBuilder/MultipleGridBuilder.h" +#include "VirtualFluids_GPU/Kernel/Utilities/KernelTypes.h" #include <parallel/Communicator.h> @@ -271,7 +272,7 @@ TEST_F(ParameterTestCumulantK17, CumulantK17_VelocityIsTooHigh_expectWarning) { para.setVelocityLB(0.11); - para.setMainKernel("K17CompressibleNavierStokes"); + para.setMainKernel(vf::CollisionKernel::Compressible::K17CompressibleNavierStokes); testing::internal::CaptureStdout(); para.initLBMSimulationParameter();