From dafb92400d2a2c9b9aa6071e1cee0bcfd468d998 Mon Sep 17 00:00:00 2001
From: Sebastian Eibl <sebastian.eibl@fau.de>
Date: Tue, 2 Oct 2018 16:20:39 +0200
Subject: [PATCH] removed all-header dependencies

---
 .../ForcesOnSphereNearPlaneInShearFlow.cpp    |  2 ++
 .../PeriodicGranularGas.cpp                   |  3 ++-
 .../BidisperseFluidizedBedDPM.cpp             |  2 ++
 apps/tutorials/pe/01_ConfinedGas.cpp          |  3 ++-
 apps/tutorials/pe/02_ConfinedGasExtended.cpp  |  3 ++-
 src/pe/raytracing/Raytracer.cpp               |  6 ++++-
 src/pe/raytracing/Raytracer.h                 | 22 +++++++++----------
 src/pe/synchronization/SyncForces.h           |  9 +++++---
 src/pe/synchronization/SyncShadowOwners.h     |  9 +++++---
 src/pe/utility/CreateWorld.cpp                |  4 +++-
 src/pe/utility/CreateWorld.h                  |  7 +++---
 tests/mesh/PeVTKMeshWriterTest.cpp            |  1 +
 tests/pe/DynamicRefinement.cpp                |  3 ++-
 tests/pe/ParMetis.cpp                         |  1 +
 tests/pe/Raytracing.cpp                       |  3 ++-
 .../HinderedSettlingDynamicsDPM.cpp           |  2 ++
 .../SphereWallCollisionBehaviorDPM.cpp        |  2 ++
 .../BodyAtBlockBoarderCheck.cpp               |  2 ++
 .../DragForceSphereMEMRefinement.cpp          |  2 ++
 ...lobalBodyAsBoundaryMEMStaticRefinement.cpp |  2 ++
 .../SettlingSphereMEMDynamicRefinement.cpp    |  3 +++
 .../SettlingSphereMEMStaticRefinement.cpp     |  2 ++
 .../DragForceSpherePSMRefinement.cpp          |  2 ++
 23 files changed, 68 insertions(+), 27 deletions(-)

diff --git a/apps/benchmarks/ForcesOnSphereNearPlaneInShearFlow/ForcesOnSphereNearPlaneInShearFlow.cpp b/apps/benchmarks/ForcesOnSphereNearPlaneInShearFlow/ForcesOnSphereNearPlaneInShearFlow.cpp
index 6f3f8a2f4..ccb7cc631 100644
--- a/apps/benchmarks/ForcesOnSphereNearPlaneInShearFlow/ForcesOnSphereNearPlaneInShearFlow.cpp
+++ b/apps/benchmarks/ForcesOnSphereNearPlaneInShearFlow/ForcesOnSphereNearPlaneInShearFlow.cpp
@@ -20,6 +20,8 @@
 
 #include "blockforest/Initialization.h"
 #include "blockforest/communication/UniformBufferedScheme.h"
+#include <blockforest/loadbalancing/StaticCurve.h>
+#include <blockforest/SetupBlockForest.h>
 
 #include "boundary/all.h"
 
diff --git a/apps/benchmarks/PeriodicGranularGas/PeriodicGranularGas.cpp b/apps/benchmarks/PeriodicGranularGas/PeriodicGranularGas.cpp
index 1866ca5c5..eed7c84b3 100644
--- a/apps/benchmarks/PeriodicGranularGas/PeriodicGranularGas.cpp
+++ b/apps/benchmarks/PeriodicGranularGas/PeriodicGranularGas.cpp
@@ -23,6 +23,7 @@
 
 #include <core/Abort.h>
 #include <core/Environment.h>
+#include <core/math/Random.h>
 #include <core/grid_generator/SCIterator.h>
 #include <core/logging/Logging.h>
 #include <core/waLBerlaBuildInfo.h>
@@ -253,4 +254,4 @@ int main( int argc, char ** argv )
 int main( int argc, char* argv[] )
 {
   return walberla::main( argc, argv );
-}
\ No newline at end of file
+}
diff --git a/apps/showcases/BidisperseFluidizedBed/BidisperseFluidizedBedDPM.cpp b/apps/showcases/BidisperseFluidizedBed/BidisperseFluidizedBedDPM.cpp
index 44b990d11..c2f3e7a12 100644
--- a/apps/showcases/BidisperseFluidizedBed/BidisperseFluidizedBedDPM.cpp
+++ b/apps/showcases/BidisperseFluidizedBed/BidisperseFluidizedBedDPM.cpp
@@ -29,6 +29,8 @@
 #include "core/grid_generator/SCIterator.h"
 #include "core/logging/all.h"
 
+#include <domain_decomposition/SharedSweep.h>
+
 #include "field/AddToStorage.h"
 #include "field/communication/PackInfo.h"
 #include "field/distributors/all.h"
diff --git a/apps/tutorials/pe/01_ConfinedGas.cpp b/apps/tutorials/pe/01_ConfinedGas.cpp
index e674e83a6..3d9847922 100644
--- a/apps/tutorials/pe/01_ConfinedGas.cpp
+++ b/apps/tutorials/pe/01_ConfinedGas.cpp
@@ -25,6 +25,7 @@
 #include <core/grid_generator/HCPIterator.h>
 #include <core/grid_generator/SCIterator.h>
 #include <core/logging/Logging.h>
+#include <core/math/Random.h>
 //! [Includes]
 
 namespace walberla {
@@ -166,4 +167,4 @@ int main( int argc, char ** argv )
 int main( int argc, char* argv[] )
 {
   return walberla::main( argc, argv );
-}
\ No newline at end of file
+}
diff --git a/apps/tutorials/pe/02_ConfinedGasExtended.cpp b/apps/tutorials/pe/02_ConfinedGasExtended.cpp
index 7e0e027a7..e1da27b0d 100644
--- a/apps/tutorials/pe/02_ConfinedGasExtended.cpp
+++ b/apps/tutorials/pe/02_ConfinedGasExtended.cpp
@@ -28,6 +28,7 @@
 #include <core/grid_generator/HCPIterator.h>
 #include <core/grid_generator/SCIterator.h>
 #include <core/logging/Logging.h>
+#include <core/math/Random.h>
 #include <core/timing/TimingTree.h>
 #include <core/waLBerlaBuildInfo.h>
 #include <postprocessing/sqlite/SQLite.h>
@@ -299,4 +300,4 @@ int main( int argc, char ** argv )
 int main( int argc, char* argv[] )
 {
   return walberla::main( argc, argv );
-}
\ No newline at end of file
+}
diff --git a/src/pe/raytracing/Raytracer.cpp b/src/pe/raytracing/Raytracer.cpp
index ebacb5e22..4f94739bc 100644
--- a/src/pe/raytracing/Raytracer.cpp
+++ b/src/pe/raytracing/Raytracer.cpp
@@ -20,7 +20,11 @@
 
 #include "Raytracer.h"
 
-#include "core/mpi/all.h"
+#include <core/mpi/Gatherv.h>
+#include <core/mpi/MPIManager.h>
+#include <core/mpi/RecvBuffer.h>
+#include <core/mpi/SendBuffer.h>
+
 #include "geometry/structured/extern/lodepng.h"
 
 namespace walberla {
diff --git a/src/pe/raytracing/Raytracer.h b/src/pe/raytracing/Raytracer.h
index 9b5e2f585..39c42aa21 100644
--- a/src/pe/raytracing/Raytracer.h
+++ b/src/pe/raytracing/Raytracer.h
@@ -20,22 +20,22 @@
 
 #pragma once
 
-#include <pe/basic.h>
-#include <pe/Types.h>
-#include <core/math/Vector3.h>
-#include <core/mpi/all.h>
 #include <core/config/Config.h>
 #include <core/Filesystem.h>
+#include <core/math/Vector3.h>
+#include <core/mpi/Datatype.h>
 #include <core/timing/TimingTree.h>
-#include <functional>
-#include "Ray.h"
-#include "Intersects.h"
-#include "Lighting.h"
-#include "ShadingFunctions.h"
-#include "pe/ccd/ICCD.h"
+
+#include <pe/ccd/ICCD.h>
 #include <pe/ccd/HashGrids.h>
+#include <pe/raytracing/Ray.h>
+#include <pe/raytracing/Intersects.h>
+#include <pe/raytracing/Lighting.h>
+#include <pe/raytracing/ShadingFunctions.h>
+#include <pe/Types.h>
 
-#include <stddef.h>
+#include <cstddef>
+#include <functional>
 
 namespace walberla {
 namespace pe {
diff --git a/src/pe/synchronization/SyncForces.h b/src/pe/synchronization/SyncForces.h
index aa83e6519..b28fb837a 100644
--- a/src/pe/synchronization/SyncForces.h
+++ b/src/pe/synchronization/SyncForces.h
@@ -20,9 +20,12 @@
 
 #pragma once
 
-#include "blockforest/all.h"
-#include "core/all.h"
-#include "domain_decomposition/all.h"
+#include <core/DataTypes.h>
+#include <core/mpi/BufferSystem.h>
+#include <core/mpi/RecvBuffer.h>
+#include <core/mpi/Reduce.h>
+#include <core/mpi/SendBuffer.h>
+#include <domain_decomposition/BlockStorage.h>
 
 #include "pe/BlockFunctions.h"
 #include "pe/rigidbody/BodyStorage.h"
diff --git a/src/pe/synchronization/SyncShadowOwners.h b/src/pe/synchronization/SyncShadowOwners.h
index 49752ae17..89716ed28 100644
--- a/src/pe/synchronization/SyncShadowOwners.h
+++ b/src/pe/synchronization/SyncShadowOwners.h
@@ -20,9 +20,12 @@
 
 #pragma once
 
-#include "blockforest/all.h"
-#include "core/all.h"
-#include "domain_decomposition/all.h"
+#include <blockforest/BlockForest.h>
+#include <core/DataTypes.h>
+#include <core/mpi/BufferSystem.h>
+#include <core/mpi/RecvBuffer.h>
+#include <core/mpi/Reduce.h>
+#include <core/mpi/SendBuffer.h>
 
 #include "pe/BlockFunctions.h"
 #include "pe/rigidbody/BodyStorage.h"
diff --git a/src/pe/utility/CreateWorld.cpp b/src/pe/utility/CreateWorld.cpp
index 4045f0eea..377473c65 100644
--- a/src/pe/utility/CreateWorld.cpp
+++ b/src/pe/utility/CreateWorld.cpp
@@ -26,7 +26,9 @@
 
 #include <pe/Types.h>
 
-#include <core/DataTypes.h>
+#include <blockforest/Initialization.h>
+#include <blockforest/loadbalancing/StaticCurve.h>
+#include <blockforest/SetupBlockForest.h>
 #include <core/logging/Logging.h>
 #include <core/math/AABB.h>
 
diff --git a/src/pe/utility/CreateWorld.h b/src/pe/utility/CreateWorld.h
index 5ce6ad385..1cfec49c2 100644
--- a/src/pe/utility/CreateWorld.h
+++ b/src/pe/utility/CreateWorld.h
@@ -24,9 +24,10 @@
 // Includes
 //*************************************************************************************************
 
-#include "blockforest/all.h"
-#include "core/all.h"
-#include "domain_decomposition/all.h"
+#include "blockforest/BlockForest.h"
+#include "core/config/Config.h"
+#include "core/DataTypes.h"
+#include <core/mpi/MPIManager.h>
 
 namespace walberla {
 namespace pe {
diff --git a/tests/mesh/PeVTKMeshWriterTest.cpp b/tests/mesh/PeVTKMeshWriterTest.cpp
index 147b3d456..b3b704a97 100644
--- a/tests/mesh/PeVTKMeshWriterTest.cpp
+++ b/tests/mesh/PeVTKMeshWriterTest.cpp
@@ -38,6 +38,7 @@
 #include <core/logging/Logging.h>
 #include <core/timing/TimingTree.h>
 #include <core/waLBerlaBuildInfo.h>
+#include <core/math/Random.h>
 #include <core/math/Utility.h>
 #include <postprocessing/sqlite/SQLite.h>
 #include <vtk/VTKOutput.h>
diff --git a/tests/pe/DynamicRefinement.cpp b/tests/pe/DynamicRefinement.cpp
index 284949aba..07ce98b85 100644
--- a/tests/pe/DynamicRefinement.cpp
+++ b/tests/pe/DynamicRefinement.cpp
@@ -24,6 +24,7 @@
 #include "pe/utility/DestroyBody.h"
 
 #include "blockforest/Initialization.h"
+#include <blockforest/loadbalancing/DynamicCurve.h>
 #include "core/all.h"
 #include "domain_decomposition/all.h"
 
@@ -198,4 +199,4 @@ int main( int argc, char** argv )
 int main( int argc, char* argv[] )
 {
   return walberla::main( argc, argv );
-}
\ No newline at end of file
+}
diff --git a/tests/pe/ParMetis.cpp b/tests/pe/ParMetis.cpp
index 0f66faf31..3314d98a2 100644
--- a/tests/pe/ParMetis.cpp
+++ b/tests/pe/ParMetis.cpp
@@ -21,6 +21,7 @@
 #include "pe/utility/CreateWorld.h"
 
 #include <blockforest/loadbalancing/DynamicParMetis.h>
+#include <core/debug/TestSubsystem.h>
 #include <core/Environment.h>
 #include <core/logging/Logging.h>
 #include <core/math/Sample.h>
diff --git a/tests/pe/Raytracing.cpp b/tests/pe/Raytracing.cpp
index cb935d969..16b27ed20 100644
--- a/tests/pe/Raytracing.cpp
+++ b/tests/pe/Raytracing.cpp
@@ -15,6 +15,7 @@
 
 #include "core/debug/TestSubsystem.h"
 #include "core/DataTypes.h"
+#include <core/math/Random.h>
 #include "core/math/Vector3.h"
 
 #include <pe/raytracing/Ray.h>
@@ -914,4 +915,4 @@ int main( int argc, char** argv )
 int main( int argc, char* argv[] )
 {
   return walberla::main( argc, argv );
-}
\ No newline at end of file
+}
diff --git a/tests/pe_coupling/discrete_particle_methods/HinderedSettlingDynamicsDPM.cpp b/tests/pe_coupling/discrete_particle_methods/HinderedSettlingDynamicsDPM.cpp
index 8730491ec..80d152379 100644
--- a/tests/pe_coupling/discrete_particle_methods/HinderedSettlingDynamicsDPM.cpp
+++ b/tests/pe_coupling/discrete_particle_methods/HinderedSettlingDynamicsDPM.cpp
@@ -29,6 +29,8 @@
 #include "core/grid_generator/SCIterator.h"
 #include "core/logging/all.h"
 
+#include <domain_decomposition/SharedSweep.h>
+
 #include "field/AddToStorage.h"
 #include "field/communication/PackInfo.h"
 #include "field/distributors/all.h"
diff --git a/tests/pe_coupling/discrete_particle_methods/SphereWallCollisionBehaviorDPM.cpp b/tests/pe_coupling/discrete_particle_methods/SphereWallCollisionBehaviorDPM.cpp
index 41f952f16..2cbdd76dc 100644
--- a/tests/pe_coupling/discrete_particle_methods/SphereWallCollisionBehaviorDPM.cpp
+++ b/tests/pe_coupling/discrete_particle_methods/SphereWallCollisionBehaviorDPM.cpp
@@ -28,6 +28,8 @@
 
 #include "core/grid_generator/SCIterator.h"
 
+#include <domain_decomposition/SharedSweep.h>
+
 #include "field/AddToStorage.h"
 #include "field/communication/PackInfo.h"
 #include "field/distributors/all.h"
diff --git a/tests/pe_coupling/momentum_exchange_method/BodyAtBlockBoarderCheck.cpp b/tests/pe_coupling/momentum_exchange_method/BodyAtBlockBoarderCheck.cpp
index e78072cbf..c7ac8a324 100644
--- a/tests/pe_coupling/momentum_exchange_method/BodyAtBlockBoarderCheck.cpp
+++ b/tests/pe_coupling/momentum_exchange_method/BodyAtBlockBoarderCheck.cpp
@@ -21,6 +21,8 @@
 
 #include "blockforest/Initialization.h"
 #include "blockforest/communication/UniformBufferedScheme.h"
+#include <blockforest/loadbalancing/StaticCurve.h>
+#include <blockforest/SetupBlockForest.h>
 
 #include "boundary/all.h"
 
diff --git a/tests/pe_coupling/momentum_exchange_method/DragForceSphereMEMRefinement.cpp b/tests/pe_coupling/momentum_exchange_method/DragForceSphereMEMRefinement.cpp
index 3d60be54a..f940ae033 100644
--- a/tests/pe_coupling/momentum_exchange_method/DragForceSphereMEMRefinement.cpp
+++ b/tests/pe_coupling/momentum_exchange_method/DragForceSphereMEMRefinement.cpp
@@ -21,6 +21,8 @@
 
 #include "blockforest/Initialization.h"
 #include "blockforest/communication/UniformBufferedScheme.h"
+#include <blockforest/loadbalancing/StaticCurve.h>
+#include <blockforest/SetupBlockForest.h>
 
 #include "boundary/all.h"
 
diff --git a/tests/pe_coupling/momentum_exchange_method/GlobalBodyAsBoundaryMEMStaticRefinement.cpp b/tests/pe_coupling/momentum_exchange_method/GlobalBodyAsBoundaryMEMStaticRefinement.cpp
index 4643443ed..2afeebd2d 100644
--- a/tests/pe_coupling/momentum_exchange_method/GlobalBodyAsBoundaryMEMStaticRefinement.cpp
+++ b/tests/pe_coupling/momentum_exchange_method/GlobalBodyAsBoundaryMEMStaticRefinement.cpp
@@ -21,6 +21,8 @@
 
 #include "blockforest/Initialization.h"
 #include "blockforest/communication/UniformBufferedScheme.h"
+#include <blockforest/loadbalancing/StaticCurve.h>
+#include <blockforest/SetupBlockForest.h>
 
 #include "boundary/all.h"
 
diff --git a/tests/pe_coupling/momentum_exchange_method/SettlingSphereMEMDynamicRefinement.cpp b/tests/pe_coupling/momentum_exchange_method/SettlingSphereMEMDynamicRefinement.cpp
index 4357e587d..c87a6e7f8 100644
--- a/tests/pe_coupling/momentum_exchange_method/SettlingSphereMEMDynamicRefinement.cpp
+++ b/tests/pe_coupling/momentum_exchange_method/SettlingSphereMEMDynamicRefinement.cpp
@@ -21,6 +21,9 @@
 
 #include "blockforest/Initialization.h"
 #include "blockforest/communication/UniformBufferedScheme.h"
+#include <blockforest/loadbalancing/DynamicCurve.h>
+#include <blockforest/loadbalancing/StaticCurve.h>
+#include <blockforest/SetupBlockForest.h>
 
 #include "boundary/all.h"
 
diff --git a/tests/pe_coupling/momentum_exchange_method/SettlingSphereMEMStaticRefinement.cpp b/tests/pe_coupling/momentum_exchange_method/SettlingSphereMEMStaticRefinement.cpp
index 41da5d22c..3cf8bf5fd 100644
--- a/tests/pe_coupling/momentum_exchange_method/SettlingSphereMEMStaticRefinement.cpp
+++ b/tests/pe_coupling/momentum_exchange_method/SettlingSphereMEMStaticRefinement.cpp
@@ -21,6 +21,8 @@
 
 #include "blockforest/Initialization.h"
 #include "blockforest/communication/UniformBufferedScheme.h"
+#include <blockforest/loadbalancing/StaticCurve.h>
+#include <blockforest/SetupBlockForest.h>
 
 #include "boundary/all.h"
 
diff --git a/tests/pe_coupling/partially_saturated_cells_method/DragForceSpherePSMRefinement.cpp b/tests/pe_coupling/partially_saturated_cells_method/DragForceSpherePSMRefinement.cpp
index 2fbc0fcbe..58add3e24 100644
--- a/tests/pe_coupling/partially_saturated_cells_method/DragForceSpherePSMRefinement.cpp
+++ b/tests/pe_coupling/partially_saturated_cells_method/DragForceSpherePSMRefinement.cpp
@@ -21,6 +21,8 @@
 
 #include "blockforest/Initialization.h"
 #include "blockforest/communication/UniformBufferedScheme.h"
+#include <blockforest/loadbalancing/StaticCurve.h>
+#include <blockforest/SetupBlockForest.h>
 
 #include "boundary/all.h"
 
-- 
GitLab