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

Commit

Permalink
small changes to the collision resolver for mergers
Browse files Browse the repository at this point in the history
  • Loading branch information
daminton committed Dec 22, 2022
1 parent 0896ffb commit d62cec5
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/collision/collision_regime.f90
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ module subroutine collision_regime_impactors(self, nbody_system, param)
case("MERGE")
impactors%regime = COLLRESOLVE_REGIME_MERGE
mtot = sum(impactors%mass(:))
if (allocated(impactors%mass_dist)) deallocate(impactors%mass_dist)
allocate(impactors%mass_dist(1))
impactors%mass_dist(1) = mtot
impactors%mass_dist(2) = 0.0_DP
impactors%mass_dist(3) = 0.0_DP
impactors%rbcom(:) = (impactors%mass(1) * impactors%rb(:,1) + impactors%mass(2) * impactors%rb(:,2)) / mtot
impactors%vbcom(:) = (impactors%mass(1) * impactors%vb(:,1) + impactors%mass(2) * impactors%vb(:,2)) / mtot
case default
Expand Down

0 comments on commit d62cec5

Please sign in to comment.