From d62cec54bded18debdf461da47a0a393757db996 Mon Sep 17 00:00:00 2001 From: David A Minton Date: Thu, 22 Dec 2022 08:19:18 -0500 Subject: [PATCH] small changes to the collision resolver for mergers --- src/collision/collision_regime.f90 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/collision/collision_regime.f90 b/src/collision/collision_regime.f90 index 50884258b..ac571b23c 100644 --- a/src/collision/collision_regime.f90 +++ b/src/collision/collision_regime.f90 @@ -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