Reorganized io subroutines into alphabetical order like the other sub…

…modules

src/modules/symba_classes.f90

@@ -537,9 +537,9 @@ end subroutine symba_util_peri_pl
 
       module subroutine symba_util_rearray_pl(self, system, param)
          implicit none
-         class(symba_pl),              intent(inout) :: self   !! SyMBA massive body object
-         class(swiftest_nbody_system), intent(inout) :: system !! Swiftest nbody system object
-         class(swiftest_parameters),   intent(in)    :: param  !! Current run configuration parameters
+         class(symba_pl),           intent(inout) :: self   !! SyMBA massive body object
+         class(symba_nbody_system), intent(inout) :: system !! SyMBA nbody system object
+         class(symba_parameters),   intent(in)    :: param  !! Current run configuration parameters with SyMBA additions
       end subroutine symba_util_rearray_pl
    end interface
 

src/symba/symba_discard.f90

@@ -310,7 +310,7 @@ module subroutine symba_discard_pl(self, system, param)
 
                if (any(pl%ldiscard(:))) then
                   call symba_discard_nonplpl_conservation(self, system, param)
-                  !call pl%rearray(self, system, param)
+                  call pl%rearray(system, param)
                end if
 
             end associate

src/symba/symba_fragmentation.f90

@@ -97,6 +97,8 @@ module function symba_fragmentation_casemerge(system, param, family, x, v, mass,
             ibiggest = maxloc(pl%Gmass(family(:)), dim=1)
             plnew%id(1) = pl%id(family(ibiggest))
             plnew%status(1) = ACTIVE
+            plnew%lcollision = .false.
+            plnew%ldiscard = .false.
             plnew%xb(:,1) = xcom(:)
             plnew%vb(:,1) = vcom(:)
             plnew%xh(:,1) = xcom(:) - cb%xb(:)

src/symba/symba_util.f90

@@ -375,17 +375,37 @@ module subroutine symba_util_rearray_pl(self, system, param)
       !! Clean up the massive body structures to remove discarded bodies and add new bodies
       implicit none
       ! Arguments
-      class(symba_pl),              intent(inout) :: self   !! SyMBA massive body object
-      class(swiftest_nbody_system), intent(inout) :: system !! Swiftest nbody system object
-      class(swiftest_parameters),   intent(in)    :: param  !! Current run configuration parameters
+      class(symba_pl),           intent(inout) :: self   !! SyMBA massive body object
+      class(symba_nbody_system), intent(inout) :: system !! Swiftest nbody system object
+      class(symba_parameters),   intent(in)    :: param  !! Current run configuration parameters
+      ! Internals
+      class(symba_pl), allocatable :: pl_discards !! The discarded body list.
+
+      associate(pl => self, mergeadd_list => system%mergeadd_list)
+         allocate(pl_discards, mold=pl)
+         ! Remove the discards
+         call pl%spill(pl_discards, lspill_list=(pl%ldiscard(:) .or. pl%status(:) == INACTIVE), ldestructive=.true.)
+
+         ! Add in any new bodies
+         call pl%append(mergeadd_list)
+
+         ! If there are still bodies in the system, sort by mass in descending order and re-index
+         if (pl%nbody > 0) then
+            call pl%sort("mass", ascending=.false.)
+            pl%lmtiny(:) = pl%Gmass(:) > param%MTINY
+            pl%nplm = count(pl%lmtiny(:))
+            call pl%eucl_index()
+         end if
 
-      ! First 
+         ! Destroy the discarded body list, since we already have what we need in the mergesub_list
+         call pl_discards%setup(0,param)
+         deallocate(pl_discards)
+      end associate
 
       return
    end subroutine symba_util_rearray_pl
 
 
-
    module subroutine symba_util_resize_arr_info(arr, nnew)
       !! author: David A. Minton
       !!

src/util/util_spill.f90

@@ -163,6 +163,7 @@ module subroutine util_spill_body(self, discards, lspill_list, ldestructive)
          call util_spill(keeps%name, discards%name, lspill_list, ldestructive)
          call util_spill(keeps%status, discards%status, lspill_list, ldestructive)
          call util_spill(keeps%lmask, discards%lmask, lspill_list, ldestructive)
+         call util_spill(keeps%ldiscard, discards%ldiscard, lspill_list, ldestructive)
          call util_spill(keeps%mu, discards%mu, lspill_list, ldestructive)
          call util_spill(keeps%xh, discards%xh, lspill_list, ldestructive)
          call util_spill(keeps%vh, discards%vh, lspill_list, ldestructive)