Skip to content
This repository was archived by the owner on Aug 28, 2024. It is now read-only.

Commit

Permalink
Merge branch 'debug'
Browse files Browse the repository at this point in the history
  • Loading branch information
daminton committed Aug 12, 2021
2 parents eca7af8 + 9d7a741 commit a4da062
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 2 deletions.
12 changes: 12 additions & 0 deletions src/symba/symba_fragmentation.f90
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,12 @@ module function symba_fragmentation_casedisruption(system, param, family, x, v,
write(*,*) 'No fragment solution found, so treat as a pure hit-and-run'
status = ACTIVE
nfrag = 0
select type(pl => system%pl)
class is (symba_pl)
pl%status(family(:)) = status
pl%ldiscard(family(:)) = .false.
pl%lcollision(family(:)) = .false.
end select
else
! Populate the list of new bodies
write(*,'("Generating ",I2.0," fragments")') nfrag
Expand Down Expand Up @@ -360,6 +366,12 @@ module function symba_fragmentation_casesupercatastrophic(system, param, family,
write(*,*) 'No fragment solution found, so treat as a pure hit-and-run'
status = ACTIVE
nfrag = 0
select type(pl => system%pl)
class is (symba_pl)
pl%status(family(:)) = status
pl%ldiscard(family(:)) = .false.
pl%lcollision(family(:)) = .false.
end select
else
! Populate the list of new bodies
write(*,'("Generating ",I2.0," fragments")') nfrag
Expand Down
3 changes: 1 addition & 2 deletions src/util/util_append.f90
Original file line number Diff line number Diff line change
Expand Up @@ -177,10 +177,9 @@ module subroutine util_append_body(self, source, lsource_mask)
call util_append(self%capom, source%capom, nold, nsrc, lsource_mask)
call util_append(self%omega, source%omega, nold, nsrc, lsource_mask)
call util_append(self%capm, source%capm, nold, nsrc, lsource_mask)
self%nbody = nold + count(lsource_mask(:))
end associate

self%nbody = count(self%status(:) /= INACTIVE)

return
end subroutine util_append_body

Expand Down

0 comments on commit a4da062

Please sign in to comment.