From 858068143e33cefdc285770351e1b38363ec632b Mon Sep 17 00:00:00 2001
From: Hkorb <henry.korb@geo.uu.se>
Date: Thu, 16 Sep 2021 17:33:06 +0200
Subject: [PATCH] fixed error in unit test compilation
---
apps/gpu/LBM/ActuatorLine/CMakeLists.txt | 2 ++
src/gpu/VirtualFluids_GPU/Visitor/ActuatorLine.cu | 4 ++++
src/gpu/VirtualFluids_GPU/Visitor/Probe.cu | 4 ++++
src/gpu/VirtualFluids_GPU/Visitor/Probe.h | 8 +-------
src/gpu/VirtualFluids_GPU/Visitor/Visitor.h | 6 +++---
5 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/apps/gpu/LBM/ActuatorLine/CMakeLists.txt b/apps/gpu/LBM/ActuatorLine/CMakeLists.txt
index 22f32fd92..e0ff4e06e 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 94ba6777e..6a2a625f0 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 5502e8649..31e082c86 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 2893595e6..98a00c640 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 d71f2407b..46b4f8dc7 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)
};
--
GitLab