From 8b5e18267827065d43e17aa67aaedbd8b26485ad Mon Sep 17 00:00:00 2001
From: Matthieu Schaller <matthieu.schaller@durham.ac.uk>
Date: Wed, 26 Apr 2017 23:29:06 +0100
Subject: [PATCH] Corrected documentation in M2L kernel
---
src/gravity/Default/gravity_iact.h | 6 ------
src/multipole.h | 4 ++--
2 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/src/gravity/Default/gravity_iact.h b/src/gravity/Default/gravity_iact.h
index b044107b15..eca5c2491c 100644
--- a/src/gravity/Default/gravity_iact.h
+++ b/src/gravity/Default/gravity_iact.h
@@ -64,8 +64,6 @@ __attribute__((always_inline)) INLINE static void runner_iact_grav_pp(
kernel_grav_eval(ui, &W);
- if (W < 0) error("W < 0");
-
/* Get softened gravity */
fi = mj * hi_inv3 * W * f_lr;
}
@@ -83,8 +81,6 @@ __attribute__((always_inline)) INLINE static void runner_iact_grav_pp(
kernel_grav_eval(uj, &W);
- if (W < 0) error("W < 0");
-
/* Get softened gravity */
fj = mi * hj_inv3 * W * f_lr;
}
@@ -135,8 +131,6 @@ __attribute__((always_inline)) INLINE static void runner_iact_grav_pp_nonsym(
kernel_grav_eval(ui, &W);
- if (W < 0) error("W < 0");
-
/* Get softened gravity */
f = mj * hi_inv3 * W * f_lr;
}
diff --git a/src/multipole.h b/src/multipole.h
index ff669bdc8f..b9d49dcf0f 100644
--- a/src/multipole.h
+++ b/src/multipole.h
@@ -1626,7 +1626,7 @@ INLINE static void gravity_M2L(struct grav_tensor *l_b,
m_a->M_010 * D_021(dx, dy, dz, r_inv) +
m_a->M_001 * D_012(dx, dy, dz, r_inv);
- /* 3rd order multipole term (addition to rank 2)*/
+ /* 3rd order multipole term (addition to rank 3)*/
l_b->F_300 += m_a->M_000 * D_300(dx, dy, dz, r_inv);
l_b->F_030 += m_a->M_000 * D_030(dx, dy, dz, r_inv);
l_b->F_003 += m_a->M_000 * D_003(dx, dy, dz, r_inv);
@@ -2151,7 +2151,7 @@ INLINE static void gravity_M2L(struct grav_tensor *l_b,
m_a->M_010 * D_soft_021(dx, dy, dz, r, eps_inv) +
m_a->M_001 * D_soft_012(dx, dy, dz, r, eps_inv);
- /* 3rd order multipole term (addition to rank 2)*/
+ /* 3rd order multipole term (addition to rank 3)*/
l_b->F_300 += m_a->M_000 * D_soft_300(dx, dy, dz, r, eps_inv);
l_b->F_030 += m_a->M_000 * D_soft_030(dx, dy, dz, r, eps_inv);
l_b->F_003 += m_a->M_000 * D_soft_003(dx, dy, dz, r, eps_inv);
--
GitLab