From d8b69b6ce9b31a4a0a8ad3aecca25807e0c0a559 Mon Sep 17 00:00:00 2001 From: David A Minton Date: Fri, 13 Jan 2023 17:56:43 -0500 Subject: [PATCH] Put the energy loss condition back in and made the disruption case projectile bigger --- examples/Fragmentation/Fragmentation_Movie.py | 4 ++-- src/fraggle/fraggle_generate.f90 | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/Fragmentation/Fragmentation_Movie.py b/examples/Fragmentation/Fragmentation_Movie.py index 7d774f983..a77156d66 100755 --- a/examples/Fragmentation/Fragmentation_Movie.py +++ b/examples/Fragmentation/Fragmentation_Movie.py @@ -90,8 +90,8 @@ np.array([0.0, 0.0, 1.0e4])] } -body_Gmass = {"disruption_headon" : [1e-7, 1e-10], - "disruption_off_axis" : [1e-7, 1e-10], +body_Gmass = {"disruption_headon" : [1e-7, 1e-9], + "disruption_off_axis" : [1e-7, 1e-9], "supercatastrophic_headon" : [1e-7, 1e-8], "supercatastrophic_off_axis": [1e-7, 1e-8], "hitandrun_disrupt" : [1e-7, 7e-10], diff --git a/src/fraggle/fraggle_generate.f90 b/src/fraggle/fraggle_generate.f90 index cf30bea7c..a4e2deb4d 100644 --- a/src/fraggle/fraggle_generate.f90 +++ b/src/fraggle/fraggle_generate.f90 @@ -620,7 +620,7 @@ module subroutine fraggle_generate_vel_vec(collider, nbody_system, param, lfailu call fragments%set_coordinate_system() end do - !if (dE_best < 0.0_DP) exit outer + if (dE_best < 0.0_DP) exit outer ! We didn't converge. Reset the fragment positions and velocities and try a new configuration with some slightly different parameters if (fragments%nbody == 2) exit outer ! Reduce the number of fragments by one