Skip to content
Snippets Groups Projects
Commit b892e7f5 authored by Peter W. Draper's avatar Peter W. Draper
Browse files

Merge branch 'stars_use_sort' into 'master'

Stars use sort

See merge request !750
parents 526c5d68 c9907eaf
Branches
Tags
1 merge request!750Stars use sort
......@@ -306,6 +306,18 @@ if test "$enable_naive_interactions" = "yes"; then
AC_DEFINE([SWIFT_USE_NAIVE_INTERACTIONS],1,[Enable use of naive cell interaction functions])
fi
# Check whether we want to default to naive cell interactions (stars)
AC_ARG_ENABLE([naive-interactions-stars],
[AS_HELP_STRING([--enable-naive-interactions-stars],
[Activate use of naive cell interaction functions for stars @<:@yes/no@:>@]
)],
[enable_naive_interactions_stars="$enableval"],
[enable_naive_interactions_stars="no"]
)
if test "$enable_naive_interactions_stars" = "yes"; then
AC_DEFINE([SWIFT_USE_NAIVE_INTERACTIONS_STARS],1,[Enable use of naive cell interaction functions for stars])
fi
# Check if gravity force checks are on for some particles.
AC_ARG_ENABLE([gravity-force-checks],
[AS_HELP_STRING([--enable-gravity-force-checks],
......@@ -1943,6 +1955,7 @@ AC_MSG_RESULT([
Interaction debugging : $enable_debug_interactions
Stars interaction debugging : $enable_debug_interactions_stars
Naive interactions : $enable_naive_interactions
Naive stars interactions : $enable_naive_interactions_stars
Gravity checks : $gravity_force_checks
Custom icbrtf : $enable_custom_icbrtf
......
......@@ -74,6 +74,7 @@
#define TASK_LOOP_GRADIENT 1
#define TASK_LOOP_FORCE 2
#define TASK_LOOP_LIMITER 3
#define TASK_LOOP_FEEDBACK 4
/* Import the density loop functions. */
#define FUNCTION density
......@@ -110,14 +111,16 @@
/* Import the stars density loop functions. */
#define FUNCTION density
#define UPDATE_STARS 1
#define FUNCTION_TASK_LOOP TASK_LOOP_DENSITY
#include "runner_doiact_stars.h"
#undef UPDATE_STARS
#undef FUNCTION_TASK_LOOP
#undef FUNCTION
/* Import the stars feedback loop functions. */
#define FUNCTION feedback
#define FUNCTION_TASK_LOOP TASK_LOOP_FEEDBACK
#include "runner_doiact_stars.h"
#undef FUNCTION_TASK_LOOP
#undef FUNCTION
/**
......
This diff is collapsed.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment