From 75afdcc80f6f03d7b1901ef6b80326f0c3236408 Mon Sep 17 00:00:00 2001 From: David A Minton Date: Thu, 12 Jan 2023 20:56:29 -0500 Subject: [PATCH] Cleanup --- src/base/base_module.f90 | 2 +- src/collision/collision_util.f90 | 2 +- src/fraggle/fraggle_util.f90 | 5 ++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/base/base_module.f90 b/src/base/base_module.f90 index d98672f4f..0669f62f3 100644 --- a/src/base/base_module.f90 +++ b/src/base/base_module.f90 @@ -209,7 +209,7 @@ end subroutine abstract_util_dealloc_object integer(I4B) :: nbody = 0 !! Number of bodies integer(I4B), dimension(:), allocatable :: id !! Identifier contains - procedure :: dealloc => base_util_dealloc_multibody + procedure :: dealloc => base_util_dealloc_multibody end type base_multibody diff --git a/src/collision/collision_util.f90 b/src/collision/collision_util.f90 index ddd8d4291..21242c1d5 100644 --- a/src/collision/collision_util.f90 +++ b/src/collision/collision_util.f90 @@ -492,7 +492,7 @@ module subroutine collision_util_setup_fragments(self, n) if (n == 0) return allocate(swiftest_particle_info :: self%info(n)) - allocate(self%id(n)) + allocate(self%status(n)) allocate(self%rh(NDIM, n)) allocate(self%vh(NDIM, n)) diff --git a/src/fraggle/fraggle_util.f90 b/src/fraggle/fraggle_util.f90 index 61d58e0c6..58ff84d4d 100644 --- a/src/fraggle/fraggle_util.f90 +++ b/src/fraggle/fraggle_util.f90 @@ -86,14 +86,13 @@ module subroutine fraggle_util_set_mass_dist(self, param) case (COLLRESOLVE_REGIME_MERGE, COLLRESOLVE_REGIME_GRAZE_AND_MERGE) call self%setup_fragments(1) - select type(fragments => self%fragments) - class is (collision_fragments) + associate(fragments => self%fragments) fragments%mass(1) = impactors%mass_dist(1) fragments%Gmass(1) = G * impactors%mass_dist(1) fragments%radius(1) = impactors%radius(jtarg) fragments%density(1) = impactors%mass_dist(1) / volume(jtarg) if (param%lrotation) fragments%Ip(:, 1) = impactors%Ip(:,1) - end select + end associate return case default write(*,*) "collision_util_set_mass_dist_fragments error: Unrecognized regime code",impactors%regime