From 8e3e4e61e4b57051f1b4141ac1ff1a93a33b8729 Mon Sep 17 00:00:00 2001
From: Henry <henry.korb@geo.uu.se>
Date: Wed, 12 Oct 2022 11:10:42 +0200
Subject: [PATCH] rename BCstructs to cuh set source file props of tests to
 LANGUAGE CUDA

---
 .../BoundaryConditions/BoundaryConditionFactory.h              | 2 +-
 ...BoundaryConditionStructs.h => BoundaryConditionStructs.cuh} | 0
 src/gpu/VirtualFluids_GPU/CMakeLists.txt                       | 3 +++
 src/gpu/VirtualFluids_GPU/Calculation/PlaneCalculations.cpp    | 2 +-
 .../DataStructureInitializer/GridReaderFiles/GridReader.h      | 2 +-
 .../GridReaderGenerator/GridGenerator.h                        | 2 +-
 src/gpu/VirtualFluids_GPU/FindQ/FindQ.h                        | 2 +-
 src/gpu/VirtualFluids_GPU/GPU/GPU_Interface.h                  | 2 +-
 src/gpu/VirtualFluids_GPU/Init/PositionReader.cpp              | 2 +-
 src/gpu/VirtualFluids_GPU/KernelManager/BCKernelManager.h      | 2 +-
 src/gpu/VirtualFluids_GPU/Output/QDebugWriter.hpp              | 2 +-
 src/gpu/VirtualFluids_GPU/Output/UnstructuredGridWriter.hpp    | 2 +-
 src/gpu/VirtualFluids_GPU/Parameter/Parameter.h                | 2 +-
 13 files changed, 14 insertions(+), 11 deletions(-)
 rename src/gpu/VirtualFluids_GPU/BoundaryConditions/{BoundaryConditionStructs.h => BoundaryConditionStructs.cuh} (100%)

diff --git a/src/gpu/VirtualFluids_GPU/BoundaryConditions/BoundaryConditionFactory.h b/src/gpu/VirtualFluids_GPU/BoundaryConditions/BoundaryConditionFactory.h
index 5b96e94ff..89adf7e79 100644
--- a/src/gpu/VirtualFluids_GPU/BoundaryConditions/BoundaryConditionFactory.h
+++ b/src/gpu/VirtualFluids_GPU/BoundaryConditions/BoundaryConditionFactory.h
@@ -39,7 +39,7 @@
 #include <variant>
 
 #include "LBM/LB.h"
-#include "BoundaryConditionStructs.h"
+#include "BoundaryConditionStructs.cuh"
 #include "Parameter/Parameter.h"
 #include "gpu/GridGenerator/grid/BoundaryConditions/Side.h"
 
diff --git a/src/gpu/VirtualFluids_GPU/BoundaryConditions/BoundaryConditionStructs.h b/src/gpu/VirtualFluids_GPU/BoundaryConditions/BoundaryConditionStructs.cuh
similarity index 100%
rename from src/gpu/VirtualFluids_GPU/BoundaryConditions/BoundaryConditionStructs.h
rename to src/gpu/VirtualFluids_GPU/BoundaryConditions/BoundaryConditionStructs.cuh
diff --git a/src/gpu/VirtualFluids_GPU/CMakeLists.txt b/src/gpu/VirtualFluids_GPU/CMakeLists.txt
index 40496abc6..2adc40ede 100644
--- a/src/gpu/VirtualFluids_GPU/CMakeLists.txt
+++ b/src/gpu/VirtualFluids_GPU/CMakeLists.txt
@@ -22,5 +22,8 @@ if(BUILD_VF_UNIT_TESTS)
 	set_source_files_properties(DataStructureInitializer/GridReaderGenerator/IndexRearrangementForStreamsTest.cpp PROPERTIES LANGUAGE CUDA)
     set_source_files_properties(Communication/ExchangeData27Test.cpp PROPERTIES LANGUAGE CUDA)
     set_source_files_properties(BoundaryConditions/BoundaryConditionFactoryTest.cpp PROPERTIES LANGUAGE CUDA)
+    set_source_files_properties(Parameter/ParameterTest.cpp PROPERTIES LANGUAGE CUDA)
+    set_source_files_properties(KernelManager/BCKernelManagerTest.cpp PROPERTIES LANGUAGE CUDA)
+    set_source_files_properties(Parameter/EdgeNodeFinderTest.cpp PROPERTIES LANGUAGE CUDA)
     target_include_directories(VirtualFluids_GPUTests PRIVATE "${VF_THIRD_DIR}/cuda_samples/")
 endif()
diff --git a/src/gpu/VirtualFluids_GPU/Calculation/PlaneCalculations.cpp b/src/gpu/VirtualFluids_GPU/Calculation/PlaneCalculations.cpp
index 2e2399d99..ca1bba908 100644
--- a/src/gpu/VirtualFluids_GPU/Calculation/PlaneCalculations.cpp
+++ b/src/gpu/VirtualFluids_GPU/Calculation/PlaneCalculations.cpp
@@ -10,7 +10,7 @@
 //using namespace std;
 //////////////////////////////////////////////////////////////////////////
 #include "Core/StringUtilities/StringUtil.h"
-#include "BoundaryConditions/BoundaryConditionStructs.h"
+#include "BoundaryConditions/BoundaryConditionStructs.cuh"
 
 void setSizeOfPlane(Parameter* para, int lev, unsigned int z)
 {
diff --git a/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderFiles/GridReader.h b/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderFiles/GridReader.h
index 47b17cd7b..ce08a8537 100644
--- a/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderFiles/GridReader.h
+++ b/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderFiles/GridReader.h
@@ -8,7 +8,7 @@
 #include <memory>
 
 #include "LBM/LB.h"
-#include "BoundaryConditions/BoundaryConditionStructs.h"
+#include "BoundaryConditions/BoundaryConditionStructs.cuh"
 
 //#include "VirtualFluids_GPU_export.h"
 
diff --git a/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/GridGenerator.h b/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/GridGenerator.h
index a2acf03ef..6d851272e 100644
--- a/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/GridGenerator.h
+++ b/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/GridGenerator.h
@@ -40,7 +40,7 @@
 #include <memory>
 
 #include "LBM/LB.h"
-#include "BoundaryConditions/BoundaryConditionStructs.h"
+#include "BoundaryConditions/BoundaryConditionStructs.cuh"
 
 
 class Parameter;
diff --git a/src/gpu/VirtualFluids_GPU/FindQ/FindQ.h b/src/gpu/VirtualFluids_GPU/FindQ/FindQ.h
index 6db243a47..39b77dc87 100644
--- a/src/gpu/VirtualFluids_GPU/FindQ/FindQ.h
+++ b/src/gpu/VirtualFluids_GPU/FindQ/FindQ.h
@@ -4,7 +4,7 @@
 #include "LBM/LB.h"
 #include "lbm/constants/D3Q27.h"
 #include "Parameter/Parameter.h"
-#include "BoundaryConditions/BoundaryConditionStructs.h"
+#include "BoundaryConditions/BoundaryConditionStructs.cuh"
 
 
 void findQ(Parameter* para, int lev);
diff --git a/src/gpu/VirtualFluids_GPU/GPU/GPU_Interface.h b/src/gpu/VirtualFluids_GPU/GPU/GPU_Interface.h
index daddcbaa1..6a9ad59da 100644
--- a/src/gpu/VirtualFluids_GPU/GPU/GPU_Interface.h
+++ b/src/gpu/VirtualFluids_GPU/GPU/GPU_Interface.h
@@ -14,7 +14,7 @@
 
 #include <DataTypes.h>
 #include "LBM/LB.h"
-#include "BoundaryConditions/BoundaryConditionStructs.h"
+#include "BoundaryConditions/BoundaryConditionStructs.cuh"
 
 struct LBMSimulationParameter;
 class Parameter;
diff --git a/src/gpu/VirtualFluids_GPU/Init/PositionReader.cpp b/src/gpu/VirtualFluids_GPU/Init/PositionReader.cpp
index eeec6aa3f..2ea931014 100644
--- a/src/gpu/VirtualFluids_GPU/Init/PositionReader.cpp
+++ b/src/gpu/VirtualFluids_GPU/Init/PositionReader.cpp
@@ -3,7 +3,7 @@
 #include "Parameter/Parameter.h"
 
 #include <basics/utilities/UbFileInputASCII.h>
-#include "BoundaryConditions/BoundaryConditionStructs.h"
+#include "BoundaryConditions/BoundaryConditionStructs.cuh"
 
 using namespace vf::lbm::dir;
 
diff --git a/src/gpu/VirtualFluids_GPU/KernelManager/BCKernelManager.h b/src/gpu/VirtualFluids_GPU/KernelManager/BCKernelManager.h
index 2b16dd438..386cf95fc 100644
--- a/src/gpu/VirtualFluids_GPU/KernelManager/BCKernelManager.h
+++ b/src/gpu/VirtualFluids_GPU/KernelManager/BCKernelManager.h
@@ -40,7 +40,7 @@
 #include "LBM/LB.h"
 #include "PointerDefinitions.h"
 #include "VirtualFluids_GPU_export.h"
-#include "BoundaryConditions/BoundaryConditionStructs.h"
+#include "BoundaryConditions/BoundaryConditionStructs.cuh"
 
 
 class CudaMemoryManager;
diff --git a/src/gpu/VirtualFluids_GPU/Output/QDebugWriter.hpp b/src/gpu/VirtualFluids_GPU/Output/QDebugWriter.hpp
index 1b2aa6fda..946810d5c 100644
--- a/src/gpu/VirtualFluids_GPU/Output/QDebugWriter.hpp
+++ b/src/gpu/VirtualFluids_GPU/Output/QDebugWriter.hpp
@@ -12,7 +12,7 @@
 #include "basics/utilities/UbSystem.h"
 #include <basics/writer/WbWriterVtkXmlBinary.h>
 #include "Core/StringUtilities/StringUtil.h"
-#include "BoundaryConditions/BoundaryConditionStructs.h"
+#include "BoundaryConditions/BoundaryConditionStructs.cuh"
 
 //using namespace std;
 
diff --git a/src/gpu/VirtualFluids_GPU/Output/UnstructuredGridWriter.hpp b/src/gpu/VirtualFluids_GPU/Output/UnstructuredGridWriter.hpp
index 1865dd905..2beb1d25c 100644
--- a/src/gpu/VirtualFluids_GPU/Output/UnstructuredGridWriter.hpp
+++ b/src/gpu/VirtualFluids_GPU/Output/UnstructuredGridWriter.hpp
@@ -9,7 +9,7 @@
 #include "LBM/LB.h"
 #include "lbm/constants/D3Q27.h"
 #include "Parameter/Parameter.h"
-#include "BoundaryConditions/BoundaryConditionStructs.h"
+#include "BoundaryConditions/BoundaryConditionStructs.cuh"
 #include "basics/utilities/UbSystem.h"
 #include <basics/writer/WbWriterVtkXmlBinary.h>
 #include <basics/writer/WbWriterVtkXmlASCII.h>
diff --git a/src/gpu/VirtualFluids_GPU/Parameter/Parameter.h b/src/gpu/VirtualFluids_GPU/Parameter/Parameter.h
index 61c92803a..4d6c38283 100644
--- a/src/gpu/VirtualFluids_GPU/Parameter/Parameter.h
+++ b/src/gpu/VirtualFluids_GPU/Parameter/Parameter.h
@@ -43,7 +43,7 @@
 #include "LBM/LB.h"
 #include "PreCollisionInteractor/PreCollisionInteractor.h"
 #include "TurbulenceModels/TurbulenceModelFactory.h"
-#include "BoundaryConditions/BoundaryConditionStructs.h"
+#include "BoundaryConditions/BoundaryConditionStructs.cuh"
 
 #include "VirtualFluids_GPU_export.h"
 
-- 
GitLab