Commit d052d9cc authored by Peter W. Draper's avatar Peter W. Draper
Browse files

Fix problems with include files and MPI build

Issuws with MPICH having task_lock argument in API and multiple inclusions

Re-aassert copyrights
parent 4419d73a
...@@ -18,11 +18,10 @@ ...@@ -18,11 +18,10 @@
* *
******************************************************************************/ ******************************************************************************/
#include "map.h"
#include "error.h"
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include "error.h"
#include "map.h"
/** /**
* @brief Mapping function to draw a specific cell (gnuplot). * @brief Mapping function to draw a specific cell (gnuplot).
......
...@@ -20,8 +20,11 @@ ...@@ -20,8 +20,11 @@
/* Includes. */ /* Includes. */
#include "cell.h" #ifndef SWIFT_MAP_H
#define SWIFT_MAP_H
#include "part.h" #include "part.h"
#include "cell.h"
void map_cells_plot(struct cell *c, void *data); void map_cells_plot(struct cell *c, void *data);
void map_check(struct part *p, struct cell *c, void *data); void map_check(struct part *p, struct cell *c, void *data);
...@@ -34,3 +37,5 @@ void map_h_min(struct part *p, struct cell *c, void *data); ...@@ -34,3 +37,5 @@ void map_h_min(struct part *p, struct cell *c, void *data);
void map_h_max(struct part *p, struct cell *c, void *data); void map_h_max(struct part *p, struct cell *c, void *data);
void map_icount(struct part *p, struct cell *c, void *data); void map_icount(struct part *p, struct cell *c, void *data);
void map_dump(struct part *p, struct cell *c, void *data); void map_dump(struct part *p, struct cell *c, void *data);
#endif /* SWIFT_MAP_H */
/******************************************************************************* /*******************************************************************************
* This file is part of SWIFT. * This file is part of SWIFT.
* Coypright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk) * Copyright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk)
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published * it under the terms of the GNU Lesser General Public License as published
...@@ -45,6 +45,7 @@ ...@@ -45,6 +45,7 @@
#include "task.h" #include "task.h"
#include "timers.h" #include "timers.h"
#include "units.h" #include "units.h"
#include "tools.h"
#include "version.h" #include "version.h"
#ifdef LEGACY_GADGET2_SPH #ifdef LEGACY_GADGET2_SPH
......
/******************************************************************************* /*******************************************************************************
* This file is part of SWIFT. * This file is part of SWIFT.
* Copyright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk),
* Matthieu Schaller (matthieu.schaller@durham.ac.uk)
* Copyright (c) 2015 Peter W. Draper (p.w.draper@durham.ac.uk) * Copyright (c) 2015 Peter W. Draper (p.w.draper@durham.ac.uk)
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
...@@ -23,6 +25,7 @@ ...@@ -23,6 +25,7 @@
#include <stddef.h> #include <stddef.h>
#include <stdio.h> #include <stdio.h>
#include "error.h"
#include "part.h" #include "part.h"
#include "cell.h" #include "cell.h"
#include "tools.h" #include "tools.h"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment