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

Make the M2L and M2P accept conditions symmetric with respect to the softening length checks

parent 361c30bd
Branches
Tags
1 merge request!1077Improved multipole acceptance criterion (MAC)
......@@ -84,7 +84,8 @@ __attribute__((nonnull, pure)) INLINE static int gravity_M2L_accept(
const float min_a_grav = A->m_pole.min_old_a_grav_norm;
/* Get the maximal softening length in B */
const float max_softening = B->m_pole.max_softening;
const float max_softening =
max(A->m_pole.max_softening, B->m_pole.max_softening);
/* Get the relative tolerance */
const float eps = props->adaptive_tolerance;
......@@ -192,8 +193,8 @@ __attribute__((nonnull, pure)) INLINE static int gravity_M2P_accept(
const float old_a_grav = pa->old_a_grav_norm;
/* Get the maximal softening length in B */
const float max_softening = max(B->m_pole.max_softening,
gravity_get_softening(pa, props));
const float max_softening =
max(B->m_pole.max_softening, gravity_get_softening(pa, props));
/* Get the relative tolerance */
const float eps = props->adaptive_tolerance;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment