From 38af04a31bc37c4dd83776f69fcd7f37c5e2984a Mon Sep 17 00:00:00 2001 From: Thomas Steinreiter Date: Wed, 23 Nov 2016 17:08:03 +0100 Subject: [PATCH] reordered includes --- bhtree_mpi/src/datastructures/BarnesHutTree.cpp | 7 ++++--- bhtree_mpi/src/datastructures/Body.cpp | 13 +++++++------ bhtree_mpi/src/datastructures/Body.hpp | 7 ++++--- bhtree_mpi/src/datastructures/Box.cpp | 5 +++-- bhtree_mpi/src/datastructures/Box.hpp | 9 +++++---- bhtree_mpi/src/datastructures/Node.cpp | 7 ++++--- bhtree_mpi/src/datastructures/Node.hpp | 7 ++++--- bhtree_mpi/src/datastructures/Tree.cpp | 11 ++++++----- bhtree_mpi/src/datastructures/Tree.hpp | 3 ++- 9 files changed, 39 insertions(+), 30 deletions(-) diff --git a/bhtree_mpi/src/datastructures/BarnesHutTree.cpp b/bhtree_mpi/src/datastructures/BarnesHutTree.cpp index 0ad4b48..69bc55e 100644 --- a/bhtree_mpi/src/datastructures/BarnesHutTree.cpp +++ b/bhtree_mpi/src/datastructures/BarnesHutTree.cpp @@ -1,9 +1,10 @@ -#include "BarnesHutTree.hpp" -#include "Node.hpp" -#include "Box.hpp" #include #include +#include "BarnesHutTree.hpp" +#include "Box.hpp" +#include "Node.hpp" + namespace nbody { BarnesHutTree::BarnesHutTree(std::size_t parallelId) : Tree(parallelId) {} diff --git a/bhtree_mpi/src/datastructures/Body.cpp b/bhtree_mpi/src/datastructures/Body.cpp index 8ab7243..1d7e233 100644 --- a/bhtree_mpi/src/datastructures/Body.cpp +++ b/bhtree_mpi/src/datastructures/Body.cpp @@ -1,11 +1,12 @@ -#include "Body.hpp" -#include -#include -#include -#include #include #include -#include +#include +#include +#include +#include + +#include "Body.hpp" +#include "Vec3.hpp" namespace nbody { Body::Body(const Vec3& position_, diff --git a/bhtree_mpi/src/datastructures/Body.hpp b/bhtree_mpi/src/datastructures/Body.hpp index b28c4ae..81b1e09 100644 --- a/bhtree_mpi/src/datastructures/Body.hpp +++ b/bhtree_mpi/src/datastructures/Body.hpp @@ -1,10 +1,11 @@ #ifndef BODY_HPP #define BODY_HPP -#include -#include #include -#include +#include +#include + +#include "Vec3.hpp" namespace nbody { static const double timestep = 1.0; diff --git a/bhtree_mpi/src/datastructures/Box.cpp b/bhtree_mpi/src/datastructures/Box.cpp index 24b09a3..4daedb1 100644 --- a/bhtree_mpi/src/datastructures/Box.cpp +++ b/bhtree_mpi/src/datastructures/Box.cpp @@ -1,7 +1,8 @@ -#include -#include #include +#include #include +#include + #include "Box.hpp" namespace nbody { diff --git a/bhtree_mpi/src/datastructures/Box.hpp b/bhtree_mpi/src/datastructures/Box.hpp index d8e8964..9794d74 100644 --- a/bhtree_mpi/src/datastructures/Box.hpp +++ b/bhtree_mpi/src/datastructures/Box.hpp @@ -1,11 +1,12 @@ #ifndef BOX_HPP #define BOX_HPP -#include #include -#include -#include -#include +#include +#include + +#include "Body.hpp" +#include "Vec3.hpp" namespace nbody { struct Box { diff --git a/bhtree_mpi/src/datastructures/Node.cpp b/bhtree_mpi/src/datastructures/Node.cpp index bca25e9..de52894 100644 --- a/bhtree_mpi/src/datastructures/Node.cpp +++ b/bhtree_mpi/src/datastructures/Node.cpp @@ -1,8 +1,9 @@ -#include +#include #include -#include #include -#include +#include +#include + #include "Node.hpp" #include "Tree.hpp" diff --git a/bhtree_mpi/src/datastructures/Node.hpp b/bhtree_mpi/src/datastructures/Node.hpp index 7837690..bc1e077 100644 --- a/bhtree_mpi/src/datastructures/Node.hpp +++ b/bhtree_mpi/src/datastructures/Node.hpp @@ -1,12 +1,13 @@ #ifndef TREE_NODE_HPP #define TREE_NODE_HPP -#include "Body.hpp" -#include -#include "Box.hpp" #include +#include #include +#include "Body.hpp" +#include "Box.hpp" + namespace nbody { class Tree; //class for storing node information diff --git a/bhtree_mpi/src/datastructures/Tree.cpp b/bhtree_mpi/src/datastructures/Tree.cpp index 68b4646..03559f1 100644 --- a/bhtree_mpi/src/datastructures/Tree.cpp +++ b/bhtree_mpi/src/datastructures/Tree.cpp @@ -1,11 +1,12 @@ -#include -#include -#include -#include #include -#include "Tree.hpp" +#include +#include +#include +#include + #include "Node.hpp" #include "Simulation.hpp" +#include "Tree.hpp" namespace nbody { Tree::Tree(std::size_t _parallelId): diff --git a/bhtree_mpi/src/datastructures/Tree.hpp b/bhtree_mpi/src/datastructures/Tree.hpp index eb8c48b..7c731bc 100644 --- a/bhtree_mpi/src/datastructures/Tree.hpp +++ b/bhtree_mpi/src/datastructures/Tree.hpp @@ -1,9 +1,10 @@ #ifndef TREE_HPP #define TREE_HPP -#include #include #include +#include + #include "Body.hpp" #include "Box.hpp" #include "Node.hpp" -- GitLab