From a26e112ad7428d8813382aa08bb49d109c6e599d Mon Sep 17 00:00:00 2001
From: Matthieu Schaller <matthieu.schaller@durham.ac.uk>
Date: Sat, 19 Aug 2017 10:35:32 +0100
Subject: [PATCH] More consistent naming of the multipole acceptance function.
---
src/cell.c | 3 +--
src/engine.c | 5 ++---
src/multipole.h | 2 +-
src/runner_doiact_grav.h | 11 ++++-------
4 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/src/cell.c b/src/cell.c
index 37cd46b7de..69cdbb7fb2 100644
--- a/src/cell.c
+++ b/src/cell.c
@@ -1733,8 +1733,7 @@ void cell_activate_subcell_grav_tasks(struct cell *ci, struct cell *cj,
const double r2 = dx * dx + dy * dy + dz * dz;
/* Can we use multipoles ? */
- if (gravity_multipole_accept(multi_i->r_max, multi_j->r_max, theta_crit2,
- r2)) {
+ if (gravity_M2L_accept(multi_i->r_max, multi_j->r_max, theta_crit2, r2)) {
/* Ok, no need to drift anything */
return;
diff --git a/src/engine.c b/src/engine.c
index a0e5929cbf..2437724c9d 100644
--- a/src/engine.c
+++ b/src/engine.c
@@ -1798,9 +1798,8 @@ void engine_make_self_gravity_tasks_mapper(void *map_data, int num_elements,
const double r2 = dx * dx + dy * dy + dz * dz;
/* Are the cells too close for a MM interaction ? */
- if (!gravity_multipole_accept(multi_i->r_max_rebuild,
- multi_j->r_max_rebuild, theta_crit2,
- r2)) {
+ if (!gravity_M2L_accept(multi_i->r_max_rebuild,
+ multi_j->r_max_rebuild, theta_crit2, r2)) {
/* Ok, we need to add a direct pair calculation */
scheduler_addtask(sched, task_type_pair, task_subtype_grav, 0, 0,
diff --git a/src/multipole.h b/src/multipole.h
index cc67504e97..9fdfa2001e 100644
--- a/src/multipole.h
+++ b/src/multipole.h
@@ -2399,7 +2399,7 @@ INLINE static void gravity_M2P(const struct multipole *ma,
* @param r2 Square of the distance (periodically wrapped) between the
* multipoles.
*/
-__attribute__((always_inline)) INLINE static int gravity_multipole_accept(
+__attribute__((always_inline)) INLINE static int gravity_M2L_accept(
double r_crit_a, double r_crit_b, double theta_crit2, double r2) {
const double size = r_crit_a + r_crit_b;
diff --git a/src/runner_doiact_grav.h b/src/runner_doiact_grav.h
index 0cbb05479c..d4c64b98b1 100644
--- a/src/runner_doiact_grav.h
+++ b/src/runner_doiact_grav.h
@@ -946,8 +946,7 @@ void runner_dopair_grav(struct runner *r, struct cell *ci, struct cell *cj,
* option... */
/* Can we use M-M interactions ? */
- if (gravity_multipole_accept(multi_i->r_max, multi_j->r_max, theta_crit2,
- r2)) {
+ if (gravity_M2L_accept(multi_i->r_max, multi_j->r_max, theta_crit2, r2)) {
/* MATTHIEU: make a symmetric M-M interaction function ! */
runner_dopair_grav_mm(r, ci, cj);
@@ -1171,8 +1170,7 @@ void runner_do_grav_long_range(struct runner *r, struct cell *ci, int timer) {
}
/* Check the multipole acceptance criterion */
- if (gravity_multipole_accept(multi_i->r_max, multi_j->r_max, theta_crit2,
- r2)) {
+ if (gravity_M2L_accept(multi_i->r_max, multi_j->r_max, theta_crit2, r2)) {
/* Go for a (non-symmetric) M-M calculation */
runner_dopair_grav_mm(r, ci, cj);
@@ -1195,9 +1193,8 @@ void runner_do_grav_long_range(struct runner *r, struct cell *ci, int timer) {
const double r2_rebuild = dx * dx + dy * dy + dz * dz;
/* Is the criterion violated now but was OK at the last rebuild ? */
- if (gravity_multipole_accept(multi_i->r_max_rebuild,
- multi_j->r_max_rebuild, theta_crit2,
- r2_rebuild)) {
+ if (gravity_M2L_accept(multi_i->r_max_rebuild, multi_j->r_max_rebuild,
+ theta_crit2, r2_rebuild)) {
/* Alright, we have to take charge of that pair in a different way. */
// MATTHIEU: We should actually open the tree-node here and recurse.
--
GitLab