diff --git a/apps/gpu/ActuatorLine/ActuatorLine.cpp b/apps/gpu/ActuatorLine/ActuatorLine.cpp
index 9791ac53ae889f0abcfea1bbd94dd141c570e6a4..0405c2375769b101e988a02c45e88858767650a0 100644
--- a/apps/gpu/ActuatorLine/ActuatorLine.cpp
+++ b/apps/gpu/ActuatorLine/ActuatorLine.cpp
@@ -148,7 +148,7 @@ void run(const vf::basics::ConfigurationFile& config)
para->setViscosityLB(viscosityLB);
para->setVelocityRatio(deltaX / deltaT);
para->setViscosityRatio(deltaX * deltaX / deltaT);
- para->configureMainKernel(vf::collisionKernel::compressible::K17CompressibleNavierStokes);
+ para->configureMainKernel(vf::collision_kernel::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/AtmosphericBoundaryLayer/AtmosphericBoundaryLayer.cpp b/apps/gpu/AtmosphericBoundaryLayer/AtmosphericBoundaryLayer.cpp
index 81f0b354b0fea4cccfeee4dfe2caca63f4469fc9..ae4940ff7c331210924be1f7c03ca1b182a342bd 100644
--- a/apps/gpu/AtmosphericBoundaryLayer/AtmosphericBoundaryLayer.cpp
+++ b/apps/gpu/AtmosphericBoundaryLayer/AtmosphericBoundaryLayer.cpp
@@ -241,7 +241,7 @@ void run(const vf::basics::ConfigurationFile& config)
para->setDensityRatio(c1o1);
para->setUseStreams(numberOfProcesses > 1);
- para->configureMainKernel(vf::collisionKernel::compressible::K17CompressibleNavierStokes);
+ para->configureMainKernel(vf::collision_kernel::compressible::K17CompressibleNavierStokes);
para->setTimestepStartOut(uint(timeStartOut / deltaT));
para->setTimestepOut(uint(timeOut / deltaT));
diff --git a/apps/gpu/DrivenCavity/DrivenCavity.cpp b/apps/gpu/DrivenCavity/DrivenCavity.cpp
index b31ad5435d0e10627db698f40bc609e2ce00f877..aea7b138a1266d96fb0c2a0ada228c7449edd32e 100644
--- a/apps/gpu/DrivenCavity/DrivenCavity.cpp
+++ b/apps/gpu/DrivenCavity/DrivenCavity.cpp
@@ -127,7 +127,7 @@ void run(const vf::basics::ConfigurationFile& config)
para->setTimestepOut(timeStepOut);
para->setTimestepEnd(timeStepEnd);
- para->configureMainKernel(vf::collisionKernel::compressible::K17CompressibleNavierStokes);
+ para->configureMainKernel(vf::collision_kernel::compressible::K17CompressibleNavierStokes);
//////////////////////////////////////////////////////////////////////////
// set boundary conditions
diff --git a/apps/gpu/DrivenCavityMultiGPU/DrivenCavityMultiGPU.cpp b/apps/gpu/DrivenCavityMultiGPU/DrivenCavityMultiGPU.cpp
index a416c7157904c1854da782e3de588777ce8952c6..714f95fbefa24dfa0c0fcb635c905a788e43e5e4 100755
--- a/apps/gpu/DrivenCavityMultiGPU/DrivenCavityMultiGPU.cpp
+++ b/apps/gpu/DrivenCavityMultiGPU/DrivenCavityMultiGPU.cpp
@@ -114,7 +114,7 @@ void run(const vf::basics::ConfigurationFile& config)
para->setOutputPrefix(simulationName);
para->setPrintFiles(true);
- para->configureMainKernel(vf::collisionKernel::compressible::K17CompressibleNavierStokes);
+ para->configureMainKernel(vf::collision_kernel::compressible::K17CompressibleNavierStokes);
scalingFactory.setScalingFactory(GridScalingFactory::GridScaling::ScaleCompressible);
vf::logging::Logger::changeLogPath(outPath + "vflog_process" + std::to_string(processID) );
diff --git a/apps/gpu/LaminarPipeFlowGPU/LaminarPipeFlow.cpp b/apps/gpu/LaminarPipeFlowGPU/LaminarPipeFlow.cpp
index 4a8100ed2e835195cea527442d68d14832ac6820..e0d862e3659b1d8a384da00c5953050129e8953d 100644
--- a/apps/gpu/LaminarPipeFlowGPU/LaminarPipeFlow.cpp
+++ b/apps/gpu/LaminarPipeFlowGPU/LaminarPipeFlow.cpp
@@ -152,7 +152,7 @@ void run(const vf::basics::ConfigurationFile& config)
para->setTimestepOut(timeStepOut);
para->setTimestepEnd(timeStepEnd);
- para->configureMainKernel(vf::collisionKernel::compressible::K17CompressibleNavierStokes);
+ para->configureMainKernel(vf::collision_kernel::compressible::K17CompressibleNavierStokes);
// set boundary conditions
diff --git a/apps/gpu/SphereInChannel/SphereInChannel.cpp b/apps/gpu/SphereInChannel/SphereInChannel.cpp
index bd2f5f392271b0e69018876a70ce47d99b4c4683..d62a6c25e2418ba5d28e6443c7dec74964f38b9f 100644
--- a/apps/gpu/SphereInChannel/SphereInChannel.cpp
+++ b/apps/gpu/SphereInChannel/SphereInChannel.cpp
@@ -134,7 +134,7 @@ void run(const vf::basics::ConfigurationFile& config)
para->setTimestepOut(timeStepOut);
para->setTimestepEnd(timeStepEnd);
- para->configureMainKernel(vf::collisionKernel::compressible::K17CompressibleNavierStokes);
+ para->configureMainKernel(vf::collision_kernel::compressible::K17CompressibleNavierStokes);
//////////////////////////////////////////////////////////////////////////
// set boundary conditions
diff --git a/apps/gpu/SphereMultiGPU/SphereMultiGPU.cpp b/apps/gpu/SphereMultiGPU/SphereMultiGPU.cpp
index 76cb6f496c58a4eb029354ef9ae842cc2e244246..3dde2d9f06dc27868937a25968be01cfccbe693d 100755
--- a/apps/gpu/SphereMultiGPU/SphereMultiGPU.cpp
+++ b/apps/gpu/SphereMultiGPU/SphereMultiGPU.cpp
@@ -104,7 +104,7 @@ void run(const vf::basics::ConfigurationFile& config)
para->setOutputPrefix(simulationName);
para->setPrintFiles(true);
- para->configureMainKernel(vf::collisionKernel::compressible::K17CompressibleNavierStokes);
+ para->configureMainKernel(vf::collision_kernel::compressible::K17CompressibleNavierStokes);
scalingFactory.setScalingFactory(GridScalingFactory::GridScaling::ScaleCompressible);
vf::logging::Logger::changeLogPath(outPath + "vflog_process" + std::to_string(processID) );
diff --git a/pythonbindings/src/gpu/submodules/kernel.cpp b/pythonbindings/src/gpu/submodules/kernel.cpp
index baa16165432102beda9a02b30aba94af78d4835c..b877a40e097f8f1dd149547df9de0490b1c720d1 100644
--- a/pythonbindings/src/gpu/submodules/kernel.cpp
+++ b/pythonbindings/src/gpu/submodules/kernel.cpp
@@ -42,13 +42,13 @@ namespace kernel
auto compressible = kernel_module.def_submodule("compressible", "Compressible Kernel types");
auto incompressible = kernel_module.def_submodule("incompressible", "Incompressible Kernel types");
- compressible.attr("BGK") = vf::collisionKernel::compressible::BGK;
- compressible.attr("BGKPlus") = vf::collisionKernel::compressible::BGKPlus;
- compressible.attr("K17CompressibleNavierStokes") = vf::collisionKernel::compressible::K17CompressibleNavierStokes;
- compressible.attr("K15CompressibleNavierStokes") = vf::collisionKernel::compressible::K15CompressibleNavierStokes;
+ compressible.attr("BGK") = vf::collision_kernel::compressible::BGK;
+ compressible.attr("BGKPlus") = vf::collision_kernel::compressible::BGKPlus;
+ compressible.attr("K17CompressibleNavierStokes") = vf::collision_kernel::compressible::K17CompressibleNavierStokes;
+ compressible.attr("K15CompressibleNavierStokes") = vf::collision_kernel::compressible::K15CompressibleNavierStokes;
- incompressible.attr("BGK") = vf::collisionKernel::incompressible::BGK;
- incompressible.attr("BGKPlus") = vf::collisionKernel::incompressible::BGKPlus;
- incompressible.attr("CumulantK15") = vf::collisionKernel::incompressible::CumulantK15;
+ incompressible.attr("BGK") = vf::collision_kernel::incompressible::BGK;
+ incompressible.attr("BGKPlus") = vf::collision_kernel::incompressible::BGKPlus;
+ incompressible.attr("CumulantK15") = vf::collision_kernel::incompressible::CumulantK15;
}
}
diff --git a/src/gpu/core/Kernel/KernelFactory/KernelFactoryImp.cpp b/src/gpu/core/Kernel/KernelFactory/KernelFactoryImp.cpp
index 9d24a68de313b53799077a63f640209d1f003f32..40f5b7dbcf666af5dbe4450459822506527d542c 100644
--- a/src/gpu/core/Kernel/KernelFactory/KernelFactoryImp.cpp
+++ b/src/gpu/core/Kernel/KernelFactory/KernelFactoryImp.cpp
@@ -94,11 +94,11 @@ std::shared_ptr<Kernel> KernelFactoryImp::makeKernel(std::shared_ptr<Parameter>
VF_LOG_INFO("Instantiating Kernel: {}", kernel);
std::shared_ptr<KernelImp> newKernel;
- if (kernel == collisionKernel::compressible::BGK) {
+ if (kernel == collision_kernel::compressible::BGK) {
newKernel = B92CompressibleNavierStokes::getNewInstance(para, level); // compressible
- } else if (kernel == collisionKernel::compressible::BGKPlus) {
+ } else if (kernel == collision_kernel::compressible::BGKPlus) {
newKernel = B15CompressibleNavierStokesBGKplus::getNewInstance(para, level);
- } else if (kernel == collisionKernel::compressible::K17CompressibleNavierStokes){
+ } else if (kernel == collision_kernel::compressible::K17CompressibleNavierStokes){
switch(para->getTurbulenceModel())
{
case lbm::TurbulenceModel::AMD:
@@ -117,14 +117,14 @@ std::shared_ptr<Kernel> KernelFactoryImp::makeKernel(std::shared_ptr<Parameter>
throw std::runtime_error("Unknown turbulence model!");
break;
}
- } else if (kernel == collisionKernel::compressible::K15CompressibleNavierStokes) {
+ } else if (kernel == collision_kernel::compressible::K15CompressibleNavierStokes) {
newKernel = K15CompressibleNavierStokes::getNewInstance(para, level);
} //===============
- else if ( kernel == collisionKernel::incompressible::BGK) { // incompressible
+ else if ( kernel == collision_kernel::incompressible::BGK) { // incompressible
newKernel = B92IncompressibleNavierStokes::getNewInstance(para, level); // ||
- } else if (kernel == collisionKernel::incompressible::BGKPlus) {
+ } else if (kernel == collision_kernel::incompressible::BGKPlus) {
newKernel = B15IncompressibleNavierStokesBGKplus::getNewInstance(para, level);
- } else if (kernel == collisionKernel::incompressible::CumulantK15) { // /\ //
+ } else if (kernel == collision_kernel::incompressible::CumulantK15) { // /\ //
newKernel = K15IncompressibleNavierStokes::getNewInstance(para, level); // ||
} //===============
else {
diff --git a/src/gpu/core/Kernel/KernelTypes.h b/src/gpu/core/Kernel/KernelTypes.h
index d00b4da7183c835f5d5ef26eebb4e6d04006e886..a98506d2f2863410e43b4d3b53ac5c659ea9fcad 100644
--- a/src/gpu/core/Kernel/KernelTypes.h
+++ b/src/gpu/core/Kernel/KernelTypes.h
@@ -35,7 +35,7 @@
#include <string>
#include <vector>
-namespace vf::collisionKernel::compressible
+namespace vf::collision_kernel::compressible
{
static const std::string BGK = "BGKCompSP27";
static const std::string BGKPlus = "BGKPlusCompSP27";
@@ -44,9 +44,9 @@ static const std::string K15CompressibleNavierStokes = "K15CompressibleNavierSto
static const std::vector<std::string> listOfKernels = { BGK, BGKPlus, K15CompressibleNavierStokes,
K17CompressibleNavierStokes };
-} // namespace vf::collisionKernel::compressible
+} // namespace vf::collision_kernel::compressible
-namespace vf::collisionKernel::incompressible
+namespace vf::collision_kernel::incompressible
{
static const std::string BGK = "BGKIncompSP27";
static const std::string BGKPlus = "BGKPlusIncompSP27";
@@ -54,7 +54,7 @@ static const std::string CumulantK15 = "CumulantK15Incomp";
static const std::vector<std::string> listOfKernels = { BGK, BGKPlus, CumulantK15 };
-} // namespace vf::collisionKernel::incompressible
+} // namespace vf::collision_kernel::incompressible
#endif
diff --git a/src/gpu/core/Parameter/Parameter.cpp b/src/gpu/core/Parameter/Parameter.cpp
index 100a441543c678a618504b92c4fe0675ef59804d..46d8e5b1459905edd202f48d00306557c42298e3 100644
--- a/src/gpu/core/Parameter/Parameter.cpp
+++ b/src/gpu/core/Parameter/Parameter.cpp
@@ -1192,7 +1192,7 @@ void Parameter::setRecvProcessNeighborsAfterFtoCZ(int numberOfNodes, int level,
void Parameter::configureMainKernel(std::string kernel)
{
this->mainKernel = kernel;
- if (kernel == vf::collisionKernel::compressible::K17CompressibleNavierStokes)
+ if (kernel == vf::collision_kernel::compressible::K17CompressibleNavierStokes)
this->kernelNeedsFluidNodeIndicesToRun = true;
}
void Parameter::setMultiKernelOn(bool isOn)
diff --git a/src/gpu/core/Parameter/Parameter.h b/src/gpu/core/Parameter/Parameter.h
index 148b506bffc9cb4a41f28b27e8dea72ed367010c..4131aa8c452e78c8e26d236ac8ad3c4b3b4bdea5 100644
--- a/src/gpu/core/Parameter/Parameter.h
+++ b/src/gpu/core/Parameter/Parameter.h
@@ -833,7 +833,7 @@ private:
// Kernel
- std::string mainKernel{ vf::collisionKernel::compressible::K17CompressibleNavierStokes };
+ std::string mainKernel{ vf::collision_kernel::compressible::K17CompressibleNavierStokes };
bool multiKernelOn{ false };
std::vector<int> multiKernelLevel;
std::vector<std::string> multiKernel;
diff --git a/tests/unit-tests/gpu/core/Kernel/KernelImpTest.cpp b/tests/unit-tests/gpu/core/Kernel/KernelImpTest.cpp
index 84ed4109d70fc1d631a2849118783d91d81b3a18..c90443b22d8cde8687775645ea6b6b964adca337 100644
--- a/tests/unit-tests/gpu/core/Kernel/KernelImpTest.cpp
+++ b/tests/unit-tests/gpu/core/Kernel/KernelImpTest.cpp
@@ -40,7 +40,7 @@
#include "../testUtilitiesGPU.h"
-using namespace vf::collisionKernel;
+using namespace vf::collision_kernel;
class KernelImpTest : public testing::TestWithParam<std::string>
{