diff --git a/apps/gpu/ActuatorLine/ActuatorLine.cpp b/apps/gpu/ActuatorLine/ActuatorLine.cpp
index 4598244a12c3abf7f9211c242877a198f7799922..5e43a552205b139ce14b2b8e1e25022a38f4de7a 100644
--- a/apps/gpu/ActuatorLine/ActuatorLine.cpp
+++ b/apps/gpu/ActuatorLine/ActuatorLine.cpp
@@ -178,7 +178,7 @@ void multipleLevel(const std::string& configPath)
para->setViscosityLB(viscosityLB);
para->setVelocityRatio( dx / dt );
para->setViscosityRatio( dx*dx/dt );
- para->configureMainKernel(vf::CollisionKernel::Compressible::K17CompressibleNavierStokes);
+ para->configureMainKernel(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/BoundaryLayer/BoundaryLayer.cpp b/apps/gpu/BoundaryLayer/BoundaryLayer.cpp
index d8b3b54b22045214c70dde4c9c2ded711ab9cf73..436ced919ee86ca5f9abab1285360633d9f4f423 100644
--- a/apps/gpu/BoundaryLayer/BoundaryLayer.cpp
+++ b/apps/gpu/BoundaryLayer/BoundaryLayer.cpp
@@ -213,7 +213,7 @@ void multipleLevel(const std::string& configPath)
bool useStreams = (nProcs > 1 ? true: false);
// useStreams=false;
para->setUseStreams(useStreams);
- para->configureMainKernel(vf::CollisionKernel::Compressible::K17CompressibleNavierStokes);
+ para->configureMainKernel(vf::collisionKernel::compressible::K17CompressibleNavierStokes);
para->setIsBodyForce( config.getValue<bool>("bodyForce") );
para->setTimestepStartOut(uint(tStartOut/dt) );
diff --git a/apps/gpu/ChannelFlow/ChannelFlow.cpp b/apps/gpu/ChannelFlow/ChannelFlow.cpp
index c716729f88d2e9d07b7647749f09127e8acf252e..da9595811a50069187ae28bf294515ced4a77ec7 100644
--- a/apps/gpu/ChannelFlow/ChannelFlow.cpp
+++ b/apps/gpu/ChannelFlow/ChannelFlow.cpp
@@ -146,7 +146,7 @@ int main(int argc, char *argv[])
para->setTimestepEnd(timeStepEnd);
para->setOutputPrefix("ChannelFlow");
- para->configureMainKernel(vf::CollisionKernel::Compressible::K17CompressibleNavierStokes);
+ para->configureMainKernel(vf::collisionKernel::compressible::K17CompressibleNavierStokes);
real overlap = (real)8.0 * dx;
diff --git a/apps/gpu/DrivenCavity/DrivenCavity.cpp b/apps/gpu/DrivenCavity/DrivenCavity.cpp
index 6f36a74a61902135ae78d4cdea43f13540e243f0..6fa193fcd7852f8393172f7251a8e72a1b41e417 100644
--- a/apps/gpu/DrivenCavity/DrivenCavity.cpp
+++ b/apps/gpu/DrivenCavity/DrivenCavity.cpp
@@ -134,7 +134,7 @@ int main()
para->setTimestepOut(timeStepOut);
para->setTimestepEnd(timeStepEnd);
- para->configureMainKernel(vf::CollisionKernel::Compressible::K17CompressibleNavierStokes);
+ para->configureMainKernel(vf::collisionKernel::compressible::K17CompressibleNavierStokes);
//////////////////////////////////////////////////////////////////////////
// set boundary conditions
diff --git a/apps/gpu/DrivenCavityMultiGPU/DrivenCavityMultiGPU.cpp b/apps/gpu/DrivenCavityMultiGPU/DrivenCavityMultiGPU.cpp
index 006f2b92335a3dd2f6c2cd97de2971cac0e61bf8..29d0a8beff5f1b93a3d6a4edbc2f7a39323239f4 100755
--- a/apps/gpu/DrivenCavityMultiGPU/DrivenCavityMultiGPU.cpp
+++ b/apps/gpu/DrivenCavityMultiGPU/DrivenCavityMultiGPU.cpp
@@ -109,7 +109,7 @@ void runVirtualFluids(const vf::basics::ConfigurationFile& config)
para->setPrintFiles(true);
std::cout << "Write result files to " << para->getFName() << std::endl;
- para->configureMainKernel(vf::CollisionKernel::Compressible::K17CompressibleNavierStokes);
+ para->configureMainKernel(vf::collisionKernel::compressible::K17CompressibleNavierStokes);
scalingFactory.setScalingFactory(GridScalingFactory::GridScaling::ScaleCompressible);
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/apps/gpu/DrivenCavityUniform/DrivenCavity.cpp b/apps/gpu/DrivenCavityUniform/DrivenCavity.cpp
index 10319c4c62ad2b1a3e5471be86e3f8fca41a49b2..38c9ac08d15dac64099ea1584129bc9d896dd659 100644
--- a/apps/gpu/DrivenCavityUniform/DrivenCavity.cpp
+++ b/apps/gpu/DrivenCavityUniform/DrivenCavity.cpp
@@ -137,7 +137,7 @@ int main()
para->setTimestepOut(timeStepOut);
para->setTimestepEnd(timeStepEnd);
- para->configureMainKernel(vf::CollisionKernel::Compressible::K17CompressibleNavierStokes);
+ para->configureMainKernel(vf::collisionKernel::compressible::K17CompressibleNavierStokes);
//////////////////////////////////////////////////////////////////////////
// set boundary conditions
diff --git a/apps/gpu/MusselOyster/MusselOyster.cpp b/apps/gpu/MusselOyster/MusselOyster.cpp
index 191a960fc1cf54d9bd74689d4d59b211220262c2..1c3a9dd642b2af43bb04d7d96f182cb77a4ab280 100644
--- a/apps/gpu/MusselOyster/MusselOyster.cpp
+++ b/apps/gpu/MusselOyster/MusselOyster.cpp
@@ -148,7 +148,7 @@ void runVirtualFluids(const vf::basics::ConfigurationFile& config)
std::cout << "Write result files to " << para->getFName() << std::endl;
para->setUseStreams(useStreams);
- para->configureMainKernel(vf::CollisionKernel::Compressible::K17CompressibleNavierStokes);
+ para->configureMainKernel(vf::collisionKernel::compressible::K17CompressibleNavierStokes);
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/apps/gpu/SphereGPU/Sphere.cpp b/apps/gpu/SphereGPU/Sphere.cpp
index 3a5de66b576aaaa6999f2ca1a38f43553d86301d..9cf84f8c433d8eb843e0d7ad40866762328acfae 100644
--- a/apps/gpu/SphereGPU/Sphere.cpp
+++ b/apps/gpu/SphereGPU/Sphere.cpp
@@ -171,7 +171,7 @@ int main(int argc, char *argv[])
para->setTimestepOut(timeStepOut);
para->setTimestepEnd(timeStepEnd);
- para->configureMainKernel(vf::CollisionKernel::Compressible::K17CompressibleNavierStokes);
+ para->configureMainKernel(vf::collisionKernel::compressible::K17CompressibleNavierStokes);
//////////////////////////////////////////////////////////////////////////
// set boundary conditions
diff --git a/apps/gpu/SphereRefined/SphereRefined.cpp b/apps/gpu/SphereRefined/SphereRefined.cpp
index 2aae0b4eb19a48e5486c908e80f257aaf463a97d..12605db750d405198b732cb4524900c92a27475a 100644
--- a/apps/gpu/SphereRefined/SphereRefined.cpp
+++ b/apps/gpu/SphereRefined/SphereRefined.cpp
@@ -145,7 +145,7 @@ int main()
para->setTimestepOut(timeStepOut);
para->setTimestepEnd(timeStepEnd);
- para->configureMainKernel(vf::CollisionKernel::Compressible::K17CompressibleNavierStokes);
+ para->configureMainKernel(vf::collisionKernel::compressible::K17CompressibleNavierStokes);
//////////////////////////////////////////////////////////////////////////
// set boundary conditions
diff --git a/apps/gpu/SphereScaling/SphereScaling.cpp b/apps/gpu/SphereScaling/SphereScaling.cpp
index 9873522362c06a9c427be296e813602839b04642..6be82fef197ad94d5857fde0692162d137d24c2b 100755
--- a/apps/gpu/SphereScaling/SphereScaling.cpp
+++ b/apps/gpu/SphereScaling/SphereScaling.cpp
@@ -117,7 +117,7 @@ void runVirtualFluids(const vf::basics::ConfigurationFile& config)
else
para->setMaxLevel(1);
- para->configureMainKernel(vf::CollisionKernel::Compressible::K17CompressibleNavierStokes);
+ para->configureMainKernel(vf::collisionKernel::compressible::K17CompressibleNavierStokes);
scalingFactory.setScalingFactory(GridScalingFactory::GridScaling::ScaleCompressible);
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/apps/gpu/TGV_3D_GridRef/TGV_3D_GridRef.cpp b/apps/gpu/TGV_3D_GridRef/TGV_3D_GridRef.cpp
index 4dc29b9309643a82fb82572ec37fb69468cebb51..5f30cba2bd8a8d5a2e2b19b2e1b96faa74da80e4 100644
--- a/apps/gpu/TGV_3D_GridRef/TGV_3D_GridRef.cpp
+++ b/apps/gpu/TGV_3D_GridRef/TGV_3D_GridRef.cpp
@@ -123,7 +123,7 @@ uint gpuIndex = 0;
bool useLimiter = false;
bool useWale = false;
-std::string kernel(vf::CollisionKernel::Compressible::K17CompressibleNavierStokes);
+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 129c08731a60ad2f75b62cdfaa4baa5eec92f00b..0f6ae8617afad6919209bfb6a1dd8108336c9715 100644
--- a/apps/gpu/WTG_RUB/WTG_RUB.cpp
+++ b/apps/gpu/WTG_RUB/WTG_RUB.cpp
@@ -243,7 +243,7 @@ void multipleLevel(const std::string& configPath)
para->setVelocityRatio(velocity/ velocityLB);
- para->configureMainKernel(vf::CollisionKernel::Compressible::K17CompressibleNavierStokes);
+ para->configureMainKernel(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/Kernel/Utilities/KernelFactory/KernelFactoryImp.cpp b/src/gpu/VirtualFluids_GPU/Kernel/Utilities/KernelFactory/KernelFactoryImp.cpp
index db803b0b3acc7cbddcc3aacfbf9c9eff594a0f74..337456db79d372acef014d78e3588f7aa59fa74e 100644
--- a/src/gpu/VirtualFluids_GPU/Kernel/Utilities/KernelFactory/KernelFactoryImp.cpp
+++ b/src/gpu/VirtualFluids_GPU/Kernel/Utilities/KernelFactory/KernelFactoryImp.cpp
@@ -100,37 +100,37 @@ std::shared_ptr<Kernel> KernelFactoryImp::makeKernel(std::shared_ptr<Parameter>
std::shared_ptr<KernelImp> newKernel;
std::shared_ptr<CheckParameterStrategy> checkStrategy;
- if (kernel == CollisionKernel::Compressible::BGK) {
+ if (kernel == collisionKernel::compressible::BGK) {
newKernel = B92CompressibleNavierStokes::getNewInstance(para, level); // compressible
checkStrategy = FluidFlowCompStrategy::getInstance(); // ||
- } else if (kernel == CollisionKernel::Compressible::BGKUnified) { // \/
+ } else if (kernel == collisionKernel::compressible::BGKUnified) { // \/
newKernel = std::make_shared<vf::gpu::B15CompressibleNavierStokesBGKplusUnified>(para, level);
checkStrategy = FluidFlowCompStrategy::getInstance();
- } else if (kernel == CollisionKernel::Compressible::BGKPlus) {
+ } else if (kernel == collisionKernel::compressible::BGKPlus) {
newKernel = B15CompressibleNavierStokesBGKplus::getNewInstance(para, level);
checkStrategy = FluidFlowCompStrategy::getInstance();
- } else if (kernel == CollisionKernel::Compressible::MRT) {
+ } else if (kernel == collisionKernel::compressible::MRT) {
newKernel = M02CompressibleNavierStokes::getNewInstance(para, level);
checkStrategy = FluidFlowCompStrategy::getInstance();
- } else if (kernel == CollisionKernel::Compressible::Cascade) {
+ } else if (kernel == collisionKernel::compressible::Cascade) {
newKernel = C06CompressibleNavierStokes::getNewInstance(para, level);
checkStrategy = FluidFlowCompStrategy::getInstance();
- } else if (kernel == CollisionKernel::Compressible::CumulantClassic) {
+ } else if (kernel == collisionKernel::compressible::CumulantClassic) {
newKernel = K08CompressibleNavierStokes::getNewInstance(para, level);
checkStrategy = FluidFlowCompStrategy::getInstance();
- } else if (kernel == CollisionKernel::Compressible::CumulantK15Unified) {
+ } else if (kernel == collisionKernel::compressible::CumulantK15Unified) {
newKernel = std::make_shared<vf::gpu::K15CompressibleNavierStokesUnified>(para, level);
checkStrategy = FluidFlowCompStrategy::getInstance();
- } else if (kernel == CollisionKernel::Compressible::K17CompressibleNavierStokesUnified) {
+ } else if (kernel == collisionKernel::compressible::K17CompressibleNavierStokesUnified) {
newKernel = std::make_shared<vf::gpu::K17CompressibleNavierStokesUnified>(para, level);
checkStrategy = FluidFlowCompStrategy::getInstance();
- } else if (kernel == CollisionKernel::Compressible::K17CompressibleNavierStokesBulkViscosity) {
+ } else if (kernel == collisionKernel::compressible::K17CompressibleNavierStokesBulkViscosity) {
newKernel = K17CompressibleNavierStokesBulkViscosity::getNewInstance(para, level);
checkStrategy = FluidFlowCompStrategy::getInstance();
- } else if (kernel == CollisionKernel::Compressible::K17CompressibleNavierStokesChimeraLegacy) {
+ } else if (kernel == collisionKernel::compressible::K17CompressibleNavierStokesChimeraLegacy) {
newKernel = K17CompressibleNavierStokesChimeraLegacy::getNewInstance(para, level);
checkStrategy = FluidFlowCompStrategy::getInstance();
- } else if (kernel == CollisionKernel::Compressible::K17CompressibleNavierStokes){
+ } else if (kernel == collisionKernel::compressible::K17CompressibleNavierStokes){
switch(para->getTurbulenceModel())
{
case TurbulenceModel::AMD:
@@ -150,61 +150,61 @@ std::shared_ptr<Kernel> KernelFactoryImp::makeKernel(std::shared_ptr<Parameter>
break;
}
checkStrategy = FluidFlowCompStrategy::getInstance();
- } else if (kernel == CollisionKernel::Compressible::CumulantAll4SP27) {
+ } else if (kernel == collisionKernel::compressible::CumulantAll4SP27) {
newKernel = K17CompressibleNavierStokesSecondDerivatesFrom5thCumulants::getNewInstance(para, level);
checkStrategy = FluidFlowCompStrategy::getInstance();
- } else if (kernel == CollisionKernel::Compressible::CumulantK18) {
+ } else if (kernel == collisionKernel::compressible::CumulantK18) {
newKernel = K18CompressibleNavierStokes::getNewInstance(para, level);
checkStrategy = FluidFlowCompStrategy::getInstance();
- } else if (kernel == CollisionKernel::Compressible::CumulantK20) {
+ } else if (kernel == collisionKernel::compressible::CumulantK20) {
newKernel = K20CompressibleNavierStokes::getNewInstance(para, level);
checkStrategy = FluidFlowCompStrategy::getInstance();
- } else if (kernel == CollisionKernel::Compressible::K15CompressibleNavierStokes) {
+ } else if (kernel == collisionKernel::compressible::K15CompressibleNavierStokes) {
newKernel = K15CompressibleNavierStokes::getNewInstance(para, level);
checkStrategy = FluidFlowCompStrategy::getInstance();
- } else if (kernel == CollisionKernel::Compressible::K15CompressibleNavierStokesBulk) {
+ } else if (kernel == collisionKernel::compressible::K15CompressibleNavierStokesBulk) {
newKernel = K15CompressibleNavierStokesBulkViscosity::getNewInstance(para, level);
checkStrategy = FluidFlowCompStrategy::getInstance();
- } else if (kernel == CollisionKernel::Compressible::K15CompressibleNavierStokesSponge) { // /\ //
+ } else if (kernel == collisionKernel::compressible::K15CompressibleNavierStokesSponge) { // /\ //
newKernel = K15CompressibleNavierStokesSponge::getNewInstance(para, level); // ||
checkStrategy = FluidFlowCompStrategy::getInstance(); // compressible
} //===============
- else if ( kernel == CollisionKernel::Incompressible::BGK) { // incompressible
+ else if ( kernel == collisionKernel::incompressible::BGK) { // incompressible
newKernel = B92IncompressibleNavierStokes::getNewInstance(para, level); // ||
checkStrategy = FluidFlowIncompStrategy::getInstance(); // \/
- } else if (kernel == CollisionKernel::Incompressible::BGKPlus) {
+ } else if (kernel == collisionKernel::incompressible::BGKPlus) {
newKernel = B15IncompressibleNavierStokesBGKplus::getNewInstance(para, level);
checkStrategy = FluidFlowIncompStrategy::getInstance();
- } else if (kernel == CollisionKernel::Incompressible::MRT) {
+ } else if (kernel == collisionKernel::incompressible::MRT) {
newKernel = M02IncompressibleNavierStokes::getNewInstance(para, level);
checkStrategy = FluidFlowIncompStrategy::getInstance();
- } else if (kernel == CollisionKernel::Incompressible::Cascade) {
+ } else if (kernel == collisionKernel::incompressible::Cascade) {
newKernel = C06IncompressibleNavierStokes::getNewInstance(para, level);
checkStrategy = FluidFlowIncompStrategy::getInstance();
- } else if (kernel == CollisionKernel::Incompressible::Cumulant1h) {
+ } else if (kernel == collisionKernel::incompressible::Cumulant1h) {
newKernel = K15IncompressibleNavierStokesRotatingVelocityField::getNewInstance(para, level);
checkStrategy = FluidFlowIncompStrategy::getInstance();
- //} else if (kernel == CollisionKernel::Incompressible::CumulantIsometric) {
+ //} else if (kernel == collisionKernel::incompressible::CumulantIsometric) {
// newKernel = K15IncompressibleNavierStokesIsoTest::getNewInstance(para, level);
// checkStrategy = FluidFlowIncompStrategy::getInstance();
- } else if (kernel == CollisionKernel::Incompressible::CumulantK15) { // /\ //
+ } else if (kernel == collisionKernel::incompressible::CumulantK15) { // /\ //
newKernel = K15IncompressibleNavierStokes::getNewInstance(para, level); // ||
checkStrategy = FluidFlowIncompStrategy::getInstance(); // incompressible
} //===============
- else if (kernel == CollisionKernel::PorousMedia::CumulantOne) { // porous media
+ else if (kernel == collisionKernel::porousMedia::CumulantOne) { // porous media
newKernel = PMCumulantOneCompSP27::getNewInstance(para, pm, level); // ||
checkStrategy = PMFluidFlowCompStrategy::getInstance(); // porous media
} //===============
- else if (kernel == CollisionKernel::Wale::CumulantK17) { // wale model
+ else if (kernel == collisionKernel::wale::CumulantK17) { // wale model
newKernel = WaleCumulantK17Comp::getNewInstance(para, level); // ||
checkStrategy = WaleFluidFlowCompStrategy::getInstance(); // \/
- } else if (kernel == CollisionKernel::Wale::CumulantK17Debug) {
+ } else if (kernel == collisionKernel::wale::CumulantK17Debug) {
newKernel = WaleCumulantK17DebugComp::getNewInstance(para, level);
checkStrategy = WaleFluidFlowCompStrategy::getInstance();
- } else if (kernel == CollisionKernel::Wale::CumulantK15) {
+ } else if (kernel == collisionKernel::wale::CumulantK15) {
newKernel = WaleCumulantK15Comp::getNewInstance(para, level);
checkStrategy = WaleFluidFlowCompStrategy::getInstance();
- } else if (kernel == CollisionKernel::Wale::CumulantK15SoniMalav) { // /\ //
+ } else if (kernel == collisionKernel::wale::CumulantK15SoniMalav) { // /\ //
newKernel = WaleBySoniMalavCumulantK15Comp::getNewInstance(para, level); // ||
checkStrategy = WaleFluidFlowCompStrategy::getInstance(); // wale model
} //===============
diff --git a/src/gpu/VirtualFluids_GPU/Kernel/Utilities/KernelTypes.h b/src/gpu/VirtualFluids_GPU/Kernel/Utilities/KernelTypes.h
index fd502fbeadf6d9445a786a8567dee1677557365f..9638a6d6f8d2c75e968484c6b0c3096826ab55c0 100644
--- a/src/gpu/VirtualFluids_GPU/Kernel/Utilities/KernelTypes.h
+++ b/src/gpu/VirtualFluids_GPU/Kernel/Utilities/KernelTypes.h
@@ -1,7 +1,7 @@
#ifndef KERNEL_TYPES_H
#define KERNEL_TYPES_H
-namespace vf::CollisionKernel::Compressible {
+namespace vf::collisionKernel::compressible {
static const std::string BGK = "BGKCompSP27";
static const std::string BGKUnified = "BGKUnified";
static const std::string BGKPlus = "BGKPlusCompSP27";
@@ -26,7 +26,7 @@ namespace vf::CollisionKernel::Compressible {
static const std::string K15CompressibleNavierStokesSponge = "K15CompressibleNavierStokesSponge";
}
-namespace vf::CollisionKernel::Incompressible {
+namespace vf::collisionKernel::incompressible {
static const std::string BGK = "BGKIncompSP27";
static const std::string BGKPlus = "BGKPlusIncompSP27";
static const std::string MRT = "MRTIncompSP27";
@@ -37,11 +37,11 @@ namespace vf::CollisionKernel::Incompressible {
static const std::string CumulantK15 = "CumulantK15Incomp";
}
-namespace vf::CollisionKernel::PorousMedia {
+namespace vf::collisionKernel::porousMedia {
static const std::string CumulantOne = "CumulantOneCompSP27";
}
-namespace vf::CollisionKernel::Wale {
+namespace vf::collisionKernel::wale {
static const std::string CumulantK17 = "WaleCumulantK17Comp";
static const std::string CumulantK17Debug = "WaleCumulantK17DebugComp";
static const std::string CumulantK15 = "WaleCumulantK15Comp";
diff --git a/src/gpu/VirtualFluids_GPU/Parameter/Parameter.cpp b/src/gpu/VirtualFluids_GPU/Parameter/Parameter.cpp
index 746029baf8cfdc7529b3150e97e6a1efb7ba18ab..ede6344270cf1f119ec30b699ae2c72b9778dc81 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 != vf::CollisionKernel::Compressible::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::configureMainKernel(std::string kernel)
{
this->mainKernel = kernel;
- if (kernel == vf::CollisionKernel::Compressible::K17CompressibleNavierStokes)
+ if (kernel == vf::collisionKernel::compressible::K17CompressibleNavierStokes)
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 739b07cbaca6ce8aedb1c030d179f192fe15e228..9140f43fa5487d6db9959fd299b836272f1ac4b2 100644
--- a/src/gpu/VirtualFluids_GPU/Parameter/Parameter.h
+++ b/src/gpu/VirtualFluids_GPU/Parameter/Parameter.h
@@ -1086,7 +1086,7 @@ private:
// Kernel
- std::string mainKernel{ vf::CollisionKernel::Compressible::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 2eee0f7f2e88ee3315e6c80fe6e7827141979a80..5ac9e3a9ab463efa8bd46bee2a0ddb86de0809bd 100644
--- a/src/gpu/VirtualFluids_GPU/Parameter/ParameterTest.cpp
+++ b/src/gpu/VirtualFluids_GPU/Parameter/ParameterTest.cpp
@@ -272,7 +272,7 @@ TEST_F(ParameterTestCumulantK17, CumulantK17_VelocityIsTooHigh_expectWarning)
{
para.setVelocityLB(0.11);
- para.configureMainKernel(vf::CollisionKernel::Compressible::K17CompressibleNavierStokes);
+ para.configureMainKernel(vf::collisionKernel::compressible::K17CompressibleNavierStokes);
testing::internal::CaptureStdout();
para.initLBMSimulationParameter();