From 22c7211613d0147142a93290ab29258a6ab361d4 Mon Sep 17 00:00:00 2001
From: Soeren Peters <peters@irmb.tu-bs.de>
Date: Wed, 16 Sep 2020 16:36:47 +0200
Subject: [PATCH] Remove VirtualFluidsDefinitions includes.

---
 src/gpu/GksGpu/DataBase/DataBaseStruct.h                        | 2 +-
 src/gpu/GksGpu/Parameters/Parameters.h                          | 2 +-
 src/gpu/GksGpu/Restart/Restart.h                                | 2 +-
 src/gpu/GridGenerator/StreetPointFinder/JunctionReader.h        | 2 +-
 src/gpu/GridGenerator/StreetPointFinder/SinkReader.h            | 2 +-
 src/gpu/GridGenerator/StreetPointFinder/SourceReader.h          | 2 +-
 src/gpu/GridGenerator/StreetPointFinder/StreetPointFinder.h     | 2 +-
 src/gpu/GridGenerator/geometries/Object.h                       | 2 +-
 src/gpu/Traffic/GPU/TrafficTimestep.h                           | 2 +-
 src/gpu/Traffic/Junction/Junction.h                             | 2 +-
 src/gpu/Traffic/Junction/JunctionData.h                         | 2 +-
 src/gpu/Traffic/Junction/JunctionRandom.h                       | 2 +-
 src/gpu/Traffic/Output/CarDisplay.h                             | 2 +-
 src/gpu/Traffic/Output/ConcentrationOutwriter.h                 | 2 +-
 src/gpu/Traffic/RoadNetwork/RoadNetworkData.h                   | 2 +-
 src/gpu/Traffic/Sink/SinkData.h                                 | 2 +-
 src/gpu/Traffic/Source/Source.h                                 | 2 +-
 src/gpu/Traffic/Source/SourceData.h                             | 2 +-
 src/gpu/Traffic/Source/SourceRandom.h                           | 2 +-
 src/gpu/Traffic/TrafficMovement.h                               | 2 +-
 src/gpu/Traffic/TrafficMovementFactory - Kopie.h                | 2 +-
 src/gpu/Traffic/TrafficMovementFactory.h                        | 2 +-
 src/gpu/Traffic/TrafficMovementFactoryTestRoads.h               | 2 +-
 src/gpu/Traffic/Utilities/ConsoleColor.cpp                      | 2 +-
 src/gpu/Traffic/Utilities/Logger.h                              | 2 +-
 src/gpu/Traffic/Utilities/RandomHelper.h                        | 2 +-
 src/gpu/Traffic/Utilities/VectorHelper.h                        | 2 +-
 src/gpu/Traffic/Utilities/invalidInput_error.h                  | 2 +-
 src/gpu/VirtualFluids_GPU/Communication/Communicator.h          | 2 +-
 .../VirtualFluids_GPU/DataStructureInitializer/GridProvider.h   | 2 +-
 .../DataStructureInitializer/GridReaderFiles/GridReader.h       | 2 +-
 .../GridReaderGenerator/GridGenerator.h                         | 2 +-
 src/gpu/VirtualFluids_GPU/LBM/Simulation.h                      | 2 +-
 src/gpu/VirtualFluids_GPU/Output/FileWriter.h                   | 2 +-
 34 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/src/gpu/GksGpu/DataBase/DataBaseStruct.h b/src/gpu/GksGpu/DataBase/DataBaseStruct.h
index 8e6e9fd9b..3fb5a50a0 100644
--- a/src/gpu/GksGpu/DataBase/DataBaseStruct.h
+++ b/src/gpu/GksGpu/DataBase/DataBaseStruct.h
@@ -3,7 +3,7 @@
 
 #include "Core/DataTypes.h"
 
-#include <VirtualFluidsDefinitions.h>
+
 
 namespace GksGpu{ 
 
diff --git a/src/gpu/GksGpu/Parameters/Parameters.h b/src/gpu/GksGpu/Parameters/Parameters.h
index 42950d3eb..ab7bdb4c6 100644
--- a/src/gpu/GksGpu/Parameters/Parameters.h
+++ b/src/gpu/GksGpu/Parameters/Parameters.h
@@ -4,7 +4,7 @@
 #include "Core/DataTypes.h"
 #include "Core/VectorTypes.h"
 
-#include <VirtualFluidsDefinitions.h>
+
 #include "GksGpu_export.h"
 
 namespace GksGpu {
diff --git a/src/gpu/GksGpu/Restart/Restart.h b/src/gpu/GksGpu/Restart/Restart.h
index f607cf355..235a43343 100644
--- a/src/gpu/GksGpu/Restart/Restart.h
+++ b/src/gpu/GksGpu/Restart/Restart.h
@@ -4,7 +4,7 @@
 #include <string>
 #include <memory>
 
-#include <VirtualFluidsDefinitions.h>
+
 #include "GksGpu_export.h"
 
 #include "PointerDefinitions.h"
diff --git a/src/gpu/GridGenerator/StreetPointFinder/JunctionReader.h b/src/gpu/GridGenerator/StreetPointFinder/JunctionReader.h
index 7d7d2bbb1..7f1769762 100644
--- a/src/gpu/GridGenerator/StreetPointFinder/JunctionReader.h
+++ b/src/gpu/GridGenerator/StreetPointFinder/JunctionReader.h
@@ -10,7 +10,7 @@
 
 #include "StreetPointFinder.h"
 
-#include <VirtualFluidsDefinitions.h>
+
 
 struct GRIDGENERATOR_EXPORT JunctionReaderData
 {
diff --git a/src/gpu/GridGenerator/StreetPointFinder/SinkReader.h b/src/gpu/GridGenerator/StreetPointFinder/SinkReader.h
index d6f71f4b5..115aea552 100644
--- a/src/gpu/GridGenerator/StreetPointFinder/SinkReader.h
+++ b/src/gpu/GridGenerator/StreetPointFinder/SinkReader.h
@@ -10,7 +10,7 @@
 
 #include "StreetPointFinder.h"
 
-#include <VirtualFluidsDefinitions.h>
+
 
 struct GRIDGENERATOR_EXPORT SinkReaderData{
 	uint sinkIndex;
diff --git a/src/gpu/GridGenerator/StreetPointFinder/SourceReader.h b/src/gpu/GridGenerator/StreetPointFinder/SourceReader.h
index 4ada88fb8..db95259ea 100644
--- a/src/gpu/GridGenerator/StreetPointFinder/SourceReader.h
+++ b/src/gpu/GridGenerator/StreetPointFinder/SourceReader.h
@@ -8,7 +8,7 @@
 
 #include "StreetPointFinder.h"
 
-#include <VirtualFluidsDefinitions.h>
+
 
 struct GRIDGENERATOR_EXPORT SourceReaderData {
 	unsigned int sourceIndex;
diff --git a/src/gpu/GridGenerator/StreetPointFinder/StreetPointFinder.h b/src/gpu/GridGenerator/StreetPointFinder/StreetPointFinder.h
index 5c552d515..73d1e0de0 100644
--- a/src/gpu/GridGenerator/StreetPointFinder/StreetPointFinder.h
+++ b/src/gpu/GridGenerator/StreetPointFinder/StreetPointFinder.h
@@ -9,7 +9,7 @@
 #include "PointerDefinitions.h"
 #include "Core/DataTypes.h"
 
-#include <VirtualFluidsDefinitions.h>
+
 
 class Grid;
 
diff --git a/src/gpu/GridGenerator/geometries/Object.h b/src/gpu/GridGenerator/geometries/Object.h
index 3635a24d4..e26ff324f 100644
--- a/src/gpu/GridGenerator/geometries/Object.h
+++ b/src/gpu/GridGenerator/geometries/Object.h
@@ -7,7 +7,7 @@
 #ifndef OBJECT_H
 #define OBJECT_H
 #include "GridGenerator_export.h"
-#include <VirtualFluidsDefinitions.h>
+
 #include "grid/Cell.h"
 #include "global.h"
 
diff --git a/src/gpu/Traffic/GPU/TrafficTimestep.h b/src/gpu/Traffic/GPU/TrafficTimestep.h
index d6355afb9..113cc3d11 100644
--- a/src/gpu/Traffic/GPU/TrafficTimestep.h
+++ b/src/gpu/Traffic/GPU/TrafficTimestep.h
@@ -7,7 +7,7 @@
 #include <thrust/device_vector.h>
 #include <curand_kernel.h>
 
-#include <VirtualFluidsDefinitions.h>
+
 #include "PointerDefinitions.h"
 #include "Core/DataTypes.h"
 #include "Traffic_export.h"
diff --git a/src/gpu/Traffic/Junction/Junction.h b/src/gpu/Traffic/Junction/Junction.h
index 6ec6e2f5f..68da2bb10 100644
--- a/src/gpu/Traffic/Junction/Junction.h
+++ b/src/gpu/Traffic/Junction/Junction.h
@@ -1,7 +1,7 @@
 #pragma once
 #include <vector>
 
-#include <VirtualFluidsDefinitions.h>
+
 #include "Core/DataTypes.h"
 
 #include "JunctionData.h"
diff --git a/src/gpu/Traffic/Junction/JunctionData.h b/src/gpu/Traffic/Junction/JunctionData.h
index fde3d50e2..3b72b1ef5 100644
--- a/src/gpu/Traffic/Junction/JunctionData.h
+++ b/src/gpu/Traffic/Junction/JunctionData.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <VirtualFluidsDefinitions.h>
+
 
 #include <vector>
 #include <memory>
diff --git a/src/gpu/Traffic/Junction/JunctionRandom.h b/src/gpu/Traffic/Junction/JunctionRandom.h
index e006aad48..21ce45968 100644
--- a/src/gpu/Traffic/Junction/JunctionRandom.h
+++ b/src/gpu/Traffic/Junction/JunctionRandom.h
@@ -2,7 +2,7 @@
 #include <random> 
 #include <vector>
 
-#include <VirtualFluidsDefinitions.h>
+
 #include "Core/DataTypes.h"
 
 #include "Junction.h"
diff --git a/src/gpu/Traffic/Output/CarDisplay.h b/src/gpu/Traffic/Output/CarDisplay.h
index 78386d42b..336160139 100644
--- a/src/gpu/Traffic/Output/CarDisplay.h
+++ b/src/gpu/Traffic/Output/CarDisplay.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <VirtualFluidsDefinitions.h>
+
 
 #include <vector>
 #include <memory>
diff --git a/src/gpu/Traffic/Output/ConcentrationOutwriter.h b/src/gpu/Traffic/Output/ConcentrationOutwriter.h
index 35fc8e274..9589e5f4b 100644
--- a/src/gpu/Traffic/Output/ConcentrationOutwriter.h
+++ b/src/gpu/Traffic/Output/ConcentrationOutwriter.h
@@ -2,7 +2,7 @@
 
 #include <vector>
 
-#include <VirtualFluidsDefinitions.h>
+
 #include "Core/DataTypes.h"
 
 #include "Traffic_export.h"
diff --git a/src/gpu/Traffic/RoadNetwork/RoadNetworkData.h b/src/gpu/Traffic/RoadNetwork/RoadNetworkData.h
index 352cd5fc7..3839c53c8 100644
--- a/src/gpu/Traffic/RoadNetwork/RoadNetworkData.h
+++ b/src/gpu/Traffic/RoadNetwork/RoadNetworkData.h
@@ -2,7 +2,7 @@
 #include <memory>
 #include <vector>
 
-#include <VirtualFluidsDefinitions.h>
+
 
 #include "Source/Source.h"
 #include "Sink/Sink.h"
diff --git a/src/gpu/Traffic/Sink/SinkData.h b/src/gpu/Traffic/Sink/SinkData.h
index f035fa315..9603c816a 100644
--- a/src/gpu/Traffic/Sink/SinkData.h
+++ b/src/gpu/Traffic/Sink/SinkData.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <VirtualFluidsDefinitions.h>
+
 #include "Core/DataTypes.h"
 
 #include "Traffic_export.h"
diff --git a/src/gpu/Traffic/Source/Source.h b/src/gpu/Traffic/Source/Source.h
index b4cad3a5c..3c786b7ee 100644
--- a/src/gpu/Traffic/Source/Source.h
+++ b/src/gpu/Traffic/Source/Source.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <VirtualFluidsDefinitions.h>
+
 
 #include "SourceData.h"
 #include "Traffic_export.h"
diff --git a/src/gpu/Traffic/Source/SourceData.h b/src/gpu/Traffic/Source/SourceData.h
index e19dca7b1..e71ec4b5c 100644
--- a/src/gpu/Traffic/Source/SourceData.h
+++ b/src/gpu/Traffic/Source/SourceData.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <VirtualFluidsDefinitions.h>
+
 #include "Core/DataTypes.h"
 
 #include <memory>
diff --git a/src/gpu/Traffic/Source/SourceRandom.h b/src/gpu/Traffic/Source/SourceRandom.h
index bed207749..5acf83fd7 100644
--- a/src/gpu/Traffic/Source/SourceRandom.h
+++ b/src/gpu/Traffic/Source/SourceRandom.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <VirtualFluidsDefinitions.h>
+
 
 #include <random>
 
diff --git a/src/gpu/Traffic/TrafficMovement.h b/src/gpu/Traffic/TrafficMovement.h
index bdc2c8690..8655e8af0 100644
--- a/src/gpu/Traffic/TrafficMovement.h
+++ b/src/gpu/Traffic/TrafficMovement.h
@@ -4,7 +4,7 @@
 #include <random> 
 #include <memory>
 
-#include <VirtualFluidsDefinitions.h>
+
 #include "Core/DataTypes.h"
 
 #include "RoadNetwork/RoadNetworkData.h"
diff --git a/src/gpu/Traffic/TrafficMovementFactory - Kopie.h b/src/gpu/Traffic/TrafficMovementFactory - Kopie.h
index d813f367d..ba27cf68e 100644
--- a/src/gpu/Traffic/TrafficMovementFactory - Kopie.h	
+++ b/src/gpu/Traffic/TrafficMovementFactory - Kopie.h	
@@ -1,6 +1,6 @@
 # pragma once
 
-#include <VirtualFluidsDefinitions.h>
+
 #include "Core/DataTypes.h"
 
 #include <vector>
diff --git a/src/gpu/Traffic/TrafficMovementFactory.h b/src/gpu/Traffic/TrafficMovementFactory.h
index afa709ab0..c934d2760 100644
--- a/src/gpu/Traffic/TrafficMovementFactory.h
+++ b/src/gpu/Traffic/TrafficMovementFactory.h
@@ -1,6 +1,6 @@
 # pragma once
 
-#include <VirtualFluidsDefinitions.h>
+
 #include "Core/DataTypes.h"
 
 #include <vector>
diff --git a/src/gpu/Traffic/TrafficMovementFactoryTestRoads.h b/src/gpu/Traffic/TrafficMovementFactoryTestRoads.h
index afb3854f8..faafcf89f 100644
--- a/src/gpu/Traffic/TrafficMovementFactoryTestRoads.h
+++ b/src/gpu/Traffic/TrafficMovementFactoryTestRoads.h
@@ -1,6 +1,6 @@
 # pragma once
 
-#include <VirtualFluidsDefinitions.h>
+
 
 #include <vector>
 #include <memory>
diff --git a/src/gpu/Traffic/Utilities/ConsoleColor.cpp b/src/gpu/Traffic/Utilities/ConsoleColor.cpp
index d8db3d440..f015fe18f 100644
--- a/src/gpu/Traffic/Utilities/ConsoleColor.cpp
+++ b/src/gpu/Traffic/Utilities/ConsoleColor.cpp
@@ -2,7 +2,7 @@
 
 
 
-#include <VirtualFluidsDefinitions.h>
+
 #include "Core/DataTypes.h"
 
 
diff --git a/src/gpu/Traffic/Utilities/Logger.h b/src/gpu/Traffic/Utilities/Logger.h
index 3e97cd35a..a10a567ac 100644
--- a/src/gpu/Traffic/Utilities/Logger.h
+++ b/src/gpu/Traffic/Utilities/Logger.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <VirtualFluidsDefinitions.h>
+
 #include "Core/DataTypes.h"
 
 #include <string>
diff --git a/src/gpu/Traffic/Utilities/RandomHelper.h b/src/gpu/Traffic/Utilities/RandomHelper.h
index 4e0ae40ae..869e93ed3 100644
--- a/src/gpu/Traffic/Utilities/RandomHelper.h
+++ b/src/gpu/Traffic/Utilities/RandomHelper.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <random>
-#include <VirtualFluidsDefinitions.h>
+
 #include "Traffic_export.h"
 
 class TRAFFIC_EXPORT RandomHelper
diff --git a/src/gpu/Traffic/Utilities/VectorHelper.h b/src/gpu/Traffic/Utilities/VectorHelper.h
index 0a76fefd9..eccc2b385 100644
--- a/src/gpu/Traffic/Utilities/VectorHelper.h
+++ b/src/gpu/Traffic/Utilities/VectorHelper.h
@@ -2,7 +2,7 @@
 
 #include <vector>
 
-#include <VirtualFluidsDefinitions.h>
+
 #include "Core/DataTypes.h"
 
 #include "Traffic_export.h"
diff --git a/src/gpu/Traffic/Utilities/invalidInput_error.h b/src/gpu/Traffic/Utilities/invalidInput_error.h
index e8e7c7c5a..d3ce36545 100644
--- a/src/gpu/Traffic/Utilities/invalidInput_error.h
+++ b/src/gpu/Traffic/Utilities/invalidInput_error.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <VirtualFluidsDefinitions.h>
+
 
 // using standard exceptions
 #include <stdexcept>
diff --git a/src/gpu/VirtualFluids_GPU/Communication/Communicator.h b/src/gpu/VirtualFluids_GPU/Communication/Communicator.h
index 341d3980b..b584bc880 100644
--- a/src/gpu/VirtualFluids_GPU/Communication/Communicator.h
+++ b/src/gpu/VirtualFluids_GPU/Communication/Communicator.h
@@ -3,7 +3,7 @@
 
 #include <vector>
 
-#include <VirtualFluidsDefinitions.h>
+
 
 #include <mpi.h>
 
diff --git a/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridProvider.h b/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridProvider.h
index 1f33ad037..70a2a8ec6 100644
--- a/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridProvider.h
+++ b/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridProvider.h
@@ -5,7 +5,7 @@
 #include <vector>
 #include <memory>
 
-#include <VirtualFluidsDefinitions.h>
+
 #include "PointerDefinitions.h"
 #include "VirtualFluids_GPU_export.h"
 
diff --git a/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderFiles/GridReader.h b/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderFiles/GridReader.h
index 9d1ce9352..22f5db4f1 100644
--- a/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderFiles/GridReader.h
+++ b/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderFiles/GridReader.h
@@ -1,7 +1,7 @@
 #ifndef GridReaderFiles_H
 #define GridReaderFiles_H
 
-#include <VirtualFluidsDefinitions.h>
+
 
 #include "../GridProvider.h"
 
diff --git a/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/GridGenerator.h b/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/GridGenerator.h
index d2ebcf217..66b07deda 100644
--- a/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/GridGenerator.h
+++ b/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/GridGenerator.h
@@ -2,7 +2,7 @@
 #define GridReaderGenerator_H
 
 #include "../GridProvider.h"
-#include <VirtualFluidsDefinitions.h>
+
 #include <vector>
 #include <string>
 #include <memory>
diff --git a/src/gpu/VirtualFluids_GPU/LBM/Simulation.h b/src/gpu/VirtualFluids_GPU/LBM/Simulation.h
index 8a92184e5..afecb7afd 100644
--- a/src/gpu/VirtualFluids_GPU/LBM/Simulation.h
+++ b/src/gpu/VirtualFluids_GPU/LBM/Simulation.h
@@ -5,7 +5,7 @@
 #include <vector>
 #include <PointerDefinitions.h>
 
-#include <VirtualFluidsDefinitions.h>
+
 
 #include "Output/LogWriter.hpp"
 #include "GPU/KineticEnergyAnalyzer.h"
diff --git a/src/gpu/VirtualFluids_GPU/Output/FileWriter.h b/src/gpu/VirtualFluids_GPU/Output/FileWriter.h
index 2aedd4b79..863d3a116 100644
--- a/src/gpu/VirtualFluids_GPU/Output/FileWriter.h
+++ b/src/gpu/VirtualFluids_GPU/Output/FileWriter.h
@@ -5,7 +5,7 @@
 #include <vector>
 #include <string>
 
-#include <VirtualFluidsDefinitions.h>
+
 
 #include "DataWriter.h"
 
-- 
GitLab