Skip to content
Snippets Groups Projects
Commit 85806814 authored by Hkorb's avatar Hkorb
Browse files

fixed error in unit test compilation

parent 2e4089de
No related branches found
No related tags found
1 merge request!81fixed AL
...@@ -3,3 +3,5 @@ PROJECT(ActuatorLine LANGUAGES CUDA CXX) ...@@ -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) 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_source_files_properties(ActuatorLine.cpp PROPERTIES LANGUAGE CUDA)
set_target_properties(ActuatorLine PROPERTIES CUDA_SEPARABLE_COMPILATION ON)
...@@ -8,6 +8,10 @@ ...@@ -8,6 +8,10 @@
#include "lbm/constants/NumericConstants.h" #include "lbm/constants/NumericConstants.h"
#include "VirtualFluids_GPU/GPU/GeometryUtils.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) __host__ __device__ __inline__ real calcGaussian3D(real posX, real posY, real posZ, real destX, real destY, real destZ, real epsilon)
{ {
real distX = destX-posX; real distX = destX-posX;
......
...@@ -10,6 +10,10 @@ ...@@ -10,6 +10,10 @@
#include "basics/writer/WbWriterVtkXmlBinary.h" #include "basics/writer/WbWriterVtkXmlBinary.h"
#include <Core/StringUtilities/StringUtil.h> #include <Core/StringUtilities/StringUtil.h>
#include "Parameter/Parameter.h"
#include "DataStructureInitializer/GridProvider.h"
#include "GPU/CudaMemoryManager.h"
__global__ void interpQuantities( int* pointIndices, __global__ void interpQuantities( int* pointIndices,
uint nPoints, uint nPoints,
......
...@@ -2,9 +2,8 @@ ...@@ -2,9 +2,8 @@
#define Probe_H #define Probe_H
#include "Visitor.h" #include "Visitor.h"
#include "Parameter/Parameter.h"
#include "PointerDefinitions.h" #include "PointerDefinitions.h"
#include "GridGenerator/grid/GridBuilder/GridBuilder.h"
enum class PostProcessingVariable{ enum class PostProcessingVariable{
// Enum val is index in pointer array -> increment between enum1 and enum2 is number of quantities allocated for enum1 // 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{ ...@@ -28,7 +27,6 @@ struct ProbeStruct{
}; };
class Probe : public Visitor class Probe : public Visitor
{ {
public: public:
...@@ -79,8 +77,4 @@ private: ...@@ -79,8 +77,4 @@ private:
// std::vector< std::vector<real> > distX, distY, distZ; // std::vector< std::vector<real> > distX, distY, distZ;
}; };
#endif #endif
\ No newline at end of file
...@@ -7,12 +7,12 @@ ...@@ -7,12 +7,12 @@
#include "PointerDefinitions.h" #include "PointerDefinitions.h"
#include "Core/DataTypes.h" #include "Core/DataTypes.h"
#include "VirtualFluids_GPU_export.h" #include "VirtualFluids_GPU_export.h"
#include "DataStructureInitializer/GridProvider.h"
#include "GPU/CudaMemoryManager.h"
#include <cassert> #include <cassert>
class Parameter; class Parameter;
class GridProvider;
class CudaMemoryManager;
class VIRTUALFLUIDS_GPU_EXPORT Visitor class VIRTUALFLUIDS_GPU_EXPORT Visitor
...@@ -52,7 +52,7 @@ public: ...@@ -52,7 +52,7 @@ public:
} }
protected: 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)
}; };
......
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