From 317ca9a232d231beb28d5f4c72c51c8681d72253 Mon Sep 17 00:00:00 2001 From: Anna <a.wellmann@tu-bs.de> Date: Fri, 17 Jun 2022 12:01:59 +0000 Subject: [PATCH] Move kernel manager into seperate folder --- src/gpu/VirtualFluids_GPU/Init/InitLattice.cpp | 2 +- .../{AdvectionDiffusion => KernelManager}/ADKernelManager.cpp | 2 +- .../{AdvectionDiffusion => KernelManager}/ADKernelManager.h | 0 .../{GPU => KernelManager}/LBKernelManager.cpp | 2 +- .../{GPU => KernelManager}/LBKernelManager.h | 0 src/gpu/VirtualFluids_GPU/LBM/Simulation.cpp | 4 ++-- src/gpu/VirtualFluids_GPU/Output/FileWriter.cpp | 4 ++-- 7 files changed, 7 insertions(+), 7 deletions(-) rename src/gpu/VirtualFluids_GPU/{AdvectionDiffusion => KernelManager}/ADKernelManager.cpp (99%) rename src/gpu/VirtualFluids_GPU/{AdvectionDiffusion => KernelManager}/ADKernelManager.h (100%) rename src/gpu/VirtualFluids_GPU/{GPU => KernelManager}/LBKernelManager.cpp (99%) rename src/gpu/VirtualFluids_GPU/{GPU => KernelManager}/LBKernelManager.h (100%) diff --git a/src/gpu/VirtualFluids_GPU/Init/InitLattice.cpp b/src/gpu/VirtualFluids_GPU/Init/InitLattice.cpp index e7e9e48db..70288317d 100644 --- a/src/gpu/VirtualFluids_GPU/Init/InitLattice.cpp +++ b/src/gpu/VirtualFluids_GPU/Init/InitLattice.cpp @@ -33,7 +33,7 @@ #include "Init/InitLattice.h" #include "Parameter/Parameter.h" #include "GPU/GPU_Interface.h" -#include "AdvectionDiffusion/ADKernelManager.h" +#include "KernelManager/ADKernelManager.h" //////////////////////////////////////////////////////////////////////////////// void initLattice(SPtr<Parameter> para, ADKernelManager* adKernelManager) diff --git a/src/gpu/VirtualFluids_GPU/AdvectionDiffusion/ADKernelManager.cpp b/src/gpu/VirtualFluids_GPU/KernelManager/ADKernelManager.cpp similarity index 99% rename from src/gpu/VirtualFluids_GPU/AdvectionDiffusion/ADKernelManager.cpp rename to src/gpu/VirtualFluids_GPU/KernelManager/ADKernelManager.cpp index 7f7697f70..a54c59753 100644 --- a/src/gpu/VirtualFluids_GPU/AdvectionDiffusion/ADKernelManager.cpp +++ b/src/gpu/VirtualFluids_GPU/KernelManager/ADKernelManager.cpp @@ -30,7 +30,7 @@ //! \ingroup AdvectionDiffusion //! \author Martin Schoenherr //======================================================================================= -#include "AdvectionDiffusion/ADKernelManager.h" +#include "KernelManager/ADKernelManager.h" #include "GPU/CudaMemoryManager.h" #include "GPU/GPU_Interface.h" #include "Parameter/Parameter.h" diff --git a/src/gpu/VirtualFluids_GPU/AdvectionDiffusion/ADKernelManager.h b/src/gpu/VirtualFluids_GPU/KernelManager/ADKernelManager.h similarity index 100% rename from src/gpu/VirtualFluids_GPU/AdvectionDiffusion/ADKernelManager.h rename to src/gpu/VirtualFluids_GPU/KernelManager/ADKernelManager.h diff --git a/src/gpu/VirtualFluids_GPU/GPU/LBKernelManager.cpp b/src/gpu/VirtualFluids_GPU/KernelManager/LBKernelManager.cpp similarity index 99% rename from src/gpu/VirtualFluids_GPU/GPU/LBKernelManager.cpp rename to src/gpu/VirtualFluids_GPU/KernelManager/LBKernelManager.cpp index 2af46edcf..d82f27e20 100644 --- a/src/gpu/VirtualFluids_GPU/GPU/LBKernelManager.cpp +++ b/src/gpu/VirtualFluids_GPU/KernelManager/LBKernelManager.cpp @@ -33,7 +33,7 @@ #include <cuda_runtime.h> #include <helper_cuda.h> #include "LBKernelManager.h" -#include "GPU_Interface.h" +#include "GPU/GPU_Interface.h" #include <Parameter/Parameter.h> diff --git a/src/gpu/VirtualFluids_GPU/GPU/LBKernelManager.h b/src/gpu/VirtualFluids_GPU/KernelManager/LBKernelManager.h similarity index 100% rename from src/gpu/VirtualFluids_GPU/GPU/LBKernelManager.h rename to src/gpu/VirtualFluids_GPU/KernelManager/LBKernelManager.h diff --git a/src/gpu/VirtualFluids_GPU/LBM/Simulation.cpp b/src/gpu/VirtualFluids_GPU/LBM/Simulation.cpp index 5b3c13e51..be0e09a7f 100644 --- a/src/gpu/VirtualFluids_GPU/LBM/Simulation.cpp +++ b/src/gpu/VirtualFluids_GPU/LBM/Simulation.cpp @@ -32,8 +32,8 @@ //======================================================================================= #include "Simulation.h" #include "DataStructureInitializer/GridProvider.h" -#include "GPU/LBKernelManager.h" -#include "AdvectionDiffusion/ADKernelManager.h" +#include "KernelManager/LBKernelManager.h" +#include "KernelManager/ADKernelManager.h" #include "GPU/CudaMemoryManager.h" #include "GPU/devCheck.h" #include "Init/InitLattice.h" diff --git a/src/gpu/VirtualFluids_GPU/Output/FileWriter.cpp b/src/gpu/VirtualFluids_GPU/Output/FileWriter.cpp index 71bf3cd60..989d9f0be 100644 --- a/src/gpu/VirtualFluids_GPU/Output/FileWriter.cpp +++ b/src/gpu/VirtualFluids_GPU/Output/FileWriter.cpp @@ -34,8 +34,8 @@ #include "GPU/CudaMemoryManager.h" #include "Parameter/Parameter.h" #include "basics/writer/WbWriterVtkXmlBinary.h" -#include "AdvectionDiffusion/ADKernelManager.h" -#include "GPU/LBKernelManager.h" +#include "KernelManager/ADKernelManager.h" +#include "KernelManager/LBKernelManager.h" void FileWriter::writeInit(SPtr<Parameter> para, SPtr<CudaMemoryManager> cudaMemoryManager, SPtr<LBKernelManager> cudaKernelManager, ADKernelManager* adKernelManager) { -- GitLab