From aaada2a274fa44b3b9488fbe3eef1ff861cc0cd3 Mon Sep 17 00:00:00 2001
From: Pedro Gonnet <gonnet@google.com>
Date: Sun, 30 Aug 2015 22:46:01 +0200
Subject: [PATCH] moved part.h from source files where appropriate.

Former-commit-id: 91658e395c7e520ce8f38f00828d1ab5a23cab73
---
 src/cell.c               | 1 -
 src/cell.h               | 3 +++
 src/common_io.c          | 1 -
 src/debug.c              | 1 -
 src/debug.h              | 3 +++
 src/engine.c             | 1 -
 src/multipole.c          | 1 -
 src/multipole.h          | 3 +++
 src/parallel_io.c        | 1 -
 src/parallel_io.h        | 3 +++
 src/part.h               | 2 +-
 src/proxy.c              | 1 -
 src/proxy.h              | 3 +++
 src/queue.c              | 1 -
 src/runner.c             | 1 -
 src/runner_doiact.h      | 3 +++
 src/runner_iact.h        | 2 ++
 src/runner_iact_legacy.h | 2 ++
 src/scheduler.c          | 1 -
 src/serial_io.c          | 1 -
 src/serial_io.h          | 3 +++
 src/single_io.c          | 1 -
 src/space.c              | 1 -
 src/space.h              | 3 +++
 src/task.c               | 1 -
 src/units.c              | 1 -
 26 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/src/cell.c b/src/cell.c
index 737b844d75..4c0839d16a 100644
--- a/src/cell.c
+++ b/src/cell.c
@@ -46,7 +46,6 @@
 #include "lock.h"
 #include "task.h"
 #include "timers.h"
-#include "part.h"
 #include "space.h"
 #include "multipole.h"
 #include "cell.h"
diff --git a/src/cell.h b/src/cell.h
index 78a0c5183f..088acb935a 100644
--- a/src/cell.h
+++ b/src/cell.h
@@ -19,6 +19,9 @@
 #ifndef SWIFT_CELL_H
 #define SWIFT_CELL_H
 
+/* Includes. */
+#include "part.h"
+
 /* Some constants. */
 #define cell_sid_dt 13
 #define cell_max_tag (1 << 16)
diff --git a/src/common_io.c b/src/common_io.c
index 51ef3bef15..10f66f0531 100644
--- a/src/common_io.c
+++ b/src/common_io.c
@@ -38,7 +38,6 @@
 #include "cycle.h"
 #include "lock.h"
 #include "task.h"
-#include "part.h"
 #include "space.h"
 #include "scheduler.h"
 #include "engine.h"
diff --git a/src/debug.c b/src/debug.c
index 2ad8417360..32ddb6816b 100644
--- a/src/debug.c
+++ b/src/debug.c
@@ -21,7 +21,6 @@
 #include <stdio.h>
 
 #include "const.h"
-#include "part.h"
 #include "lock.h"
 #include "multipole.h"
 #include "space.h"
diff --git a/src/debug.h b/src/debug.h
index 6e8e95df04..7cdb5c78c6 100644
--- a/src/debug.h
+++ b/src/debug.h
@@ -19,6 +19,9 @@
 #ifndef SWIFT_DEBUG_H
 #define SWIFT_DEBUG_H
 
+/* Includes. */
+#include "part.h"
+
 void print_cell(struct cell *c);
 void printParticle(struct part *parts, long long int i, int N);
 void printgParticle(struct gpart *parts, long long int i, int N);
diff --git a/src/engine.c b/src/engine.c
index 2ebab0dcaf..99735a83e7 100644
--- a/src/engine.c
+++ b/src/engine.c
@@ -51,7 +51,6 @@
 #include "vector.h"
 #include "lock.h"
 #include "task.h"
-#include "part.h"
 #include "debug.h"
 #include "space.h"
 #include "multipole.h"
diff --git a/src/multipole.c b/src/multipole.c
index 829882918f..bf3d77cf8f 100644
--- a/src/multipole.c
+++ b/src/multipole.c
@@ -40,7 +40,6 @@
 #include "atomic.h"
 #include "lock.h"
 #include "space.h"
-#include "part.h"
 #include "multipole.h"
 #include "cell.h"
 
diff --git a/src/multipole.h b/src/multipole.h
index 03dd0c4a10..42b78bd617 100644
--- a/src/multipole.h
+++ b/src/multipole.h
@@ -19,6 +19,9 @@
 #ifndef SWIFT_MULTIPOLE_H
 #define SWIFT_MULTIPOLE_H
 
+/* Includes. */
+#include "part.h"
+
 /* Some constants. */
 #define multipole_order 1
 
diff --git a/src/parallel_io.c b/src/parallel_io.c
index a0a4c66b03..beab80b880 100644
--- a/src/parallel_io.c
+++ b/src/parallel_io.c
@@ -39,7 +39,6 @@
 #include "cycle.h"
 #include "lock.h"
 #include "task.h"
-#include "part.h"
 #include "space.h"
 #include "scheduler.h"
 #include "engine.h"
diff --git a/src/parallel_io.h b/src/parallel_io.h
index 3096e5a1ba..035f94c336 100644
--- a/src/parallel_io.h
+++ b/src/parallel_io.h
@@ -19,6 +19,9 @@
 #ifndef SWIFT_PARALLEL_IO_H
 #define SWIFT_PARALLEL_IO_H
 
+/* Includes. */
+#include "part.h"
+
 #if defined(HAVE_HDF5) && defined(WITH_MPI) && defined(HAVE_PARALLEL_HDF5)
 
 void read_ic_parallel(char* fileName, double dim[3], struct part** parts,
diff --git a/src/part.h b/src/part.h
index e9e61c617d..380c2dedb2 100644
--- a/src/part.h
+++ b/src/part.h
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  ******************************************************************************/
-#ifndef SIWFT_PART_H
+#ifndef SWIFT_PART_H
 #define SWIFT_PART_H
 
 /* Some constants. */
diff --git a/src/proxy.c b/src/proxy.c
index 9153ad85a0..3616d05433 100644
--- a/src/proxy.c
+++ b/src/proxy.c
@@ -46,7 +46,6 @@
 #include "vector.h"
 #include "lock.h"
 #include "space.h"
-#include "part.h"
 #include "multipole.h"
 #include "cell.h"
 #include "task.h"
diff --git a/src/proxy.h b/src/proxy.h
index 20e05bc072..afdd004f91 100644
--- a/src/proxy.h
+++ b/src/proxy.h
@@ -19,6 +19,9 @@
 #ifndef SWIFT_PROXY_H
 #define SWIFT_PROXY_H
 
+/* Includes. */
+#include "part.h"
+
 /* Some constants. */
 #define proxy_buffgrow 1.5
 #define proxy_buffinit 100
diff --git a/src/queue.c b/src/queue.c
index 0cdfc34108..945c300f54 100644
--- a/src/queue.c
+++ b/src/queue.c
@@ -37,7 +37,6 @@
 #include "task.h"
 #include "timers.h"
 #include "space.h"
-#include "part.h"
 #include "multipole.h"
 #include "cell.h"
 #include "queue.h"
diff --git a/src/runner.c b/src/runner.c
index 7ec7899432..28d5c78f52 100644
--- a/src/runner.c
+++ b/src/runner.c
@@ -43,7 +43,6 @@
 #include "const.h"
 #include "lock.h"
 #include "task.h"
-#include "part.h"
 #include "space.h"
 #include "multipole.h"
 #include "cell.h"
diff --git a/src/runner_doiact.h b/src/runner_doiact.h
index a9d96490a3..3c6a732af1 100644
--- a/src/runner_doiact.h
+++ b/src/runner_doiact.h
@@ -17,6 +17,9 @@
  *
  ******************************************************************************/
 
+/* Includes. */
+#include "part.h"
+
 /* Before including this file, define FUNCTION, which is the
    name of the interaction function. This creates the interaction functions
    runner_dopair_FUNCTION, runner_dopair_FUNCTION_naive, runner_doself_FUNCTION,
diff --git a/src/runner_iact.h b/src/runner_iact.h
index d1de59afc8..747208afc1 100644
--- a/src/runner_iact.h
+++ b/src/runner_iact.h
@@ -20,6 +20,8 @@
 #ifndef SWIFT_RUNNER_IACT_H
 #define SWIFT_RUNNER_IACT_H
 
+/* Includes. */
+#include "part.h"
 #include "kernel.h"
 #include "vector.h"
 
diff --git a/src/runner_iact_legacy.h b/src/runner_iact_legacy.h
index f098b3d56e..5b42c6de7f 100644
--- a/src/runner_iact_legacy.h
+++ b/src/runner_iact_legacy.h
@@ -20,6 +20,8 @@
 #ifndef SWIFT_RUNNER_IACT_LEGACY_H
 #define SWIFT_RUNNER_IACT_LECAGY_H
 
+/* Includes. */
+#include "part.h"
 #include "kernel.h"
 #include "vector.h"
 
diff --git a/src/scheduler.c b/src/scheduler.c
index 658e587b16..fa6b3db548 100644
--- a/src/scheduler.c
+++ b/src/scheduler.c
@@ -43,7 +43,6 @@
 #include "vector.h"
 #include "lock.h"
 #include "task.h"
-#include "part.h"
 #include "debug.h"
 #include "space.h"
 #include "multipole.h"
diff --git a/src/serial_io.c b/src/serial_io.c
index a86dcbc9e6..89b6c1583a 100644
--- a/src/serial_io.c
+++ b/src/serial_io.c
@@ -37,7 +37,6 @@
 #include "cycle.h"
 #include "lock.h"
 #include "task.h"
-#include "part.h"
 #include "space.h"
 #include "scheduler.h"
 #include "engine.h"
diff --git a/src/serial_io.h b/src/serial_io.h
index 6f28b56c95..3344c0dab3 100644
--- a/src/serial_io.h
+++ b/src/serial_io.h
@@ -19,6 +19,9 @@
 #ifndef SWIFT_SERIAL_IO_H
 #define SWIFT_SERIAL_IO_H
 
+/* Includes. */
+#include "part.h"
+
 #if defined(HAVE_HDF5) && defined(WITH_MPI) && !defined(HAVE_PARALLEL_HDF5)
 
 void read_ic_serial(char* fileName, double dim[3], struct part** parts, int* N,
diff --git a/src/single_io.c b/src/single_io.c
index 449980cd51..cfcafc53df 100644
--- a/src/single_io.c
+++ b/src/single_io.c
@@ -35,7 +35,6 @@
 #include "cycle.h"
 #include "lock.h"
 #include "task.h"
-#include "part.h"
 #include "space.h"
 #include "scheduler.h"
 #include "engine.h"
diff --git a/src/space.c b/src/space.c
index 14bf75b744..308c881ee6 100644
--- a/src/space.c
+++ b/src/space.c
@@ -42,7 +42,6 @@
 #include "lock.h"
 #include "task.h"
 #include "kernel.h"
-#include "part.h"
 #include "space.h"
 #include "multipole.h"
 #include "cell.h"
diff --git a/src/space.h b/src/space.h
index e6770333f3..85bb93de6e 100644
--- a/src/space.h
+++ b/src/space.h
@@ -19,6 +19,9 @@
 #ifndef SWIFT_SPACE_H
 #define SWIFT_SPACE_H
 
+/* Includes. */
+#include "part.h"
+
 /* Some constants. */
 #define space_maxdepth 10
 #define space_cellallocchunk 1000
diff --git a/src/task.c b/src/task.c
index 897914a84f..52b25e9498 100644
--- a/src/task.c
+++ b/src/task.c
@@ -42,7 +42,6 @@
 #include "atomic.h"
 #include "lock.h"
 #include "space.h"
-#include "part.h"
 #include "multipole.h"
 #include "cell.h"
 #include "task.h"
diff --git a/src/units.c b/src/units.c
index 2efcfaa510..ed16f259f1 100644
--- a/src/units.c
+++ b/src/units.c
@@ -32,7 +32,6 @@
 
 #include "const.h"
 #include "cycle.h"
-#include "part.h"
 #include "error.h"
 #include "units.h"
 
-- 
GitLab