Rename CudaKernelManager to LBKernelManager

src/gpu/VirtualFluids_GPU/AdvectionDiffusion/ADKernelManager.h

@@ -35,6 +35,7 @@
 
 #include "PointerDefinitions.h"
 #include "Core/DataTypes.h"
+#include "VirtualFluids_GPU_export.h"
 
 //! \brief Class forwarding for Parameter, DataWriter and CudaMemoryManager
 class Parameter;
@@ -42,7 +43,7 @@ class CudaMemoryManager;
 
 //! \class ADKernelManager
 //! \brief manage the advection diffusion kernel calls
-class ADKernelManager{
+class VIRTUALFLUIDS_GPU_EXPORT ADKernelManager{
 
 public:
 

src/gpu/VirtualFluids_GPU/GPU/CudaKernelManager.cpp → src/gpu/VirtualFluids_GPU/GPU/LBKernelManager.cpp

@@ -26,18 +26,18 @@
 //  You should have received a copy of the GNU General Public License along
 //  with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
 //
-//! \file CudaKernelManager.cpp
+//! \file LBKernelManager.cpp
 //! \ingroup GPU
 //! \author Martin Schoenherr
 //=======================================================================================
 #include <cuda_runtime.h>
 #include <helper_cuda.h>
-#include "CudaKernelManager.h"
+#include "LBKernelManager.h"
 #include "GPU_Interface.h"
 #include <Parameter/Parameter.h>
 
 
-void CudaKernelManager::runLBMKernel(SPtr<Parameter> para)
+void LBKernelManager::runLBMKernel(SPtr<Parameter> para)
 {
     if (para->getIsADcalculationOn()) {
 		CumulantK17LBMDeviceKernelAD(
@@ -67,7 +67,7 @@ void CudaKernelManager::runLBMKernel(SPtr<Parameter> para)
 	}
 }
 
-void CudaKernelManager::runVelocityBCKernel(SPtr<Parameter> para)
+void LBKernelManager::runVelocityBCKernel(SPtr<Parameter> para)
 {
 	if (para->getParD()->numberOfVeloBCnodes > 0)
 	{
@@ -89,7 +89,7 @@ void CudaKernelManager::runVelocityBCKernel(SPtr<Parameter> para)
 	}
 }
 
-void CudaKernelManager::runGeoBCKernel(SPtr<Parameter> para)
+void LBKernelManager::runGeoBCKernel(SPtr<Parameter> para)
 {
     if (para->getParD()->numberOfVeloBCnodes > 0)
     {
@@ -97,7 +97,7 @@ void CudaKernelManager::runGeoBCKernel(SPtr<Parameter> para)
     }
 }
 
-void CudaKernelManager::calculateMacroscopicValues(SPtr<Parameter> para)
+void LBKernelManager::calculateMacroscopicValues(SPtr<Parameter> para)
 {
     if (para->getIsADcalculationOn()) {
 		CalcMacADCompSP27(
@@ -144,17 +144,17 @@ void CudaKernelManager::calculateMacroscopicValues(SPtr<Parameter> para)
 
 
 
-SPtr<CudaKernelManager> CudaKernelManager::make(SPtr<Parameter> parameter)
+SPtr<LBKernelManager> LBKernelManager::make(SPtr<Parameter> parameter)
 {
-    return SPtr<CudaKernelManager>(new CudaKernelManager(parameter));
+    return SPtr<LBKernelManager>(new LBKernelManager(parameter));
 }
 
-CudaKernelManager::CudaKernelManager(SPtr<Parameter> parameter)
+LBKernelManager::LBKernelManager(SPtr<Parameter> parameter)
 {
     this->parameter = parameter;
 }
 
-CudaKernelManager::CudaKernelManager(const CudaKernelManager&)
+LBKernelManager::LBKernelManager(const LBKernelManager&)
 {
 
 }

src/gpu/VirtualFluids_GPU/GPU/CudaKernelManager.h → src/gpu/VirtualFluids_GPU/GPU/LBKernelManager.h

@@ -26,12 +26,12 @@
 //  You should have received a copy of the GNU General Public License along
 //  with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
 //
-//! \file CudaKernelManager.h
+//! \file LBKernelManager.h
 //! \ingroup GPU
 //! \author Martin Schoenherr
 //=======================================================================================
-#ifndef CudaKernelManager_H
-#define CudaKernelManager_H
+#ifndef LBKernelManager_H
+#define LBKernelManager_H
 
 #include <memory>
 #include "PointerDefinitions.h"
@@ -40,14 +40,14 @@
 //! \brief Class forwarding for Parameter
 class Parameter;
 
-//! \class CudaKernelManager
+//! \class LBKernelManager
 //! \brief manage the cuda kernel calls
-class VIRTUALFLUIDS_GPU_EXPORT CudaKernelManager
+class VIRTUALFLUIDS_GPU_EXPORT LBKernelManager
 {
 public:
-	//! \brief makes an object of CudaKernelManager
+	//! \brief makes an object of LBKernelManager
 	//! \param para shared pointer to instance of class Parameter
-    static SPtr<CudaKernelManager> make(std::shared_ptr<Parameter> parameter);
+    static SPtr<LBKernelManager> make(std::shared_ptr<Parameter> parameter);
     
 	//! \brief calls the device function of the lattice Boltzmann kernel
 	void runLBMKernel(SPtr<Parameter> para);
@@ -65,10 +65,10 @@ public:
 private:
 	//! Class constructor
 	//! \param parameter shared pointer to instance of class Parameter
-	CudaKernelManager(SPtr<Parameter> parameter);
+	LBKernelManager(SPtr<Parameter> parameter);
 	//! Class copy constructor
-	//! \param CudaKernelManager is a reference to CudaKernelManager object
-	CudaKernelManager(const CudaKernelManager&);
+	//! \param LBKernelManager is a reference to LBKernelManager object
+	LBKernelManager(const LBKernelManager&);
 
 	//! \property para is a shared pointer to an object of Parameter
 	SPtr<Parameter> parameter;

src/gpu/VirtualFluids_GPU/LBM/Simulation.cpp

@@ -32,7 +32,7 @@
 //=======================================================================================
 #include "Simulation.h"
 #include "DataStructureInitializer/GridProvider.h"
-#include "GPU/CudaKernelManager.h"
+#include "GPU/LBKernelManager.h"
 #include "AdvectionDiffusion/ADKernelManager.h"
 #include "GPU/CudaMemoryManager.h"
 #include "GPU/devCheck.h"
@@ -65,7 +65,7 @@ void Simulation::init(SPtr<Parameter> para, SPtr<GridProvider> gridProvider, SPt
     this->gridProvider      = gridProvider;
     this->cudaMemoryManager = cudaMemoryManager;
     this->para              = para;
-    this->cudaKernelManager = CudaKernelManager::make(para);
+    this->cudaKernelManager = LBKernelManager::make(para);
 
     para->initParameter();
     para->setRe(para->getVelocityLB() * (real)1.0 / para->getViscosityLB());

src/gpu/VirtualFluids_GPU/LBM/Simulation.h

@@ -39,7 +39,7 @@
 
 //! \brief Class forwarding for CudaMemoryManager, Parameter, GridProvider and DataWriter
 class CudaMemoryManager;
-class CudaKernelManager;
+class LBKernelManager;
 class ADKernelManager;
 class Parameter;
 class GridProvider;
@@ -75,8 +75,8 @@ protected:
     SPtr<DataWriter> dataWriter;
     //! \property cudaMemoryManager is a shared pointer to an object of CudaMemoryManager
     SPtr<CudaMemoryManager> cudaMemoryManager;
-    //! \property cudaKernelManager is a shared pointer to an object of CudaKernelManager
-    SPtr<CudaKernelManager> cudaKernelManager;
+    //! \property cudaKernelManager is a shared pointer to an object of LBKernelManager
+    SPtr<LBKernelManager> cudaKernelManager;
     //! \property adKernelManager is a shared pointer to an object of ADKernelManager
     std::shared_ptr<ADKernelManager> adKernelManager;
 };

src/gpu/VirtualFluids_GPU/Output/DataWriter.h

@@ -40,7 +40,7 @@
 //! \brief Class forwarding for CudaMemoryManager and Parameter
 class Parameter;
 class CudaMemoryManager;
-class CudaKernelManager;
+class LBKernelManager;
 class ADKernelManager;
 
 //! \class FileWriter
@@ -56,21 +56,21 @@ public:
 	//! \brief write the initialization step to VTK file(s)
 	//! \param para instance of classParameter
 	//! \param cudaMemoryManager instance of class CudaMemoryManager
-    //! \param cudaKernelManager instance of class CudaKernelManager
+    //! \param cudaKernelManager instance of class LBKernelManager
     virtual void VIRTUALFLUIDS_GPU_EXPORT writeInit(
 		SPtr<Parameter> para, 
 		SPtr<CudaMemoryManager> cudaMemoryManager, 
-		SPtr<CudaKernelManager> cudaKernelManager,
+		SPtr<LBKernelManager> cudaKernelManager,
 		ADKernelManager* ADKernelManager) = 0;
 	//! \brief write time step to VTK file(s)
 	//! \param para instance of classParameter
     //! \param cudaMemoryManager instance of class CudaMemoryManager
-    //! \param cudaKernelManager instance of class CudaKernelManager
+    //! \param cudaKernelManager instance of class LBKernelManager
     //! \param timestep of the simulation
 	virtual void VIRTUALFLUIDS_GPU_EXPORT writeTimestep(
 		SPtr<Parameter> para, 
 		SPtr<CudaMemoryManager> cudaMemoryManager, 
-		SPtr<CudaKernelManager> cudaKernelManager,
+		SPtr<LBKernelManager> cudaKernelManager,
 		ADKernelManager* ADKernelManager, 
 		uint timestep) = 0;
 };

src/gpu/VirtualFluids_GPU/Output/FileWriter.cpp

@@ -35,15 +35,15 @@
 #include "Parameter/Parameter.h"
 #include "basics/writer/WbWriterVtkXmlBinary.h"
 #include "AdvectionDiffusion/ADKernelManager.h"
-#include "GPU/CudaKernelManager.h"
+#include "GPU/LBKernelManager.h"
 
-void FileWriter::writeInit(SPtr<Parameter> para, SPtr<CudaMemoryManager> cudaMemoryManager, SPtr<CudaKernelManager> cudaKernelManager, ADKernelManager* adKernelManager)
+void FileWriter::writeInit(SPtr<Parameter> para, SPtr<CudaMemoryManager> cudaMemoryManager, SPtr<LBKernelManager> cudaKernelManager, ADKernelManager* adKernelManager)
 {
     uint timestep = 0;
     writeTimestep(para, cudaMemoryManager, cudaKernelManager, adKernelManager, timestep);
 }
 
-void FileWriter::writeTimestep(SPtr<Parameter> para, SPtr<CudaMemoryManager> cudaMemoryManager, SPtr<CudaKernelManager> cudaKernelManager, ADKernelManager* adKernelManager, uint timestep)
+void FileWriter::writeTimestep(SPtr<Parameter> para, SPtr<CudaMemoryManager> cudaMemoryManager, SPtr<LBKernelManager> cudaKernelManager, ADKernelManager* adKernelManager, uint timestep)
 {
     if (para->getIsADcalculationOn())
         adKernelManager->printAD(cudaMemoryManager);

src/gpu/VirtualFluids_GPU/Output/FileWriter.h

@@ -41,7 +41,7 @@
 //! \brief Class forwarding for CudaMemoryManager and Parameter
 class Parameter;
 class CudaMemoryManager;
-class CudaKernelManager;
+class LBKernelManager;
 class ADKernelManager;
 
 //! \class FileWriter derived class of DataWriter
@@ -57,21 +57,21 @@ public:
     //! \brief write the initialization step to VTK file(s)
     //! \param para instance of classParameter
     //! \param cudaMemoryManager instance of class CudaMemoryManager
-    //! \param cudaKernelManager instance of class CudaKernelManager
+    //! \param cudaKernelManager instance of class LBKernelManager
     void VIRTUALFLUIDS_GPU_EXPORT writeInit(
         SPtr<Parameter> para, 
         SPtr<CudaMemoryManager> cudaMemoryManager, 
-        SPtr<CudaKernelManager> cudaKernelManager,
+        SPtr<LBKernelManager> cudaKernelManager,
         ADKernelManager* adKernelManager) override;
     //! \brief write time step to VTK file(s)
     //! \param para instance of classParameter
     //! \param cudaMemoryManager instance of class CudaMemoryManager
-    //! \param cudaKernelManager instance of class CudaKernelManager
+    //! \param cudaKernelManager instance of class LBKernelManager
     //! \param timestep of the simulation
     void VIRTUALFLUIDS_GPU_EXPORT writeTimestep(
         SPtr<Parameter> para,
         SPtr<CudaMemoryManager> cudaMemoryManager,
-        SPtr<CudaKernelManager> cudaKernelManager,
+        SPtr<LBKernelManager> cudaKernelManager,
         ADKernelManager* adKernelManager,
         uint timestep) override;