From 2213b911bbe6bae5a6d6eddd33c5d7b7010aec66 Mon Sep 17 00:00:00 2001 From: David A Minton Date: Wed, 22 Feb 2023 14:22:42 -0500 Subject: [PATCH] Added ability to convert over to hit and run if merger body spins too fast. --- src/fraggle/fraggle_generate.f90 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/fraggle/fraggle_generate.f90 b/src/fraggle/fraggle_generate.f90 index bbca213f6..6ee9c36bd 100644 --- a/src/fraggle/fraggle_generate.f90 +++ b/src/fraggle/fraggle_generate.f90 @@ -160,7 +160,6 @@ module subroutine fraggle_generate_disrupt(self, nbody_system, param, t, lfailur call fraggle_generate_rot_vec(self, nbody_system, param) call fraggle_generate_vel_vec(self, nbody_system, param, lfailure) end if - lfailure = .true. if (.not.lfailure) then if (self%fragments%nbody /= nfrag_start) then @@ -320,6 +319,7 @@ module subroutine fraggle_generate_merge(self, nbody_system, param, t) if (rotmag < self%max_rot) then call self%collision_basic%merge(nbody_system, param, t) else + call swiftest_io_log_one_message(COLLISION_LOG_OUT, "Merger would break the spin barrier. Converting to pure hit and run" ) impactors%mass_dist(1:2) = impactors%mass(1:2) call self%hitandrun(nbody_system, param, t) end if