Commit 839cbab3 authored by Matthieu Schaller's avatar Matthieu Schaller
Browse files

Moved the interaction functions to the hydro directory

parent 907fc8fd
......@@ -45,8 +45,8 @@ AM_SOURCES = space.c runner.c queue.c task.c cell.c engine.c \
# Include files for distribution, not installation.
noinst_HEADERS = atomic.h cycle.h error.h inline.h kernel.h vector.h \
runner_iact_legacy.h runner_iact_grav.h runner_doiact.h \
runner_doiact_grav.h units.h intrinsics.h
runner_doiact.h runner_doiact_grav.h units.h intrinsics.h \
hydro.h gravity.h
# Sources and flags for regular library
libswiftsim_la_SOURCES = $(AM_SOURCES)
......
......@@ -55,12 +55,6 @@
#include "part.h"
#include "timers.h"
#ifdef LEGACY_GADGET2_SPH
#include "runner_iact_legacy.h"
#else
#include "runner_iact.h"
#endif
const char *engine_policy_names[10] = {
"none", "rand", "steal", "keep", "block",
"fix_dt", "multi_dt", "cpu_tight", "mpi", "numa_affinity"};
......
......@@ -24,5 +24,6 @@
/* So far only one model here */
/* Straight-forward import */
#include "./gravity/Default/gravity.h"
#include "runner_iact_grav.h"
#endif
......@@ -16,6 +16,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
******************************************************************************/
#include <float.h>
/**
* @brief Computes the gravity time-step of a given particle
*
......
......@@ -24,8 +24,10 @@
/* Import the right functions */
#ifdef LEGACY_GADGET2_SPH
#include "./hydro/Gadget2/hydro.h"
#include "./hydro/Gadget2/hydro_iact.h"
#else
#include "./hydro/Default/hydro.h"
#include "./hydro/Default/hydro_iact.h"
#endif
#endif
......@@ -45,14 +45,6 @@
#include "hydro.h"
#include "gravity.h"
/* Include the right variant of the SPH interactions */
#ifdef LEGACY_GADGET2_SPH
#include "runner_iact_legacy.h"
#else
#include "runner_iact.h"
#endif
#include "runner_iact_grav.h"
/* Orientation of the cell pairs */
const float runner_shift[13 * 3] = {
5.773502691896258e-01, 5.773502691896258e-01, 5.773502691896258e-01,
......
......@@ -31,6 +31,8 @@
#include "debug.h"
#include "engine.h"
#include "error.h"
#include "gravity.h"
#include "hydro.h"
#include "lock.h"
#include "map.h"
#include "multipole.h"
......@@ -48,11 +50,5 @@
#include "tools.h"
#include "version.h"
#ifdef LEGACY_GADGET2_SPH
#include "runner_iact_legacy.h"
#else
#include "runner_iact.h"
#endif
#include "runner_iact_grav.h"
#endif /* SWIFT_SWIFT_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