Skip to content
Snippets Groups Projects
Commit 839cbab3 authored by Matthieu Schaller's avatar Matthieu Schaller
Browse files

Moved the interaction functions to the hydro directory

parent 907fc8fd
No related branches found
No related tags found
2 merge requests!136Master,!79First version of the multiple time-stepping
...@@ -45,8 +45,8 @@ AM_SOURCES = space.c runner.c queue.c task.c cell.c engine.c \ ...@@ -45,8 +45,8 @@ AM_SOURCES = space.c runner.c queue.c task.c cell.c engine.c \
# Include files for distribution, not installation. # Include files for distribution, not installation.
noinst_HEADERS = atomic.h cycle.h error.h inline.h kernel.h vector.h \ 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.h runner_doiact_grav.h units.h intrinsics.h \
runner_doiact_grav.h units.h intrinsics.h hydro.h gravity.h
# Sources and flags for regular library # Sources and flags for regular library
libswiftsim_la_SOURCES = $(AM_SOURCES) libswiftsim_la_SOURCES = $(AM_SOURCES)
......
...@@ -55,12 +55,6 @@ ...@@ -55,12 +55,6 @@
#include "part.h" #include "part.h"
#include "timers.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] = { const char *engine_policy_names[10] = {
"none", "rand", "steal", "keep", "block", "none", "rand", "steal", "keep", "block",
"fix_dt", "multi_dt", "cpu_tight", "mpi", "numa_affinity"}; "fix_dt", "multi_dt", "cpu_tight", "mpi", "numa_affinity"};
......
...@@ -24,5 +24,6 @@ ...@@ -24,5 +24,6 @@
/* So far only one model here */ /* So far only one model here */
/* Straight-forward import */ /* Straight-forward import */
#include "./gravity/Default/gravity.h" #include "./gravity/Default/gravity.h"
#include "runner_iact_grav.h"
#endif #endif
...@@ -16,6 +16,9 @@ ...@@ -16,6 +16,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * 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 * @brief Computes the gravity time-step of a given particle
* *
......
...@@ -24,8 +24,10 @@ ...@@ -24,8 +24,10 @@
/* Import the right functions */ /* Import the right functions */
#ifdef LEGACY_GADGET2_SPH #ifdef LEGACY_GADGET2_SPH
#include "./hydro/Gadget2/hydro.h" #include "./hydro/Gadget2/hydro.h"
#include "./hydro/Gadget2/hydro_iact.h"
#else #else
#include "./hydro/Default/hydro.h" #include "./hydro/Default/hydro.h"
#include "./hydro/Default/hydro_iact.h"
#endif #endif
#endif #endif
File moved
File moved
...@@ -45,14 +45,6 @@ ...@@ -45,14 +45,6 @@
#include "hydro.h" #include "hydro.h"
#include "gravity.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 */ /* Orientation of the cell pairs */
const float runner_shift[13 * 3] = { const float runner_shift[13 * 3] = {
5.773502691896258e-01, 5.773502691896258e-01, 5.773502691896258e-01, 5.773502691896258e-01, 5.773502691896258e-01, 5.773502691896258e-01,
......
...@@ -31,6 +31,8 @@ ...@@ -31,6 +31,8 @@
#include "debug.h" #include "debug.h"
#include "engine.h" #include "engine.h"
#include "error.h" #include "error.h"
#include "gravity.h"
#include "hydro.h"
#include "lock.h" #include "lock.h"
#include "map.h" #include "map.h"
#include "multipole.h" #include "multipole.h"
...@@ -48,11 +50,5 @@ ...@@ -48,11 +50,5 @@
#include "tools.h" #include "tools.h"
#include "version.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 */ #endif /* SWIFT_SWIFT_H */
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment