diff --git a/apps/gpu/LBM/ActuatorLine/CMakeLists.txt b/apps/gpu/LBM/ActuatorLine/CMakeLists.txt index 22f32fd92452469478d8ca1242a1121ecaf49121..e0ff4e06e83a957be6966a7322ff06a0d068d18a 100644 --- a/apps/gpu/LBM/ActuatorLine/CMakeLists.txt +++ b/apps/gpu/LBM/ActuatorLine/CMakeLists.txt @@ -3,3 +3,5 @@ PROJECT(ActuatorLine LANGUAGES CUDA CXX) vf_add_library(BUILDTYPE binary PRIVATE_LINK basics VirtualFluids_GPU GridGenerator MPI::MPI_CXX FILES ActuatorLine.cpp) set_source_files_properties(ActuatorLine.cpp PROPERTIES LANGUAGE CUDA) + +set_target_properties(ActuatorLine PROPERTIES CUDA_SEPARABLE_COMPILATION ON) diff --git a/src/gpu/VirtualFluids_GPU/Visitor/ActuatorLine.cu b/src/gpu/VirtualFluids_GPU/Visitor/ActuatorLine.cu index 94ba6777eff609f2f6bc66f1337a5ae31aeb5b2e..6a2a625f03e64059f59480a3938f606d9f63d254 100644 --- a/src/gpu/VirtualFluids_GPU/Visitor/ActuatorLine.cu +++ b/src/gpu/VirtualFluids_GPU/Visitor/ActuatorLine.cu @@ -8,6 +8,10 @@ #include "lbm/constants/NumericConstants.h" #include "VirtualFluids_GPU/GPU/GeometryUtils.h" +#include "Parameter/Parameter.h" +#include "DataStructureInitializer/GridProvider.h" +#include "GPU/CudaMemoryManager.h" + __host__ __device__ __inline__ real calcGaussian3D(real posX, real posY, real posZ, real destX, real destY, real destZ, real epsilon) { real distX = destX-posX; diff --git a/src/gpu/VirtualFluids_GPU/Visitor/Probe.cu b/src/gpu/VirtualFluids_GPU/Visitor/Probe.cu index 5502e8649da4a1a8cab37c0543d8e3081a304a8b..31e082c8640225fcb2b790f2f6dec19c78c5f3ec 100644 --- a/src/gpu/VirtualFluids_GPU/Visitor/Probe.cu +++ b/src/gpu/VirtualFluids_GPU/Visitor/Probe.cu @@ -10,6 +10,10 @@ #include "basics/writer/WbWriterVtkXmlBinary.h" #include <Core/StringUtilities/StringUtil.h> +#include "Parameter/Parameter.h" +#include "DataStructureInitializer/GridProvider.h" +#include "GPU/CudaMemoryManager.h" + __global__ void interpQuantities( int* pointIndices, uint nPoints, diff --git a/src/gpu/VirtualFluids_GPU/Visitor/Probe.h b/src/gpu/VirtualFluids_GPU/Visitor/Probe.h index 2893595e694a3af5c1a6aadadd6c78334e8c2c49..98a00c640da11e97c325b891d6615cf574f8ed98 100644 --- a/src/gpu/VirtualFluids_GPU/Visitor/Probe.h +++ b/src/gpu/VirtualFluids_GPU/Visitor/Probe.h @@ -2,9 +2,8 @@ #define Probe_H #include "Visitor.h" -#include "Parameter/Parameter.h" #include "PointerDefinitions.h" -#include "GridGenerator/grid/GridBuilder/GridBuilder.h" + enum class PostProcessingVariable{ // Enum val is index in pointer array -> increment between enum1 and enum2 is number of quantities allocated for enum1 @@ -28,7 +27,6 @@ struct ProbeStruct{ }; - class Probe : public Visitor { public: @@ -79,8 +77,4 @@ private: // std::vector< std::vector<real> > distX, distY, distZ; }; - - - - #endif \ No newline at end of file diff --git a/src/gpu/VirtualFluids_GPU/Visitor/Visitor.h b/src/gpu/VirtualFluids_GPU/Visitor/Visitor.h index d71f2407b6067aba5bf99e76c06bcacdbe278125..46b4f8dc79264b4d4dd11d2931c94cfa84e0472a 100644 --- a/src/gpu/VirtualFluids_GPU/Visitor/Visitor.h +++ b/src/gpu/VirtualFluids_GPU/Visitor/Visitor.h @@ -7,12 +7,12 @@ #include "PointerDefinitions.h" #include "Core/DataTypes.h" #include "VirtualFluids_GPU_export.h" -#include "DataStructureInitializer/GridProvider.h" -#include "GPU/CudaMemoryManager.h" #include <cassert> class Parameter; +class GridProvider; +class CudaMemoryManager; class VIRTUALFLUIDS_GPU_EXPORT Visitor @@ -52,7 +52,7 @@ public: } protected: - uint updateInterval; ///< update interval in number of timesteps of the coars patch (1 = each time step) + uint updateInterval; ///< update interval in number of timesteps of the coarse patch (1 = each time step) };