diff --git a/apps/cpu/AcousticPulse/ap.cpp b/apps/cpu/AcousticPulse/ap.cpp index 68f40b34324ec2c79251855309c810cb3188713d..23674d6b89fe692f9fca10ee5f111b31834af01f 100644 --- a/apps/cpu/AcousticPulse/ap.cpp +++ b/apps/cpu/AcousticPulse/ap.cpp @@ -160,8 +160,8 @@ void run() } double bulckViscosity = 10.0*nuLB; - SPtr<LBMKernel> kernel = SPtr<LBMKernel>(new CompressibleCumulant4thOrderViscosityLBMKernel()); - //dynamicPointerCast<CompressibleCumulant4thOrderViscosityLBMKernel>(kernel)->setBulkViscosity(bulckViscosity); + SPtr<LBMKernel> kernel = SPtr<LBMKernel>(new K17CompressibleNavierStokes()); + //dynamicPointerCast<K17CompressibleNavierStokes>(kernel)->setBulkViscosity(bulckViscosity); //SPtr<LBMKernel> kernel = SPtr<LBMKernel>(new K15CompressibleNavierStokes()); //dynamicPointerCast<K15CompressibleNavierStokes>(kernel)->setBulkOmegaToOmega(true); // diff --git a/apps/cpu/BoxBenchmark/bb.cpp b/apps/cpu/BoxBenchmark/bb.cpp index 4ad5dcc763f697e9c3a37645afe10758d119cb54..161ab3cf404456a73f08d2862abaa62754a5af3f 100644 --- a/apps/cpu/BoxBenchmark/bb.cpp +++ b/apps/cpu/BoxBenchmark/bb.cpp @@ -161,7 +161,7 @@ void run(string configname) SPtr<LBMKernel> kernel; //kernel = SPtr<LBMKernel>(new InK15CompressibleNavierStokes()); - kernel = SPtr<LBMKernel>(new CompressibleCumulant4thOrderViscosityLBMKernel()); + kernel = SPtr<LBMKernel>(new K17CompressibleNavierStokes()); SPtr<BCProcessor> bcProc(new BCProcessor()); kernel->setBCProcessor(bcProc); kernel->setForcingX1(0.1); diff --git a/apps/cpu/LaminarTubeFlow/ltf.cpp b/apps/cpu/LaminarTubeFlow/ltf.cpp index f9c7a2571852426903c4e956696bfea71baea27e..a2eb39dadcab7d9761a3c6c3a1ebf5d2fd1167df 100644 --- a/apps/cpu/LaminarTubeFlow/ltf.cpp +++ b/apps/cpu/LaminarTubeFlow/ltf.cpp @@ -99,9 +99,9 @@ void run(string configname) SPtr<BCSet> bcProc; bcProc = SPtr<BCSet>(new BCSet()); - //SPtr<LBMKernel> kernel = SPtr<LBMKernel>(new CompressibleCumulant4thOrderViscosityLBMKernel()); + //SPtr<LBMKernel> kernel = SPtr<LBMKernel>(new K17CompressibleNavierStokes()); //double bulckViscosity = 3700*nuLB; - //dynamicPointerCast<CompressibleCumulant4thOrderViscosityLBMKernel>(kernel)->setBulkViscosity(bulckViscosity); + //dynamicPointerCast<K17CompressibleNavierStokes>(kernel)->setBulkViscosity(bulckViscosity); SPtr<LBMKernel> kernel = SPtr<LBMKernel>(new K17CompressibleNavierStokes()); kernel->setBCSet(bcProc); kernel->setBCSet(bcProc); diff --git a/apps/cpu/poiseuille_example/poiseuille.cpp b/apps/cpu/poiseuille_example/poiseuille.cpp index d2e2c178e247f69d1629374661da9746ad8542bc..459d937f201788451dba4b32db8cfb2b4268eb58 100644 --- a/apps/cpu/poiseuille_example/poiseuille.cpp +++ b/apps/cpu/poiseuille_example/poiseuille.cpp @@ -26,7 +26,7 @@ int main() const auto writer = WbWriterVtkXmlBinary::getInstance(); const auto communicator = vf::parallel::MPICommunicator::getInstance(); - const auto kernel = std::make_shared<CompressibleCumulant4thOrderViscosityLBMKernel>(); + const auto kernel = std::make_shared<K17CompressibleNavierStokes>(); kernel->setBCProcessor(std::make_shared<BCProcessor>()); kernel->setForcingX1(1e-6 * lbmUnitConverter->getFactorForceWToLb()); diff --git a/src/cpu/simulationconfig/KernelFactory.cpp b/src/cpu/simulationconfig/KernelFactory.cpp index 87e6912bf974a97278965480c293f5408ee475fa..27bd3a3d07077bc5a8e79027a6c9cee626bbae2b 100644 --- a/src/cpu/simulationconfig/KernelFactory.cpp +++ b/src/cpu/simulationconfig/KernelFactory.cpp @@ -1,5 +1,5 @@ #include <LBM/LBMKernel.h> -#include <LBM/CompressibleCumulant4thOrderViscosityLBMKernel.h> +#include <LBM/K17CompressibleNavierStokes.h> #include <LBM/BGKLBMKernel.h> #include <simulationconfig/D3Q27LBMSystem.h> #include "simulationconfig/KernelFactory.h" @@ -10,7 +10,7 @@ std::shared_ptr<LBMKernel> KernelFactory::makeKernel(KernelType kernelType) case BGK: return std::shared_ptr<LBMKernel>(new BGKLBMKernel()); case COMPRESSIBLE_CUMULANT_4TH_ORDER_VISCOSITY: - return std::shared_ptr<LBMKernel>(new CompressibleCumulant4thOrderViscosityLBMKernel()); + return std::shared_ptr<LBMKernel>(new K17CompressibleNavierStokes()); default: throw std::logic_error("No such kernel type"); }