From b2471edc921f785c14f81ff8694078df50b9b18c Mon Sep 17 00:00:00 2001
From: Anna Wellmann <a.wellmann@tu-braunschweig.de>
Date: Fri, 11 Mar 2022 17:45:22 +0100
Subject: [PATCH] Add class IndexRearrangementForStreamsTest and fix includes
---
.../GridGenerator/geometries/Vertex/Vertex.h | 2 +-
src/gpu/GridGenerator/grid/Cell.h | 4 ++--
src/gpu/GridGenerator/grid/Field.h | 2 +-
src/gpu/GridGenerator/grid/Grid.h | 6 ++---
.../grid/GridBuilder/GridBuilder.h | 2 +-
.../grid/GridBuilder/LevelGridBuilder.h | 8 +++----
src/gpu/GridGenerator/grid/GridImp.h | 10 ++++-----
src/gpu/GridGenerator/grid/GridInterface.h | 2 +-
.../grid/distributions/Distribution.h | 2 +-
.../SimulationFileWriter.h | 2 +-
src/gpu/VirtualFluids_GPU/CMakeLists.txt | 1 +
.../DataStructureInitializer/GridProvider.h | 2 +-
.../IndexRearrangementForStreams.h | 2 +-
.../IndexRearrangementForStreamsTest.cpp | 22 +++++++++++++++++++
14 files changed, 45 insertions(+), 22 deletions(-)
create mode 100644 src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/IndexRearrangementForStreamsTest.cpp
diff --git a/src/gpu/GridGenerator/geometries/Vertex/Vertex.h b/src/gpu/GridGenerator/geometries/Vertex/Vertex.h
index cabbc21c9..f1610b7e2 100644
--- a/src/gpu/GridGenerator/geometries/Vertex/Vertex.h
+++ b/src/gpu/GridGenerator/geometries/Vertex/Vertex.h
@@ -6,7 +6,7 @@
#include <memory>
#include <ostream>
-#include "global.h"
+#include "gpu/GridGenerator/global.h"
class VertexMemento;
diff --git a/src/gpu/GridGenerator/grid/Cell.h b/src/gpu/GridGenerator/grid/Cell.h
index 845e02eaa..0d6c3e13d 100644
--- a/src/gpu/GridGenerator/grid/Cell.h
+++ b/src/gpu/GridGenerator/grid/Cell.h
@@ -1,9 +1,9 @@
#ifndef CELL_H
#define CELL_H
-#include "global.h"
+#include "gpu/GridGenerator/global.h"
-#include "utilities/cuda/cudaDefines.h"
+#include "gpu/GridGenerator/utilities/cuda/cudaDefines.h"
struct Point
{
diff --git a/src/gpu/GridGenerator/grid/Field.h b/src/gpu/GridGenerator/grid/Field.h
index 9e7513108..d2ad5ca78 100644
--- a/src/gpu/GridGenerator/grid/Field.h
+++ b/src/gpu/GridGenerator/grid/Field.h
@@ -1,7 +1,7 @@
#ifndef FIELD_H
#define FIELD_H
-#include "global.h"
+#include "gpu/GridGenerator/global.h"
struct Vertex;
class GridStrategy;
diff --git a/src/gpu/GridGenerator/grid/Grid.h b/src/gpu/GridGenerator/grid/Grid.h
index 21cfea189..36d607bc0 100644
--- a/src/gpu/GridGenerator/grid/Grid.h
+++ b/src/gpu/GridGenerator/grid/Grid.h
@@ -3,11 +3,11 @@
#include "Core/LbmOrGks.h"
-#include "global.h"
+#include "gpu/GridGenerator/global.h"
-#include "geometries/Vertex/Vertex.h"
+#include "gpu/GridGenerator/geometries/Vertex/Vertex.h"
-#include "grid/Cell.h"
+#include "gpu/GridGenerator/grid/Cell.h"
class TriangularMesh;
struct Vertex;
diff --git a/src/gpu/GridGenerator/grid/GridBuilder/GridBuilder.h b/src/gpu/GridGenerator/grid/GridBuilder/GridBuilder.h
index 9ff99fad4..3d516c671 100644
--- a/src/gpu/GridGenerator/grid/GridBuilder/GridBuilder.h
+++ b/src/gpu/GridGenerator/grid/GridBuilder/GridBuilder.h
@@ -5,7 +5,7 @@
#include <string>
#include <memory>
-#include "global.h"
+#include "gpu/GridGenerator/global.h"
#define GEOMQS 6
#define INLETQS 0
diff --git a/src/gpu/GridGenerator/grid/GridBuilder/LevelGridBuilder.h b/src/gpu/GridGenerator/grid/GridBuilder/LevelGridBuilder.h
index f212f2c02..f90bbe231 100644
--- a/src/gpu/GridGenerator/grid/GridBuilder/LevelGridBuilder.h
+++ b/src/gpu/GridGenerator/grid/GridBuilder/LevelGridBuilder.h
@@ -6,11 +6,11 @@
#include <memory>
#include <array>
-#include "global.h"
+#include "gpu/GridGenerator/global.h"
-#include "grid/GridBuilder/GridBuilder.h"
-#include "grid/Grid.h"
-#include "grid/GridInterface.h"
+#include "gpu/GridGenerator/grid/GridBuilder/GridBuilder.h"
+#include "gpu/GridGenerator/grid/Grid.h"
+#include "gpu/GridGenerator/grid/GridInterface.h"
struct Vertex;
class Grid;
diff --git a/src/gpu/GridGenerator/grid/GridImp.h b/src/gpu/GridGenerator/grid/GridImp.h
index 09f278a4d..4ae18181f 100644
--- a/src/gpu/GridGenerator/grid/GridImp.h
+++ b/src/gpu/GridGenerator/grid/GridImp.h
@@ -5,12 +5,12 @@
#include "Core/LbmOrGks.h"
-#include "global.h"
+#include "gpu/GridGenerator/global.h"
-#include "grid/distributions/Distribution.h"
-#include "grid/Grid.h"
-#include "grid/Cell.h"
-#include "grid/Field.h"
+#include "gpu/GridGenerator/grid/distributions/Distribution.h"
+#include "gpu/GridGenerator/grid/Grid.h"
+#include "gpu/GridGenerator/grid/Cell.h"
+#include "gpu/GridGenerator/grid/Field.h"
class TriangularMesh;
struct Vertex;
diff --git a/src/gpu/GridGenerator/grid/GridInterface.h b/src/gpu/GridGenerator/grid/GridInterface.h
index d0f04ea34..2044fb494 100644
--- a/src/gpu/GridGenerator/grid/GridInterface.h
+++ b/src/gpu/GridGenerator/grid/GridInterface.h
@@ -1,7 +1,7 @@
#ifndef GRID_INTERFACE_H
#define GRID_INTERFACE_H
-#include "global.h"
+#include "gpu/GridGenerator/global.h"
class GridImp;
diff --git a/src/gpu/GridGenerator/grid/distributions/Distribution.h b/src/gpu/GridGenerator/grid/distributions/Distribution.h
index b05b5db36..04b7093aa 100644
--- a/src/gpu/GridGenerator/grid/distributions/Distribution.h
+++ b/src/gpu/GridGenerator/grid/distributions/Distribution.h
@@ -4,7 +4,7 @@
#include <vector>
#include <string>
-#include "global.h"
+#include "gpu/GridGenerator/global.h"
#define DIR_END_MAX 27
diff --git a/src/gpu/GridGenerator/io/SimulationFileWriter/SimulationFileWriter.h b/src/gpu/GridGenerator/io/SimulationFileWriter/SimulationFileWriter.h
index eb10c9c10..116c84b12 100644
--- a/src/gpu/GridGenerator/io/SimulationFileWriter/SimulationFileWriter.h
+++ b/src/gpu/GridGenerator/io/SimulationFileWriter/SimulationFileWriter.h
@@ -10,7 +10,7 @@
#include "Core/NonCreatable.h"
-#include "global.h"
+#include "gpu/GridGenerator/global.h"
class UnstructuredGridBuilder;
class GridBuilder;
diff --git a/src/gpu/VirtualFluids_GPU/CMakeLists.txt b/src/gpu/VirtualFluids_GPU/CMakeLists.txt
index 5c9359944..194200b5f 100644
--- a/src/gpu/VirtualFluids_GPU/CMakeLists.txt
+++ b/src/gpu/VirtualFluids_GPU/CMakeLists.txt
@@ -20,4 +20,5 @@ vf_add_tests()
if(BUILD_VF_UNIT_TESTS)
set_target_properties(VirtualFluids_GPUTests PROPERTIES CUDA_SEPARABLE_COMPILATION ON)
set_source_files_properties(Kernel/Utilities/DistributionHelperTests.cpp PROPERTIES LANGUAGE CUDA)
+ set_source_files_properties(DataStructureInitializer/GridReaderGenerator/IndexRearrangementForStreamsTest.cpp PROPERTIES LANGUAGE CUDA)
endif()
diff --git a/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridProvider.h b/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridProvider.h
index d12a25733..7ffe404cf 100644
--- a/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridProvider.h
+++ b/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridProvider.h
@@ -9,7 +9,7 @@
#include "PointerDefinitions.h"
#include "VirtualFluids_GPU_export.h"
-#include <GridGenerator/io/SimulationFileWriter/SimulationFileWriter.h>
+#include <gpu/GridGenerator/io/SimulationFileWriter/SimulationFileWriter.h>
class Parameter;
class GridBuilder;
diff --git a/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/IndexRearrangementForStreams.h b/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/IndexRearrangementForStreams.h
index fb1e06950..1ea5e6f1d 100644
--- a/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/IndexRearrangementForStreams.h
+++ b/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/IndexRearrangementForStreams.h
@@ -1,7 +1,7 @@
#ifndef IndexRearrangementForStreams_H
#define IndexRearrangementForStreams_H
-#include "../GridProvider.h"
+#include <gpu/VirtualFluids_GPU/DataStructureInitializer/GridProvider.h>
#include <vector>
#include <string>
diff --git a/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/IndexRearrangementForStreamsTest.cpp b/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/IndexRearrangementForStreamsTest.cpp
new file mode 100644
index 000000000..b6d2984da
--- /dev/null
+++ b/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/IndexRearrangementForStreamsTest.cpp
@@ -0,0 +1,22 @@
+#include <gmock/gmock.h>
+
+#include <iostream>
+#include <algorithm>
+#include <filesystem>
+
+#include <basics/config/ConfigurationFile.h>
+#include <Parameter/Parameter.h>
+
+#include <DataStructureInitializer/GridReaderGenerator/IndexRearrangementForStreams.h>
+#include <gpu/GridGenerator/grid/GridBuilder/LevelGridBuilder.h>
+#include <gpu/GridGenerator/grid/GridImp.h>
+
+
+auto RealEq = [](auto value) {
+#ifdef VF_DOUBLE_ACCURACY
+ return testing::DoubleEq(value);
+#else
+ return testing::FloatEq(value);
+#endif
+};
+
--
GitLab