Cleanup

MintonGroup · Jan 13, 2023 · 75afdcc · 75afdcc
1 parent 26560d6
commit 75afdcc
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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