Skip to content
Snippets Groups Projects
Commit 577defef authored by Martin Schönherr's avatar Martin Schönherr :speech_balloon:
Browse files

move the KernelFactory up

parent 4aad5fc9
No related branches found
No related tags found
1 merge request!286move the KernelFactory a folder up (get rid of the kernel/utilities subfolder)
Showing
with 26 additions and 16 deletions
......@@ -65,7 +65,7 @@
#include "gpu/core/LBM/Simulation.h"
#include "gpu/core/Output/FileWriter.h"
#include "gpu/core/Parameter/Parameter.h"
#include "gpu/core/Kernel/Utilities/KernelTypes.h"
#include "gpu/core/Kernel/KernelTypes.h"
//////////////////////////////////////////////////////////////////////////
......
......@@ -67,7 +67,7 @@
#include "gpu/core/Output/FileWriter.h"
#include "gpu/core/Parameter/Parameter.h"
#include "gpu/core/Factories/GridScalingFactory.h"
#include "gpu/core/Kernel/Utilities/KernelTypes.h"
#include "gpu/core/Kernel/KernelTypes.h"
#include <parallel/MPICommunicator.h>
......
#ifndef ADV_DIFF_KERNEL_H
#define ADV_DIFF_KERNEL_H
#ifndef AdvectionDiffusionKernel_H
#define AdvectionDiffusionKernel_H
#include "Kernel/KernelImp.h"
class ADKernel : public KernelImp
class AdvectionDiffusionKernel : public KernelImp
{
virtual void run() = 0;
};
......
#ifndef F16CompressibleAdvectionDiffusion_H
#define F16CompressibleAdvectionDiffusion_H
#include "Kernel/ADKernel.h"
#include "Kernel/AdvectionDiffusionKernel.h"
class F16CompressibleAdvectionDiffusion : public ADKernel
class F16CompressibleAdvectionDiffusion : public AdvectionDiffusionKernel
{
public:
static std::shared_ptr<F16CompressibleAdvectionDiffusion> getNewInstance(std::shared_ptr< Parameter> para, int level);
......
#ifndef B12CompressibleAdvectionDiffusionD3Q7_H
#define B12CompressibleAdvectionDiffusionD3Q7_H
#include "Kernel/ADKernel.h"
#include "Kernel/AdvectionDiffusionKernel.h"
class B12CompressibleAdvectionDiffusionD3Q7 : public ADKernel
class B12CompressibleAdvectionDiffusionD3Q7 : public AdvectionDiffusionKernel
{
public:
static std::shared_ptr<B12CompressibleAdvectionDiffusionD3Q7> getNewInstance(std::shared_ptr< Parameter> para, int level);
......
#ifndef F16IncompressibleAdvectionDiffusion_H
#define F16IncompressibleAdvectionDiffusion_H
#include "Kernel/ADKernel.h"
#include "Kernel/AdvectionDiffusionKernel.h"
class F16IncompressibleAdvectionDiffusion : public ADKernel
class F16IncompressibleAdvectionDiffusion : public AdvectionDiffusionKernel
{
public:
static std::shared_ptr<F16IncompressibleAdvectionDiffusion> getNewInstance(std::shared_ptr<Parameter> para, int level);
......
#ifndef B12IncompressibleAdvectionDiffusionD3Q7_H
#define B12IncompressibleAdvectionDiffusionD3Q7_H
#include "Kernel/ADKernel.h"
#include "Kernel/AdvectionDiffusionKernel.h"
class B12IncompressibleAdvectionDiffusionD3Q7 : public ADKernel
class B12IncompressibleAdvectionDiffusionD3Q7 : public AdvectionDiffusionKernel
{
public:
static std::shared_ptr<B12IncompressibleAdvectionDiffusionD3Q7> getNewInstance(std::shared_ptr< Parameter> para, int level);
......
......@@ -4,7 +4,7 @@
#include "Parameter/Parameter.h"
#include "Kernel/Utilities/KernelTypes.h"
#include "Kernel/KernelTypes.h"
//LBM kernel (compressible)
#include "Kernel/Compressible/NavierStokes/B92/B92CompressibleNavierStokes.h"
......
......@@ -50,10 +50,10 @@
//////////////////////////////////////////////////////////////////////////
#include "DataStructureInitializer/GridProvider.h"
#include "Output/DataWriter.h"
#include "Kernel/Utilities/KernelFactory/KernelFactory.h"
#include "Kernel/KernelFactory/KernelFactory.h"
#include "PreProcessor/PreProcessorFactory/PreProcessorFactory.h"
#include "PreProcessor/PreProcessorFactory/PreProcessorFactoryImp.h"
#include "Kernel/Utilities/KernelFactory/KernelFactoryImp.h"
#include "Kernel/KernelFactory/KernelFactoryImp.h"
#include "Kernel/Kernel.h"
#include "TurbulenceModels/TurbulenceModelFactory.h"
......
......@@ -22,7 +22,7 @@ class RestartObject;
class ForceCalculations;
class DataWriter;
class Kernel;
class ADKernel;
class AdvectionDiffusionKernel;
class KernelFactory;
class PreProcessor;
class PreProcessorFactory;
......@@ -83,7 +83,7 @@ private:
std::shared_ptr<DataWriter> dataWriter;
std::shared_ptr<CudaMemoryManager> cudaMemoryManager;
std::vector < SPtr< Kernel>> kernels;
std::vector < SPtr< ADKernel>> adKernels;
std::vector < SPtr< AdvectionDiffusionKernel>> adKernels;
std::shared_ptr<PreProcessor> preProcessor;
SPtr<TurbulenceModelFactory> tmFactory;
......
......@@ -43,7 +43,7 @@
#include "LBM/LB.h"
#include "PreCollisionInteractor/PreCollisionInteractor.h"
#include "TurbulenceModels/TurbulenceModelFactory.h"
#include "gpu/core/Kernel/Utilities/KernelTypes.h"
#include "gpu/core/Kernel/KernelTypes.h"
#include <lbm/collision/TurbulentViscosity.h>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment