diff --git a/apps/gpu/LBM/ActuatorLine/ActuatorLine.cpp b/apps/gpu/LBM/ActuatorLine/ActuatorLine.cpp index 368e80a726c1f6e75bd5300ad3de60fd840ba119..c1f9790652a796f9e8d84d642e7dd754f690f607 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 1482adf275da6dabae7bdde7647ac374a0d66bb1..76a5038a9a5cfc63383a558eba9658eaf86c6b21 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 245d1c052c909cef7c1ab948ca55d104419fa8cd..c27151b530280d285eb11975ff234506173653be 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 d7f6dace74a07ba8477085b94f2146cf4500d7d1..ba6711fe93e50b9511b19c4f217a076b12fe1e61 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 05c164ea82790c4a26c5c65538d944f46d1c969c..a0dc2545ba52fec2b8b3f636ec027c3ce3f184ae 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 1cff9cf2675fbe9d42f4765c6c9e1bcea4bd7065..c6b11339f78ebeb7d5ac12488c23df7c68b7fda2 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 e4291f81a288528397246f2fb56f95aa3c04ac0c..c604fb670e3319bc589bc3c19fda95d4318307f9 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 e27e62f28945efd22353259a20cdebed6b468f4b..ebc2d94dab0c8d846c0c785b28e0b3beb175bb9d 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";