From cf7f9f6b0f80c864303ffbe64a441e5a47906f54 Mon Sep 17 00:00:00 2001 From: David A Minton Date: Sat, 31 Dec 2022 12:02:44 -0500 Subject: [PATCH] Tweaks and improvements to log files. Also made sure pure hit and run is actually pure --- examples/Fragmentation/Fragmentation_Movie.py | 2 +- src/fraggle/fraggle_generate.f90 | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/examples/Fragmentation/Fragmentation_Movie.py b/examples/Fragmentation/Fragmentation_Movie.py index dab940b79..fafe319f8 100644 --- a/examples/Fragmentation/Fragmentation_Movie.py +++ b/examples/Fragmentation/Fragmentation_Movie.py @@ -68,7 +68,7 @@ "hitandrun_disrupt" : [np.array([ 0.00, 6.28, 0.0]), np.array([-1.45, -6.28, 0.0])], "hitandrun_pure" : [np.array([ 0.00, 6.28, 0.0]), - np.array([-1.50, -6.28, 0.0])] + np.array([-1.51, -6.28, 0.0])] } rot_vectors = {"disruption_headon" : [np.array([0.0, 0.0, 0.0]), diff --git a/src/fraggle/fraggle_generate.f90 b/src/fraggle/fraggle_generate.f90 index 0711ab001..c0afb2393 100644 --- a/src/fraggle/fraggle_generate.f90 +++ b/src/fraggle/fraggle_generate.f90 @@ -180,10 +180,7 @@ module subroutine fraggle_generate_hitandrun(self, nbody_system, param, t) select type(pl => nbody_system%pl) class is (swiftest_pl) associate(impactors => self%impactors) - message = "Hit and run between" call collision_io_collider_message(nbody_system%pl, impactors%id, message) - call swiftest_io_log_one_message(COLLISION_LOG_OUT, trim(adjustl(message))) - if (impactors%mass(1) > impactors%mass(2)) then jtarg = 1 jproj = 2 @@ -202,6 +199,8 @@ module subroutine fraggle_generate_hitandrun(self, nbody_system, param, t) end if lpure = .false. call self%set_mass_dist(param) + message = "Hit and run between" + call swiftest_io_log_one_message(COLLISION_LOG_OUT, trim(adjustl(message))) ! Generate the position and velocity distributions of the fragments call self%disrupt(nbody_system, param, t, lpure)