From 468b3cdf1bf4942e21952dd0c019309f41a44ddd Mon Sep 17 00:00:00 2001 From: David Minton Date: Tue, 11 May 2021 14:27:02 -0400 Subject: [PATCH] Added some explanatory comments on why the calculations sometimes result in a merge --- src/symba/symba_frag_pos.f90 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/symba/symba_frag_pos.f90 b/src/symba/symba_frag_pos.f90 index 9c06c8d89..44e44063e 100644 --- a/src/symba/symba_frag_pos.f90 +++ b/src/symba/symba_frag_pos.f90 @@ -367,6 +367,8 @@ subroutine symba_frag_pos_kinetic_energy(xcom, vcom, L_orb, L_spin, m_frag, x_fr v_frag(:, i) = v_r_mag(i) * v_r_unit(:, i) + v_t(:, i) end do else + ! No solution exists for this case, so we need to indicate that this should be a merge + ! This may happen due to setting the tangential velocities too high when setting the angular momentum constraint lmerge = .true. v_frag(:, :) = 0.0_DP end if